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

[rh...@apache.org]

Author: rhuijben
Date: Thu Jun 24 17:17:04 2010
New Revision: 957637

URL: http://svn.apache.org/viewvc?rev=957637&view=rev
Log:
* subversion/libsvn_client/status.c
  (report_baton_t): Add depth.
  (reporter_link_path): If reporting paths for additional levels above
    the expected depth increase the lock request depth to infinity.
  (reporter_finish_report): Use the requested depth.
  (svn_client_status5): Convert depth unknown to depth infinity
    and copy requested depth in baton.

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=957637&r1=957636&r2=957637&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/status.c (original)
+++ subversion/trunk/subversion/libsvn_client/status.c Thu Jun 24 17:17:04 2010
@@ -121,6 +121,7 @@ typedef struct report_baton_t {
   /* The common ancestor URL of all paths included in the report. */
   char *ancestor;
   void *set_locks_baton;
+  svn_depth_t depth;
   svn_client_ctx_t *ctx;
   /* Pool to store locks in. */
   apr_pool_t *pool;
@@ -161,14 +162,17 @@ reporter_link_path(void *report_baton, c
   const char *ancestor;
   apr_size_t len;
 
-  ancestor = svn_dirent_get_longest_ancestor(url, rb->ancestor, pool);
+  ancestor = svn_uri_get_longest_ancestor(url, rb->ancestor, pool);
 
   /* If we got a shorter ancestor, truncate our current ancestor.
      Note that svn_dirent_get_longest_ancestor will allocate its return
      value even if it identical to one of its arguments. */
   len = strlen(ancestor);
   if (len < strlen(rb->ancestor))
-    rb->ancestor[len] = '\0';
+    {
+      rb->ancestor[len] = '\0';
+      rb->depth = svn_depth_infinity;
+    }
 
   return rb->wrapped_reporter->link_path(rb->wrapped_report_baton, path, url,
                                          revision, depth, start_empty,
@@ -195,7 +199,7 @@ reporter_finish_report(void *report_bato
   /* The locks need to live throughout the edit.  Note that if the
      server doesn't support lock discovery, we'll just not do locky
      stuff. */
-  err = svn_ra_get_locks2(ras, &locks, "", svn_depth_infinity, rb->pool);
+  err = svn_ra_get_locks2(ras, &locks, "", rb->depth, rb->pool);
   if (err && ((err->apr_err == SVN_ERR_RA_NOT_IMPLEMENTED)
               || (err->apr_err == SVN_ERR_UNSUPPORTED_FEATURE)))
     {
@@ -269,6 +273,9 @@ 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;
@@ -463,6 +470,7 @@ svn_client_status5(svn_revnum_t *result_
           rb.set_locks_baton = set_locks_baton;
           rb.ctx = ctx;
           rb.pool = pool;
+          rb.depth = depth;
 
           SVN_ERR(svn_ra_has_capability(ra_session, &server_supports_depth,
                                         SVN_RA_CAPABILITY_DEPTH, pool));