[PATCH 4 of 4 random] spelling: fixes from proofreading of spell checker issues
Augie Fackler
raf at durin42.com
Tue Mar 3 16:17:55 UTC 2015
On Fri, Feb 27, 2015 at 09:45:18PM +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1421545137 -3600
> # Sun Jan 18 02:38:57 2015 +0100
> # Node ID 510b00da0a9f662f0973e6622ebec8f116347edc
> # Parent a4232f35c43c74018c9b7ffcd1e8fc62a3819a5f
> spelling: fixes from proofreading of spell checker issues
Queueing these, but making some tweaks to patches 2 and 4 in
flight. Thanks.
>
> diff --git a/doc/hgmanpage.py b/doc/hgmanpage.py
> --- a/doc/hgmanpage.py
> +++ b/doc/hgmanpage.py
> @@ -427,7 +427,7 @@ class Translator(nodes.NodeVisitor):
> pass
>
> def visit_block_quote(self, node):
> - # BUG/HACK: indent alway uses the _last_ indention,
> + # BUG/HACK: indent always uses the _last_ indention,
> # thus we need two of them.
> self.indent(BLOCKQOUTE_INDENT)
> self.indent(0)
> diff --git a/hgext/largefiles/lfcommands.py b/hgext/largefiles/lfcommands.py
> --- a/hgext/largefiles/lfcommands.py
> +++ b/hgext/largefiles/lfcommands.py
> @@ -471,9 +471,8 @@ def updatelfiles(ui, repo, filelist=None
> if lfile not in repo[None]: # not switched to normal file
> util.unlinkpath(abslfile, ignoremissing=True)
> # use normallookup() to allocate an entry in largefiles
> - # dirstate, because lack of it misleads
> - # lfilesrepo.status() into recognition that such cache
> - # missing files are removed.
> + # dirstate to prevent lfilesrepo.status() from reporting
> + # missing files as removed.
> lfdirstate.normallookup(lfile)
> update[lfile] = expecthash
> else:
> diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py
> --- a/hgext/largefiles/lfutil.py
> +++ b/hgext/largefiles/lfutil.py
> @@ -581,6 +581,6 @@ def getstatuswriter(ui, repo, forcibly=N
> return repo._lfstatuswriters[-1]
> else:
> if forcibly:
> - return ui.status # forcibly WRITE OUT
> + return ui.status
> else:
> - return lambda *msg, **opts: None # forcibly IGNORE
> + return lambda *msg, **opts: None
> diff --git a/hgext/largefiles/reposetup.py b/hgext/largefiles/reposetup.py
> --- a/hgext/largefiles/reposetup.py
> +++ b/hgext/largefiles/reposetup.py
> @@ -326,10 +326,10 @@ def reposetup(ui, repo):
> actualfiles.append(lf)
> if not matcheddir:
> # There may still be normal files in the dir, so
> - # make sure _a_ directory is in the list, which
> + # add a directory to the list, which
> # forces status/dirstate to walk all files and
> # call the match function on the matcher, even
> - # on case sensitive filesytems.
> + # on case sensitive filesystems.
> actualfiles.append('.')
> matcheddir = True
> # Nothing in dir, so readd it
> diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
> --- a/mercurial/bookmarks.py
> +++ b/mercurial/bookmarks.py
> @@ -456,5 +456,5 @@ def validdest(repo, old, new):
> elif repo.obsstore:
> return new.node() in obsolete.foreground(repo, [old.node()])
> else:
> - # still an independent clause as it is lazyer (and therefore faster)
> + # still an independent clause as it is lazier (and therefore faster)
> return old.descendant(new)
> diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
> --- a/mercurial/changegroup.py
> +++ b/mercurial/changegroup.py
> @@ -111,7 +111,8 @@ def writebundle(ui, cg, filename, bundle
> chunkiter = bundle.getchunks()
> else:
> if cg.version != '01':
> - raise util.Abort(_('Bundle1 only supports v1 changegroups\n'))
> + raise util.Abort(_('old bundle types only supports v1 '
> + 'changegroups'))
> header, compressor = bundletypes[bundletype]
> fh.write(header)
> z = compressor()
> diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> --- a/mercurial/cmdutil.py
> +++ b/mercurial/cmdutil.py
> @@ -110,22 +110,22 @@ def logmessage(ui, opts):
> (logfile, inst.strerror))
> return message
>
> -def mergeeditform(ctxorbool, baseform):
> - """build appropriate editform from ctxorbool and baseform
> -
> - 'ctxorbool' is one of a ctx to be committed, or a bool whether
> +def mergeeditform(ctxorbool, baseformname):
> + """return appropriate editform name (referencing a committemplate)
> +
> + 'ctxorbool' is either a ctx to be committed, or a bool indicating whether
> merging is committed.
>
> - This returns editform 'baseform' with '.merge' if merging is
> - committed, or one with '.normal' suffix otherwise.
> + This returns baseformname with '.merge' appended if it is a merge,
> + otherwise '.normal' is appended.
> """
> if isinstance(ctxorbool, bool):
> if ctxorbool:
> - return baseform + ".merge"
> + return baseformname + ".merge"
> elif 1 < len(ctxorbool.parents()):
> - return baseform + ".merge"
> -
> - return baseform + ".normal"
> + return baseformname + ".merge"
> +
> + return baseformname + ".normal"
>
> def getcommiteditor(edit=False, finishdesc=None, extramsg=None,
> editform='', **opts):
> @@ -2598,9 +2598,8 @@ 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.
> - #
> - # Even, when we revert against something else than parent. This will
> + # We need to account for the state of the file in the dirstate,
> + # even when we revert against something else than parent. This will
> # slightly alter the behavior of revert (doing back up or not, delete
> # or just forget etc).
> if parent == node:
> diff --git a/mercurial/context.py b/mercurial/context.py
> --- a/mercurial/context.py
> +++ b/mercurial/context.py
> @@ -754,7 +754,7 @@ class basefilectx(object):
> return True
>
> def _adjustlinkrev(self, path, filelog, fnode, srcrev, inclusive=False):
> - """return the first ancestor of <srcrev> introducting <fnode>
> + """return the first ancestor of <srcrev> introducing <fnode>
>
> If the linkrev of the file revision does not point to an ancestor of
> srcrev, we'll walk down the ancestors until we find one introducing
> @@ -826,7 +826,7 @@ class basefilectx(object):
> # be replaced with the rename information. This parent is -always-
> # the first one.
> #
> - # As null id have alway been filtered out in the previous list
> + # As null id always have been filtered out in the previous list
> # comprehension, inserting to 0 will always result in "replacing
> # first nullid parent with rename information.
> pl.insert(0, (r[0], r[1], self._repo.file(r[0])))
> diff --git a/mercurial/graphmod.py b/mercurial/graphmod.py
> --- a/mercurial/graphmod.py
> +++ b/mercurial/graphmod.py
> @@ -122,7 +122,7 @@ def groupbranchiter(revs, parentsfunc, f
> heappush(pendingheap, -currentrev)
> pendingset.add(currentrev)
> # iterates on pending rev until after the current rev have been
> - # processeed.
> + # processed.
> rev = None
> while rev != currentrev:
> rev = -heappop(pendingheap)
> diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
> --- a/mercurial/localrepo.py
> +++ b/mercurial/localrepo.py
> @@ -1211,7 +1211,7 @@ class localrepository(object):
>
> # Here, we used to search backwards through history to try to find
> # where the file copy came from if the source of a copy was not in
> - # the parent diretory. However, this doesn't actually make sense to
> + # the parent directory. However, this doesn't actually make sense to
> # do (what does a copy from something not in your working copy even
> # mean?) and it causes bugs (eg, issue4476). Instead, we will warn
> # the user that copy information was dropped, so if they didn't
> diff --git a/mercurial/namespaces.py b/mercurial/namespaces.py
> --- a/mercurial/namespaces.py
> +++ b/mercurial/namespaces.py
> @@ -139,7 +139,7 @@ class namespace(object):
> is used
> colorname: the name to use for colored log output; if not specified
> logname is used
> - logfmt: the format to use for (l10n-ed) log output; if not specified
> + logfmt: the format to use for (i18n-ed) log output; if not specified
> it is composed from logname
> listnames: function to list all names
> namemap: function that inputs a node, output name(s)
> diff --git a/tests/test-addremove.t b/tests/test-addremove.t
> --- a/tests/test-addremove.t
> +++ b/tests/test-addremove.t
> @@ -30,12 +30,12 @@
> adding foo
> $ hg forget foo
> #if windows
> - $ hg -v addremove nonexistant
> - nonexistant: The system cannot find the file specified
> + $ hg -v addremove nonexistent
> + nonexistent: The system cannot find the file specified
> [1]
> #else
> - $ hg -v addremove nonexistant
> - nonexistant: No such file or directory
> + $ hg -v addremove nonexistent
> + nonexistent: No such file or directory
> [1]
> #endif
> $ cd ..
> @@ -88,13 +88,13 @@
>
> $ rm c
> #if windows
> - $ hg ci -A -m "c" nonexistant
> - nonexistant: The system cannot find the file specified
> + $ hg ci -A -m "c" nonexistent
> + nonexistent: The system cannot find the file specified
> abort: failed to mark all new/missing files as added/removed
> [255]
> #else
> - $ hg ci -A -m "c" nonexistant
> - nonexistant: No such file or directory
> + $ hg ci -A -m "c" nonexistent
> + nonexistent: No such file or directory
> abort: failed to mark all new/missing files as added/removed
> [255]
> #endif
> diff --git a/tests/test-context.py b/tests/test-context.py
> --- a/tests/test-context.py
> +++ b/tests/test-context.py
> @@ -51,7 +51,7 @@ print ctxb.status(ctxa)
> for d in ctxb.diff(ctxa, git=True):
> print d
>
> -# test safeness and correctness of "cxt.status()"
> +# test safeness and correctness of "ctx.status()"
> print '= checking context.status():'
>
> # ancestor "wcctx ~ 2"
> diff --git a/tests/test-largefiles-cache.t b/tests/test-largefiles-cache.t
> --- a/tests/test-largefiles-cache.t
> +++ b/tests/test-largefiles-cache.t
> @@ -136,7 +136,7 @@ Test permission of files created by push
> #endif
>
> Test issue 4053 (remove --after on a deleted, uncommitted file shouldn't say
> -it is missing, but a remove on a nonexistant unknown file still should. Same
> +it is missing, but a remove on a nonexistent unknown file still should. Same
> for a forget.)
>
> $ cd src
> diff --git a/tests/test-log.t b/tests/test-log.t
> --- a/tests/test-log.t
> +++ b/tests/test-log.t
> @@ -1659,7 +1659,7 @@ hg log -f dir across branches
> |
> o a
>
> -Ensure that largefiles doesn't intefere with following a normal file
> +Ensure that largefiles doesn't interfere with following a normal file
> $ hg --config extensions.largefiles= log -f d -T '{desc}' -G
> @ c
> |
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
More information about the Mercurial-devel
mailing list