# HG changeset patch # User Pierre-Yves David # Date 1495208085 -7200 # Node ID 6a23a55f77d2d16e0d58985fa931e4360945943e # Parent a8fea2ae3c0bcfd1eaf85200833a7c5cd1e05e44 next: prevent a color related crash when evolve This was not caught by test because they run color less. diff --git a/README b/README --- 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 ------------------- diff --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py --- 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 diff --git a/tests/test-prev-next.t b/tests/test-prev-next.t --- 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