diff --git a/i18n/de.po b/i18n/de.po index e60c601953d7102ef2c6d9d952b5cb7ef3e987b7_aTE4bi9kZS5wbw==..4647e0a8d3d7ab0c934535b00e968fe4e9ed0973_aTE4bi9kZS5wbw== 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -9746,8 +9746,8 @@ #. 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 @@ #. 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 index e60c601953d7102ef2c6d9d952b5cb7ef3e987b7_bWVyY3VyaWFsL2NtZHV0aWwucHk=..4647e0a8d3d7ab0c934535b00e968fe4e9ed0973_bWVyY3VyaWFsL2NtZHV0aWwucHk= 100644 --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1623,12 +1623,5 @@ '''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: @@ -1633,8 +1626,9 @@ 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" @@ -1636,9 +1630,9 @@ 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,9 +1661,8 @@ 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() @@ -1672,5 +1665,6 @@ 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" @@ -1676,7 +1670,6 @@ # 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 index e60c601953d7102ef2c6d9d952b5cb7ef3e987b7_bWVyY3VyaWFsL3NjbXV0aWwucHk=..4647e0a8d3d7ab0c934535b00e968fe4e9ed0973_bWVyY3VyaWFsL3NjbXV0aWwucHk= 100644 --- a/mercurial/scmutil.py +++ b/mercurial/scmutil.py @@ -19,6 +19,7 @@ from .node import ( hex, nullid, + short, wdirid, wdirrev, ) @@ -405,6 +406,20 @@ 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 index e60c601953d7102ef2c6d9d952b5cb7ef3e987b7_bWVyY3VyaWFsL3RlbXBsYXRla3cucHk=..4647e0a8d3d7ab0c934535b00e968fe4e9ed0973_bWVyY3VyaWFsL3RlbXBsYXRla3cucHk= 100644 --- a/mercurial/templatekw.py +++ b/mercurial/templatekw.py @@ -11,7 +11,6 @@ from .node import ( hex, nullid, - short, ) from . import ( @@ -163,16 +162,6 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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):