You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Julian Foad <ju...@btopenworld.com> on 2012/09/18 21:07:36 UTC
Re: r1352935 - supporting "svn mergeinfo --revision" option
Hi Mike. ...
> Author: cmpilato
> Date: Fri Jun 22 15:47:43 2012
> New Revision: 1352935
>
> URL: http://svn.apache.org/viewvc?rev=1352935&view=rev
> Log:
> Finish issue #4199 ("Add real support for the --revision (-r) option
> to the 'svn mergeinfo' command"). Prior to this change, 'svn
> mergeinfo' accepted the --revision (-r) option, but did nothing with
> it. Oops!
>
> * subversion/include/svn_client.h
> (svn_client_mergeinfo_log2): New iteration (adding an operative
> revision range) of ...
> (svn_client_mergeinfo_log): ... this now-deprecated function.
>
> * subversion/libsvn_client/deprecated.c
> (svn_client_mergeinfo_log): Move this here, and make it a mere
> wrapper around svn_client_mergeinfo_log2().
>
> * subversion/libsvn_client/mergeinfo.c
> (svn_client_mergeinfo_log2): Replaces svn_client_mergeinfo_log(),
> adding 'source_start_revision' and 'source_end_revision'
> parameters and handling. The core of this change was really
> straightforward -- we just needed to provide the resolved
> start/end revisions to the existing invocation of
> svn_client__get_history_as_mergeinfo().
>
> * subversion/svn/main.c
> (main): Add svn_cl__mergeinfo to the set of functions which may
> accept a revision range.
>
> * subversion/svn/mergeinfo-cmd.c
> (svn_cl__mergeinfo): Upgrade to svn_client_mergeinfo_log2(), passing
> the revision range provided by the user.
>
> Modified:
> subversion/trunk/subversion/include/svn_client.h
> subversion/trunk/subversion/libsvn_client/deprecated.c
> subversion/trunk/subversion/libsvn_client/mergeinfo.c
> subversion/trunk/subversion/svn/main.c
> subversion/trunk/subversion/svn/mergeinfo-cmd.c
>
> Modified: subversion/trunk/subversion/include/svn_client.h
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1352935&r1=1352934&r2=1352935&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/include/svn_client.h (original)
> +++ subversion/trunk/subversion/include/svn_client.h Fri Jun 22 15:47:43 2012
> @@ -3730,8 +3730,32 @@ svn_client_mergeinfo_get_merged(apr_hash
> * If the server doesn't support retrieval of mergeinfo, return an
> * #SVN_ERR_UNSUPPORTED_FEATURE error.
> *
Please can you document the new parameters here?
- Julian
> + * @since New in 1.8.
> + */
> +svn_error_t *
> +svn_client_mergeinfo_log2(svn_boolean_t finding_merged,
> + const char *target_path_or_url,
> + const svn_opt_revision_t *target_peg_revision,
> + const char *source_path_or_url,
> + const svn_opt_revision_t *source_peg_revision,
> + const svn_opt_revision_t *source_start_revision,
> + const svn_opt_revision_t *source_end_revision,
> + svn_log_entry_receiver_t receiver,
> + void *receiver_baton,
> + svn_boolean_t discover_changed_paths,
> + svn_depth_t depth,
> + const apr_array_header_t *revprops,
> + svn_client_ctx_t *ctx,
> + apr_pool_t *scratch_pool);
> +
> +/**
> + * Similar to svn_client_mergeinfo_log2(), but with @a source_start_revision
> + * and @a source_end_revision always of kind @c svn_opt_revision_unspecified;
> + *
> + * @deprecated Provided for backwards compatibility with the 1.7 API.
> * @since New in 1.7.
> */
> +SVN_DEPRECATED
> svn_error_t *
> svn_client_mergeinfo_log(svn_boolean_t finding_merged,
> const char *target_path_or_url,
Re: r1352935 - supporting "svn mergeinfo --revision" option
Posted by Julian Foad <ju...@btopenworld.com>.
C. Michael Pilato wrote:
> On 09/18/2012 12:07 PM, Julian Foad wrote:
>> Please can you document the new parameters here?
>
> r1387875 takes a crack at it.
Thanks, Mike.
- Julian
Re: r1352935 - supporting "svn mergeinfo --revision" option
Posted by "C. Michael Pilato" <cm...@collab.net>.
On 09/18/2012 12:07 PM, Julian Foad wrote:
> Hi Mike. ...
>
>> Author: cmpilato
>
>> Date: Fri Jun 22 15:47:43 2012
>> New Revision: 1352935
[...]
>> * subversion/include/svn_client.h
>> (svn_client_mergeinfo_log2): New iteration (adding an operative
>> revision range) of ...
>> (svn_client_mergeinfo_log): ... this now-deprecated function.
[...]
>> Modified: subversion/trunk/subversion/include/svn_client.h
>> URL:
>> http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1352935&r1=1352934&r2=1352935&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/include/svn_client.h (original)
>> +++ subversion/trunk/subversion/include/svn_client.h Fri Jun 22 15:47:43 2012
>> @@ -3730,8 +3730,32 @@ svn_client_mergeinfo_get_merged(apr_hash
>> * If the server doesn't support retrieval of mergeinfo, return an
>> * #SVN_ERR_UNSUPPORTED_FEATURE error.
>> *
>
> Please can you document the new parameters here?
r1387875 takes a crack at it.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Enterprise Cloud Development