Mercurial > public > mercurial-scm > hg-stable

diff hgext/histedit.py @ 25330:8594d0b3018e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: fix keep during --continue The --keep option was being serialized to the state file, but it wasn't actually being used when running a histedit --continue. This fixes that.
author Durham Goode <durham@fb.com>
date Thu, 28 May 2015 20:30:20 -0700
parents 3c762cceedde
children 7d24a41200d3
line wrap: on
line diff
--- a/hgext/histedit.py	Wed May 27 14:28:29 2015 -0500
+++ b/hgext/histedit.py	Thu May 28 20:30:20 2015 -0700
@@ -741,7 +741,7 @@
 
 
     replacements = []
-    keep = opts.get('keep', False)
+    state.keep = opts.get('keep', False)
 
     # rebuild state
     if goal == 'continue':
@@ -810,7 +810,7 @@
                     'exactly one common root'))
             root = rr[0].node()
 
-        revs = between(repo, root, topmost, keep)
+        revs = between(repo, root, topmost, state.keep)
         if not revs:
             raise util.Abort(_('%s is not an ancestor of working directory') %
                              node.short(root))
@@ -834,7 +834,6 @@
 
         state.parentctxnode = parentctxnode
         state.rules = rules
-        state.keep = keep
         state.topmost = topmost
         state.replacements = replacements
 
@@ -870,7 +869,7 @@
                     for n in succs[1:]:
                         ui.debug(m % node.short(n))
 
-    if not keep:
+    if not state.keep:
         if mapping:
             movebookmarks(ui, repo, mapping, state.topmost, ntm)
             # TODO update mq state