Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templater: fix output instability from gsoc patches
authorAugie Fackler <raf@durin42.com>
Thu, 02 May 2013 20:41:22 -0500
changeset 19127 d982edcfe7f0
parent 19126 5c5152af0d15
child 19130 70f0d1da36b0
templater: fix output instability from gsoc patches
mercurial/templater.py file | annotate | diff | comparison | revisions
mercurial/templates/map-cmdline.phases file | annotate | diff | comparison | revisions
tests/test-command-template.t file | annotate | diff | comparison | revisions
tests/test-log.t file | annotate | diff | comparison | revisions 
--- 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
hg-stable