You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/06/18 11:35:31 UTC
svn commit: r955907 - in
/subversion/trunk/subversion/bindings/javahl/native: BlameCallback.cpp
BlameCallback.h
Author: rhuijben
Date: Fri Jun 18 09:35:31 2010
New Revision: 955907
URL: http://svn.apache.org/viewvc?rev=955907&view=rev
Log:
Following up on r955895, update javahl handler to accept the start end
end revision of the blame to fix compilation.
* subversion/bindings/javahl/native/BlameCallback.cpp
(BlameCallback::callback, BlameCallback::singleLine):
Accept start and end revision.
* subversion/bindings/javahl/native/BlameCallback.h
(BlameCallback::callback, BlameCallback::singleLine):
Accept start and end revision.
Modified:
subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/BlameCallback.h
Modified: subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp?rev=955907&r1=955906&r2=955907&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp Fri Jun 18 09:35:31 2010
@@ -45,8 +45,11 @@ BlameCallback::~BlameCallback()
// in parameter to the Java SVNClient.blame method.
}
+/* implements svn_client_blame_receiver3_t */
svn_error_t *
BlameCallback::callback(void *baton,
+ svn_revnum_t start_revnum,
+ svn_revnum_t end_revnum,
apr_int64_t line_no,
svn_revnum_t revision,
apr_hash_t *rev_props,
@@ -58,7 +61,8 @@ BlameCallback::callback(void *baton,
apr_pool_t *pool)
{
if (baton)
- return ((BlameCallback *)baton)->singleLine(line_no, revision, rev_props,
+ return ((BlameCallback *)baton)->singleLine(start_revnum, end_revnum,
+ line_no, revision, rev_props,
merged_revision,
merged_rev_props, merged_path,
line, local_change, pool);
@@ -71,7 +75,8 @@ BlameCallback::callback(void *baton,
* information was requested. See the Java-doc for more information.
*/
svn_error_t *
-BlameCallback::singleLine(apr_int64_t line_no, svn_revnum_t revision,
+BlameCallback::singleLine(svn_revnum_t start_revnum, svn_revnum_t end_revnum,
+ 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,
Modified: subversion/trunk/subversion/bindings/javahl/native/BlameCallback.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/BlameCallback.h?rev=955907&r1=955906&r2=955907&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/BlameCallback.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/BlameCallback.h Fri Jun 18 09:35:31 2010
@@ -41,6 +41,8 @@ class BlameCallback
~BlameCallback();
static svn_error_t *callback(void *baton,
+ svn_revnum_t start_revnum,
+ svn_revnum_t end_revnum,
apr_int64_t line_no,
svn_revnum_t revision,
apr_hash_t *rev_props,
@@ -52,7 +54,9 @@ class BlameCallback
apr_pool_t *pool);
protected:
- svn_error_t *singleLine(apr_int64_t line_no,
+ svn_error_t *singleLine(svn_revnum_t start_revnum,
+ svn_revnum_t end_revnum,
+ apr_int64_t line_no,
svn_revnum_t revision,
apr_hash_t *rev_props,
svn_revnum_t merged_revision,