[PATCH] spelling: fixes from proofreading of spell checker issues

Martin von Zweigbergk martinvonz at google.com
Sun Nov 2 23:43:18 CST 2014


On Sun Nov 02 2014 at 7:36:24 AM Mads Kiilerich <mads at kiilerich.com> wrote:

> diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> --- a/mercurial/cmdutil.py
> +++ b/mercurial/cmdutil.py
> @@ -1783,8 +1783,8 @@ def _makelogrevset(repo, pats, opts, rev
>          # If we're forced to take the slowpath it means we're following
>          # at least one pattern/directory, so don't bother with rename
> tracking.
>          if follow and not match.always() and not slowpath:
> -            # _makelogfilematcher expects its files argument to be
> relative to
> -            # the repo root, so use match.files(), not pats.
> +            # _makefollowlogfilematcher  expects its files argument to be
>

nit: double space before "expects".

+            # relative to the repo root, so use match.files(), not pats.
>              filematcher = _makefollowlogfilematcher(repo, match.files(),
>                                                      followfirst)
>          else:
> @@ -2522,11 +2522,11 @@ def revert(ui, repo, ctx, parents, *pats
>          deladded = _deleted - smf
>          deleted = _deleted - deladded
>
> -        # We need to account for the state of file in the dirstate
> +        # We need to account for the state of file in the dirstate.
>

Might as well add a "the" before "file".

         #
> -        # Even, when we revert agains something else than parent. this
> will
> +        # Even, when we revert against something else than parent. This
> will
>

I don't think the "Even" should start a new sentence here. I'd rather not
add the full stop above and instead make it "...in the dirstate, even when
we..."


> diff --git a/mercurial/exchange.py b/mercurial/exchange.py
> --- a/mercurial/exchange.py
> +++ b/mercurial/exchange.py
> @@ -448,7 +448,7 @@ def _pushb2ctx(pushop, bundler):
>      cg = changegroup.getlocalchangegroup(pushop.repo, 'push',
> pushop.outgoing)
>      cgpart = bundler.newpart('B2X:CHANGEGROUP', data=cg.getchunks())
>      def handlereply(op):
> -        """extract addchangroup returns from server reply"""
> +        """extract addchangegroup returns from server reply"""
>

Is an "addchangegroup return" something? Or drop "returns"? Or make it
"returned"?


> --- a/tests/test-largefiles-wireproto.t
> +++ b/tests/test-largefiles-wireproto.t
> @@ -1,5 +1,5 @@
> -This file contains testcases that tend to be related to the wireprotocol
> part of
> -largefile.
> +This file contains testcases that tend to be related to the wire protocol
> part
> +of largefile.
>

s/largefile/largefiles/?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20141103/1939b1f1/attachment.html>


More information about the Mercurial-devel mailing list