[PATCH V3] summary: add troubles list to the output of hg summary

[Augie Fackler]

On Fri, Dec 11, 2015 at 11:46:13AM +0000, Pierre-Yves David wrote:
>
>
> On 12/11/2015 01:05 AM, Laurent Charignon wrote:
> ># HG changeset patch
> ># User Laurent Charignon <lcharignon at fb.com>
> ># Date 1449795920 28800
> >#      Thu Dec 10 17:05:20 2015 -0800
> ># Node ID 565dc5add568bd2947afe1c2c693389f1468515e
> ># Parent  71aa5a26162d6e4a165b68f07b331e3e2eedc117
> >summary: add troubles list to the output of hg summary
> >
> >This patch adds troubles information for the output of hg summary.
> >Example lines displayed in hg summary:
> >unstable: 1 changeset
> >bumped: 2 changesets
> >
> >diff --git a/mercurial/commands.py b/mercurial/commands.py
> >--- a/mercurial/commands.py
> >+++ b/mercurial/commands.py
> >@@ -6335,6 +6335,18 @@ def summary(ui, repo, **opts):
> >      if draft or secret:
> >          ui.status(_('phases: %s\n') % ', '.join(t))
> >
> >+    if obsolete.isenabled(repo, obsolete.createmarkersopt):
> >+        for trouble in ("unstable", "divergent", "bumped"):
> >+            numtrouble = len(repo.revs(trouble + "()"))
> >+            # We write all the possibilities to ease translation
> >+            troublemsg = {
> >+               "unstable": _("%d unstable changeset"),
> >+               "divergent": _("%d divergent changeset"),
> >+               "bumped": _("%d bumped changeset"),
> >+            }
> >+            if numtrouble > 0:
> >+                ui.status(troublemsg[trouble] % numtrouble + "\n")
> >+
> >      cmdutil.summaryhooks(ui, repo)
> >
> >      if opts.get('remote'):
> >diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
> >--- a/tests/test-obsolete.t
> >+++ b/tests/test-obsolete.t
> >@@ -238,6 +238,14 @@ And that we can't push bumped changeset
> >  Fixing "bumped" situation
> >  We need to create a clone of 5 and add a special marker with a flag
> >
> >+  $ hg summary
> >+  parent: 5:5601fb93a350 tip
> >+   add new_3_c
> >+  branch: default
> >+  commit: (clean)
> >+  update: 1 new changesets, 2 branch heads (merge)
> >+  phases: 1 draft
> >+  1 bumped changeset
>
> Why did we changed from "unstable: 1 changesets"
> to "1 unstable changesets" between V3 and V3?
>
> I think we should stick with the "<category>: <data>" structure used in the
> rest of `hg summary` output.
>
> Did I missed something?

+1, I liked v2's output slightly better I think.

>
> --
> Pierre-Yves David
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel