# HG changeset patch # User Mads Kiilerich # Date 1421545137 -3600 # Node ID d8e0c591781c147468ea299c255ca255392eda3e # Parent 14d647d25c7078ef9acede614ee2ef1c1ca27164 spelling: fixes from proofreading of spell checker issues diff -r 14d647d25c70 -r d8e0c591781c doc/hgmanpage.py --- a/doc/hgmanpage.py Fri Feb 27 21:42:58 2015 +0100 +++ b/doc/hgmanpage.py Sun Jan 18 02:38:57 2015 +0100 @@ -427,7 +427,7 @@ 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 -r 14d647d25c70 -r d8e0c591781c hgext/largefiles/lfcommands.py --- a/hgext/largefiles/lfcommands.py Fri Feb 27 21:42:58 2015 +0100 +++ b/hgext/largefiles/lfcommands.py Sun Jan 18 02:38:57 2015 +0100 @@ -471,9 +471,8 @@ 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 -r 14d647d25c70 -r d8e0c591781c hgext/largefiles/reposetup.py --- a/hgext/largefiles/reposetup.py Fri Feb 27 21:42:58 2015 +0100 +++ b/hgext/largefiles/reposetup.py Sun Jan 18 02:38:57 2015 +0100 @@ -329,10 +329,10 @@ 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 -r 14d647d25c70 -r d8e0c591781c mercurial/bookmarks.py --- a/mercurial/bookmarks.py Fri Feb 27 21:42:58 2015 +0100 +++ b/mercurial/bookmarks.py Sun Jan 18 02:38:57 2015 +0100 @@ -456,5 +456,5 @@ 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 -r 14d647d25c70 -r d8e0c591781c mercurial/changegroup.py --- a/mercurial/changegroup.py Fri Feb 27 21:42:58 2015 +0100 +++ b/mercurial/changegroup.py Sun Jan 18 02:38:57 2015 +0100 @@ -111,7 +111,8 @@ 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 -r 14d647d25c70 -r d8e0c591781c mercurial/cmdutil.py --- a/mercurial/cmdutil.py Fri Feb 27 21:42:58 2015 +0100 +++ b/mercurial/cmdutil.py Sun Jan 18 02:38:57 2015 +0100 @@ -110,22 +110,22 @@ (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): @@ -2600,9 +2600,8 @@ 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 -r 14d647d25c70 -r d8e0c591781c mercurial/context.py --- a/mercurial/context.py Fri Feb 27 21:42:58 2015 +0100 +++ b/mercurial/context.py Sun Jan 18 02:38:57 2015 +0100 @@ -754,7 +754,7 @@ return True def _adjustlinkrev(self, path, filelog, fnode, srcrev, inclusive=False): - """return the first ancestor of introducting + """return the first ancestor of introducing 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 @@ # 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 have always 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 -r 14d647d25c70 -r d8e0c591781c mercurial/graphmod.py --- a/mercurial/graphmod.py Fri Feb 27 21:42:58 2015 +0100 +++ b/mercurial/graphmod.py Sun Jan 18 02:38:57 2015 +0100 @@ -122,7 +122,7 @@ 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 -r 14d647d25c70 -r d8e0c591781c mercurial/localrepo.py --- a/mercurial/localrepo.py Fri Feb 27 21:42:58 2015 +0100 +++ b/mercurial/localrepo.py Sun Jan 18 02:38:57 2015 +0100 @@ -1210,7 +1210,7 @@ # 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 -r 14d647d25c70 -r d8e0c591781c mercurial/namespaces.py --- a/mercurial/namespaces.py Fri Feb 27 21:42:58 2015 +0100 +++ b/mercurial/namespaces.py Sun Jan 18 02:38:57 2015 +0100 @@ -142,7 +142,7 @@ 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 -r 14d647d25c70 -r d8e0c591781c tests/test-addremove.t --- a/tests/test-addremove.t Fri Feb 27 21:42:58 2015 +0100 +++ b/tests/test-addremove.t Sun Jan 18 02:38:57 2015 +0100 @@ -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 -r 14d647d25c70 -r d8e0c591781c tests/test-context.py --- a/tests/test-context.py Fri Feb 27 21:42:58 2015 +0100 +++ b/tests/test-context.py Sun Jan 18 02:38:57 2015 +0100 @@ -51,7 +51,7 @@ 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 -r 14d647d25c70 -r d8e0c591781c tests/test-largefiles-cache.t --- a/tests/test-largefiles-cache.t Fri Feb 27 21:42:58 2015 +0100 +++ b/tests/test-largefiles-cache.t Sun Jan 18 02:38:57 2015 +0100 @@ -136,7 +136,7 @@ #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 -r 14d647d25c70 -r d8e0c591781c tests/test-log.t --- a/tests/test-log.t Fri Feb 27 21:42:58 2015 +0100 +++ b/tests/test-log.t Sun Jan 18 02:38:57 2015 +0100 @@ -1659,7 +1659,7 @@ | 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 |