##// END OF EJS Templates
histedit: use single quotes in use warning
timeless -
r29970:5ad16469 default
parent child Browse files
Show More
@@ -854,7 +854,7 b' def findoutgoing(ui, repo, remote=None, '
854 roots = list(repo.revs("roots(%ln)", outgoing.missing))
854 roots = list(repo.revs("roots(%ln)", outgoing.missing))
855 if 1 < len(roots):
855 if 1 < len(roots):
856 msg = _('there are ambiguous outgoing revisions')
856 msg = _('there are ambiguous outgoing revisions')
857 hint = _('see "hg help histedit" for more detail')
857 hint = _("see 'hg help histedit' for more detail")
858 raise error.Abort(msg, hint=hint)
858 raise error.Abort(msg, hint=hint)
859 return repo.lookup(roots[0])
859 return repo.lookup(roots[0])
860
860
@@ -1290,7 +1290,7 b' def between(repo, old, new, keep):'
1290 root = ctxs[0] # list is already sorted by repo.set
1290 root = ctxs[0] # list is already sorted by repo.set
1291 if not root.mutable():
1291 if not root.mutable():
1292 raise error.Abort(_('cannot edit public changeset: %s') % root,
1292 raise error.Abort(_('cannot edit public changeset: %s') % root,
1293 hint=_('see "hg help phases" for details'))
1293 hint=_("see 'hg help phases' for details"))
1294 return [c.node() for c in ctxs]
1294 return [c.node() for c in ctxs]
1295
1295
1296 def ruleeditor(repo, ui, actions, editcomment=""):
1296 def ruleeditor(repo, ui, actions, editcomment=""):
@@ -1402,7 +1402,7 b' def verifyactions(actions, state, ctxs):'
1402 raise error.ParseError(_('missing rules for changeset %s') %
1402 raise error.ParseError(_('missing rules for changeset %s') %
1403 node.short(missing[0]),
1403 node.short(missing[0]),
1404 hint=_('use "drop %s" to discard, see also: '
1404 hint=_('use "drop %s" to discard, see also: '
1405 '"hg help -e histedit.config"')
1405 "'hg help -e histedit.config'")
1406 % node.short(missing[0]))
1406 % node.short(missing[0]))
1407
1407
1408 def adjustreplacementsfrommarkers(repo, oldreplacements):
1408 def adjustreplacementsfrommarkers(repo, oldreplacements):
@@ -169,7 +169,7 b' Test that missing revisions are detected'
169 > pick 08d98a8350f3 4 five
169 > pick 08d98a8350f3 4 five
170 > EOF
170 > EOF
171 hg: parse error: missing rules for changeset c8e68270e35a
171 hg: parse error: missing rules for changeset c8e68270e35a
172 (use "drop c8e68270e35a" to discard, see also: "hg help -e histedit.config")
172 (use "drop c8e68270e35a" to discard, see also: 'hg help -e histedit.config')
173 [255]
173 [255]
174
174
175 Test that extra revisions are detected
175 Test that extra revisions are detected
@@ -151,7 +151,7 b' Drop the last changeset'
151 > pick ee283cb5f2d5 e
151 > pick ee283cb5f2d5 e
152 > EOF
152 > EOF
153 hg: parse error: missing rules for changeset a4f7421b80f7
153 hg: parse error: missing rules for changeset a4f7421b80f7
154 (use "drop a4f7421b80f7" to discard, see also: "hg help -e histedit.config")
154 (use "drop a4f7421b80f7" to discard, see also: 'hg help -e histedit.config')
155 $ hg --config histedit.dropmissing=True histedit cb9a9f314b8b --commands - 2>&1 << EOF | fixbundle
155 $ hg --config histedit.dropmissing=True histedit cb9a9f314b8b --commands - 2>&1 << EOF | fixbundle
156 > EOF
156 > EOF
157 hg: parse error: no rules provided
157 hg: parse error: no rules provided
@@ -299,7 +299,7 b' Check that histedit respect immutability'
299
299
300 $ hg histedit -r '.~2'
300 $ hg histedit -r '.~2'
301 abort: cannot edit public changeset: cb9a9f314b8b
301 abort: cannot edit public changeset: cb9a9f314b8b
302 (see "hg help phases" for details)
302 (see 'hg help phases' for details)
303 [255]
303 [255]
304
304
305
305
@@ -130,7 +130,7 b' test to check number of roots in outgoin'
130
130
131 $ HGEDITOR=cat hg -q histedit --outgoing '../r'
131 $ HGEDITOR=cat hg -q histedit --outgoing '../r'
132 abort: there are ambiguous outgoing revisions
132 abort: there are ambiguous outgoing revisions
133 (see "hg help histedit" for more detail)
133 (see 'hg help histedit' for more detail)
134 [255]
134 [255]
135
135
136 $ hg -q update -C 2
136 $ hg -q update -C 2
@@ -147,7 +147,7 b' test to check number of roots in outgoin'
147
147
148 $ HGEDITOR=cat hg -q histedit --outgoing '../r#default'
148 $ HGEDITOR=cat hg -q histedit --outgoing '../r#default'
149 abort: there are ambiguous outgoing revisions
149 abort: there are ambiguous outgoing revisions
150 (see "hg help histedit" for more detail)
150 (see 'hg help histedit' for more detail)
151 [255]
151 [255]
152
152
153 $ cd ..
153 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now