Patchwork histedit: fix English (en-US)

login
register
mail settings
Submitter timeless@mozdev.org
Date Sept. 4, 2015, 10:26 a.m.
Message ID <039d3b5f09a567971f41.1441362409@waste.org>
Download mbox | patch
Permalink /patch/10394/
State Accepted
Headers show

Comments

timeless@mozdev.org - Sept. 4, 2015, 10:26 a.m.
# HG changeset patch
# User timeless@mozdev.org
# Date 1440784369 14400
#      Fri Aug 28 13:52:49 2015 -0400
# Node ID 039d3b5f09a567971f416f871e4fa9114907ebe9
# Parent  7187f6e923d55cf6b7e6910d24645f303db671ee
histedit: fix English (en-US)
Augie Fackler - Sept. 8, 2015, 4:38 p.m.
On Fri, Sep 04, 2015 at 05:26:49AM -0500, timeless@mozdev.org wrote:
> # HG changeset patch
> # User timeless@mozdev.org
> # Date 1440784369 14400
> #      Fri Aug 28 13:52:49 2015 -0400
> # Node ID 039d3b5f09a567971f416f871e4fa9114907ebe9
> # Parent  7187f6e923d55cf6b7e6910d24645f303db671ee
> histedit: fix English (en-US)

queued, thanks

>
> diff --git a/hgext/histedit.py b/hgext/histedit.py
> --- a/hgext/histedit.py
> +++ b/hgext/histedit.py
> @@ -144,7 +144,7 @@
>  repo, you can add a ``--force`` option.
>
>  Histedit rule lines are truncated to 80 characters by default. You
> -can customise this behavior by setting a different length in your
> +can customize this behavior by setting a different length in your
>  configuration file::
>
>    [histedit]
> @@ -406,7 +406,7 @@
>      """Merge changeset from ctx (only) in the current working directory"""
>      wcpar = repo.dirstate.parents()[0]
>      if ctx.p1().node() == wcpar:
> -        # edition ar "in place" we do not need to make any merge,
> +        # edits are "in place" we do not need to make any merge,
>          # just applies changes on parent for edition
>          cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
>          stats = None
> @@ -617,7 +617,7 @@
>  def findoutgoing(ui, repo, remote=None, force=False, opts={}):
>      """utility function to find the first outgoing changeset
>
> -    Used by initialisation code"""
> +    Used by initialization code"""
>      dest = ui.expandpath(remote or 'default-push', remote or 'default')
>      dest, revs = hg.parseurl(dest, None)[:2]
>      ui.status(_('comparing with %s\n') % util.hidepassword(dest))
> @@ -1132,8 +1132,8 @@
>          # we should probably get ride of obsolescence marker created during the
>          # histedit, but we currently do not have such information.
>          repo = repo.unfiltered()
> -        # Find all node that need to be stripped
> -        # (we hg %lr instead of %ln to silently ignore unknown item
> +        # Find all nodes that need to be stripped
> +        # (we use %lr instead of %ln to silently ignore unknown items)
>          nm = repo.changelog.nodemap
>          nodes = sorted(n for n in nodes if n in nm)
>          roots = [c.node() for c in repo.set("roots(%ln)", nodes)]
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -144,7 +144,7 @@ 
 repo, you can add a ``--force`` option.
 
 Histedit rule lines are truncated to 80 characters by default. You
-can customise this behavior by setting a different length in your
+can customize this behavior by setting a different length in your
 configuration file::
 
   [histedit]
@@ -406,7 +406,7 @@ 
     """Merge changeset from ctx (only) in the current working directory"""
     wcpar = repo.dirstate.parents()[0]
     if ctx.p1().node() == wcpar:
-        # edition ar "in place" we do not need to make any merge,
+        # edits are "in place" we do not need to make any merge,
         # just applies changes on parent for edition
         cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
         stats = None
@@ -617,7 +617,7 @@ 
 def findoutgoing(ui, repo, remote=None, force=False, opts={}):
     """utility function to find the first outgoing changeset
 
-    Used by initialisation code"""
+    Used by initialization code"""
     dest = ui.expandpath(remote or 'default-push', remote or 'default')
     dest, revs = hg.parseurl(dest, None)[:2]
     ui.status(_('comparing with %s\n') % util.hidepassword(dest))
@@ -1132,8 +1132,8 @@ 
         # we should probably get ride of obsolescence marker created during the
         # histedit, but we currently do not have such information.
         repo = repo.unfiltered()
-        # Find all node that need to be stripped
-        # (we hg %lr instead of %ln to silently ignore unknown item
+        # Find all nodes that need to be stripped
+        # (we use %lr instead of %ln to silently ignore unknown items)
         nm = repo.changelog.nodemap
         nodes = sorted(n for n in nodes if n in nm)
         roots = [c.node() for c in repo.set("roots(%ln)", nodes)]