[PATCH 2 of 2] fix wording and not-completely-trivial spelling errors and bad docstrings

Augie Fackler raf at durin42.com
Tue Aug 14 20:23:25 CDT 2012


On Aug 14, 2012, at 7:22 PM, Mads Kiilerich wrote:

> # HG changeset patch
> # User Mads Kiilerich <mads at kiilerich.com>
> # Date 1344989263 -7200
> # Node ID 7677b03e2c73e67455712f38653388b4f8f8fcc3
> # Parent  c271e69d350f7a6812a763f3bb66e6e5b91d38ad
> fix wording and not-completely-trivial spelling errors and bad docstrings
> 
> diff --git a/hgext/convert/monotone.py b/hgext/convert/monotone.py
> --- a/hgext/convert/monotone.py
> +++ b/hgext/convert/monotone.py
> @@ -225,7 +225,6 @@
>             return [self.rev]
> 
>     def getchanges(self, rev):
> -        #revision = self.mtncmd("get_revision %s" % rev).split("\n\n")

Can we have "deleted dead code" as a discrete change?



> import urllib2
> 
> diff --git a/hgext/mq.py b/hgext/mq.py
> --- a/hgext/mq.py
> +++ b/hgext/mq.py
> @@ -1522,7 +1522,7 @@
>             #
>             # this should really read:
>             #   mm, dd, aa = repo.status(top, patchparent)[:3]
> -            # but we do it backwards to take advantage of manifest/chlog
> +            # but we do it backwards to take advantage of manifest

This should still mention change log caches IMO.

>             # caching against the next repo.status call
>             mm, aa, dd = repo.status(patchparent, top)[:3]
>             changes = repo.changelog.read(top)
> diff --git a/hgext/record.py b/hgext/record.py
> --- a/hgext/record.py
> +++ b/hgext/record.py
> @@ -33,7 +33,7 @@
>     - ('file',    [header_lines + fromfile + tofile])
>     - ('context', [context_lines])
>     - ('hunk',    [hunk_lines])
> -    - ('range',   (-start,len, +start,len, diffp))
> +    - ('range',   (-start,len, +start,len, proc))

I have no idea what diffp or proc should mean.




> diff --git a/mercurial/match.py b/mercurial/match.py
> --- a/mercurial/match.py
> +++ b/mercurial/match.py
> @@ -49,7 +49,7 @@
>         a pattern is one of:
>         'glob:<glob>' - a glob relative to cwd
>         're:<regexp>' - a regular expression
> -        'path:<path>' - a path relative to canonroot
> +        'path:<path>' - a path relative to (repository) root

I don't think this should be in parens

>         'relglob:<glob>' - an unrooted glob (*.c matches C files in all dirs)
>         'relpath:<path>' - a path relative to cwd
>         'relre:<regexp>' - a regexp that needn't match the start of a name
> diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py
> --- a/mercurial/obsolete.py
> +++ b/mercurial/obsolete.py
> @@ -55,10 +55,6 @@
> from mercurial import util, base85
> from i18n import _
> 
> -# the obsolete feature is not mature enought to be enabled by default.
> -# you have to rely on third party extension extension to enable this.
> -_enabled = False
> -

Sorry, what the heck?



> diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py
> --- a/mercurial/setdiscovery.py
> +++ b/mercurial/setdiscovery.py
> @@ -84,9 +84,6 @@
>                     abortwhenunrelated=True):
>     '''Return a tuple (common, anyincoming, remoteheads) used to identify
>     missing nodes from or in remote.
> -
> -    shortcutlocal determines whether we try use direct access to localrepo if
> -    remote is actually local.

Also here.




More information about the Mercurial-devel mailing list