diff mercurial/repair.py @ 16745:27b2e1823e83

branchcache: backout 0311a6abd38a
author Matt Mackall <mpm@selenic.com>
date Thu, 17 May 2012 15:34:59 -0500
parents 0311a6abd38a
children 1093ad1e8903
line wrap: on
line diff
--- a/mercurial/repair.py	Wed May 16 16:18:07 2012 -0500
+++ b/mercurial/repair.py	Thu May 17 15:34:59 2012 -0500
@@ -56,11 +56,6 @@
     return s
 
 def strip(ui, repo, nodelist, backup="all", topic='backup'):
-    # It simplifies the logic around updating the branchheads cache if we only
-    # have to consider the effect of the stripped revisions and not revisions
-    # missing because the cache is out-of-date.
-    repo.updatebranchcache()
-
     cl = repo.changelog
     # TODO handle undo of merge sets
     if isinstance(nodelist, str):
@@ -68,14 +63,6 @@
     striplist = [cl.rev(node) for node in nodelist]
     striprev = min(striplist)
 
-    # Set of potential new heads resulting from the strip.  The parents of any
-    # node removed could be a new head because the node to be removed could have
-    # been the only child of the parent.
-    # Do a list->set->list conversion to remove duplicates.
-    stringstriplist = [str(rev) for rev in striplist]
-    newheadrevs = set(repo.revs("parents(%lr::) - %lr::", stringstriplist,
-                                stringstriplist))
-
     keeppartialbundle = backup == 'strip'
 
     # Some revisions with rev > striprev may not be descendants of striprev.
@@ -182,4 +169,4 @@
                     % chgrpfile)
         raise
 
-    repo.destroyed(newheadrevs)
+    repo.destroyed()