[PATCH 4 of 8] scmutil: extract helper functions that returns human-readable change id
Yuya Nishihara
yuya at tcha.org
Sun Sep 24 08:21:53 EDT 2017
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1506224637 -32400
# Sun Sep 24 12:43:57 2017 +0900
# Node ID 5f8c602b3140a4b7b02c9de4fdbc01da5f07dc91
# Parent 43ebc214e86ae5a0f0f5f8d273306c8922c0dcde
scmutil: extract helper functions that returns human-readable change id
We do "'%d:%s' % (ctx...)" at several places, so let's formalize it. A low-
level function, formatrevnode(ui, rev, node), is extracted so we can pass
a manifest rev/node pair.
Note that hex() for manifest output can be replaced with hexfunc() because
it is printed only when debugflag is set.
i18n/de.po is updated so test-log.t passes with no error.
diff --git a/i18n/de.po b/i18n/de.po
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -9746,8 +9746,8 @@ msgstr ""
#. i18n: column positioning for "hg log"
#, python-format
-msgid "changeset: %d:%s\n"
-msgstr "Änderung: %d:%s\n"
+msgid "changeset: %s\n"
+msgstr "Änderung: %s\n"
#. i18n: column positioning for "hg log"
#, python-format
@@ -9771,8 +9771,8 @@ msgstr "Phase: %s\n"
#. i18n: column positioning for "hg log"
#, python-format
-msgid "parent: %d:%s\n"
-msgstr "Vorgänger: %d:%s\n"
+msgid "parent: %s\n"
+msgstr "Vorgänger: %s\n"
#. i18n: column positioning for "hg log"
#, python-format
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1623,22 +1623,16 @@ class changeset_printer(object):
'''show a single changeset or file revision'''
changenode = ctx.node()
rev = ctx.rev()
- if self.ui.debugflag:
- hexfunc = hex
- else:
- 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(scmutil.binnode(ctx)))
if self.ui.quiet:
- self.ui.write("%d:%s\n" % revnode, label='log.node')
+ self.ui.write("%s\n" % scmutil.formatchangeid(ctx),
+ label='log.node')
return
date = util.datestr(ctx.date())
# i18n: column positioning for "hg log"
- self.ui.write(_("changeset: %d:%s\n") % revnode,
+ self.ui.write(_("changeset: %s\n") % scmutil.formatchangeid(ctx),
label=_changesetlabels(ctx))
# branches are shown first before any other names due to backwards
@@ -1667,16 +1661,15 @@ class changeset_printer(object):
for pctx in scmutil.meaningfulparents(self.repo, ctx):
label = 'log.parent changeset.%s' % pctx.phasestr()
# i18n: column positioning for "hg log"
- self.ui.write(_("parent: %d:%s\n")
- % (pctx.rev(), hexfunc(pctx.node())),
+ self.ui.write(_("parent: %s\n") % scmutil.formatchangeid(pctx),
label=label)
if self.ui.debugflag and rev is not None:
mnode = ctx.manifestnode()
+ mrev = self.repo.manifestlog._revlog.rev(mnode)
# i18n: column positioning for "hg log"
- self.ui.write(_("manifest: %d:%s\n") %
- (self.repo.manifestlog._revlog.rev(mnode),
- hex(mnode)),
+ self.ui.write(_("manifest: %s\n")
+ % scmutil.formatrevnode(self.ui, mrev, mnode),
label='ui.debug log.manifest')
# i18n: column positioning for "hg log"
self.ui.write(_("user: %s\n") % ctx.user(),
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -19,6 +19,7 @@ from .i18n import _
from .node import (
hex,
nullid,
+ short,
wdirid,
wdirrev,
)
@@ -405,6 +406,20 @@ def intrev(ctx):
return wdirrev
return rev
+def formatchangeid(ctx):
+ """Format changectx as '{rev}:{node|formatnode}', which is the default
+ template provided by cmdutil.changeset_templater"""
+ repo = ctx.repo()
+ return formatrevnode(repo.ui, intrev(ctx), binnode(ctx))
+
+def formatrevnode(ui, rev, node):
+ """Format given revision and node depending on the current verbosity"""
+ if ui.debugflag:
+ hexfunc = hex
+ else:
+ hexfunc = short
+ return '%d:%s' % (rev, hexfunc(node))
+
def revsingle(repo, revspec, default='.', localalias=None):
if not revspec and revspec != 0:
return repo[default]
diff --git a/mercurial/templatekw.py b/mercurial/templatekw.py
--- a/mercurial/templatekw.py
+++ b/mercurial/templatekw.py
@@ -11,7 +11,6 @@ from .i18n import _
from .node import (
hex,
nullid,
- short,
)
from . import (
@@ -163,16 +162,6 @@ def _showlist(name, values, mapping, plu
if endname in templ:
yield templ(endname, **strmapping)
-def _formatrevnode(ctx):
- """Format changeset as '{rev}:{node|formatnode}', which is the default
- template provided by cmdutil.changeset_templater"""
- repo = ctx.repo()
- if repo.ui.debugflag:
- hexfunc = hex
- else:
- hexfunc = short
- return '%d:%s' % (scmutil.intrev(ctx), hexfunc(scmutil.binnode(ctx)))
-
def getfiles(repo, ctx, revcache):
if 'files' not in revcache:
revcache['files'] = repo.status(ctx.p1(), ctx)[:3]
@@ -640,7 +629,7 @@ def showpredecessors(repo, ctx, **args):
return _hybrid(None, predecessors,
lambda x: {'ctx': repo[x], 'revcache': {}},
- lambda d: _formatrevnode(d['ctx']))
+ lambda d: scmutil.formatchangeid(d['ctx']))
@templatekeyword("successorssets")
def showsuccessorssets(repo, ctx, **args):
@@ -658,7 +647,7 @@ def showsuccessorssets(repo, ctx, **args
data = []
for ss in ssets:
h = _hybrid(None, ss, lambda x: {'ctx': repo[x], 'revcache': {}},
- lambda d: _formatrevnode(d['ctx']))
+ lambda d: scmutil.formatchangeid(d['ctx']))
data.append(h)
# Format the successorssets
@@ -698,7 +687,7 @@ def showsuccsandmarkers(repo, ctx, **arg
successors = [hex(n) for n in successors]
successors = _hybrid(None, successors,
lambda x: {'ctx': repo[x], 'revcache': {}},
- lambda d: _formatrevnode(d['ctx']))
+ lambda d: scmutil.formatchangeid(d['ctx']))
# Format markers
finalmarkers = []
@@ -759,7 +748,7 @@ def showparents(**args):
for p in pctxs]
f = _showlist('parent', parents, args)
return _hybrid(f, prevs, lambda x: {'ctx': repo[int(x)], 'revcache': {}},
- lambda d: _formatrevnode(d['ctx']))
+ lambda d: scmutil.formatchangeid(d['ctx']))
@templatekeyword('phase')
def showphase(repo, ctx, templ, **args):
More information about the Mercurial-devel
mailing list