Mercurial > evolve
diff hgext/evolve.py @ 1447:09206bdc2db4
next: reword error output
We move to a more compact and direct phrasing. I'm not fully happy about it yet,
but this is a step forward. The listing of candidate should maybe be moved
behind a --verbose flag (and such verbose flag be suggested in the error).
G: changed tests/test-prev-next.t
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Wed, 24 Jun 2015 20:23:41 -0700 |
parents | a73d1ee48003 |
children | 3c113c097339 |
line wrap: on
line diff
--- a/hgext/evolve.py Wed Jun 24 20:17:57 2015 -0700 +++ b/hgext/evolve.py Wed Jun 24 20:23:41 2015 -0700 @@ -2036,13 +2036,13 @@ displayer.show(c) result = 0 elif children: + ui.warn("ambigious next changeset:\n") for c in children: displayer.show(c) - ui.warn(_('multiple non-obsolete children, ' - 'explicitly update to one of them\n')) + ui.warn(_('explicitly update to one of them\n')) result = 1 else: - ui.warn(_('no non-obsolete children\n')) + ui.warn(_('no children\n')) result = 1 return result