Patchwork [1,of,4] debugcreatestreamclonebundle: use single quotes around command hint

login
register
mail settings
Submitter timeless@gcc2-power8.osuosl.org
Date April 14, 2016, 3:24 p.m.
Message ID <036f254e2b2b5b7ded7c.1460647482@gcc2-power8.osuosl.org>
Download mbox | patch
Permalink /patch/14614/
State Accepted
Headers show

Comments

timeless@gcc2-power8.osuosl.org - April 14, 2016, 3:24 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1460647035 0
#      Thu Apr 14 15:17:15 2016 +0000
# Node ID 036f254e2b2b5b7ded7c1d546b4b60ce7c6830f4
# Parent  8d398155bfda3a98e664af74096f0e405cc7dd09
# EXP-Topic quotes
# Available At bb://timeless/mercurial-crew
#              hg pull bb://timeless/mercurial-crew -r 036f254e2b2b
debugcreatestreamclonebundle: use single quotes around command hint

Windows command lines use double quotes to quote arguments with spaces.
This change is in a series to unify around using single quotes around
commands, and double quotes around interior arguments.

Patch

diff -r 8d398155bfda -r 036f254e2b2b mercurial/commands.py
--- a/mercurial/commands.py	Mon Feb 29 22:58:15 2016 +0900
+++ b/mercurial/commands.py	Thu Apr 14 15:17:15 2016 +0000
@@ -1386,7 +1386,7 @@ 
     # Packed bundles are a pseudo bundle format for now.
     if cgversion == 's1':
         raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
-                          hint=_('use "hg debugcreatestreamclonebundle"'))
+                          hint=_("use 'hg debugcreatestreamclonebundle'"))
 
     if opts.get('all'):
         if dest:
@@ -4232,7 +4232,7 @@ 
                     extra += ' --date %s' % opts['date']
                 if opts.get('log'):
                     extra += ' --log'
-                hint=_('use hg resolve and hg graft --continue%s') % extra
+                hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
                 raise error.Abort(
                     _("unresolved conflicts, can't continue"),
                     hint=hint)
@@ -6315,7 +6315,7 @@ 
     if not opts.get('rev') and p2 != nullid:
         # revert after merge is a trap for new users (issue2915)
         raise error.Abort(_('uncommitted merge with no revision specified'),
-                         hint=_('use "hg update" or see "hg help revert"'))
+                         hint=_("use 'hg update' or see 'hg help revert'"))
 
     ctx = scmutil.revsingle(repo, opts.get('rev'))
 
diff -r 8d398155bfda -r 036f254e2b2b tests/test-bundle.t
--- a/tests/test-bundle.t	Mon Feb 29 22:58:15 2016 +0900
+++ b/tests/test-bundle.t	Thu Apr 14 15:17:15 2016 +0000
@@ -260,7 +260,7 @@ 
 
   $ hg -R test bundle -t packed1 packed.hg
   abort: packed bundles cannot be produced by "hg bundle"
-  (use "hg debugcreatestreamclonebundle")
+  (use 'hg debugcreatestreamclonebundle')
   [255]
 
 packed1 is produced properly