Patchwork messages: quote "hg help" hints consistently

login
register
mail settings
Submitter Wagner Bruna
Date Jan. 18, 2015, 12:51 a.m.
Message ID <b4b00ffec528dd128ec5.1421542286@sirius.home>
Download mbox | patch
Permalink /patch/7514/
State Accepted
Commit 3cbb5bf4035de5a22bc736f34e4bd6167c1c8c14
Headers show

Comments

Wagner Bruna - Jan. 18, 2015, 12:51 a.m.
# HG changeset patch
# User Wagner Bruna <wbruna@yahoo.com>
# Date 1421539274 7200
#      Sat Jan 17 22:01:14 2015 -0200
# Node ID b4b00ffec528dd128ec5e66b9fb29c10ea5f5a15
# Parent  7d0aa6269ece303adeb0e353c3256df5b8444643
messages: quote "hg help" hints consistently
Matt Mackall - Jan. 18, 2015, 2:09 a.m.
On Sat, 2015-01-17 at 22:51 -0200, Wagner Bruna wrote:
> # HG changeset patch
> # User Wagner Bruna <wbruna@yahoo.com>
> # Date 1421539274 7200
> #      Sat Jan 17 22:01:14 2015 -0200
> # Node ID b4b00ffec528dd128ec5e66b9fb29c10ea5f5a15
> # Parent  7d0aa6269ece303adeb0e353c3256df5b8444643
> messages: quote "hg help" hints consistently

Queued, thanks.

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -198,7 +198,7 @@ 
 
         if opts.get('interactive'):
             msg = _("interactive history editing is supported by the "
-                    "'histedit' extension (see 'hg help histedit')")
+                    "'histedit' extension (see \"hg help histedit\")")
             raise util.Abort(msg)
 
         if collapsemsg and not collapsef:
@@ -327,7 +327,7 @@ 
             if not keepf and not repo[root].mutable():
                 raise util.Abort(_("can't rebase immutable changeset %s")
                                  % repo[root],
-                                 hint=_('see hg help phases for details'))
+                                 hint=_('see "hg help phases" for details'))
 
             originalwd, target, state = result
             if collapsef:
@@ -858,7 +858,7 @@ 
     if immutable:
         repo.ui.warn(_("warning: can't clean up immutable changesets %s\n")
                      % ', '.join(str(repo[r]) for r in immutable),
-                     hint=_('see hg help phases for details'))
+                     hint=_('see "hg help phases" for details'))
         cleanup = False
 
     descendants = set()
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1367,8 +1367,8 @@ 
             ms = mergemod.mergestate(self)
             for f in status.modified:
                 if f in ms and ms[f] == 'u':
-                    raise util.Abort(_("unresolved merge conflicts "
-                                       "(see hg help resolve)"))
+                    raise util.Abort(_('unresolved merge conflicts '
+                                       '(see "hg help resolve")'))
 
             if editor:
                 cctx._text = editor(self, cctx, subs)
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -1463,7 +1463,7 @@ 
         except ValueError:
             raise Abort(_("invalid day spec: %s") % date[1:])
         if days < 0:
-            raise Abort(_("%s must be nonnegative (see 'hg help dates')")
+            raise Abort(_('%s must be nonnegative (see "hg help dates")')
                 % date[1:])
         when = makedate()[0] - days * 3600 * 24
         return lambda x: x >= when
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
@@ -35,7 +35,7 @@ 
 
   $ echo "ABCD" > A
   $ hg commit -m "Merged"
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: unresolved merge conflicts (see "hg help resolve")
   [255]
 
 Mark the conflict as resolved and commit
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -234,7 +234,7 @@ 
 
   $ hg graft -c
   grafting 4:9c233e8e184d "4"
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: unresolved merge conflicts (see "hg help resolve")
   [255]
 
 Fix up:
diff --git a/tests/test-parse-date.t b/tests/test-parse-date.t
--- a/tests/test-parse-date.t
+++ b/tests/test-parse-date.t
@@ -100,7 +100,7 @@ 
 Negative range
 
   $ hg log -d "--2"
-  abort: -2 must be nonnegative (see 'hg help dates')
+  abort: -2 must be nonnegative (see "hg help dates")
   [255]
 
 Whitespace only
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
@@ -74,7 +74,7 @@ 
   $ hg rebase --continue
   already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
   rebasing 4:46f0b057b5c0 "L2"
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: unresolved merge conflicts (see "hg help resolve")
   [255]
 
 Conclude rebase:
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
@@ -490,11 +490,11 @@ 
   saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob)
 
   $ hg rebase -i
-  abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit')
+  abort: interactive history editing is supported by the 'histedit' extension (see "hg help histedit")
   [255]
 
   $ hg rebase --interactive
-  abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit')
+  abort: interactive history editing is supported by the 'histedit' extension (see "hg help histedit")
   [255]
 
   $ cd ..
diff --git a/tests/test-rebase-scenario-global.t b/tests/test-rebase-scenario-global.t
--- a/tests/test-rebase-scenario-global.t
+++ b/tests/test-rebase-scenario-global.t
@@ -309,7 +309,7 @@ 
   [1]
   $ hg rebase -d 5 -b 6
   abort: can't rebase immutable changeset e1c4361dd923
-  (see hg help phases for details)
+  (see "hg help phases" for details)
   [255]
 
   $ hg rebase -d 5 -b 6 --keep