subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1576328 - /subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
Date Tue, 11 Mar 2014 13:09:31 GMT
Author: rhuijben
Date: Tue Mar 11 13:09:30 2014
New Revision: 1576328

URL: http://svn.apache.org/r1576328
Log:
* subversion/bindings/javahl/native/StatusCallback.cpp
  (StatusCallback::callback): Following up on r1576308, fix JavaHL assumptions
    around that it always used the status walker for single status results.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp

Modified: subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp?rev=1576328&r1=1576327&r2=1576328&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp Tue Mar 11 13:09:30
2014
@@ -54,6 +54,20 @@ StatusCallback::callback(void *baton,
                          const svn_client_status_t *status,
                          apr_pool_t *pool)
 {
+  if (!status->versioned
+      && !status->conflicted
+      && status->node_status == svn_wc_status_none
+      && status->repos_node_status == svn_wc_status_none)
+    {
+      /* Node does not exist in the WC, nor on disk, nor in the repository,
+         and it isn't even a tree conflict...
+
+         For legacy reasons the current JavaHL api doesn't want to know about
+         it even though it explicitly asked for the information. We probably
+         want to move this to the deprecated wrapper in a future iteration. */
+      return SVN_NO_ERROR;
+    }
+
   if (baton)
     return static_cast<StatusCallback *>(baton)->doStatus(
             local_abspath, status, pool);



Mime
View raw message