Patchwork [3,of,4] template: update map-cmdline.phases with troubled states

login
register
mail settings
Submitter Romain DEP.
Date Jan. 6, 2015, 9:48 a.m.
Message ID <c6424975de25be65520c.1420537714@ultas>
Download mbox | patch
Permalink /patch/7334/
State Changes Requested
Headers show

Comments

Romain DEP. - Jan. 6, 2015, 9:48 a.m.
# HG changeset patch
# User Romain DEP. <rom1dep@gmail.com>
# Date 1420456285 -3600
#      Mon Jan 05 12:11:25 2015 +0100
# Node ID c6424975de25be65520cb5b98e68f3f52fb9c4eb
# Parent  43da4f6fc04f5886bec71483cda9f42382d2fc29
template: update map-cmdline.phases with troubled states

Patch

diff --git a/mercurial/templates/map-cmdline.phases b/mercurial/templates/map-cmdline.phases
--- a/mercurial/templates/map-cmdline.phases
+++ b/mercurial/templates/map-cmdline.phases
@@ -27,17 +27,20 @@ 
                                  "copies:     {file_copies_switch
                                                % ' {name} ({source})'}\n"))}'
 
+ltroubles = '{if(troubles,
+                " changeset.{join(troubles, ' changeset.')}")}'
+
 # General templates
-cset = '{label("log.changeset changeset.{phase} changeset.{hidden} changeset.{obsolete}",
+cset = '{label("log.changeset changeset.{phase} changeset.{hidden} changeset.{obsolete}{ltroubles}",
                "changeset:   {rev}:{node|short}")}\n'
 
 lphase = '{label("log.phase",
                  "phase:       {phase}")}\n'
 
-fullcset = '{label("log.changeset changeset.{phase} changeset.{hidden} changeset.{obsolete}",
+fullcset = '{label("log.changeset changeset.{phase} changeset.{hidden} changeset.{obsolete}{ltroubles}",
                    "changeset:   {rev}:{node}")}\n'
 
-parent = '{label("log.parent changeset.{phase} changeset.{hidden} changeset.{obsolete}",
+parent = '{label("log.parent changeset.{phase} changeset.{hidden} changeset.{obsolete}{ltroubles}",
                   "parent:      {rev}:{node|formatnode}")}\n'
 
 node = '{label("log.node",