You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2019/01/17 13:05:11 UTC
svn commit: r1851525 - in /subversion/trunk/subversion:
bindings/javahl/native/SVNClient.cpp include/svn_client.h
libsvn_client/blame.c libsvn_client/deprecated.c svn/blame-cmd.c
Author: brane
Date: Thu Jan 17 13:05:11 2019
New Revision: 1851525
URL: http://svn.apache.org/viewvc?rev=1851525&view=rev
Log:
Follow up to r1851268: our coding guidelines say that output parameters
should come first in the function argument list.
* subversion/include/svn_client.h
(svn_client_blame6): Move start_revnum_p and end_revnum_p to the
beginning of the argument list and update the docstring to say that
either of these may be NULL.
* subversion/libsvn_client/blame.c
(svn_client_blame6): Update signature.
* subversion/svn/blame-cmd.c (svn_cl__blame),
subversion/libsvn_client/deprecated.c (svn_client_blame5),
subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::blame):
Update all callers.
Modified:
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/libsvn_client/blame.c
subversion/trunk/subversion/libsvn_client/deprecated.c
subversion/trunk/subversion/svn/blame-cmd.c
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1851525&r1=1851524&r2=1851525&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Thu Jan 17 13:05:11 2019
@@ -1285,9 +1285,9 @@ void SVNClient::blame(const char *path,
return;
SVN_JNI_ERR(svn_client_blame6(
+ NULL, NULL, // TODO: start and end revision numbers
intPath.c_str(), pegRevision.revision(), revisionStart.revision(),
revisionEnd.revision(),
- NULL, NULL,
options.fileOptions(subPool), ignoreMimeType,
includeMergedRevisions, BlameCallback::callback, callback, ctx,
subPool.getPool()),
Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1851525&r1=1851524&r2=1851525&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Thu Jan 17 13:05:11 2019
@@ -2961,7 +2961,8 @@ svn_client_log(const apr_array_header_t
* Before the first call to @a receiver, set @a *start_revnum_p and
* @a *end_revnum_p to the start and end revision number of the entire
* blame operation, as resolved from the repository. This can be useful
- * for the blame receiver to format the blame output.
+ * for the blame receiver to format the blame output. Any or both of these
+ * arguments may be @c NULL.
*
* Use @a diff_options to determine how to compare different revisions of the
* target.
@@ -2974,12 +2975,12 @@ svn_client_log(const apr_array_header_t
* @since New in 1.12.
*/
svn_error_t *
-svn_client_blame6(const char *path_or_url,
+svn_client_blame6(svn_revnum_t *start_revnum_p,
+ svn_revnum_t *end_revnum_p,
+ const char *path_or_url,
const svn_opt_revision_t *peg_revision,
const svn_opt_revision_t *start,
const svn_opt_revision_t *end,
- svn_revnum_t *start_revnum_p,
- svn_revnum_t *end_revnum_p,
const svn_diff_file_options_t *diff_options,
svn_boolean_t ignore_mime_type,
svn_boolean_t include_merged_revisions,
Modified: subversion/trunk/subversion/libsvn_client/blame.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/blame.c?rev=1851525&r1=1851524&r2=1851525&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/blame.c (original)
+++ subversion/trunk/subversion/libsvn_client/blame.c Thu Jan 17 13:05:11 2019
@@ -656,12 +656,12 @@ normalize_blames(struct blame_chain *cha
}
svn_error_t *
-svn_client_blame6(const char *target,
+svn_client_blame6(svn_revnum_t *start_revnum_p,
+ svn_revnum_t *end_revnum_p,
+ const char *target,
const svn_opt_revision_t *peg_revision,
const svn_opt_revision_t *start,
const svn_opt_revision_t *end,
- svn_revnum_t *start_revnum_p,
- svn_revnum_t *end_revnum_p,
const svn_diff_file_options_t *diff_options,
svn_boolean_t ignore_mime_type,
svn_boolean_t include_merged_revisions,
Modified: subversion/trunk/subversion/libsvn_client/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/deprecated.c?rev=1851525&r1=1851524&r2=1851525&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_client/deprecated.c Thu Jan 17 13:05:11 2019
@@ -215,8 +215,8 @@ svn_client_blame5(const char *target,
baton.receiver = receiver;
baton.baton = receiver_baton;
- return svn_client_blame6(target, peg_revision, start, end,
- &baton.start_revnum, &baton.end_revnum,
+ return svn_client_blame6(&baton.start_revnum, &baton.end_revnum,
+ target, peg_revision, start, end,
diff_options,
ignore_mime_type, include_merged_revisions,
blame_wrapper_receiver3, &baton, ctx, pool);
Modified: subversion/trunk/subversion/svn/blame-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/blame-cmd.c?rev=1851525&r1=1851524&r2=1851525&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/blame-cmd.c (original)
+++ subversion/trunk/subversion/svn/blame-cmd.c Thu Jan 17 13:05:11 2019
@@ -365,11 +365,11 @@ svn_cl__blame(apr_getopt_t *os,
else
receiver = blame_receiver;
- err = svn_client_blame6(truepath,
+ err = svn_client_blame6(&bl.start_revnum, &bl.end_revnum,
+ truepath,
&peg_revision,
&opt_state->start_revision,
&opt_state->end_revision,
- &bl.start_revnum, &bl.end_revnum,
diff_options,
opt_state->force,
opt_state->use_merge_history,