# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1406338369 -7200
# Node ID b081decd90628d52552904edb5b627e6e01e1dc2
# Parent  868e2cea3ea08a2b24b90b8901224d30b5625f2e
resolve: add parenthesis around "no more unresolved files" message

This message may be confused with an error message. Adding parenthesis around it
will make it more recognisable as an informative message.

diff -r 868e2cea3ea0 -r b081decd9062 mercurial/commands.py
--- a/mercurial/commands.py	Fri Jul 25 15:51:42 2014 -0500
+++ b/mercurial/commands.py	Sat Jul 26 03:32:49 2014 +0200
@@ -5062,7 +5062,7 @@
     # this with the list/show operation because we want list/show to remain
     # machine readable.
     if not list(ms.unresolved()) and not show:
-        ui.status(_('no more unresolved files\n'))
+        ui.status(_('(no more unresolved files)\n'))
 
     return ret
 
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-add.t
--- a/tests/test-add.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-add.t	Sat Jul 26 03:32:49 2014 +0200
@@ -107,7 +107,7 @@
   M a
   ? a.orig
   $ hg resolve -m a
-  no more unresolved files
+  (no more unresolved files)
   $ hg ci -m merge
 
 Issue683: peculiarity with hg revert of an removed then added file
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-backout.t
--- a/tests/test-backout.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-backout.t	Sat Jul 26 03:32:49 2014 +0200
@@ -517,7 +517,7 @@
   merging foo
   my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437
    premerge successful
-  no more unresolved files
+  (no more unresolved files)
   $ hg status
   M foo
   ? foo.orig
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-commit-amend.t
--- a/tests/test-commit-amend.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-commit-amend.t	Sat Jul 26 03:32:49 2014 +0200
@@ -586,7 +586,7 @@
   merging cc incomplete! (edit conflicts, then use 'hg resolve --mark')
   [1]
   $ hg resolve -m cc
-  no more unresolved files
+  (no more unresolved files)
   $ hg ci -m 'merge bar'
   $ hg log --config diff.git=1 -pr .
   changeset:   23:93cd4445f720
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-commit-unresolved.t
--- a/tests/test-commit-unresolved.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-commit-unresolved.t	Sat Jul 26 03:32:49 2014 +0200
@@ -41,7 +41,7 @@
 Mark the conflict as resolved and commit
 
   $ hg resolve -m A
-  no more unresolved files
+  (no more unresolved files)
   $ hg commit -m "Merged"
 
   $ cd ..
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-convert-svn-sink.t
--- a/tests/test-convert-svn-sink.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-convert-svn-sink.t	Sat Jul 26 03:32:49 2014 +0200
@@ -352,7 +352,7 @@
   [1]
   $ hg --cwd b revert -r 2 b
   $ hg --cwd b resolve -m b
-  no more unresolved files
+  (no more unresolved files)
   $ hg --cwd b ci -d '5 0' -m 'merge'
 
 Expect 4 changes
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-fileset.t
--- a/tests/test-fileset.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-fileset.t	Sat Jul 26 03:32:49 2014 +0200
@@ -154,7 +154,7 @@
   b2
   $ echo e > b2
   $ hg resolve -m b2
-  no more unresolved files
+  (no more unresolved files)
   $ fileset 'resolved()'
   b2
   $ fileset 'unresolved()'
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-graft.t
--- a/tests/test-graft.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-graft.t	Sat Jul 26 03:32:49 2014 +0200
@@ -235,7 +235,7 @@
 
   $ echo b > e
   $ hg resolve -m e
-  no more unresolved files
+  (no more unresolved files)
 
 Continue with a revision should fail:
 
@@ -370,7 +370,7 @@
   [255]
   $ hg resolve --all
   merging a
-  no more unresolved files
+  (no more unresolved files)
   $ hg graft -c
   grafting revision 1
   $ hg export tip --git
@@ -399,7 +399,7 @@
   [255]
   $ hg resolve --all
   merging a and b to b
-  no more unresolved files
+  (no more unresolved files)
   $ hg graft -c
   grafting revision 2
   $ hg export tip --git
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-histedit-fold-non-commute.t
--- a/tests/test-histedit-fold-non-commute.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-histedit-fold-non-commute.t	Sat Jul 26 03:32:49 2014 +0200
@@ -95,7 +95,7 @@
 fix up
   $ echo 'I can haz no commute' > e
   $ hg resolve --mark e
-  no more unresolved files
+  (no more unresolved files)
   $ cat > cat.py <<EOF
   > import sys
   > print open(sys.argv[1]).read()
@@ -130,7 +130,7 @@
 just continue this time
   $ hg revert -r 'p1()' e
   $ hg resolve --mark e
-  no more unresolved files
+  (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-histedit-fold.t
--- a/tests/test-histedit-fold.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-histedit-fold.t	Sat Jul 26 03:32:49 2014 +0200
@@ -217,7 +217,7 @@
   U file
   $ hg revert -r 'p1()' file
   $ hg resolve --mark file
-  no more unresolved files
+  (no more unresolved files)
   $ hg histedit --continue
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/*-backup.hg (glob)
@@ -277,7 +277,7 @@
   > 5
   > EOF
   $ hg resolve --mark file
-  no more unresolved files
+  (no more unresolved files)
   $ hg commit -m '+5.2'
   created new head
   $ echo 6 >> file
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-histedit-non-commute.t
--- a/tests/test-histedit-non-commute.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-histedit-non-commute.t	Sat Jul 26 03:32:49 2014 +0200
@@ -154,7 +154,7 @@
 fix up
   $ echo 'I can haz no commute' > e
   $ hg resolve --mark e
-  no more unresolved files
+  (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
@@ -168,7 +168,7 @@
 just continue this time
   $ hg revert -r 'p1()' e
   $ hg resolve --mark e
-  no more unresolved files
+  (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -241,7 +241,7 @@
 
   $ echo 'I can haz no commute' > e
   $ hg resolve --mark e
-  no more unresolved files
+  (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
@@ -251,7 +251,7 @@
 second edit also fails, but just continue
   $ hg revert -r 'p1()' e
   $ hg resolve --mark e
-  no more unresolved files
+  (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-keyword.t
--- a/tests/test-keyword.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-keyword.t	Sat Jul 26 03:32:49 2014 +0200
@@ -1057,7 +1057,7 @@
 resolve to local
 
   $ HGMERGE=internal:local hg resolve -a
-  no more unresolved files
+  (no more unresolved files)
   $ hg commit -m localresolve
   $ cat m
   $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-lfconvert.t
--- a/tests/test-lfconvert.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-lfconvert.t	Sat Jul 26 03:32:49 2014 +0200
@@ -132,7 +132,7 @@
   [1]
   $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat
   $ hg resolve -m stuff/maybelarge.dat
-  no more unresolved files
+  (no more unresolved files)
   $ hg commit -m"merge"
   $ hg log -G --template "{rev}:{node|short}  {desc|firstline}\n"
   @    5:4884f215abda  merge
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-log.t
--- a/tests/test-log.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-log.t	Sat Jul 26 03:32:49 2014 +0200
@@ -1027,7 +1027,7 @@
   [1]
   $ echo 'merge 1' > foo
   $ hg resolve -m foo
-  no more unresolved files
+  (no more unresolved files)
   $ hg ci -m "First merge, related"
 
   $ hg merge 4
@@ -1039,7 +1039,7 @@
   [1]
   $ echo 'merge 2' > foo
   $ hg resolve -m foo
-  no more unresolved files
+  (no more unresolved files)
   $ hg ci -m "Last merge, related"
 
   $ hg log --graph
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-merge-types.t
--- a/tests/test-merge-types.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-merge-types.t	Sat Jul 26 03:32:49 2014 +0200
@@ -50,7 +50,7 @@
   a is a symlink:
   a -> symlink
   $ hg resolve a --tool internal:other
-  no more unresolved files
+  (no more unresolved files)
   $ tellmeabout a
   a is an executable file with content:
   a
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-merge7.t
--- a/tests/test-merge7.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-merge7.t	Sat Jul 26 03:32:49 2014 +0200
@@ -57,7 +57,7 @@
   > EOF
   $ rm -f *.orig
   $ hg resolve -m test.txt
-  no more unresolved files
+  (no more unresolved files)
   $ hg commit -m "Merge 1"
 
 change test-a again
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-mq-qnew.t
--- a/tests/test-mq-qnew.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-mq-qnew.t	Sat Jul 26 03:32:49 2014 +0200
@@ -158,7 +158,7 @@
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
-  no more unresolved files
+  (no more unresolved files)
   abort: cannot manage merge changesets
   $ rm -r sandbox
 
@@ -232,7 +232,7 @@
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
-  no more unresolved files
+  (no more unresolved files)
   abort: cannot manage merge changesets
   $ rm -r sandbox
 
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-rebase-bookmarks.t	Sat Jul 26 03:32:49 2014 +0200
@@ -169,7 +169,7 @@
   [1]
   $ echo 'c' > c
   $ hg resolve --mark c
-  no more unresolved files
+  (no more unresolved files)
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob)
   $ hg tglog
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-rebase-check-restore.t
--- a/tests/test-rebase-check-restore.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-rebase-check-restore.t	Sat Jul 26 03:32:49 2014 +0200
@@ -76,7 +76,7 @@
   $ echo 'conflict solved' > A
   $ rm A.orig
   $ hg resolve -m A
-  no more unresolved files
+  (no more unresolved files)
   $ hg rebase --continue
 
   $ hg tglog
@@ -130,7 +130,7 @@
   $ echo 'conflict solved' > A
   $ rm A.orig
   $ hg resolve -m A
-  no more unresolved files
+  (no more unresolved files)
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
 
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-rebase-conflicts.t	Sat Jul 26 03:32:49 2014 +0200
@@ -77,7 +77,7 @@
 
   $ echo 'resolved merge' >common
   $ hg resolve -m common
-  no more unresolved files
+  (no more unresolved files)
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
 
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-rebase-detach.t	Sat Jul 26 03:32:49 2014 +0200
@@ -374,7 +374,7 @@
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ hg resolve --all -t internal:local
-  no more unresolved files
+  (no more unresolved files)
   $ hg rebase -c
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob)
   $ hg  log -G --template "{rev}:{phase} '{desc}' {branches}\n"
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-rebase-interruptions.t
--- a/tests/test-rebase-interruptions.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-rebase-interruptions.t	Sat Jul 26 03:32:49 2014 +0200
@@ -104,7 +104,7 @@
   $ echo 'conflict solved' > A
   $ rm A.orig
   $ hg resolve -m A
-  no more unresolved files
+  (no more unresolved files)
 
   $ hg rebase --continue
   warning: new changesets detected on source branch, not stripping
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-rebase-mq-skip.t	Sat Jul 26 03:32:49 2014 +0200
@@ -111,7 +111,7 @@
   [1]
 
   $ HGMERGE=internal:local hg resolve --all
-  no more unresolved files
+  (no more unresolved files)
 
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-rebase-mq.t
--- a/tests/test-rebase-mq.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-rebase-mq.t	Sat Jul 26 03:32:49 2014 +0200
@@ -69,7 +69,7 @@
 
   $ echo mq1r1 > f
   $ hg resolve -m f
-  no more unresolved files
+  (no more unresolved files)
   $ hg rebase -c
   merging f
   warning: conflicts during merge.
@@ -81,7 +81,7 @@
 
   $ echo mq1r1mq2 > f
   $ hg resolve -m f
-  no more unresolved files
+  (no more unresolved files)
   $ hg rebase -c
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
 
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-rebase-parameters.t	Sat Jul 26 03:32:49 2014 +0200
@@ -454,7 +454,7 @@
   U c2
 
   $ hg resolve -m c2
-  no more unresolved files
+  (no more unresolved files)
   $ hg rebase -c --tool internal:fail
   tool option will be ignored
   saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob)
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-resolve.t
--- a/tests/test-resolve.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-resolve.t	Sat Jul 26 03:32:49 2014 +0200
@@ -39,7 +39,7 @@
 
   $ echo resolved > file
   $ hg resolve -m file
-  no more unresolved files
+  (no more unresolved files)
   $ hg commit -m 'resolved'
 
 resolve -l should be empty
diff -r 868e2cea3ea0 -r b081decd9062 tests/test-shelve.t
--- a/tests/test-shelve.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-shelve.t	Sat Jul 26 03:32:49 2014 +0200
@@ -308,7 +308,7 @@
 
   $ hg revert -r . a/a
   $ hg resolve -m a/a
-  no more unresolved files
+  (no more unresolved files)
 
   $ hg commit -m 'commit while unshelve in progress'
   abort: unshelve already in progress