[PATCH] spelling: fixes from proofreading of spell checker issues
Martin von Zweigbergk
martinvonz at google.com
Sun Nov 2 15:09:21 CST 2014
On Sun Nov 02 2014 at 7:36:24 AM Mads Kiilerich <mads at kiilerich.com> wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1397767658 -7200
> # Thu Apr 17 22:47:38 2014 +0200
> # Branch stable
> # Node ID 2ff580fd43fabecd3c0121ca0b8df4beb7100c8e
> # Parent cc1cbb0bba8ed1d95c8f1b8e27d4d2893e0dcca7
> spelling: fixes from proofreading of spell checker issues
>
> diff --git a/contrib/check-code.py b/contrib/check-code.py
> --- a/contrib/check-code.py
> +++ b/contrib/check-code.py
> @@ -291,7 +291,7 @@ pypats = [
> "always assign an opened file to a variable, and close it
> afterwards"),
> (r'[\s\(](open|file)\([^)]*\)\.',
> "always assign an opened file to a variable, and close it
> afterwards"),
> - (r'(?i)descendent', "the proper spelling is descendAnt"),
> + (r'(?i)descend[e]nt', "the proper spelling is descendAnt"),
>
Is this a regular expression? If it is, I suspect this change was not
intentional.
> (r'\.debug\(\_', "don't mark debug messages for translation"),
> (r'\.strip\(\)\.split\(\)', "no need to strip before splitting"),
> (r'^\s*except\s*:', "naked except clause", r'#.*re-raises'),
> diff --git a/contrib/revsetbenchmarks.py b/contrib/revsetbenchmarks.py
> --- a/contrib/revsetbenchmarks.py
> +++ b/contrib/revsetbenchmarks.py
> @@ -74,7 +74,7 @@ def getrevs(spec):
>
> parser = OptionParser(usage="usage: %prog [options] <revs>")
> parser.add_option("-f", "--file",
> - help="read revset from FILE (stdin if omited)",
> + help="read revset from FILE (stdin if omitted)",
> metavar="FILE")
> parser.add_option("-R", "--repo",
> help="run benchmark on REPO", metavar="REPO")
> diff --git a/hgext/largefiles/lfcommands.py b/hgext/largefiles/lfcommands.
> py
> --- a/hgext/largefiles/lfcommands.py
> +++ b/hgext/largefiles/lfcommands.py
> @@ -462,10 +462,10 @@ def updatelfiles(ui, repo, filelist=None
> expecthash != lfutil.hashfile(abslfile))):
> if lfile not in repo[None]: # not switched to normal
> file
> util.unlinkpath(abslfile, ignoremissing=True)
> - # use normallookup() to allocate entry in largefiles
> + # use normallookup() to allocate an entry in
> largefiles
> # dirstate, because lack of it misleads
> # lfilesrepo.status() into recognition that such cache
>
If you're changing here anyway, you might as well fix the above as well.
The "misleads... into recognition" sounds odd to me. How about
s/recognition/thinking/?
> - # missing files are REMOVED.
> + # missing files has been removed.
>
s/has/have/
Also, "such cache missing files" seems clearer as "such missing files in
[from?] the cache" or "such files missing from the cache".
> lfdirstate.normallookup(lfile)
> update[lfile] = expecthash
> else:
> diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
> --- a/hgext/largefiles/overrides.py
> +++ b/hgext/largefiles/overrides.py
> @@ -63,10 +63,10 @@ def installmatchandpatsfn(f):
>
> def restorematchandpatsfn():
> '''restores scmutil.matchandpats to what it was before
> - installnormalfilesmatchandpatsfn was called. no-op if
> scmutil.matchandpats
> + installmatchandpatsfn was called. No-op if scmutil.matchandpats
> is its original function.
>
> - Note that n calls to installnormalfilesmatchandpatsfn will require n
> calls
> + Note that n calls to installmatchandpatsfn will require n calls
> to restore matchfn to reverse'''
>
Drop "to reverse"? It seems like "to restore" already says that.
> scmutil.matchandpats = getattr(scmutil.matchandpats,
> 'oldmatchandpats',
> scmutil.matchandpats)
> diff --git a/hgext/largefiles/reposetup.py b/hgext/largefiles/reposetup.py
> --- a/hgext/largefiles/reposetup.py
> +++ b/hgext/largefiles/reposetup.py
> @@ -263,7 +263,7 @@ def reposetup(ui, repo):
> # and so on), this code path is used to avoid:
> # (1) updating standins, because standins should
> # be already updated at this point
> - # (2) aborting when stadnins are matched by "match",
> + # (2) aborting when standins are matched by "match",
> # because automated committing may specify them
> directly
> #
> if getattr(self, "_isrebasing", False) or \
> diff --git a/hgext/rebase.py b/hgext/rebase.py
> --- a/hgext/rebase.py
> +++ b/hgext/rebase.py
> @@ -278,7 +278,7 @@ def rebase(ui, repo, **opts):
> commonanc, base, commonanc)
> if not rebaseset:
> # transform to list because smartsets are not
> comparable to
> - # lists. This should be improved to honor lazyness of
> + # lists. This should be improved to honor laziness of
> # smartset.
> if list(base) == [dest.rev()]:
> if basef:
> diff --git a/hgext/strip.py b/hgext/strip.py
> --- a/hgext/strip.py
> +++ b/hgext/strip.py
> @@ -1,4 +1,4 @@
> -"""strip changesets and their descendents from history
> +"""strip changesets and their descendants from history
>
> This extension allows you to strip changesets and all their descendants
> from the
> repository. See the command help for details.
> diff --git a/i18n/polib.py b/i18n/polib.py
> --- a/i18n/polib.py
> +++ b/i18n/polib.py
> @@ -396,7 +396,7 @@ class _BaseFile(list):
> def ordered_metadata(self):
> """
> Convenience method that returns an ordered version of the metadata
> - dictionnary. The return value is list of tuples (metadata name,
> + dictionary. The return value is list of tuples (metadata name,
> metadata_value).
> """
> # copy the dict first
> diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
> --- a/mercurial/bundle2.py
> +++ b/mercurial/bundle2.py
> @@ -229,7 +229,7 @@ class unbundlerecords(object):
> self.getreplies(inreplyto).add(category, entry)
>
> def getreplies(self, partid):
> - """get the subrecords that replies to a specific part"""
> + """get the records that are replies to a specific part"""
> return self._replies.setdefault(partid, unbundlerecords())
>
> def __getitem__(self, cat):
> @@ -303,7 +303,7 @@ def processbundle(repo, unbundler, trans
> # consume the bundle content
> part.read()
> # Small hack to let caller code distinguish exceptions from
> bundle2
> - # processing fron the ones from bundle1 processing. This is mostly
> + # processing from processing the old format. This is mostly
> # needed to handle different return codes to unbundle according
> to the
> # type of bundle. We should probably clean up or drop this return
> code
> # craziness in a future version.
> @@ -359,7 +359,7 @@ def _processpart(op, part):
>
>
> def decodecaps(blob):
> - """decode a bundle2 caps bytes blob into a dictionnary
> + """decode a bundle2 caps bytes blob into a dictionary
>
> The blob is a list of capabilities (one per line)
> Capabilities may have values using a line of the form::
> @@ -741,7 +741,7 @@ class interrupthandler(unpackermixin):
> self.ui.debug('bundle2 stream interruption, looking for a
> part.\n')
> headerblock = self._readpartheader()
> if headerblock is None:
> - self.ui.debug('no part found during iterruption.\n')
> + self.ui.debug('no part found during interruption.\n')
> return
> part = unbundlepart(self.ui, headerblock, self._fp)
> op = interruptoperation(self.ui)
> @@ -828,7 +828,7 @@ class unbundlepart(unpackermixin):
> # split mandatory from advisory
> mansizes = paramsizes[:mancount]
> advsizes = paramsizes[mancount:]
> - # retrive param value
> + # retrieve param value
> manparams = []
> for key, value in mansizes:
> manparams.append((self._fromheader(key),
> self._fromheader(value)))
> @@ -888,7 +888,7 @@ def getrepocaps(repo):
> return caps
>
> def bundle2caps(remote):
> - """return the bundlecapabilities of a peer as dict"""
> + """return the bundle capabilities of a peer as dict"""
> raw = remote.capable('bundle2-exp')
> if not raw and raw != '':
> return {}
> @@ -920,7 +920,7 @@ def handlechangegroup(op, inpart):
> ret = changegroup.addchangegroup(op.repo, cg, 'bundle2', 'bundle2')
> op.records.add('changegroup', {'return': ret})
> if op.reply is not None:
> - # This is definitly not the final form of this
> + # This is definitely not the final form of this
> # return. But one need to start somewhere.
> part = op.reply.newpart('b2x:reply:changegroup')
> part.addparam('in-reply-to', str(inpart.id), mandatory=False)
> @@ -989,7 +989,7 @@ def handleremotechangegroup(op, inpart):
> ret = changegroup.addchangegroup(op.repo, cg, 'bundle2', 'bundle2')
> op.records.add('changegroup', {'return': ret})
> if op.reply is not None:
> - # This is definitly not the final form of this
> + # This is definitely not the final form of this
> # return. But one need to start somewhere.
> part = op.reply.newpart('b2x:reply:changegroup')
> part.addparam('in-reply-to', str(inpart.id), mandatory=False)
> diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> --- a/mercurial/cmdutil.py
> +++ b/mercurial/cmdutil.py
> @@ -113,7 +113,7 @@ def logmessage(ui, opts):
> def mergeeditform(ctxorbool, baseform):
> """build appropriate editform from ctxorbool and baseform
>
> - 'cxtorbool' is one of a ctx to be committed, or a bool whether
> + 'ctxorbool' is one of a ctx to be committed, or a bool whether
> merging is committed.
>
I'd say "..is either a ctx to be commited, or a bool indicating whether
merging is committed." Also, should it be "whether the merge has been
committed"? Or "whether merging is permitted"?
At this point in the review, I noticed that the patch has already been
applied. Let me know if I should continue reviewing.
>
> This returns editform 'baseform' with '.merge' if merging is
> @@ -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
> + # 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.
> #
> - # Even, when we revert agains something else than parent. this
> will
> + # 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)
> + # or just forget etc).
> if parent == node:
> dsmodified = modified
> dsadded = added
> diff --git a/mercurial/context.py b/mercurial/context.py
> --- a/mercurial/context.py
> +++ b/mercurial/context.py
> @@ -109,7 +109,7 @@ class basectx(object):
> """provide a hook to allow child objects to postprocess status
> results
>
> For example, this allows other contexts, such as workingctx, to
> filter
> - suspect symlinks in the case of FAT32 and NTFS filesytems.
> + suspect symlinks in the case of FAT32 and NTFS filesystems.
> """
> return s
>
> @@ -1415,7 +1415,7 @@ class workingctx(committablectx):
> def _prestatus(self, other, s, match, listignored, listclean,
> listunknown):
> """override the parent hook with a dirstate query
>
> - We use this prestatus hook to populate the status with
> information from
> + We use this _prestatus hook to populate the status with
> information from
> the dirstate.
> """
> # doesn't need to call super; if that changes, be aware that super
> @@ -1426,9 +1426,9 @@ class workingctx(committablectx):
> def _poststatus(self, other, s, match, listignored, listclean,
> listunknown):
> """override the parent hook with a filter for suspect symlinks
>
> - We use this poststatus hook to filter out symlinks that might have
> + We use this _poststatus hook to filter out symlinks that might
> have
> accidentally ended up with the entire contents of the file they
> are
> - susposed to be linking to.
> + supposed to be linking to.
> """
> s[0] = self._filtersuspectsymlink(s[0])
> self._status = scmutil.status(*s)
> @@ -1693,7 +1693,7 @@ class memctx(committablectx):
> class memfilectx(committablefilectx):
> """memfilectx represents an in-memory file to commit.
>
> - See memctx and commitablefilectx for more details.
> + See memctx and committablefilectx for more details.
> """
> def __init__(self, repo, path, data, islink=False,
> isexec=False, copied=None, memctx=None):
> diff --git a/mercurial/copies.py b/mercurial/copies.py
> --- a/mercurial/copies.py
> +++ b/mercurial/copies.py
> @@ -97,7 +97,7 @@ def _findlimit(repo, a, b):
> # |/
> # o 0 a0
> #
> - # When findlimit is called, a and b are revs 3 and 0, so limit will
> be 2,
> + # When _findlimit is called, a and b are revs 3 and 0, so limit will
> be 2,
> # yet the filelog has the copy information in rev 1 and we will not
> look
> # back far enough unless we also look at the a and b as candidates.
> # This only occurs when a is a descendent of b or visa-versa.
> diff --git a/mercurial/exchange.py b/mercurial/exchange.py
> --- a/mercurial/exchange.py
> +++ b/mercurial/exchange.py
> @@ -298,7 +298,7 @@ def _pushdiscoveryphase(pushop):
> else:
> # adds changeset we are going to push as draft
> #
> - # should not be necessary for pushblishing server, but because of
> an
> + # should not be necessary for publishing server, but because of an
> # issue fixed in xxxxx we have to do it anyway.
> fdroots = list(unfi.set('roots(%ln + %ln::)',
> outgoing.missing, droots))
> @@ -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"""
> cgreplies = op.records.getreplies(cgpart.id)
> assert len(cgreplies['changegroup']) == 1
> pushop.cgresult = cgreplies['changegroup'][0]['return']
> @@ -702,7 +702,7 @@ def _pushsyncphase(pushop):
> pushop.ui.warn(msg)
>
> else:
> - # fallback to independant pushkey command
> + # fallback to independent pushkey command
> for newremotehead in outdated:
> r = pushop.remote.pushkey('phases',
> newremotehead.hex(),
> diff --git a/mercurial/hg.py b/mercurial/hg.py
> --- a/mercurial/hg.py
> +++ b/mercurial/hg.py
> @@ -390,7 +390,7 @@ def clone(ui, peeropts, source, dest=Non
>
> dstcachedir = os.path.join(destpath, 'cache')
> # In local clones we're copying all nodes, not just served
> - # ones. Therefore copy all branchcaches over.
> + # ones. Therefore copy all branch caches over.
> copybranchcache('branch2')
> for cachename in repoview.filtertable:
> copybranchcache('branch2-%s' % cachename)
> diff --git a/mercurial/pathutil.py b/mercurial/pathutil.py
> --- a/mercurial/pathutil.py
> +++ b/mercurial/pathutil.py
> @@ -146,7 +146,7 @@ def canonpath(root, cwd, myname, auditor
> def normasprefix(path):
> '''normalize the specified path as path prefix
>
> - Returned vaule can be used safely for "p.startswith(prefix)",
> + Returned value can be used safely for "p.startswith(prefix)",
> "p[len(prefix):]", and so on.
>
> For efficiency, this expects "path" argument to be already
> diff --git a/mercurial/revset.py b/mercurial/revset.py
> --- a/mercurial/revset.py
> +++ b/mercurial/revset.py
> @@ -2551,7 +2551,7 @@ class addset(abstractsmartset):
> return it()
>
> def _trysetasclist(self):
> - """populate the _asclist attribut if possible and necessary"""
> + """populate the _asclist attribute if possible and necessary"""
> if self._genlist is not None and self._asclist is None:
> self._asclist = sorted(self._genlist)
>
> @@ -2744,7 +2744,7 @@ class generatorset(abstractsmartset):
>
> # We have to use this complex iteration strategy to allow multiple
> # iterations at the same time. We need to be able to catch
> revision
> - # removed from `consumegen` and added to genlist in another
> instance.
> + # removed from _consumegen and added to genlist in another
> instance.
> #
> # Getting rid of it would provide an about 15% speed up on this
> # iteration.
> @@ -2939,17 +2939,15 @@ class _spanset(abstractsmartset):
> class fullreposet(_spanset):
> """a set containing all revisions in the repo
>
> - This class exists to host special optimisation.
> + This class exists to host special optimization.
> """
>
> def __init__(self, repo):
> super(fullreposet, self).__init__(repo)
>
> def __and__(self, other):
> - """fullrepo & other -> other
> -
> - As self contains the whole repo, all of the other set should also
> be in
> - self. Therefor `self & other = other`.
> + """As self contains the whole repo, all of the other set should
> also be
> + in self. Therefore `self & other = other`.
>
> This boldly assumes the other contains valid revs only.
> """
> diff --git a/mercurial/tagmerge.py b/mercurial/tagmerge.py
> --- a/mercurial/tagmerge.py
> +++ b/mercurial/tagmerge.py
> @@ -39,7 +39,7 @@
> # and between base and p2, possibly on separate clones
> # 4. for each tag found both on p1 and p2 perform the following merge
> algorithm:
> # - the tags conflict if their tag "histories" have the same "rank"
> (i.e.
> -# length) _AND_ the last (current) tag is _NOT_ the same
> +# length) AND the last (current) tag is NOT the same
> # - for non conflicting tags:
> # - choose which are the high and the low ranking nodes
> # - the high ranking list of nodes is the one that is longer.
> @@ -57,7 +57,7 @@
> # 5. write the merged tags taking into account to their positions in the
> first
> # parent (i.e. try to keep the relative ordering of the nodes that come
> # from p1). This minimizes the diff between the merged and the p1 tag
> files
> -# This is donw by using the following algorithm
> +# This is done by using the following algorithm
> # - group the nodes for a given tag that must be written next to each
> other
> # - A: nodes that come from consecutive lines on p1
> # - B: nodes that come from p2 (i.e. whose associated line number
> is
> @@ -81,9 +81,9 @@ hexnullid = hex(nullid)
> def readtagsformerge(ui, repo, lines, fn='', keeplinenums=False):
> '''read the .hgtags file into a structure that is suitable for merging
>
> - Sepending on the keeplinenumbers flag, clear the line numbers
> associated
> - with each tag. Rhis is done because only the line numbers of the first
> - parent are useful for merging
> + Depending on the keeplinenums flag, clear the line numbers associated
> + with each tag. This is done because only the line numbers of the first
> + parent are useful for merging.
> '''
> filetags = tagsmod._readtaghist(ui, repo, lines, fn=fn, recode=None,
> calcnodelines=True)[1]
> diff --git a/mercurial/tags.py b/mercurial/tags.py
> --- a/mercurial/tags.py
> +++ b/mercurial/tags.py
> @@ -87,7 +87,7 @@ def readlocaltags(ui, repo, alltags, tag
> def _readtaghist(ui, repo, lines, fn, recode=None, calcnodelines=False):
> '''Read tag definitions from a file (or any source of lines).
> This function returns two sortdicts with similar information:
> - - the first dict, bingtaglist, contains the tag information as
> expected by
> + - the first dict, bintaghist, contains the tag information as
> expected by
> the _readtags function, i.e. a mapping from tag name to (node,
> hist):
> - node is the node id from the last line read for that name,
> - hist is the list of node ids previously associated with it (in
> file
> diff --git a/mercurial/ui.py b/mercurial/ui.py
> --- a/mercurial/ui.py
> +++ b/mercurial/ui.py
> @@ -537,7 +537,7 @@ class ui(object):
> return path or loc
>
> def pushbuffer(self, error=False):
> - """install a buffer to capture standar output of the ui object
> + """install a buffer to capture standard output of the ui object
>
> If error is True, the error output will be captured too."""
> self._buffers.append([])
> diff --git a/mercurial/util.py b/mercurial/util.py
> --- a/mercurial/util.py
> +++ b/mercurial/util.py
> @@ -1148,7 +1148,7 @@ class chunkbuffer(object):
> """Read L bytes of data from the iterator of chunks of data.
> Returns less than L bytes if the iterator runs dry.
>
> - If size parameter is ommited, read everything"""
> + If size parameter is omitted, read everything"""
> left = l
> buf = []
> queue = self._queue
> diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
> --- a/mercurial/wireproto.py
> +++ b/mercurial/wireproto.py
> @@ -827,7 +827,7 @@ def unbundle(repo, proto, heads):
> r = exchange.unbundle(repo, gen, their_heads, 'serve',
> proto._client())
> if util.safehasattr(r, 'addpart'):
> - # The return looks streameable, we are in the bundle2
> case and
> + # The return looks streamable, we are in the bundle2 case
> and
> # should return a stream.
> return streamres(r.getchunks())
> return pushres(r)
> diff --git a/tests/dumbhttp.py b/tests/dumbhttp.py
> --- a/tests/dumbhttp.py
> +++ b/tests/dumbhttp.py
> @@ -40,7 +40,7 @@ if __name__ == '__main__':
> # This doesn't attempt to cleanly detach the process, as it's not
> # meant to be a long-lived, independent process. As a consequence,
> # it's still part of the same process group, and keeps any file
> - # descriptors it might have inherited besided stdin/stdout/stderr.
> + # descriptors it might have inherited besides stdin/stdout/stderr.
> # Trying to do things cleanly is more complicated, requires
> # OS-dependent code, and is not worth the effort.
> proc = subprocess.Popen([sys.executable, __file__, '-f',
> diff --git a/tests/run-tests.py b/tests/run-tests.py
> --- a/tests/run-tests.py
> +++ b/tests/run-tests.py
> @@ -500,7 +500,7 @@ class Test(unittest.TestCase):
> except self.failureException, e:
> # This differs from unittest in that we don't capture
> # the stack trace. This is for historical reasons and
> - # this decision could be revisted in the future,
> + # this decision could be revisited in the future,
> # especially for PythonTest instances.
> if result.addFailure(self, str(e)):
> success = True
> @@ -1263,7 +1263,7 @@ class TestResult(unittest._TextTestResul
> iolock.release()
>
> class TestSuite(unittest.TestSuite):
> - """Custom unitest TestSuite that knows how to execute Mercurial
> tests."""
> + """Custom unittest TestSuite that knows how to execute Mercurial
> tests."""
>
> def __init__(self, testdir, jobs=1, whitelist=None, blacklist=None,
> retest=False, keywords=None, loop=False,
> @@ -1895,8 +1895,8 @@ class TestRunner(object):
> the one we expect it to be. If not, print a warning to stderr."""
> if ((self._bindir == self._pythondir) and
> (self._bindir != self._tmpbindir)):
> - # The pythondir has been infered from --with-hg flag.
> - # We cannot expect anything sensible here
> + # The pythondir has been inferred from --with-hg flag.
> + # We cannot expect anything sensible here.
> return
> expecthg = os.path.join(self._pythondir, 'mercurial')
> actualhg = self._gethgpath()
> diff --git a/tests/test-bundle2-format.t b/tests/test-bundle2-format.t
> --- a/tests/test-bundle2-format.t
> +++ b/tests/test-bundle2-format.t
> @@ -1,4 +1,4 @@
> -This test is decicated to test the bundle2 container format
> +This test is dedicated to test the bundle2 container format
>
> It test multiple existing parts to test different feature of the
> container. You
> probably do not need to touch this test unless you change the binary
> encoding
> diff --git a/tests/test-check-code.t b/tests/test-check-code.t
> --- a/tests/test-check-code.t
> +++ b/tests/test-check-code.t
> @@ -261,7 +261,7 @@
> > print _("concatenating " " by " " space %s" % v)
> > print _("concatenating " + " by " + " '+' %s" % v)
> >
> - > print _("maping operation in different line %s"
> + > print _("mapping operation in different line %s"
> > % v)
> >
> > print _(
> @@ -278,7 +278,7 @@
> > print _("concatenating " + " by " + " '+' %s" % v)
> don't use % inside _()
> ./map-inside-gettext.py:6:
> - > print _("maping operation in different line %s"
> + > print _("mapping operation in different line %s"
> don't use % inside _()
> ./map-inside-gettext.py:9:
> > print _(
> diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
> --- a/tests/test-commit-amend.t
> +++ b/tests/test-commit-amend.t
> @@ -889,9 +889,9 @@ in the file revlog topology and the chan
>
> The way mercurial does amends is to create a temporary commit (rev 3) and
> then
> fold the new and old commits together into another commit (rev 4). During
> this
> -process, findlimit is called to check how far back to look for the
> transitive
> +process, _findlimit is called to check how far back to look for the
> transitive
> closure of file copy information, but due to the divergence of the filelog
> -and changelog graph topologies, before findlimit was fixed, it returned a
> rev
> +and changelog graph topologies, before _findlimit was fixed, it returned
> a rev
> which was not far enough back in this case.
> $ hg mv a1 a2
> $ hg status --copies --rev 0
> diff --git a/tests/test-help.t b/tests/test-help.t
> --- a/tests/test-help.t
> +++ b/tests/test-help.t
> @@ -272,7 +272,7 @@ Test extension help:
> schemes extend schemes with shortcuts to repository swarms
> share share a common history between several working
> directories
> shelve save and restore changes to the working directory
> - strip strip changesets and their descendents from history
> + strip strip changesets and their descendants from history
> transplant command to transplant changesets from another branch
> win32mbcs allow the use of MBCS paths with problematic
> encodings
> zeroconf discover and advertise repositories on the local
> network
> diff --git a/tests/test-largefiles-misc.t b/tests/test-largefiles-misc.t
> --- a/tests/test-largefiles-misc.t
> +++ b/tests/test-largefiles-misc.t
> @@ -589,7 +589,7 @@ check messages when there are files to u
> 89e6c98d92887913cadf06b2adb97f26cde4849b
>
>
> -Pusing revision #1 causes uploading entity 89e6c98d9288, which is
> +Pushing revision #1 causes uploading entity 89e6c98d9288, which is
> shared also by largefiles b1, b2 in revision #2 and b in revision #5.
>
> Then, entity 89e6c98d9288 is not treated as "outgoing entity" at "hg
> diff --git a/tests/test-largefiles-wireproto.t b/tests/test-largefiles-
> wireproto.t
> --- 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.
>
> $ USERCACHE="$TESTTMP/cache"; export USERCACHE
> $ mkdir "${USERCACHE}"
> diff --git a/tests/test-mq-guards.t b/tests/test-mq-guards.t
> --- a/tests/test-mq-guards.t
> +++ b/tests/test-mq-guards.t
> @@ -568,7 +568,7 @@ guarded (= not yet applied) one.
> 3 G b.patch
>
> test that "qselect --reapply" checks applied patches correctly when no
> -applied patche becomes guarded but some of unapplied ones become
> +applied patches becomes guarded but some of unapplied ones become
> unguarded.
>
> $ hg qpop -q -a
> diff --git a/tests/test-mq.t b/tests/test-mq.t
> --- a/tests/test-mq.t
> +++ b/tests/test-mq.t
> @@ -1582,7 +1582,7 @@ Test that secret mq patch does not break
>
> $ cd ..
>
> -Test interraction with revset (issue4426)
> +Test interaction with revset (issue4426)
>
> $ hg init issue4426
> $ cd issue4426
> diff --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t
> --- a/tests/test-phases-exchange.t
> +++ b/tests/test-phases-exchange.t
> @@ -755,7 +755,7 @@ Pushing to Publish=True (common changese
>
> Bare push with next changeset and common changeset needing sync
> (issue3575)
>
> -(reset some stat on remot repo to not confused other test)
> +(reset some stat on remote repo to avoid confusing other tests)
>
> $ hg -R ../alpha --config extensions.strip= strip --no-backup
> 967b449fbc94
> 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
> diff --git a/tests/test-progress.t b/tests/test-progress.t
> --- a/tests/test-progress.t
> +++ b/tests/test-progress.t
> @@ -296,7 +296,7 @@ are different from each other.
> \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88 [=====> ]\r
> (no-eol) (esc)
> \r (no-eol) (esc)
>
> -test triming progress items, when they contain multi-byte characters,
> +test trimming progress items, when they contain multi-byte characters,
> of which length of byte sequence and columns in display are different
> from each other.
>
> diff --git a/tests/test-revert.t b/tests/test-revert.t
> --- a/tests/test-revert.t
> +++ b/tests/test-revert.t
> @@ -400,7 +400,7 @@ Systematic behavior validation of most p
>
> This section tests most of the possible combinations of working directory
> changes and inter-revision changes. The number of possible cases is
> significant
> -but they all have a slighly different handling. So this section commits to
> +but they all have a slightly different handling. So this section commits
> to
> generating and testing all of them to allow safe refactoring of the
> revert code.
>
> A python script is used to generate a file history for each combination of
> @@ -1068,7 +1068,7 @@ revert all files individually and check
> ### revert for: removed_wc
>
>
> -check resulting directory againt the --all run
> +check resulting directory against the --all run
> (There should be no difference)
>
> $ python ../dircontent.py > ../content-parent-explicit.txt
> @@ -1188,7 +1188,7 @@ revert all files individually and check
> ### revert for: removed_wc
>
>
> -check resulting directory againt the --all run
> +check resulting directory against the --all run
> (There should be no difference)
>
> $ python ../dircontent.py > ../content-base-explicit.txt
> diff --git a/tests/test-tag.t b/tests/test-tag.t
> --- a/tests/test-tag.t
> +++ b/tests/test-tag.t
> @@ -479,7 +479,7 @@ check that we can merge tags that differ
> 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3
> 79505d5360b07e3e79d1052e347e73c02b8afa5b t3
>
> -check that the merge tried to minimize the diff witht he first merge
> parent
> +check that the merge tried to minimize the diff with the first merge
> parent
>
> $ hg diff --git -r 'p1()' .hgtags
> diff --git a/.hgtags b/.hgtags
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20141102/31a4c450/attachment.html>
More information about the Mercurial-devel
mailing list