# HG changeset patch # User Denis Laxalde <denis.laxa...@logilab.fr> # Date 1476094018 -7200 # Mon Oct 10 12:06:58 2016 +0200 # Node ID d9f7776c40b8c82bf438322f2442d99c4e116161 # Parent 6c916ce602f5c92c5a5a4de954629670b8c7ca8c # EXP-Topic evolve-ui cmdutil: add support for evolution "troubles" display in changeset_printer
Add a "troubles" line in changeset header along with a couple of labels on "log.changeset" line to indicate whether a changeset is troubled or not and which kind trouble occurs. Extract a _changesetlabels function to be reused in summary command. diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1204,6 +1204,14 @@ def diffordiffstat(ui, repo, diffopts, n sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, stat=stat, fp=fp, prefix=prefix) +def _changesetlabels(ctx): + labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()] + if ctx.troubled(): + labels.append('changeset.troubled') + for trouble in ctx.troubles(): + labels.append('trouble.%s' % trouble) + return ' '.join(labels) + class changeset_printer(object): '''show changeset information when templating not requested.''' @@ -1264,7 +1272,7 @@ class changeset_printer(object): # i18n: column positioning for "hg log" self.ui.write(_("changeset: %d:%s\n") % revnode, - label='log.changeset changeset.%s' % ctx.phasestr()) + label=_changesetlabels(ctx)) # branches are shown first before any other names due to backwards # compatibility @@ -1309,6 +1317,10 @@ class changeset_printer(object): self.ui.write(_("date: %s\n") % date, label='log.date') + if ctx.troubled(): + self.ui.write(_("troubles: %s\n") % ', '.join(ctx.troubles()), + label='ui.note log.troubles') + if self.ui.debugflag: files = ctx.p1().status(ctx)[:3] for key, value in zip([# i18n: column positioning for "hg log" diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t --- a/tests/test-commit-amend.t +++ b/tests/test-commit-amend.t @@ -614,6 +614,7 @@ Test that rewriting leaving instability parent: 11:3334b7925910 user: test date: Thu Jan 01 00:00:00 1970 +0000 + troubles: unstable summary: babar _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel