# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1495210076 -7200
# Node ID 07c5c79fc3d93bf39dfb5967e07bec37f733aec2
# Parent  29fd3eec625cd7d0dad3035e643d2331eae65079# Parent  6a23a55f77d2d16e0d58985fa931e4360945943e
merge back with stable

diff -r 29fd3eec625c -r 07c5c79fc3d9 README
--- a/README	Fri May 19 17:48:44 2017 +0200
+++ b/README	Fri May 19 18:07:56 2017 +0200
@@ -117,6 +117,12 @@
 
  - olog: add an 'obslog' alias
 
+6.2.1 - in progress
+-------------------
+
+- prune: fix a crash related to color handling,
+- next: fix a crash related to color handling,
+
 6.2.0 -- 2017-05-18
 -------------------
 
diff -r 29fd3eec625c -r 07c5c79fc3d9 hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py	Fri May 19 17:48:44 2017 +0200
+++ b/hgext3rd/evolve/__init__.py	Fri May 19 18:07:56 2017 +0200
@@ -2064,7 +2064,7 @@
                                    False, lambda: None, category='unstable')
                 if not result:
                     ui.status(_('working directory now at %s\n')
-                              % ui.label(repo['.'], 'evolve.node'))
+                              % ui.label(str(repo['.']), 'evolve.node'))
                 return result
             return 1
         return result
@@ -2271,7 +2271,7 @@
                     repo._bookmarks.recordchange(tr)
                 commands.update(ui, repo, newnode.rev())
                 ui.status(_('working directory now at %s\n')
-                          % ui.label(newnode, 'evolve.node'))
+                          % ui.label(str(newnode), 'evolve.node'))
                 if movebookmark:
                     bookmarksmod.activate(repo, bookactive)
 
diff -r 29fd3eec625c -r 07c5c79fc3d9 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Fri May 19 17:48:44 2017 +0200
+++ b/tests/test-prev-next.t	Fri May 19 18:07:56 2017 +0200
@@ -170,10 +170,13 @@
   atop:[3] added b (2)
   hg rebase -r 4e26ef31f919 -d 9ad178109a19
   working directory now at 9ad178109a19
-  $ hg next --evolve
-  move:[2] added c
-  atop:[3] added b (2)
-  working directory now at e3b6d5df389b
+
+(add color output for smoke testing)
+
+  $ hg next --evolve --color debug
+  move:[[evolve.rev|2]] added c
+  atop:[[evolve.rev|3]] added b (2)
+  [ ui.status|working directory now at [evolve.node|e3b6d5df389b]]
 
 next with ambiguity
 
diff -r 29fd3eec625c -r 07c5c79fc3d9 tests/test-prune.t
--- a/tests/test-prune.t	Fri May 19 17:48:44 2017 +0200
+++ b/tests/test-prune.t	Fri May 19 18:07:56 2017 +0200
@@ -71,10 +71,12 @@
 
 pruning multiple changeset at once
 
-  $ hg prune 2:
-  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  working directory now at 1f0dee641bb7
-  2 changesets pruned
+(add color output to test it does not crash)
+
+  $ hg prune 2: --color debug
+  [ ui.status|0 files updated, 0 files merged, 3 files removed, 0 files unresolved]
+  [ ui.status|working directory now at [evolve.node|1f0dee641bb7]]
+  [ ui.status|2 changesets pruned]
   $ hg debugobsolete
   9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
   7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob)