Mercurial > hg
diff hgext/histedit.py @ 25360:7d24a41200d3
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 29 May 2015 17:00:55 -0500 |
parents | 80c5b2666a96 8594d0b3018e |
children | d298805fb639 |
line wrap: on
line diff
--- a/hgext/histedit.py Wed May 27 15:56:10 2015 -0700 +++ b/hgext/histedit.py Fri May 29 17:00:55 2015 -0500 @@ -745,7 +745,7 @@ replacements = [] - keep = opts.get('keep', False) + state.keep = opts.get('keep', False) # rebuild state if goal == 'continue': @@ -814,7 +814,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)) @@ -838,7 +838,6 @@ state.parentctxnode = parentctxnode state.rules = rules - state.keep = keep state.topmost = topmost state.replacements = replacements @@ -874,7 +873,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