Mercurial > hg-stable
changeset 19127:d982edcfe7f0
templater: fix output instability from gsoc patches
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Thu, 02 May 2013 20:41:22 -0500 |
| parents | 5c5152af0d15 |
| children | 70f0d1da36b0 |
| files | mercurial/templater.py mercurial/templates/map-cmdline.phases tests/test-command-template.t tests/test-log.t |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templater.py Thu Apr 18 22:56:57 2013 +0300 +++ b/mercurial/templater.py Thu May 02 20:41:22 2013 -0500 @@ -402,7 +402,7 @@ split = file.split(".") if split[0] == "map-cmdline": stylelist.append(split[1]) - return ", ".join(stylelist) + return ", ".join(sorted(stylelist)) class templater(object):
--- a/tests/test-command-template.t Thu Apr 18 22:56:57 2013 +0300 +++ b/tests/test-command-template.t Thu May 02 20:41:22 2013 -0500 @@ -458,7 +458,8 @@ Error if no style: $ hg log --style notexist - abort: style not found: notexist + abort: style 'notexist' not found + (available styles: bisect, changelog, compact, default, phases, xml) [255] Error if style missing key:
--- a/tests/test-log.t Thu Apr 18 22:56:57 2013 +0300 +++ b/tests/test-log.t Thu May 02 20:41:22 2013 -0500 @@ -88,7 +88,7 @@ $ hg log -f -l1 --style something abort: style 'something' not found - (available styles: changelog, bisect, default, xml, phases, compact) + (available styles: bisect, changelog, compact, default, phases, xml) [255] -f, phases style