From patchwork Sat Jul 26 01:41:38 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1, of, 2,
 STABLE] resolve: add parenthesis around "no more unresolved files"
 message
From: Pierre-Yves David <pierre-yves.david@ens-lyon.org>
X-Patchwork-Id: 5202
Message-Id: <395a5911571ec1b337d6.1406338898@marginatus.alto.octopoid.net>
To: mercurial-devel@selenic.com
Cc: pierre-yves.david@ens-lyon.org
Date: Sat, 26 Jul 2014 03:41:38 +0200

# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1406338369 -7200
#      Sat Jul 26 03:32:49 2014 +0200
# Branch stable
# Node ID 395a5911571ec1b337d6a4b658754c5f9b73cb29
# 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 --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5060,11 +5060,11 @@ def resolve(ui, repo, *pats, **opts):
 
     # Nudge users into finishing an unfinished operation. We don't print
     # 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
 
 @command('revert',
     [('a', 'all', None, _('revert all changes when no arguments given')),
diff --git a/tests/test-add.t b/tests/test-add.t
--- a/tests/test-add.t
+++ b/tests/test-add.t
@@ -105,11 +105,11 @@ should fail
   a already tracked!
   $ hg st
   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
 
   $ hg forget a
diff --git a/tests/test-backout.t b/tests/test-backout.t
--- a/tests/test-backout.t
+++ b/tests/test-backout.t
@@ -515,11 +515,11 @@ Test usage of `hg resolve` in case of co
   $ hg resolve --all --debug
   picked tool 'internal:merge' for foo (binary False symlink False)
   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
   $ hg resolve -l
   R foo
diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -584,11 +584,11 @@ Amend a merge changeset (with renames an
   $ hg merge -q bar
   warning: conflicts during merge.
   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
   tag:         tip
   parent:      22:30d96aeaf27b
diff --git a/tests/test-commit-unresolved.t b/tests/test-commit-unresolved.t
--- a/tests/test-commit-unresolved.t
+++ b/tests/test-commit-unresolved.t
@@ -39,9 +39,9 @@ Correct the conflict without marking the
   [255]
 
 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 --git a/tests/test-convert-svn-sink.t b/tests/test-convert-svn-sink.t
--- a/tests/test-convert-svn-sink.t
+++ b/tests/test-convert-svn-sink.t
@@ -350,11 +350,11 @@ Branchy history
   2 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
   [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
 
   $ hg convert -d svn b
diff --git a/tests/test-fileset.t b/tests/test-fileset.t
--- a/tests/test-fileset.t
+++ b/tests/test-fileset.t
@@ -152,11 +152,11 @@ Test merge states
   $ fileset 'resolved()'
   $ fileset 'unresolved()'
   b2
   $ echo e > b2
   $ hg resolve -m b2
-  no more unresolved files
+  (no more unresolved files)
   $ fileset 'resolved()'
   b2
   $ fileset 'unresolved()'
   $ hg ci -m merge
 
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -233,11 +233,11 @@ Continue without resolve should fail:
 
 Fix up:
 
   $ echo b > e
   $ hg resolve -m e
-  no more unresolved files
+  (no more unresolved files)
 
 Continue with a revision should fail:
 
   $ hg graft -c 6
   abort: can't specify --continue and revisions
@@ -368,11 +368,11 @@ Resolve conflicted graft
   abort: unresolved conflicts, can't continue
   (use hg resolve and hg graft --continue)
   [255]
   $ hg resolve --all
   merging a
-  no more unresolved files
+  (no more unresolved files)
   $ hg graft -c
   grafting revision 1
   $ hg export tip --git
   # HG changeset patch
   # User bar
@@ -397,11 +397,11 @@ Resolve conflicted graft with rename
   abort: unresolved conflicts, can't continue
   (use hg resolve and hg graft --continue)
   [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
   # HG changeset patch
   # User test
diff --git a/tests/test-histedit-fold-non-commute.t b/tests/test-histedit-fold-non-commute.t
--- a/tests/test-histedit-fold-non-commute.t
+++ b/tests/test-histedit-fold-non-commute.t
@@ -93,11 +93,11 @@ edit the history
   Fix up the change and run hg histedit --continue
 
 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()
   > print
   > print
@@ -128,11 +128,11 @@ fix up
   Fix up the change and run hg histedit --continue
 
 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
 
 log after edit
diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
--- a/tests/test-histedit-fold.t
+++ b/tests/test-histedit-fold.t
@@ -215,11 +215,11 @@ should effectively drop the changes from
   ? file.orig
   $ hg resolve -l
   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)
   $ hg logt --graph
   @  1:617f94f13c0f +4
@@ -275,11 +275,11 @@ dropped revision.
   > 3
   > 4
   > 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
   $ HGEDITOR=cat hg histedit --continue
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-histedit-non-commute.t b/tests/test-histedit-non-commute.t
--- a/tests/test-histedit-non-commute.t
+++ b/tests/test-histedit-non-commute.t
@@ -152,11 +152,11 @@ edit the history
   Fix up the change and run hg histedit --continue
 
 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
   warning: conflicts during merge.
   merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
@@ -166,11 +166,11 @@ This failure is caused by 7b4e2f4b7bcd "
 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
 
 log after edit
@@ -239,21 +239,21 @@ edit the history, this time with a fold 
   merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
 
   $ 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
   warning: conflicts during merge.
   merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
 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
 
 post message fix
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -1055,11 +1055,11 @@ conflict: keyword should stay outside co
   >>>>>>> other: 85d2d2d732a5  - test: simplemerge
 
 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 $
   bar
 
diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
--- a/tests/test-lfconvert.t
+++ b/tests/test-lfconvert.t
@@ -130,11 +130,11 @@ add some changesets to rename/remove/mer
   0 files updated, 1 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [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
   |\
   | o  4:7285f817b77e  remove large, normal3
diff --git a/tests/test-log.t b/tests/test-log.t
--- a/tests/test-log.t
+++ b/tests/test-log.t
@@ -1025,11 +1025,11 @@ log -p -R repo
   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
   [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
   merging foo
   warning: conflicts during merge.
@@ -1037,11 +1037,11 @@ log -p -R repo
   1 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
   [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
   @    changeset:   10:4dae8563d2c5
   |\   tag:         tip
diff --git a/tests/test-merge-types.t b/tests/test-merge-types.t
--- a/tests/test-merge-types.t
+++ b/tests/test-merge-types.t
@@ -48,11 +48,11 @@ Symlink is local parent, executable is o
 
   $ tellmeabout a
   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
   $ hg st
   M a
diff --git a/tests/test-merge7.t b/tests/test-merge7.t
--- a/tests/test-merge7.t
+++ b/tests/test-merge7.t
@@ -55,11 +55,11 @@ resolve conflict
   > two-point-five
   > three
   > 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
   $ cd ../test-a
   $ cat >test.txt <<"EOF"
diff --git a/tests/test-mq-qnew.t b/tests/test-mq-qnew.t
--- a/tests/test-mq-qnew.t
+++ b/tests/test-mq-qnew.t
@@ -156,11 +156,11 @@ plain headers
   merging a
   warning: conflicts during merge.
   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
 
 hg headers
 
@@ -230,11 +230,11 @@ hg headers
   merging a
   warning: conflicts during merge.
   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
 
 Test saving last-message.txt
 
diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t
+++ b/tests/test-rebase-bookmarks.t
@@ -167,11 +167,11 @@ rebase --continue with bookmarks present
   merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [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
   @  4: 'C' bookmarks: Y Z
   |
diff --git a/tests/test-rebase-check-restore.t b/tests/test-rebase-check-restore.t
--- a/tests/test-rebase-check-restore.t
+++ b/tests/test-rebase-check-restore.t
@@ -74,11 +74,11 @@ Rebasing B onto E - check keep: and phas
 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
   o  7:secret 'C'
   |
@@ -128,11 +128,11 @@ Rebase F onto E - check keepbranches:
 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)
 
   $ hg tglog
   @  5:draft 'F' notdefault
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -75,11 +75,11 @@ Try to continue without solving the conf
 
 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)
 
   $ hg tglog
   @  5:secret 'L3'  mybook
diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@@ -372,11 +372,11 @@ Ensure --continue restores a correct sta
   warning: conflicts during merge.
   merging H incomplete! (edit conflicts, then use 'hg resolve --mark')
   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"
   @  7:draft 'H'
   |
diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t
--- a/tests/test-rebase-interruptions.t
+++ b/tests/test-rebase-interruptions.t
@@ -102,11 +102,11 @@ Resume the rebasing:
 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
 
   $ hg tglogp
diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t
+++ b/tests/test-rebase-mq-skip.t
@@ -109,11 +109,11 @@ already has one local mq patch
   $ HGMERGE=internal:fail hg rebase
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [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)
 
   $ hg tglog
diff --git a/tests/test-rebase-mq.t b/tests/test-rebase-mq.t
--- a/tests/test-rebase-mq.t
+++ b/tests/test-rebase-mq.t
@@ -67,11 +67,11 @@ Rebase - generate a conflict:
 
 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.
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
@@ -79,11 +79,11 @@ Fix the 1st conflict:
 
 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)
 
   $ hg tglog
   @  3: 'P1' tags: f2.patch qtip tip
diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t
+++ b/tests/test-rebase-parameters.t
@@ -452,11 +452,11 @@ Test --tool parameter:
 
   $ hg resolve -l
   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)
 
   $ cd ..
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -37,11 +37,11 @@ resolving an unknown path emits a warnin
 
 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
 
   $ hg resolve -l
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -306,11 +306,11 @@ attempt to continue
   (see 'hg resolve', then 'hg unshelve --continue')
   [255]
 
   $ 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
   (use 'hg unshelve --continue' or 'hg unshelve --abort')
   [255]