upstream/mercurial-mirror Commit - r23139:e53f6b72

spelling: fixes from proofreading of spell checker issues

Mads Kiilerich -

r23139:e53f6b72 default

parent child

contrib/check-code.py

0 +1 -1

                  "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"),
                 (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'),

contrib/revsetbenchmarks.py

0 +1 -1

             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")

hgext/largefiles/lfcommands.py

0 +2 -2

                                  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
-                                # missing files are REMOVED.
+                                # missing files are removed.
                                 lfdirstate.normallookup(lfile)
                                 update[lfile] = expecthash
                         else:

hgext/largefiles/overrides.py

0 +2 -2

             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'''
                 scmutil.matchandpats = getattr(scmutil.matchandpats, 'oldmatchandpats',
                         scmutil.matchandpats)

hgext/largefiles/reposetup.py

0 +1 -1

                             # 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 \

hgext/rebase.py

0 +1 -1

                                                   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:

hgext/strip.py

0 +1 -1

-            """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.

i18n/polib.py

0 +1 -1

                 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

mercurial/bundle2.py

0 +7 -7

                         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):
                         # 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.
             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::
                     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)
                     # 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)))
                 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)
                 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)

mercurial/cmdutil.py

0 +6 -6

             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.
                 This returns editform 'baseform' with '.merge' if merging is
                     # 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
+                        # _makefollowlogfilematcher expects its files argument to be
-                        # the repo root, so use match.files(), not pats.
+                        # relative to the repo root, so use match.files(), not pats.
                         filematcher = _makefollowlogfilematcher(repo, match.files(),
                                                                 followfirst)
                     else:
                     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

mercurial/context.py

0 +5 -5

                     """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
                 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
                 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)
             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):

mercurial/copies.py

0 +1 -1

                 # |/
                 # 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.

mercurial/exchange.py

0 +3 -3

                 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))
                 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']
                                 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(),

mercurial/pathutil.py

0 +1 -1

             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

mercurial/revset.py

0 +5 -7

                     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)
                     # 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.
             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. Therefore `self & other = other`.
-                    As self contains the whole repo, all of the other set should also be in
-                    self. Therefor `self & other = other`.
                     This boldly assumes the other contains valid revs only.
                     """

mercurial/tagmerge.py

0 +5 -5

             #       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.
             # 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
             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
+                Depending on the keeplinenums flag, clear the line numbers associated
-                with each tag. Rhis is done because only the line numbers of the first
+                with each tag. This is done because only the line numbers of the first
-                parent are useful for merging
+                parent are useful for merging.
                 '''
                 filetags = tagsmod._readtaghist(ui, repo, lines, fn=fn, recode=None,
                                                 calcnodelines=True)[1]

mercurial/tags.py

0 +1 -1

             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

mercurial/ui.py

0 +1 -1

                     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([])

mercurial/util.py

0 +1 -1

                     """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

mercurial/wireproto.py

0 +1 -1

                         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)

tests/run-tests.py

0 +4 -4

                         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
                         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,
                     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.
+                        # The pythondir has been inferred from --with-hg flag.
-                        # We cannot expect anything sensible here
+                        # We cannot expect anything sensible here.
                         return
                     expecthg = os.path.join(self._pythondir, 'mercurial')
                     actualhg = self._gethgpath()

tests/test-bundle2-format.t

0 +1 -1

-            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

tests/test-check-code.t

0 +2 -2

               > 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 _(
                > 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 _(

tests/test-commit-amend.t

0 +2 -2

             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

tests/test-help.t

0 +1 -1

                    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

tests/test-largefiles-misc.t

0 +1 -1

 e6c98d92887913cadf06b2adb97f26cde4849b
-            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

tests/test-largefiles-wireproto.t

0 +2 -2

-            This file contains testcases that tend to be related to the wireprotocol part of
+            This file contains testcases that tend to be related to the wire protocol part
-            largefile.
+            of largefiles.
               $ USERCACHE="$TESTTMP/cache"; export USERCACHE
               $ mkdir "${USERCACHE}"

tests/test-mq-guards.t

0 +1 -1

 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

tests/test-mq.t

0 +1 -1

               $ cd ..
-            Test interraction with revset (issue4426)
+            Test interaction with revset (issue4426)
               $ hg init issue4426
               $ cd issue4426

tests/test-phases-exchange.t

0 +1 -1

             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
 files updated, 0 files merged, 1 files removed, 0 files unresolved

tests/test-progress.t

0 +1 -1

               \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.

tests/test-revert.t

0 +3 -3

             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
               ### 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
               ### 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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages