Patchwork [3,of,3,evolve-ext] evolve: make error message consistent

login
register
mail settings
Submitter via Mercurial-devel
Date Oct. 28, 2016, 10:22 p.m.
Message ID <fc367693739cb18b0433.1477693376@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/17219/
State Accepted
Headers show

Comments

via Mercurial-devel - Oct. 28, 2016, 10:22 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1477692293 25200
#      Fri Oct 28 15:04:53 2016 -0700
# Node ID fc367693739cb18b04336609d65d659b0d4f49b7
# Parent  8f59ce14ebb1864eb750a4d3a8c6a9b486aab074
evolve: make error message consistent

We should use double quotes around commands consistently. Also use
"abort" instead of "abandon" for consistency.

Patch

diff -r 8f59ce14ebb1 -r fc367693739c hgext/evolve.py
--- a/hgext/evolve.py	Fri Oct 28 15:17:27 2016 -0700
+++ b/hgext/evolve.py	Fri Oct 28 15:04:53 2016 -0700
@@ -2147,8 +2147,8 @@ 
 
     hg._showstats(repo, stats)
     if stats[3]:
-        repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
-                         "or 'hg update -C .' to abandon\n"))
+        repo.ui.status(_('use "hg resolve" to retry unresolved file merges '
+                         'or "hg update -C ." to abort\n'))
     if stats[3] > 0:
         raise error.Abort('merge conflict between several amendments '
             '(this is not automated yet)',
@@ -4044,7 +4044,7 @@ 
 @eh.uisetup
 def setupevolveunfinished(ui):
     data = ('evolvestate', True, False, _('evolve in progress'),
-           _("use 'hg evolve --continue' or 'hg update -C .' to abort"))
+           _('use "hg evolve --continue" or "hg update -C ." to abort'))
     cmdutil.unfinishedstates.append(data)
 
 @eh.wrapfunction(hg, 'clean')
diff -r 8f59ce14ebb1 -r fc367693739c tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Fri Oct 28 15:17:27 2016 -0700
+++ b/tests/test-stabilize-result.t	Fri Oct 28 15:04:53 2016 -0700
@@ -359,7 +359,7 @@ 
   merging a
   warning: conflicts while merging a! (edit, 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
+  use "hg resolve" to retry unresolved file merges or "hg update -C ." to abort
   abort: merge conflict between several amendments (this is not automated yet)
   (/!\ You can try:
   /!\ * manual merge + resolve => new cset X