Mercurial > hg-stable

changeset 21267:e4f451c8c05c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: simplify "finished" message The recently introduced message was: no unresolved files; you may continue your unfinished operation This had three problems: - looks a bit like an error message because it's not saying "we've just resolved the last file" - refers to "unfinished operation", which won't be the case with "update" or "merge" - introduces semicolons to error messages, which is stylistically questionable I've simplified this to: no more unresolved files In the future, if we want to prompt someone to continue a particular operation, we should use a hint style: no more unresolved files (use 'hg graft --continue' to finish grafting)
author Matt Mackall <mpm@selenic.com>
date Fri, 09 May 2014 14:46:50 -0500
parents 19d6fec60b81
children a0b8a912ec81
files mercurial/commands.py tests/test-add.t tests/test-backout.t tests/test-commit-amend.t tests/test-commit-unresolved.t tests/test-convert-svn-sink.t tests/test-fileset.t tests/test-graft.t tests/test-histedit-fold-non-commute.t tests/test-histedit-fold.t tests/test-histedit-non-commute.t tests/test-keyword.t tests/test-lfconvert.t tests/test-log.t tests/test-merge-types.t tests/test-merge7.t tests/test-mq-qnew.t tests/test-rebase-bookmarks.t tests/test-rebase-check-restore.t tests/test-rebase-conflicts.t tests/test-rebase-detach.t tests/test-rebase-interruptions.t tests/test-rebase-mq-skip.t tests/test-rebase-mq.t tests/test-rebase-parameters.t tests/test-resolve.t tests/test-shelve.t
diffstat 27 files changed, 38 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Apr 18 22:19:25 2014 -0700
+++ b/mercurial/commands.py	Fri May 09 14:46:50 2014 -0500
@@ -4981,8 +4981,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.write(_('no unresolved files; '))
-        ui.write(_('you may continue your unfinished operation\n'))
+        ui.status(_('no more unresolved files\n'))
 
     return ret
 
--- a/tests/test-add.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-add.t	Fri May 09 14:46:50 2014 -0500
@@ -107,7 +107,7 @@
   M a
   ? a.orig
   $ hg resolve -m a
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg ci -m merge
 
 Issue683: peculiarity with hg revert of an removed then added file
--- a/tests/test-backout.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-backout.t	Fri May 09 14:46:50 2014 -0500
@@ -490,7 +490,7 @@
   merging foo
   my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437
    premerge successful
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg status
   M foo
   ? foo.orig
--- a/tests/test-commit-amend.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-commit-amend.t	Fri May 09 14:46:50 2014 -0500
@@ -586,7 +586,7 @@
   merging cc incomplete! (edit conflicts, then use 'hg resolve --mark')
   [1]
   $ hg resolve -m cc
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg ci -m 'merge bar'
   $ hg log --config diff.git=1 -pr .
   changeset:   23:d51446492733
--- a/tests/test-commit-unresolved.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-commit-unresolved.t	Fri May 09 14:46:50 2014 -0500
@@ -41,7 +41,7 @@
 Mark the conflict as resolved and commit
 
   $ hg resolve -m A
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg commit -m "Merged"
 
   $ cd ..
--- a/tests/test-convert-svn-sink.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-convert-svn-sink.t	Fri May 09 14:46:50 2014 -0500
@@ -352,7 +352,7 @@
   [1]
   $ hg --cwd b revert -r 2 b
   $ hg --cwd b resolve -m b
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg --cwd b ci -d '5 0' -m 'merge'
 
 Expect 4 changes
--- a/tests/test-fileset.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-fileset.t	Fri May 09 14:46:50 2014 -0500
@@ -154,7 +154,7 @@
   b2
   $ echo e > b2
   $ hg resolve -m b2
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ fileset 'resolved()'
   b2
   $ fileset 'unresolved()'
--- a/tests/test-graft.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-graft.t	Fri May 09 14:46:50 2014 -0500
@@ -220,7 +220,7 @@
 
   $ echo b > e
   $ hg resolve -m e
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
 
 Continue with a revision should fail:
 
@@ -355,7 +355,7 @@
   [255]
   $ hg resolve --all
   merging a
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg graft -c
   grafting revision 1
   $ hg export tip --git
@@ -384,7 +384,7 @@
   [255]
   $ hg resolve --all
   merging a and b to b
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg graft -c
   grafting revision 2
   $ hg export tip --git
--- a/tests/test-histedit-fold-non-commute.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-histedit-fold-non-commute.t	Fri May 09 14:46:50 2014 -0500
@@ -95,7 +95,7 @@
 fix up
   $ echo 'I can haz no commute' > e
   $ hg resolve --mark e
-  no unresolved files; you may continue your unfinished operation
+  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 unresolved files; you may continue your unfinished operation
+  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
--- a/tests/test-histedit-fold.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-histedit-fold.t	Fri May 09 14:46:50 2014 -0500
@@ -217,7 +217,7 @@
   U file
   $ hg revert -r 'p1()' file
   $ hg resolve --mark file
-  no unresolved files; you may continue your unfinished operation
+  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 unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg commit -m '+5.2'
   created new head
   $ echo 6 >> file
--- a/tests/test-histedit-non-commute.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-histedit-non-commute.t	Fri May 09 14:46:50 2014 -0500
@@ -154,7 +154,7 @@
 fix up
   $ echo 'I can haz no commute' > e
   $ hg resolve --mark e
-  no unresolved files; you may continue your unfinished operation
+  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 unresolved files; you may continue your unfinished operation
+  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 unresolved files; you may continue your unfinished operation
+  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 unresolved files; you may continue your unfinished operation
+  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
--- a/tests/test-keyword.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-keyword.t	Fri May 09 14:46:50 2014 -0500
@@ -1058,7 +1058,7 @@
 resolve to local
 
   $ HGMERGE=internal:local hg resolve -a
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg commit -m localresolve
   $ cat m
   $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
--- a/tests/test-lfconvert.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-lfconvert.t	Fri May 09 14:46:50 2014 -0500
@@ -132,7 +132,7 @@
   [1]
   $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat
   $ hg resolve -m stuff/maybelarge.dat
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg commit -m"merge"
   $ hg log -G --template "{rev}:{node|short}  {desc|firstline}\n"
   @    5:4884f215abda  merge
--- a/tests/test-log.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-log.t	Fri May 09 14:46:50 2014 -0500
@@ -990,7 +990,7 @@
   [1]
   $ echo 'merge 1' > foo
   $ hg resolve -m foo
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg ci -m "First merge, related"
 
   $ hg merge 4
@@ -1002,7 +1002,7 @@
   [1]
   $ echo 'merge 2' > foo
   $ hg resolve -m foo
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg ci -m "Last merge, related"
 
   $ hg log --graph
--- a/tests/test-merge-types.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-merge-types.t	Fri May 09 14:46:50 2014 -0500
@@ -50,7 +50,7 @@
   a is a symlink:
   a -> symlink
   $ hg resolve a --tool internal:other
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ tellmeabout a
   a is an executable file with content:
   a
--- a/tests/test-merge7.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-merge7.t	Fri May 09 14:46:50 2014 -0500
@@ -57,7 +57,7 @@
   > EOF
   $ rm -f *.orig
   $ hg resolve -m test.txt
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg commit -m "Merge 1"
 
 change test-a again
--- a/tests/test-mq-qnew.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-mq-qnew.t	Fri May 09 14:46:50 2014 -0500
@@ -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 unresolved files; you may continue your unfinished operation
+  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 unresolved files; you may continue your unfinished operation
+  no more unresolved files
   abort: cannot manage merge changesets
   $ rm -r sandbox
 
--- a/tests/test-rebase-bookmarks.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-bookmarks.t	Fri May 09 14:46:50 2014 -0500
@@ -168,7 +168,7 @@
   [1]
   $ echo 'c' > c
   $ hg resolve --mark c
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob)
   $ hg tglog
--- a/tests/test-rebase-check-restore.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-check-restore.t	Fri May 09 14:46:50 2014 -0500
@@ -76,7 +76,7 @@
   $ echo 'conflict solved' > A
   $ rm A.orig
   $ hg resolve -m A
-  no unresolved files; you may continue your unfinished operation
+  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 unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
 
--- a/tests/test-rebase-conflicts.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-conflicts.t	Fri May 09 14:46:50 2014 -0500
@@ -77,7 +77,7 @@
 
   $ echo 'resolved merge' >common
   $ hg resolve -m common
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
 
--- a/tests/test-rebase-detach.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-detach.t	Fri May 09 14:46:50 2014 -0500
@@ -374,7 +374,7 @@
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ hg resolve --all -t internal:local
-  no unresolved files; you may continue your unfinished operation
+  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"
--- a/tests/test-rebase-interruptions.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-interruptions.t	Fri May 09 14:46:50 2014 -0500
@@ -104,7 +104,7 @@
   $ echo 'conflict solved' > A
   $ rm A.orig
   $ hg resolve -m A
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
 
   $ hg rebase --continue
   warning: new changesets detected on source branch, not stripping
--- a/tests/test-rebase-mq-skip.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-mq-skip.t	Fri May 09 14:46:50 2014 -0500
@@ -111,7 +111,7 @@
   [1]
 
   $ HGMERGE=internal:local hg resolve --all
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
 
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
--- a/tests/test-rebase-mq.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-mq.t	Fri May 09 14:46:50 2014 -0500
@@ -69,7 +69,7 @@
 
   $ echo mq1r1 > f
   $ hg resolve -m f
-  no unresolved files; you may continue your unfinished operation
+  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 unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg rebase -c
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
 
--- a/tests/test-rebase-parameters.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-parameters.t	Fri May 09 14:46:50 2014 -0500
@@ -454,7 +454,7 @@
   U c2
 
   $ hg resolve -m c2
-  no unresolved files; you may continue your unfinished operation
+  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)
--- a/tests/test-resolve.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-resolve.t	Fri May 09 14:46:50 2014 -0500
@@ -39,7 +39,7 @@
 
   $ echo resolved > file
   $ hg resolve -m file
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg commit -m 'resolved'
 
 resolve -l should error since no merge in progress
--- a/tests/test-shelve.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-shelve.t	Fri May 09 14:46:50 2014 -0500
@@ -294,7 +294,7 @@
 
   $ hg revert -r . a/a
   $ hg resolve -m a/a
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
 
   $ hg commit -m 'commit while unshelve in progress'
   abort: unshelve already in progress