svn commit: r1442372 - /subversion/trunk/subversion/libsvn_client/merge.c

[rh...@apache.org]

Author: rhuijben
Date: Mon Feb  4 21:27:26 2013
New Revision: 1442372

URL: http://svn.apache.org/viewvc?rev=1442372&view=rev
Log:
In the merge code: Use the batons to detect whether we are at the root of an
added tree, instead of doing hash table lookups.

* subversion/libsvn_client/merge.c
  (record_update_add): Remove unneeded code.
  (merge_file_added,
   merge_dir_added): Record the roots of added trees.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1442372&r1=1442371&r2=1442372&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Feb  4 21:27:26 2013
@@ -1547,42 +1547,8 @@ record_update_add(merge_cmd_baton_t *mer
                   svn_boolean_t notify_replaced,
                   apr_pool_t *scratch_pool)
 {
-  svn_boolean_t root_of_added_subtree = TRUE;
-
   if (merge_b->merge_source.ancestral || merge_b->reintegrate_merge)
     {
-      /* Stash the root path of any added subtrees. */
-      if (merge_b->added_abspaths == NULL)
-        {
-          /* The first added path is always a root. */
-          merge_b->added_abspaths = apr_hash_make(merge_b->pool);
-        }
-      else
-        {
-          const char *added_path_dir = svn_dirent_dirname(local_abspath,
-                                                          scratch_pool);
-
-          /* Is NOTIFY->PATH the root of an added subtree? */
-          while (strcmp(merge_b->target->abspath, added_path_dir))
-            {
-              if (contains_path(merge_b->added_abspaths, added_path_dir))
-                {
-                  root_of_added_subtree = FALSE;
-                  break;
-                }
-
-              if (svn_dirent_is_root(added_path_dir, strlen(added_path_dir)))
-                break;
-              added_path_dir = svn_dirent_dirname(added_path_dir,
-                                                  scratch_pool);
-            }
-        }
-
-      if (root_of_added_subtree)
-        {
-          store_path(merge_b->added_abspaths, local_abspath);
-        }
-
       store_path(merge_b->merged_abspaths, local_abspath);
     }
 
@@ -2298,6 +2264,12 @@ merge_file_added(const char *relpath,
       return SVN_NO_ERROR;
     }
 
+  if ((merge_b->merge_source.ancestral || merge_b->reintegrate_merge)
+      && ( !fb->parent_baton || !fb->parent_baton->added))
+    {
+      /* Store the roots of added subtrees */
+      store_path(merge_b->added_abspaths, local_abspath);
+    }
 
   if (!merge_b->dry_run)
     {
@@ -2418,11 +2390,6 @@ merge_file_added(const char *relpath,
                                          scratch_pool));
         }
     }
-  else /* dry_run */
-    {
-      /* ### Should we do this?
-      store_path(merge_b->dry_run_added, local_abspath); */
-    }
 
   SVN_ERR(record_update_add(merge_b, local_abspath, svn_node_file,
                             fb->add_is_replace, scratch_pool));
@@ -3015,6 +2982,13 @@ merge_dir_added(const char *relpath,
                  && ! merge_b->record_only /* Skip details from merge_open_dir() */
                  );
 
+  if ((merge_b->merge_source.ancestral || merge_b->reintegrate_merge)
+      && ( !db->parent_baton || !db->parent_baton->added))
+    {
+      /* Store the roots of added subtrees */
+      store_path(merge_b->added_abspaths, local_abspath);
+    }
+
   if (merge_b->same_repos)
     {
       /* When the directory was added in merge_dir_added() we didn't update its
@@ -3064,8 +3038,6 @@ merge_dir_added(const char *relpath,
           alloc_and_store_path(&merge_b->paths_with_new_mergeinfo,
                                local_abspath, merge_b->pool);
         }
-
-      return SVN_NO_ERROR;
     }
   else
     {