subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1455801 - in /subversion/trunk/subversion/bindings/javahl: native/ListCallback.cpp native/ListCallback.h native/SVNClient.cpp src/org/apache/subversion/javahl/callback/ListCallback.java
Date Wed, 13 Mar 2013 04:24:59 GMT
Author: brane
Date: Wed Mar 13 04:24:59 2013
New Revision: 1455801

URL: http://svn.apache.org/r1455801
Log:
Working on isue #4326 (update javahl with new 1.8 APIs).

[in subversion/bindings/javahl/native]
* ListCallback.h, ListCallback.cpp (ListCallback::callback):
   Update prototype to match svn_client_list_func2_t.
* SVNClient.cpp (SVNClient::list): Call svn_client_list3
   instead of svn_client_list2.
  (SVNClient::commit): Call svn_client_commit6 so that
   behaviour does not change from the deprecated svn_client_commit5.

[in subversion/bindings/javahl/src/org/apache/subversion/javahl/callback]
* ListCallback.java (ListCallback): Fix link in docstring.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp
    subversion/trunk/subversion/bindings/javahl/native/ListCallback.h
    subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java

Modified: subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp?rev=1455801&r1=1455800&r2=1455801&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp Wed Mar 13 04:24:59
2013
@@ -54,11 +54,13 @@ ListCallback::callback(void *baton,
                        const svn_dirent_t *dirent,
                        const svn_lock_t *lock,
                        const char *abs_path,
-                       apr_pool_t *pool)
+                       const char * /* external_parent_url */,
+                       const char * /* external_target */,
+                       apr_pool_t *scratch_pool)
 {
   if (baton)
     return static_cast<ListCallback *>(baton)->doList(
-            path, dirent, lock, abs_path, pool);
+            path, dirent, lock, abs_path, scratch_pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/trunk/subversion/bindings/javahl/native/ListCallback.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ListCallback.h?rev=1455801&r1=1455800&r2=1455801&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ListCallback.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ListCallback.h Wed Mar 13 04:24:59
2013
@@ -45,7 +45,9 @@ public:
                                const svn_dirent_t *dirent,
                                const svn_lock_t *lock,
                                const char *abs_path,
-                               apr_pool_t *pool);
+                               const char *external_parent_url,
+                               const char *external_target,
+                               apr_pool_t *scratch_pool);
 
 protected:
   svn_error_t *doList(const char *path,

Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1455801&r1=1455800&r2=1455801&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Wed Mar 13 04:24:59 2013
@@ -169,12 +169,13 @@ void SVNClient::list(const char *url, Re
     Path urlPath(url, subPool);
     SVN_JNI_ERR(urlPath.error_occurred(), );
 
-    SVN_JNI_ERR(svn_client_list2(urlPath.c_str(),
+    SVN_JNI_ERR(svn_client_list3(urlPath.c_str(),
                                  pegRevision.revision(),
                                  revision.revision(),
                                  depth,
                                  direntFields,
                                  fetchLocks,
+                                 FALSE, // include_externals
                                  ListCallback::callback,
                                  callback,
                                  ctx, subPool.getPool()), );
@@ -427,7 +428,9 @@ void SVNClient::commit(Targets &targets,
 
     SVN_JNI_ERR(svn_client_commit6(targets2, depth,
                                    noUnlock, keepChangelist,
-                                   TRUE, TRUE, TRUE,
+                                   TRUE,
+                                   FALSE, // include_file_externals
+                                   FALSE, // include_dir_externals
                                    changelists.array(subPool),
                                    revprops.hash(subPool),
                                    CommitCallback::callback, callback,

Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java?rev=1455801&r1=1455800&r2=1455801&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java
(original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java
Wed Mar 13 04:24:59 2013
@@ -29,7 +29,7 @@ import org.apache.subversion.javahl.type
 
 /**
  * This interface is used to receive every single line for a file on a
- * the {@link ISVNClient#blame} call.
+ * the {@link ISVNClient#list} call.
  */
 public interface ListCallback
 {



Mime
View raw message