svn commit: r957657 - /subversion/trunk/subversion/libsvn_client/status.c

[rh...@apache.org]

Author: rhuijben
Date: Thu Jun 24 18:08:02 2010
New Revision: 957657

URL: http://svn.apache.org/viewvc?rev=957657&view=rev
Log:
* subversion/libsvn_client/status.c
  (svn_client_status5): Following up on r957637, revert the conversion
    from depth unknown to depth empty, as that makes svn_ra_status2()
    report excluded nodes (which might be a bug, but is also a feature).
    But do set depth infinity for the lock retrievals.

Modified:
    subversion/trunk/subversion/libsvn_client/status.c

Modified: subversion/trunk/subversion/libsvn_client/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/status.c?rev=957657&r1=957656&r2=957657&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/status.c (original)
+++ subversion/trunk/subversion/libsvn_client/status.c Thu Jun 24 18:08:02 2010
@@ -273,9 +273,6 @@ svn_client_status5(svn_revnum_t *result_
   if (result_rev)
     *result_rev = SVN_INVALID_REVNUM;
 
-  if (depth == svn_depth_unknown)
-    depth = svn_depth_infinity;
-
   sb.real_status_func = status_func;
   sb.real_status_baton = status_baton;
   sb.deleted_in_repos = FALSE;
@@ -470,7 +467,11 @@ svn_client_status5(svn_revnum_t *result_
           rb.set_locks_baton = set_locks_baton;
           rb.ctx = ctx;
           rb.pool = pool;
-          rb.depth = depth;
+
+          if (depth == svn_depth_unknown)
+            rb.depth = svn_depth_infinity;
+          else
+            rb.depth = depth;
 
           SVN_ERR(svn_ra_has_capability(ra_session, &server_supports_depth,
                                         SVN_RA_CAPABILITY_DEPTH, pool));