You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2019/01/14 14:34:47 UTC
svn commit: r1851262 - in /subversion/trunk/subversion:
bindings/javahl/native/BlameCallback.cpp
bindings/javahl/native/BlameCallback.h bindings/javahl/native/SVNClient.cpp
svn/blame-cmd.c
Author: julianfoad
Date: Mon Jan 14 14:34:47 2019
New Revision: 1851262
URL: http://svn.apache.org/viewvc?rev=1851262&view=rev
Log:
Update callers to use the newly revved svn_client_blame6() API.
* subversion/bindings/javahl/native/BlameCallback.h,
subversion/bindings/javahl/native/BlameCallback.cpp
(callback,
singleLine): Expect 'svn_string_t *' instead of 'char *'.
* subversion/bindings/javahl/native/SVNClient.cpp
(blame): Update the call to use svn_client_blame6.
* subversion/svn/blame-cmd.c
(blame_receiver_xml,
blame_receiver): Expect 'line' to be an svn_string_t.
(svn_cl__blame): Update to use svn_client_blame6 and
svn_client_blame_receiver4_t.
Modified:
subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/BlameCallback.h
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/svn/blame-cmd.c
Modified: subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp?rev=1851262&r1=1851261&r2=1851262&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp Mon Jan 14 14:34:47 2019
@@ -56,7 +56,7 @@ BlameCallback::callback(void *baton,
svn_revnum_t merged_revision,
apr_hash_t *merged_rev_props,
const char *merged_path,
- const char *line,
+ const svn_string_t *line,
svn_boolean_t local_change,
apr_pool_t *pool)
{
@@ -77,7 +77,7 @@ BlameCallback::singleLine(svn_revnum_t s
apr_int64_t line_no, svn_revnum_t revision,
apr_hash_t *revProps, svn_revnum_t mergedRevision,
apr_hash_t *mergedRevProps, const char *mergedPath,
- const char *line, svn_boolean_t localChange,
+ const svn_string_t *line, svn_boolean_t localChange,
apr_pool_t *pool)
{
JNIEnv *env = JNIUtil::getEnv();
@@ -120,7 +120,7 @@ BlameCallback::singleLine(svn_revnum_t s
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
- jstring jline = JNIUtil::makeJString(line);
+ jstring jline = JNIUtil::makeJString(line->data);
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
Modified: subversion/trunk/subversion/bindings/javahl/native/BlameCallback.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/BlameCallback.h?rev=1851262&r1=1851261&r2=1851262&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/BlameCallback.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/BlameCallback.h Mon Jan 14 14:34:47 2019
@@ -49,7 +49,7 @@ class BlameCallback
svn_revnum_t merged_revision,
apr_hash_t *merged_rev_props,
const char *merged_path,
- const char *line,
+ const svn_string_t *line,
svn_boolean_t local_change,
apr_pool_t *pool);
@@ -62,7 +62,7 @@ class BlameCallback
svn_revnum_t merged_revision,
apr_hash_t *merged_rev_props,
const char *merged_path,
- const char *line,
+ const svn_string_t *line,
svn_boolean_t local_change,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1851262&r1=1851261&r2=1851262&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Mon Jan 14 14:34:47 2019
@@ -1284,7 +1284,7 @@ void SVNClient::blame(const char *path,
if (ctx == NULL)
return;
- SVN_JNI_ERR(svn_client_blame5(
+ SVN_JNI_ERR(svn_client_blame6(
intPath.c_str(), pegRevision.revision(), revisionStart.revision(),
revisionEnd.revision(),
options.fileOptions(subPool), ignoreMimeType,
Modified: subversion/trunk/subversion/svn/blame-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/blame-cmd.c?rev=1851262&r1=1851261&r2=1851262&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/blame-cmd.c (original)
+++ subversion/trunk/subversion/svn/blame-cmd.c Mon Jan 14 14:34:47 2019
@@ -62,7 +62,7 @@ blame_receiver_xml(void *baton,
svn_revnum_t merged_revision,
apr_hash_t *merged_rev_props,
const char *merged_path,
- const char *line,
+ const svn_string_t *line,
svn_boolean_t local_change,
apr_pool_t *pool)
{
@@ -178,7 +178,7 @@ blame_receiver(void *baton,
svn_revnum_t merged_revision,
apr_hash_t *merged_rev_props,
const char *merged_path,
- const char *line,
+ const svn_string_t *line,
svn_boolean_t local_change,
apr_pool_t *pool)
{
@@ -237,7 +237,7 @@ blame_receiver(void *baton,
bb->rev_maxlength,
pool));
- return svn_stream_printf(out, pool, "%s%s", line, APR_EOL_STR);
+ return svn_stream_printf(out, pool, "%s%s", line->data, APR_EOL_STR);
}
@@ -333,7 +333,7 @@ svn_cl__blame(apr_getopt_t *os,
const char *target = APR_ARRAY_IDX(targets, i, const char *);
const char *truepath;
svn_opt_revision_t peg_revision;
- svn_client_blame_receiver3_t receiver;
+ svn_client_blame_receiver4_t receiver;
svn_pool_clear(subpool);
SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
@@ -368,7 +368,7 @@ svn_cl__blame(apr_getopt_t *os,
else
receiver = blame_receiver;
- err = svn_client_blame5(truepath,
+ err = svn_client_blame6(truepath,
&peg_revision,
&opt_state->start_revision,
&opt_state->end_revision,