diff -r 9fbd8ad398aa -r 55ff67ffcead mercurial/cmdutil.py --- a/mercurial/cmdutil.py Sat Jun 03 19:01:19 2017 +0900 +++ b/mercurial/cmdutil.py Sat Jun 03 19:12:01 2017 +0900 @@ -15,7 +15,6 @@ from .i18n import _ from .node import ( - bin, hex, nullid, nullrev, @@ -1349,7 +1348,7 @@ hexfunc = short # as of now, wctx.node() and wctx.rev() return None, but we want to # show the same values as {node} and {rev} templatekw - revnode = (scmutil.intrev(ctx), hexfunc(bin(ctx.hex()))) + revnode = (scmutil.intrev(ctx), hexfunc(scmutil.binnode(ctx))) if self.ui.quiet: self.ui.write("%d:%s\n" % revnode, label='log.node')