# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1367545282 18000
# Node ID d982edcfe7f0e815a6dd878de1823e7da3e3b17c
# Parent  5c5152af0d15cdad8824dfb56828c7a9670ad041
templater: fix output instability from gsoc patches

diff -r 5c5152af0d15 -r d982edcfe7f0 mercurial/templater.py
--- 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):
 
diff -r 5c5152af0d15 -r d982edcfe7f0 tests/test-command-template.t
--- 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:
diff -r 5c5152af0d15 -r d982edcfe7f0 tests/test-log.t
--- 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