Mercurial > hg > evolve

changeset 2539:6a23a55f77d2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
next: prevent a color related crash when evolve This was not caught by test because they run color less.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 19 May 2017 17:34:45 +0200
parents a8fea2ae3c0b
children 07c5c79fc3d9 62e4f9ff352b
files README hgext3rd/evolve/__init__.py tests/test-prev-next.t
diffstat 3 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/README
+++ b/README
@@ -116,6 +116,7 @@
 -------------------
 
 - prune: fix a crash related to color handling,
+- next: fix a crash related to color handling,
 
 6.2.0 -- 2017-05-18
 -------------------
--- a/hgext3rd/evolve/__init__.py
+++ b/hgext3rd/evolve/__init__.py
@@ -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
--- a/tests/test-prev-next.t
+++ b/tests/test-prev-next.t
@@ -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