Mercurial > evolve
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 1446:a73d1ee48003 | 1447:09206bdc2db4 |
|---|---|
| 2034 else: | 2034 else: |
| 2035 bmdeactivate(repo) | 2035 bmdeactivate(repo) |
| 2036 displayer.show(c) | 2036 displayer.show(c) |
| 2037 result = 0 | 2037 result = 0 |
| 2038 elif children: | 2038 elif children: |
| 2039 ui.warn("ambigious next changeset:\n") | |
| 2039 for c in children: | 2040 for c in children: |
| 2040 displayer.show(c) | 2041 displayer.show(c) |
| 2041 ui.warn(_('multiple non-obsolete children, ' | 2042 ui.warn(_('explicitly update to one of them\n')) |
| 2042 'explicitly update to one of them\n')) | |
| 2043 result = 1 | 2043 result = 1 |
| 2044 else: | 2044 else: |
| 2045 ui.warn(_('no non-obsolete children\n')) | 2045 ui.warn(_('no children\n')) |
| 2046 result = 1 | 2046 result = 1 |
| 2047 return result | 2047 return result |
| 2048 | 2048 |
| 2049 def _reachablefrombookmark(repo, revs, mark): | 2049 def _reachablefrombookmark(repo, revs, mark): |
| 2050 """filter revisions and bookmarks reachable from the given bookmark | 2050 """filter revisions and bookmarks reachable from the given bookmark |