--- a/hgext3rd/evolve/__init__.py Thu Jul 11 16:24:13 2019 -0700
+++ b/hgext3rd/evolve/__init__.py Thu Jul 11 22:23:32 2019 -0700
@@ -1174,15 +1174,15 @@
% ui.label(str(repo['.']), 'evolve.node'))
return 0
-def _updatetonext(ui, repo, children, displayer, opts):
+def _updatetonext(ui, repo, child, displayer, opts):
""" logic for `hg next` command to update to children and move bookmarks if
required """
bm = repo._activebookmark
shouldmove = opts.get('move_bookmark') and bm is not None
if opts.get('dry_run'):
- ui.write(_('hg update %s;\n') % children)
+ ui.write(_('hg update %s;\n') % child)
if shouldmove:
- ui.write(_('hg bookmark %s -r %s;\n') % (bm, children))
+ ui.write(_('hg bookmark %s -r %s;\n') % (bm, child))
else:
updatecheck = None
# --merge is passed, we don't need to care about commands.update.check
@@ -1190,7 +1190,7 @@
if opts['merge']:
updatecheck = 'none'
try:
- ret = hg.updatetotally(ui, repo, children.node(), None,
+ ret = hg.updatetotally(ui, repo, child.node(), None,
updatecheck=updatecheck)
except error.Abort as exc:
# replace the hint to mention about --merge option
@@ -1203,7 +1203,7 @@
lock = repo.lock()
tr = repo.transaction('next')
if shouldmove:
- bmchanges = [(bm, children.node())]
+ bmchanges = [(bm, child.node())]
repo._bookmarks.applychanges(repo, tr, bmchanges)
else:
bookmarksmod.deactivate(repo)
@@ -1211,7 +1211,7 @@
finally:
lockmod.release(tr, lock)
if not ui.quiet:
- displayer.show(children)
+ displayer.show(child)
return 0
@eh.wrapcommand('commit')