##// END OF EJS Templates
histedit: fix English (en-US)
timeless@mozdev.org -
r26171:49c14244 default
parent child Browse files
Show More
@@ -144,7 +144,7 b' repository that Mercurial does not detec'
144 repo, you can add a ``--force`` option.
144 repo, you can add a ``--force`` option.
145
145
146 Histedit rule lines are truncated to 80 characters by default. You
146 Histedit rule lines are truncated to 80 characters by default. You
147 can customise this behavior by setting a different length in your
147 can customize this behavior by setting a different length in your
148 configuration file::
148 configuration file::
149
149
150 [histedit]
150 [histedit]
@@ -406,7 +406,7 b' def applychanges(ui, repo, ctx, opts):'
406 """Merge changeset from ctx (only) in the current working directory"""
406 """Merge changeset from ctx (only) in the current working directory"""
407 wcpar = repo.dirstate.parents()[0]
407 wcpar = repo.dirstate.parents()[0]
408 if ctx.p1().node() == wcpar:
408 if ctx.p1().node() == wcpar:
409 # edition ar "in place" we do not need to make any merge,
409 # edits are "in place" we do not need to make any merge,
410 # just applies changes on parent for edition
410 # just applies changes on parent for edition
411 cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
411 cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
412 stats = None
412 stats = None
@@ -617,7 +617,7 b' class message(histeditaction):'
617 def findoutgoing(ui, repo, remote=None, force=False, opts={}):
617 def findoutgoing(ui, repo, remote=None, force=False, opts={}):
618 """utility function to find the first outgoing changeset
618 """utility function to find the first outgoing changeset
619
619
620 Used by initialisation code"""
620 Used by initialization code"""
621 dest = ui.expandpath(remote or 'default-push', remote or 'default')
621 dest = ui.expandpath(remote or 'default-push', remote or 'default')
622 dest, revs = hg.parseurl(dest, None)[:2]
622 dest, revs = hg.parseurl(dest, None)[:2]
623 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
623 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
@@ -1132,8 +1132,8 b' def cleanupnode(ui, repo, name, nodes):'
1132 # we should probably get ride of obsolescence marker created during the
1132 # we should probably get ride of obsolescence marker created during the
1133 # histedit, but we currently do not have such information.
1133 # histedit, but we currently do not have such information.
1134 repo = repo.unfiltered()
1134 repo = repo.unfiltered()
1135 # Find all node that need to be stripped
1135 # Find all nodes that need to be stripped
1136 # (we hg %lr instead of %ln to silently ignore unknown item
1136 # (we use %lr instead of %ln to silently ignore unknown items)
1137 nm = repo.changelog.nodemap
1137 nm = repo.changelog.nodemap
1138 nodes = sorted(n for n in nodes if n in nm)
1138 nodes = sorted(n for n in nodes if n in nm)
1139 roots = [c.node() for c in repo.set("roots(%ln)", nodes)]
1139 roots = [c.node() for c in repo.set("roots(%ln)", nodes)]
General Comments 0
You need to be logged in to leave comments. Login now