commit 512d97d4124ce2af8e7bde6700628e188f73eb38
author iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Mar 31 23:36:10 2014 +0000
committer iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Mar 31 23:36:10 2014 +0000
tree a64860b7fbdfedb171fa9288d876d135bd1c4cb8
parent b1391c6a68b7154446b9acd4eb3eec5e7de27db3

Remember what branches we delete and do not try to reparent them in cleanup.

R=agable@chromium.org
BUG=357367

Review URL: https://codereview.chromium.org/214133006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260704 0039d316-1c4b-4281-b951-d872f2087c98

git_rebase_update.py

diff --git a/git_rebase_update.py b/git_rebase_update.py
index 37f3066..b0c5bf4 100755
--- a/git_rebase_update.py
+++ b/git_rebase_update.py
@@ -74,6 +74,7 @@
   tag_set = git.tags()
   ensure_root_checkout = git.once(lambda: git.run('checkout', git.root()))
 
+  deletions = set()
   downstreams = collections.defaultdict(list)
   for branch, parent in git.topo_iter(branch_tree, top_down=False):
     downstreams[parent].append(branch)
@@ -84,6 +85,9 @@
       logging.debug('branch %s merged to %s', branch, parent)
 
       for down in downstreams[branch]:
+        if down in deletions:
+          continue
+
         if parent in tag_set:
           git.set_branch_config(down, 'remote', '.')
           git.set_branch_config(down, 'merge', 'refs/tags/%s' % parent)
@@ -94,6 +98,7 @@
           print ('Reparented %s to track %s (was tracking %s)'
                  % (down, parent, branch))
 
+      deletions.add(branch)
       print git.run('branch', '-d', branch)