Mercurial > hg
comparison mercurial/cmdutil.py @ 34327:4647e0a8d3d7
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.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 24 Sep 2017 12:43:57 +0900 |
| parents | 1d6558f5ea74 |
| children | 255c761a52db |
comparison
equal
deleted
inserted
replaced
| 34326:e60c601953d7 | 34327:4647e0a8d3d7 |
|---|---|
| 1621 | 1621 |
| 1622 def _show(self, ctx, copies, matchfn, props): | 1622 def _show(self, ctx, copies, matchfn, props): |
| 1623 '''show a single changeset or file revision''' | 1623 '''show a single changeset or file revision''' |
| 1624 changenode = ctx.node() | 1624 changenode = ctx.node() |
| 1625 rev = ctx.rev() | 1625 rev = ctx.rev() |
| 1626 if self.ui.debugflag: | |
| 1627 hexfunc = hex | |
| 1628 else: | |
| 1629 hexfunc = short | |
| 1630 # as of now, wctx.node() and wctx.rev() return None, but we want to | |
| 1631 # show the same values as {node} and {rev} templatekw | |
| 1632 revnode = (scmutil.intrev(ctx), hexfunc(scmutil.binnode(ctx))) | |
| 1633 | 1626 |
| 1634 if self.ui.quiet: | 1627 if self.ui.quiet: |
| 1635 self.ui.write("%d:%s\n" % revnode, label='log.node') | 1628 self.ui.write("%s\n" % scmutil.formatchangeid(ctx), |
| 1629 label='log.node') | |
| 1636 return | 1630 return |
| 1637 | 1631 |
| 1638 date = util.datestr(ctx.date()) | 1632 date = util.datestr(ctx.date()) |
| 1639 | 1633 |
| 1640 # i18n: column positioning for "hg log" | 1634 # i18n: column positioning for "hg log" |
| 1641 self.ui.write(_("changeset: %d:%s\n") % revnode, | 1635 self.ui.write(_("changeset: %s\n") % scmutil.formatchangeid(ctx), |
| 1642 label=_changesetlabels(ctx)) | 1636 label=_changesetlabels(ctx)) |
| 1643 | 1637 |
| 1644 # branches are shown first before any other names due to backwards | 1638 # branches are shown first before any other names due to backwards |
| 1645 # compatibility | 1639 # compatibility |
| 1646 branch = ctx.branch() | 1640 branch = ctx.branch() |
| 1665 self.ui.write(_("phase: %s\n") % ctx.phasestr(), | 1659 self.ui.write(_("phase: %s\n") % ctx.phasestr(), |
| 1666 label='log.phase') | 1660 label='log.phase') |
| 1667 for pctx in scmutil.meaningfulparents(self.repo, ctx): | 1661 for pctx in scmutil.meaningfulparents(self.repo, ctx): |
| 1668 label = 'log.parent changeset.%s' % pctx.phasestr() | 1662 label = 'log.parent changeset.%s' % pctx.phasestr() |
| 1669 # i18n: column positioning for "hg log" | 1663 # i18n: column positioning for "hg log" |
| 1670 self.ui.write(_("parent: %d:%s\n") | 1664 self.ui.write(_("parent: %s\n") % scmutil.formatchangeid(pctx), |
| 1671 % (pctx.rev(), hexfunc(pctx.node())), | |
| 1672 label=label) | 1665 label=label) |
| 1673 | 1666 |
| 1674 if self.ui.debugflag and rev is not None: | 1667 if self.ui.debugflag and rev is not None: |
| 1675 mnode = ctx.manifestnode() | 1668 mnode = ctx.manifestnode() |
| 1669 mrev = self.repo.manifestlog._revlog.rev(mnode) | |
| 1676 # i18n: column positioning for "hg log" | 1670 # i18n: column positioning for "hg log" |
| 1677 self.ui.write(_("manifest: %d:%s\n") % | 1671 self.ui.write(_("manifest: %s\n") |
| 1678 (self.repo.manifestlog._revlog.rev(mnode), | 1672 % scmutil.formatrevnode(self.ui, mrev, mnode), |
| 1679 hex(mnode)), | |
| 1680 label='ui.debug log.manifest') | 1673 label='ui.debug log.manifest') |
| 1681 # i18n: column positioning for "hg log" | 1674 # i18n: column positioning for "hg log" |
| 1682 self.ui.write(_("user: %s\n") % ctx.user(), | 1675 self.ui.write(_("user: %s\n") % ctx.user(), |
| 1683 label='log.user') | 1676 label='log.user') |
| 1684 # i18n: column positioning for "hg log" | 1677 # i18n: column positioning for "hg log" |