Read about our upcoming Code of Conduct on this issue

Commit 6f1e7837 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

evolve: use nodemod.short() instead of nodemod.hex()[:12]

parent 5d00679d78aa
Pipeline #18464 passed with stage
in 5 minutes and 1 second
......@@ -579,7 +579,7 @@ def _createtempcommit(ui, repo, old, match):
c.write(fp)
fp.seek(0)
oldnode = node.hex(old.node())[:12]
oldnode = node.short(old.node())
message = b'temporary commit for uncommiting %s' % oldnode
tempnode = _patchtocommit(ui, repo, old, fp, message, oldnode)
return tempnode
......@@ -1484,7 +1484,7 @@ def abortpick(ui, repo, pickstate, abortcmd=False):
pickstate.load()
pctxnode = pickstate[b'oldpctx']
ui.status(_(b"aborting pick, updating to %s\n") %
node.hex(pctxnode)[:12])
node.short(pctxnode))
compat.clean_update(repo[pctxnode])
pickstate.delete()
return 0
......
......@@ -1966,7 +1966,7 @@ def abortevolve(ui, repo, evolvestate):
evolvestate.delete()
ui.status(_(b'evolve aborted\n'))
ui.status(_(b'working directory is now at %s\n')
% nodemod.hex(startnode)[:12])
% nodemod.short(startnode))
else:
raise error.Abort(_(b"unable to abort interrupted evolve, use 'hg "
b"evolve --stop' to stop evolve"))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment