Mercurial > evolve

changeset 1447:09206bdc2db4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
files README hgext/evolve.py tests/test-prev-next.t
diffstat 3 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/README	Wed Jun 24 20:17:57 2015 -0700
+++ b/README	Wed Jun 24 20:23:41 2015 -0700
@@ -64,9 +64,10 @@
 - evolve: `hg evolve --all` only evolve changeset that will end up as
           descendant of the current working copy. The old behavior of `--all`
           in now in `--all --any`.
-- next/prev: requires `--merge` to move with uncommited changes
 - evolve: add a 'experimental.evolutioncommands' for fine grained commands
           enabling
+- next/prev: requires `--merge` to move with uncommited changes
+- next: significantly reword error messages
 
 5.1.5 -- 2015-06-23
 
--- 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
 
--- a/tests/test-prev-next.t	Wed Jun 24 20:17:57 2015 -0700
+++ b/tests/test-prev-next.t	Wed Jun 24 20:23:41 2015 -0700
@@ -135,7 +135,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   [2] added c
   $ hg next
-  no non-obsolete children
+  no children
   [1]
   $ hg prev
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -146,7 +146,7 @@
   $ hg amend -m 'added b (2)'
   1 new unstable changesets
   $ hg next
-  no non-obsolete children
+  no children
   [1]
   $ hg evolve
   move:[2] added c
@@ -166,9 +166,10 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [3] added b (2)
   $ hg next
+  ambigious next changeset:
   [4] added c
   [5] added d
-  multiple non-obsolete children, explicitly update to one of them
+  explicitly update to one of them
   [1]
 
 next with ambiguity in aspiring children
@@ -176,7 +177,7 @@
   $ hg am -m 'added b (3)'
   2 new unstable changesets
   $ hg next
-  no non-obsolete children
+  no children
   [1]
   $ hg evolve
   abort: multiple evolve candidates