# HG changeset patch
# User Pierre-Yves David <pyd@fb.com>
# Date 1402954309 25200
# Node ID ff43167ed0ba60038304a08621bda4cbac5e6224
# Parent  6d691fefdbd1ceb0f2b65862a76e7352098a68d4# Parent  9ff6d9240f165155d0614209f5f358d235543588
merge with some older backport

diff -r 6d691fefdbd1 -r ff43167ed0ba hgext/evolve.py
--- a/hgext/evolve.py	Thu Jun 05 18:07:39 2014 -0400
+++ b/hgext/evolve.py	Mon Jun 16 14:31:49 2014 -0700
@@ -594,6 +594,13 @@
         return 'unstable'
     return 'stable'
 
+@eh.templatekw('troubles')
+def showtroubles(repo, ctx, **args):
+    """:troubles: List of strings. Evolution troubles affecting the changeset
+    (zero or more of "unstable", "divergent" or "bumped")."""
+    return templatekw.showlist('trouble', ctx.troubles(), plural='troubles',
+                               **args)
+
 #####################################################################
 ### Various trouble warning                                       ###
 #####################################################################
diff -r 6d691fefdbd1 -r ff43167ed0ba tests/test-evolve.t
--- a/tests/test-evolve.t	Thu Jun 05 18:07:39 2014 -0400
+++ b/tests/test-evolve.t	Mon Jun 16 14:31:49 2014 -0700
@@ -341,6 +341,27 @@
   $ hg commit --amend -m 'dansk!'
   2 new unstable changesets
 
+(ninja test for the {trouble} template:
+
+  $ hg log -G --template '{rev} {troubles}\n'
+  @  13
+  |
+  | o  11 unstable
+  | |
+  | o  10 unstable
+  | |
+  | x  9
+  |/
+  o  7
+  |
+  o  6
+  |
+  o  0
+  
+
+
+(/ninja)
+
   $ hg evolve --all --traceback
   move:[10] dansk 2!
   atop:[13] dansk!