[PATCH 1 of 2] rebase: improve resolve failure message

[steve at borho.org]

# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1288475895 18000
# Branch stable
# Node ID 1ef0e920cf260f62517730fec156f71a1a9ee1db
# Parent  bc91a79fa3d04b365a7149989ec52888d88b256b
rebase: improve resolve failure message

diff -r bc91a79fa3d0 -r 1ef0e920cf26 hgext/rebase.py
--- a/hgext/rebase.py	Sat Oct 30 11:32:04 2010 -0500
+++ b/hgext/rebase.py	Sat Oct 30 16:58:15 2010 -0500
@@ -165,8 +165,8 @@
                 else:
                     stats = rebasenode(repo, rev, p1, p2, state)
                     if stats and stats[3] > 0:
-                        raise util.Abort(_('fix unresolved conflicts with hg '
-                                    'resolve then run hg rebase --continue'))
+                        raise util.Abort(_('unresolved conflicts (use hg '
+                                    'resolve, then hg rebase --continue)'))
                 updatedirstate(repo, rev, target, p2)
                 if not collapsef:
                     newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn)
diff -r bc91a79fa3d0 -r 1ef0e920cf26 tests/test-rebase-abort.t
--- a/tests/test-rebase-abort.t	Sat Oct 30 11:32:04 2010 -0500
+++ b/tests/test-rebase-abort.t	Sat Oct 30 16:58:15 2010 -0500
@@ -50,7 +50,7 @@
   merging common
   warning: conflicts during merge.
   merging common failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (use hg resolve, then hg rebase --continue)
   [255]
 
 Abort:
@@ -118,7 +118,7 @@
   merging c
   warning: conflicts during merge.
   merging c failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (use hg resolve, then hg rebase --continue)
   [255]
 
   $ hg tglog
diff -r bc91a79fa3d0 -r 1ef0e920cf26 tests/test-rebase-check-restore.t
--- a/tests/test-rebase-check-restore.t	Sat Oct 30 11:32:04 2010 -0500
+++ b/tests/test-rebase-check-restore.t	Sat Oct 30 16:58:15 2010 -0500
@@ -64,7 +64,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (use hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on:
@@ -116,7 +116,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (use hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on:
diff -r bc91a79fa3d0 -r 1ef0e920cf26 tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t	Sat Oct 30 11:32:04 2010 -0500
+++ b/tests/test-rebase-conflicts.t	Sat Oct 30 16:58:15 2010 -0500
@@ -59,7 +59,7 @@
   merging common
   warning: conflicts during merge.
   merging common failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (use hg resolve, then hg rebase --continue)
   [255]
 
 Try to continue without solving the conflict:
diff -r bc91a79fa3d0 -r 1ef0e920cf26 tests/test-rebase-interruptions.t
--- a/tests/test-rebase-interruptions.t	Sat Oct 30 11:32:04 2010 -0500
+++ b/tests/test-rebase-interruptions.t	Sat Oct 30 16:58:15 2010 -0500
@@ -57,7 +57,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (use hg resolve, then hg rebase --continue)
   [255]
 
 Force a commit on C during the interruption:
@@ -89,7 +89,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (use hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on:
@@ -143,7 +143,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (use hg resolve, then hg rebase --continue)
   [255]
 
 Force a commit on B' during the interruption:
diff -r bc91a79fa3d0 -r 1ef0e920cf26 tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t	Sat Oct 30 11:32:04 2010 -0500
+++ b/tests/test-rebase-mq-skip.t	Sat Oct 30 16:58:15 2010 -0500
@@ -105,7 +105,7 @@
   $ hg up -q qtip
 
   $ HGMERGE=internal:fail hg rebase
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (use hg resolve, then hg rebase --continue)
   [255]
 
   $ HGMERGE=internal:local hg resolve --all
diff -r bc91a79fa3d0 -r 1ef0e920cf26 tests/test-rebase-mq.t
--- a/tests/test-rebase-mq.t	Sat Oct 30 11:32:04 2010 -0500
+++ b/tests/test-rebase-mq.t	Sat Oct 30 16:58:15 2010 -0500
@@ -63,7 +63,7 @@
   merging f
   warning: conflicts during merge.
   merging f failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (use hg resolve, then hg rebase --continue)
   [255]
 
 Fix the 1st conflict:
@@ -74,7 +74,7 @@
   merging f
   warning: conflicts during merge.
   merging f failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (use hg resolve, then hg rebase --continue)
   [255]
 
 Fix the 2nd conflict: