subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r936637 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Date Thu, 22 Apr 2010 07:44:31 GMT
Author: julianfoad
Date: Thu Apr 22 07:44:31 2010
New Revision: 936637

URL: http://svn.apache.org/viewvc?rev=936637&view=rev
Log:
Simplify recursion of svn_wc__process_committed_internal().

* subversion/libsvn_wc/adm_ops.c
  (svn_wc__process_committed_internal): Always recurse, even when the child is
    a file.  This consolidates two places where process_committed_leaf() was
    called into just one place now.

Modified:
    subversion/trunk/subversion/libsvn_wc/adm_ops.c

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=936637&r1=936636&r2=936637&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Thu Apr 22 07:44:31 2010
@@ -502,23 +502,8 @@ svn_wc__process_committed_internal(svn_w
           if (status == svn_wc__db_status_excluded)
             continue;
 
-          /* Recurse, but only allow further recursion if the child is
-             a directory.  Pass NULL for NEW_DAV_CACHE, because the
-             ones present in the current call are only applicable to
-             this one committed item. */
-          if (kind == svn_wc__db_kind_dir)
-            {
-              SVN_ERR(svn_wc__process_committed_internal(db, this_abspath,
-                                                         TRUE /* recurse */,
-                                                         new_revnum, new_date,
-                                                         rev_author,
-                                                         NULL,
-                                                         TRUE /* no_unlock */,
-                                                         keep_changelist, NULL,
-                                                         queue, iterpool));
-              SVN_ERR(svn_wc__wq_run(db, this_abspath, NULL, NULL, iterpool));
-            }
-          else
+          checksum = NULL;
+          if (kind != svn_wc__db_kind_dir)
             {
               /* Suppress log creation for deleted entries in a replaced
                  directory.  By the time any log we create here is run,
@@ -537,7 +522,6 @@ svn_wc__process_committed_internal(svn_w
                     continue;
                 }
 
-              checksum = NULL;
               if (queue != NULL)
                 {
                   const committed_queue_item_t *cqi
@@ -547,14 +531,23 @@ svn_wc__process_committed_internal(svn_w
                   if (cqi != NULL)
                     checksum = cqi->checksum;
                 }
-
-              SVN_ERR(process_committed_leaf(db, this_abspath,
-                                             new_revnum,
-                                             new_date, rev_author, NULL,
-                                             TRUE /* no_unlock */,
-                                             keep_changelist,
-                                             checksum, iterpool));
             }
+
+          /* Recurse.  Pass NULL for NEW_DAV_CACHE, because the
+             ones present in the current call are only applicable to
+             this one committed item. */
+          SVN_ERR(svn_wc__process_committed_internal(db, this_abspath,
+                                                     TRUE /* recurse */,
+                                                     new_revnum, new_date,
+                                                     rev_author,
+                                                     NULL,
+                                                     TRUE /* no_unlock */,
+                                                     keep_changelist,
+                                                     checksum,
+                                                     queue, iterpool));
+
+          if (kind == svn_wc__db_kind_dir)
+            SVN_ERR(svn_wc__wq_run(db, this_abspath, NULL, NULL, iterpool));
         }
 
       svn_pool_destroy(iterpool);



Mime
View raw message