--- a/hgext3rd/evolve/cmdrewrite.py Fri Aug 31 09:19:13 2018 +0200
+++ b/hgext3rd/evolve/cmdrewrite.py Fri Aug 31 09:20:21 2018 +0200
@@ -1337,7 +1337,7 @@
revs.append(opts['rev'])
with repo.wlock(), repo.lock(), repo.transaction('pick'):
- grabstate = state.cmdstate(repo, path='grabstate')
+ pickstate = state.cmdstate(repo, path='pickstate')
pctx = repo['.']
if not cont and not abort:
@@ -1361,17 +1361,17 @@
stats = merge.graft(repo, origctx, origctx.p1(), ['local',
'destination'])
if compat.hasconflict(stats):
- grabstate.addopts({'orignode': origctx.node(),
+ pickstate.addopts({'orignode': origctx.node(),
'oldpctx': pctx.node()})
- grabstate.save()
+ pickstate.save()
raise error.InterventionRequired(_("unresolved merge conflicts"
" (see hg help resolve)"))
elif abort:
- if not grabstate:
+ if not pickstate:
raise error.Abort(_("no interrupted pick state exists"))
- grabstate.load()
- pctxnode = grabstate['oldpctx']
+ pickstate.load()
+ pctxnode = pickstate['oldpctx']
ui.status(_("aborting pick, updating to %s\n") %
node.hex(pctxnode)[:12])
hg.updaterepo(repo, pctxnode, True)
@@ -1381,11 +1381,11 @@
if revs:
raise error.Abort(_("cannot specify both --continue and "
"revision"))
- if not grabstate:
+ if not pickstate:
raise error.Abort(_("no interrupted pick state exists"))
- grabstate.load()
- orignode = grabstate['orignode']
+ pickstate.load()
+ orignode = pickstate['orignode']
origctx = repo[orignode]
overrides = {('phases', 'new-commit'): origctx.phase()}
@@ -1394,8 +1394,8 @@
user=origctx.user(),
date=origctx.date(), extra=origctx.extra())
- if grabstate:
- grabstate.delete()
+ if pickstate:
+ pickstate.delete()
newctx = repo[newnode] if newnode else pctx
obsolete.createmarkers(repo, [(origctx, (newctx,))], operation="pick")