[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-cvs
Subject:    svn commit: r25894 - in trunk/subversion: libsvn_wc svn
From:       vgeorgescu () tigris ! org
Date:       2007-07-31 7:13:22
Message-ID: 200707310713.l6V7DMX0021374 () svn2 ! sjc ! collab ! net
[Download RAW message or body]

Author: vgeorgescu
Date: Tue Jul 31 00:13:22 2007
New Revision: 25894

Log:
Don't convert svn_depth_unknown to svn_depth_infinity for switch and diff.
svn_depth_unknown is now a legal value for the requested depth of these
operations.  Also, using svn_depth_infinity in a depth < infinity working copy
produces incorrect results, because it is interpreted as a depth upgrade.

* subversion/svn/diff-cmd.c
  (svn_cl__diff): Remove svn_depth_unknown->svn_depth_infinity conversion.

* subversion/svn/switch-cmd.c
  (svn_cl__switch): Remove svn_depth_unknown->svn_depth_infinity conversion.

* subversion/libsvn_wc/diff.c
  (directory_elements_diff): Recurse when depth is svn_depth_unknown.


Modified:
   trunk/subversion/libsvn_wc/diff.c
   trunk/subversion/svn/diff-cmd.c
   trunk/subversion/svn/switch-cmd.c

Modified: trunk/subversion/libsvn_wc/diff.c
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/diff.c?pathrev=25894&r1=25893&r2=25894
==============================================================================
--- trunk/subversion/libsvn_wc/diff.c	(original)
+++ trunk/subversion/libsvn_wc/diff.c	Tue Jul 31 00:13:22 2007
@@ -742,7 +742,8 @@
           /* Check the subdir if in the anchor (the subdir is the target), or
              if recursive */
           if (in_anchor_not_target
-              || (dir_baton->edit_baton->depth == svn_depth_infinity))
+              || (dir_baton->edit_baton->depth == svn_depth_infinity)
+              || (dir_baton->edit_baton->depth == svn_depth_unknown))
             {
               subdir_baton = make_dir_baton(path, dir_baton,
                                             dir_baton->edit_baton,

Modified: trunk/subversion/svn/diff-cmd.c
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/diff-cmd.c?pathrev=25894&r1=25893&r2=25894
==============================================================================
--- trunk/subversion/svn/diff-cmd.c	(original)
+++ trunk/subversion/svn/diff-cmd.c	Tue Jul 31 00:13:22 2007
@@ -255,15 +255,6 @@
 
     }
 
-  /* ### TODO(sd): Will this behave correctly in working copies with
-   * ### complex depth mixtures?  It should, because they'll just
-   * ### report their state as for an update, and the editor drive
-   * ### that results will take depth into account.  But this needs
-   * ### to be tested.
-   */
-  if (opt_state->depth == svn_depth_unknown)
-    opt_state->depth = svn_depth_infinity;
-
   svn_opt_push_implicit_dot_target(targets, pool);
 
   iterpool = svn_pool_create(pool);

Modified: trunk/subversion/svn/switch-cmd.c
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/switch-cmd.c?pathrev=25894&r1=25893&r2=25894
==============================================================================
--- trunk/subversion/svn/switch-cmd.c	(original)
+++ trunk/subversion/svn/switch-cmd.c	Tue Jul 31 00:13:22 2007
@@ -99,12 +99,6 @@
   SVN_ERR(svn_opt_args_to_target_array2(&targets, os, 
                                         opt_state->targets, pool));
 
-  /* ### TODO(sd): I'm not completely sure we should allow explicit depth
-     ### on this command.  It took -N but not -R.  Why was -N
-     ### useful?  Does it make sense in a depthy universe? */
-  if (opt_state->depth == svn_depth_unknown)
-    opt_state->depth = svn_depth_infinity;
-
   /* handle only-rewrite case specially */
   if (opt_state->relocate)
     return rewrite_urls(targets,

---------------------------------------------------------------------
To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
For additional commands, e-mail: svn-help@subversion.tigris.org

[prev in list] [next in list] [prev in thread] [next in thread]