--- a/hgext/rebase.py Sat Jan 17 18:08:47 2015 -0800
+++ b/hgext/rebase.py Sat Jan 17 22:01:14 2015 -0200
@@ -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()
--- a/mercurial/localrepo.py Sat Jan 17 18:08:47 2015 -0800
+++ b/mercurial/localrepo.py Sat Jan 17 22:01:14 2015 -0200
@@ -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)
--- a/mercurial/util.py Sat Jan 17 18:08:47 2015 -0800
+++ b/mercurial/util.py Sat Jan 17 22:01:14 2015 -0200
@@ -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
--- a/tests/test-commit-unresolved.t Sat Jan 17 18:08:47 2015 -0800
+++ b/tests/test-commit-unresolved.t Sat Jan 17 22:01:14 2015 -0200
@@ -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
--- a/tests/test-graft.t Sat Jan 17 18:08:47 2015 -0800
+++ b/tests/test-graft.t Sat Jan 17 22:01:14 2015 -0200
@@ -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:
--- a/tests/test-parse-date.t Sat Jan 17 18:08:47 2015 -0800
+++ b/tests/test-parse-date.t Sat Jan 17 22:01:14 2015 -0200
@@ -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
--- a/tests/test-rebase-conflicts.t Sat Jan 17 18:08:47 2015 -0800
+++ b/tests/test-rebase-conflicts.t Sat Jan 17 22:01:14 2015 -0200
@@ -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:
--- a/tests/test-rebase-parameters.t Sat Jan 17 18:08:47 2015 -0800
+++ b/tests/test-rebase-parameters.t Sat Jan 17 22:01:14 2015 -0200
@@ -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 ..
--- a/tests/test-rebase-scenario-global.t Sat Jan 17 18:08:47 2015 -0800
+++ b/tests/test-rebase-scenario-global.t Sat Jan 17 22:01:14 2015 -0200
@@ -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