| Submitter | Yuya Nishihara |
|---|---|
| Date | Oct. 14, 2017, 10:41 a.m. |
| Message ID | <a0e3d1f07deaad9a3a13.1507977675@mimosa> |
| Download | mbox | patch |
| Permalink | /patch/24892/ |
| State | Accepted |
| Headers | show |
Comments
On Sat, Oct 14, 2017 at 07:41:15PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara <yuya@tcha.org> > # Date 1507974080 -32400 > # Sat Oct 14 18:41:20 2017 +0900 > # Node ID a0e3d1f07deaad9a3a1392a1434b26de1bff1a3e > # Parent 1fa8afb93739b8233c6744c2b59fec6e9dee073a > templates: fix missed space between instability labels queued, thanks
Patch
diff --git a/mercurial/templates/map-cmdline.default b/mercurial/templates/map-cmdline.default --- a/mercurial/templates/map-cmdline.default +++ b/mercurial/templates/map-cmdline.default @@ -82,5 +82,6 @@ labelcset(expr) = label(separate(" ", "changeset.{phase}", if(obsolete, "changeset.obsolete"), if(instabilities, "changeset.unstable"), - instabilities % "instability.{instability}"), + join(instabilities + % "instability.{instability}", " ")), expr) diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -963,7 +963,7 @@ test the obsolete labels $ hg log -T default -r 'phasedivergent()' --color=debug - [log.changeset changeset.draft changeset.unstable instability.orphaninstability.phase-divergent|changeset: 7:50c51b361e60] + [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] [log.user|user: test] [log.date|date: Thu Jan 01 00:00:00 1970 +0000] [log.instability|instability: orphan, phase-divergent]