Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip: compute bookmark target only if we have bookmark to move
authorBoris Feld <boris.feld@octobus.net>
Wed, 02 Jan 2019 05:07:03 +0100
changeset 41101 f04e0ca04099
parent 41100 399010051cf4
child 41102 c9a2c4d0e80f
strip: compute bookmark target only if we have bookmark to move This is a small change that seems to make sense.
mercurial/repair.py file | annotate | diff | comparison | revisions 
--- a/mercurial/repair.py	Wed Jan 02 05:01:15 2019 +0100
+++ b/mercurial/repair.py	Wed Jan 02 05:07:03 2019 +0100
@@ -153,20 +153,22 @@
         stripobsidx = [i for i, m in enumerate(repo.obsstore)
                        if m in obsmarkers]
 
-    # For a set s, max(parents(s) - s) is the same as max(heads(::s - s)), but
-    # is much faster
-    newbmtarget = repo.revs('max(parents(%ld) - (%ld))', tostrip, tostrip)
-    if newbmtarget:
-        newbmtarget = repo[newbmtarget.first()].node()
-    else:
-        newbmtarget = '.'
-
+    # compute necessary bookmark movement
     bm = repo._bookmarks
     updatebm = []
     for m in bm:
         rev = repo[bm[m]].rev()
         if rev in tostrip:
             updatebm.append(m)
+    newbmtarget = None
+    if updatebm: # don't compute anything is there is no bookmark to move anyway
+        # For a set s, max(parents(s) - s) is the same as max(heads(::s - s)),
+        # but is much faster
+        newbmtarget = repo.revs('max(parents(%ld) - (%ld))', tostrip, tostrip)
+        if newbmtarget:
+            newbmtarget = repo[newbmtarget.first()].node()
+        else:
+            newbmtarget = '.'
 
     backupfile = None
     node = nodelist[-1]
Mercurial