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.

mercurial/commands.py

@@ -5062,7 +5062,7 b' def resolve(ui, repo, *pats, **opts):'
     # 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
 

tests/test-add.t

@@ -107,7 +107,7 b' should fail'
   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

tests/test-backout.t

@@ -517,7 +517,7 b' Test usage of `hg resolve` in case of co'
   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

tests/test-commit-amend.t

@@ -586,7 +586,7 b' Amend a merge changeset (with renames an'
   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

tests/test-commit-unresolved.t

@@ -41,7 +41,7 b' Correct the conflict without marking the'
 Mark the conflict as resolved and commit
 
   $ hg resolve -m A
-  no more unresolved files
+  (no more unresolved files)
   $ hg commit -m "Merged"
 
   $ cd ..

tests/test-convert-svn-sink.t

@@ -352,7 +352,7 b' Branchy history'
   [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

tests/test-fileset.t

@@ -154,7 +154,7 b' Test merge states'
   b2
   $ echo e > b2
   $ hg resolve -m b2
-  no more unresolved files
+  (no more unresolved files)
   $ fileset 'resolved()'
   b2
   $ fileset 'unresolved()'

tests/test-graft.t

@@ -235,7 +235,7 b' Fix up:'
 
   $ 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 b' Resolve conflicted graft'
   [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 b' Resolve conflicted graft with rename'
   [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

tests/test-histedit-fold-non-commute.t

@@ -95,7 +95,7 b' edit the history'
 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 b' fix up'
 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

tests/test-histedit-fold.t

@@ -217,7 +217,7 b' should effectively drop the changes from'
   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 b' dropped revision.'
   > 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

tests/test-histedit-non-commute.t

@@ -154,7 +154,7 b' edit the history'
 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 b' former children.'
 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 b' edit the history, this time with a fold '
 
   $ 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 b' edit the history, this time with a fold '
 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

tests/test-keyword.t

@@ -1057,7 +1057,7 b' conflict: keyword should stay outside co'
 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 $

tests/test-lfconvert.t

@@ -132,7 +132,7 b' add some changesets to rename/remove/mer'
   [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

tests/test-log.t

@@ -1027,7 +1027,7 b' log -p -R repo'
   [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 b' log -p -R repo'
   [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

tests/test-merge-types.t

@@ -50,7 +50,7 b' Symlink is local parent, executable is o'
   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

tests/test-merge7.t

@@ -57,7 +57,7 b' resolve conflict'
   > 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

tests/test-mq-qnew.t

@@ -158,7 +158,7 b' plain headers'
   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 b' hg headers'
   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
 

tests/test-rebase-bookmarks.t

@@ -169,7 +169,7 b' rebase --continue with bookmarks present'
   [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

tests/test-rebase-check-restore.t

@@ -76,7 +76,7 b' Solve the conflict and go on:'
   $ 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 b' Solve the conflict and go on:'
   $ 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)
 

tests/test-rebase-conflicts.t

@@ -77,7 +77,7 b' Conclude rebase:'
 
   $ 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)
 

tests/test-rebase-detach.t

@@ -374,7 +374,7 b' Ensure --continue restores a correct sta'
   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"

tests/test-rebase-interruptions.t

@@ -104,7 +104,7 b' Solve the conflict and go on:'
   $ 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

tests/test-rebase-mq-skip.t

@@ -111,7 +111,7 b' already has one local mq patch'
   [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)

tests/test-rebase-mq.t

@@ -69,7 +69,7 b' Fix the 1st conflict:'
 
   $ 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 b' Fix the 2nd conflict:'
 
   $ 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)
 

tests/test-rebase-parameters.t

@@ -454,7 +454,7 b' Test --tool parameter:'
   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)

tests/test-resolve.t

@@ -39,7 +39,7 b' resolve the failure'
 
   $ echo resolved > file
   $ hg resolve -m file
-  no more unresolved files
+  (no more unresolved files)
   $ hg commit -m 'resolved'
 
 resolve -l should be empty

tests/test-shelve.t

@@ -308,7 +308,7 b' attempt to continue'
 
   $ 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