[PATCH 08 of 17] histedit: use single quotes in use warning
timeless
timeless at fmr.im
Tue Sep 20 20:19:49 EDT 2016
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1474415125 0
# Tue Sep 20 23:45:25 2016 +0000
# Node ID 912436c3e806e4715a7a9f7af78895f91a3e6c32
# Parent 45ccea8f0646176c5e9801113f91df201bd9be31
# Available At https://bitbucket.org/timeless/mercurial-crew
# hg pull https://bitbucket.org/timeless/mercurial-crew -r 912436c3e806
histedit: use single quotes in use warning
diff -r 45ccea8f0646 -r 912436c3e806 hgext/histedit.py
--- a/hgext/histedit.py Tue Sep 20 23:45:15 2016 +0000
+++ b/hgext/histedit.py Tue Sep 20 23:45:25 2016 +0000
@@ -854,7 +854,7 @@
roots = list(repo.revs("roots(%ln)", outgoing.missing))
if 1 < len(roots):
msg = _('there are ambiguous outgoing revisions')
- hint = _('see "hg help histedit" for more detail')
+ hint = _("see 'hg help histedit' for more detail")
raise error.Abort(msg, hint=hint)
return repo.lookup(roots[0])
@@ -1290,7 +1290,7 @@
root = ctxs[0] # list is already sorted by repo.set
if not root.mutable():
raise error.Abort(_('cannot edit public changeset: %s') % root,
- hint=_('see "hg help phases" for details'))
+ hint=_("see 'hg help phases' for details"))
return [c.node() for c in ctxs]
def ruleeditor(repo, ui, actions, editcomment=""):
@@ -1402,7 +1402,7 @@
raise error.ParseError(_('missing rules for changeset %s') %
node.short(missing[0]),
hint=_('use "drop %s" to discard, see also: '
- '"hg help -e histedit.config"')
+ "'hg help -e histedit.config'")
% node.short(missing[0]))
def adjustreplacementsfrommarkers(repo, oldreplacements):
diff -r 45ccea8f0646 -r 912436c3e806 tests/test-histedit-arguments.t
--- a/tests/test-histedit-arguments.t Tue Sep 20 23:45:15 2016 +0000
+++ b/tests/test-histedit-arguments.t Tue Sep 20 23:45:25 2016 +0000
@@ -169,7 +169,7 @@
> pick 08d98a8350f3 4 five
> EOF
hg: parse error: missing rules for changeset c8e68270e35a
- (use "drop c8e68270e35a" to discard, see also: "hg help -e histedit.config")
+ (use "drop c8e68270e35a" to discard, see also: 'hg help -e histedit.config')
[255]
Test that extra revisions are detected
diff -r 45ccea8f0646 -r 912436c3e806 tests/test-histedit-drop.t
--- a/tests/test-histedit-drop.t Tue Sep 20 23:45:15 2016 +0000
+++ b/tests/test-histedit-drop.t Tue Sep 20 23:45:25 2016 +0000
@@ -151,7 +151,7 @@
> pick ee283cb5f2d5 e
> EOF
hg: parse error: missing rules for changeset a4f7421b80f7
- (use "drop a4f7421b80f7" to discard, see also: "hg help -e histedit.config")
+ (use "drop a4f7421b80f7" to discard, see also: 'hg help -e histedit.config')
$ hg --config histedit.dropmissing=True histedit cb9a9f314b8b --commands - 2>&1 << EOF | fixbundle
> EOF
hg: parse error: no rules provided
diff -r 45ccea8f0646 -r 912436c3e806 tests/test-histedit-obsolete.t
--- a/tests/test-histedit-obsolete.t Tue Sep 20 23:45:15 2016 +0000
+++ b/tests/test-histedit-obsolete.t Tue Sep 20 23:45:25 2016 +0000
@@ -299,7 +299,7 @@
$ hg histedit -r '.~2'
abort: cannot edit public changeset: cb9a9f314b8b
- (see "hg help phases" for details)
+ (see 'hg help phases' for details)
[255]
diff -r 45ccea8f0646 -r 912436c3e806 tests/test-histedit-outgoing.t
--- a/tests/test-histedit-outgoing.t Tue Sep 20 23:45:15 2016 +0000
+++ b/tests/test-histedit-outgoing.t Tue Sep 20 23:45:25 2016 +0000
@@ -130,7 +130,7 @@
$ HGEDITOR=cat hg -q histedit --outgoing '../r'
abort: there are ambiguous outgoing revisions
- (see "hg help histedit" for more detail)
+ (see 'hg help histedit' for more detail)
[255]
$ hg -q update -C 2
@@ -147,7 +147,7 @@
$ HGEDITOR=cat hg -q histedit --outgoing '../r#default'
abort: there are ambiguous outgoing revisions
- (see "hg help histedit" for more detail)
+ (see 'hg help histedit' for more detail)
[255]
$ cd ..
More information about the Mercurial-devel
mailing list