upstream/mercurial-mirror Commit - r21024:7731a228

spelling: fixes from spell checker

Mads Kiilerich -

r21024:7731a228 default

parent child

hgext/color.py

0 +1 -1

                 _styles = {}
                 for effect in _effects.keys():
                     _styles[effect] = effect
-                ui.write(('colormode: %s\n') % ui._colormode)
+                ui.write(('color mode: %s\n') % ui._colormode)
                 ui.write(_('available colors:\n'))
                 for label, colors in _styles.items():
                     ui.write(('%s\n') % colors, label=label)

hgext/convert/__init__.py

0 +1 -1

                 you want to close a branch. Each entry contains a revision or hash
                 separated by white space.
-                The tagpmap is a file that exactly analogous to the branchmap. This will
+                The tagmap is a file that exactly analogous to the branchmap. This will
                 rename tags on the fly and prevent the 'update tags' commit usually found
                 at the end of a convert process.

mercurial/bundle2.py

0 +12 -12

             the Binary format
             ============================
-            All numbers are unsigned and big endian.
+            All numbers are unsigned and big-endian.
             stream level parameters
             ------------------------
               A blob of `params size` containing the serialized version of all stream level
               parameters.
-              The blob contains a space separated list of parameters. parameter with value
+              The blob contains a space separated list of parameters. Parameters with value
               are stored in the form `<name>=<value>`. Both name and value are urlquoted.
               Empty name are obviously forbidden.
               Name MUST start with a letter. If this first letter is lower case, the
-              parameter is advisory and can be safefly ignored. However when the first
+              parameter is advisory and can be safely ignored. However when the first
               letter is capital, the parameter is mandatory and the bundling process MUST
               stop if he is not able to proceed it.
               Stream parameters use a simple textual format for two main reasons:
-              - Stream level parameters should remains simple and we want to discourage any
+              - Stream level parameters should remain simple and we want to discourage any
                 crazy usage.
-              - Textual data allow easy human inspection of a the bundle2 header in case of
+              - Textual data allow easy human inspection of a bundle2 header in case of
                 troubles.
               Any Applicative level options MUST go into a bundle2 part instead.
                 :typesize: (one byte)
-                :typename: alphanumerical part name
+                :parttype: alphanumerical part name
                 :partid: A 32bits integer (unique in the bundle) that can be used to refer
                          to this part.
                 :parameters:
-                    Part's parameter may have arbitraty content, the binary structure is::
+                    Part's parameter may have arbitrary content, the binary structure is::
                         <mandatory-count><advisory-count><param-sizes><param-data>
                 `chunksize` says)` The payload part is concluded by a zero size chunk.
                 The current implementation always produces either zero or one chunk.
-                This is an implementation limitation that will ultimatly be lifted.
+                This is an implementation limitation that will ultimately be lifted.
             Bundle processing
             ============================
                 """keep record of what happens during and unbundle
                 New records are added using `records.add('cat', obj)`. Where 'cat' is a
-                category of record and obj is an arbitraty object.
+                category of record and obj is an arbitrary object.
                 `records['cat']` will return all entries of this category 'cat'.
                 Use the `addparam` method to add stream level parameter. and `addpart` to
                 populate it. Then call `getchunks` to retrieve all the binary chunks of
-                datathat compose the bundle2 container."""
+                data that compose the bundle2 container."""
                 def __init__(self, ui):
                     self.ui = ui
                 def addpart(self, part):
                     """add a new part to the bundle2 container
-                    Parts contains the actuall applicative payload."""
+                    Parts contains the actual applicative payload."""
                     assert part.id is None
                     part.id = len(self._parts) # very cheap counter
                     self._parts.append(part)
                 @util.propertycache
                 def params(self):
-                    """dictionnary of stream level parameters"""
+                    """dictionary of stream level parameters"""
                     self.ui.debug('reading bundle2 stream parameters\n')
                     params = {}
                     paramssize = self._unpack(_fstreamparamsize)[0]

mercurial/cmdutil.py

0 +1 -1

                 This is an independent function to let extension to plug in and react to
                 the imminent revert.
-                Make sure you have the working directory locked when caling this function.
+                Make sure you have the working directory locked when calling this function.
                 """
                 parent, p2 = parents
                 node = ctx.node()

mercurial/exchange.py

0 +9 -9

-            # exchange.py - utily to exchange data between repo.
+            # exchange.py - utility to exchange data between repos.
             #
             # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
             #
                 It purpose is to carry push related state and very common operation.
-                A new should be created at the begining of each push and discarded
+                A new should be created at the beginning of each push and discarded
                 afterward.
                 """
                     #   we have outgoing changesets but refused to push
                     # - other values as described by addchangegroup()
                     self.ret = None
-                    # discover.outgoing object (contains common and outgoin data)
+                    # discover.outgoing object (contains common and outgoing data)
                     self.outgoing = None
                     # all remote heads before the push
                     self.remoteheads = None
                 pushop.commonheads = cheads
             def _pushsyncphase(pushop):
-                """synchronise phase information locally and remotly"""
+                """synchronise phase information locally and remotely"""
                 unfi = pushop.repo.unfiltered()
                 cheads = pushop.commonheads
                 if pushop.ret:
                 It purpose is to carry push related state and very common operation.
-                A new should be created at the begining of each pull and discarded
+                A new should be created at the beginning of each pull and discarded
                 afterward.
                 """
                     self.common = None
                     # set of pulled head
                     self.rheads = None
-                    # list of missing changeset to fetch remotly
+                    # list of missing changeset to fetch remotely
                     self.fetch = None
-                    # result of changegroup pulling (used as returng code by pull)
+                    # result of changegroup pulling (used as return code by pull)
                     self.cgresult = None
                     # list of step remaining todo (related to future bundle2 usage)
                     self.todosteps = set(['changegroup', 'phases', 'obsmarkers'])
                 return bundle2.unbundle20(repo.ui, util.chunkbuffer(bundler.getchunks()))
             class PushRaced(RuntimeError):
-                """An exception raised during unbunding that indicate a push race"""
+                """An exception raised during unbundling that indicate a push race"""
             def check_heads(repo, their_heads, context):
                 """check if the heads of a repo have been modified
                 """Apply a bundle to a repo.
                 this function makes sure the repo is locked during the application and have
-                mechanism to check that no push race occured between the creation of the
+                mechanism to check that no push race occurred between the creation of the
                 bundle and its application.
                 If the push was raced as PushRaced exception is raised."""

mercurial/merge.py

0 +4 -4

                 def _readrecords(self):
                     """Read merge state from disk and return a list of record (TYPE, data)
-                    We read data from both V1 and Ve files decide which on to use.
+                    We read data from both v1 and v2 files and decide which one to use.
-                    V1 have been used by version prior to 2.9.1 and contains less data than
+                    V1 has been used by version prior to 2.9.1 and contains less data than
-                    v2. We read both version and check if no data in v2 contradict one in
+                    v2. We read both versions and check if no data in v2 contradicts
                     v1. If there is not contradiction we can safely assume that both v1
                     and v2 were written at the same time and use the extract data in v2. If
                     there is contradiction we ignore v2 content as we assume an old version
-                    of Mercurial have over written the mergstate file and left an old v2
+                    of Mercurial has overwritten the mergestate file and left an old v2
                     file around.
                     returns list of record [(TYPE, data), ...]"""

mercurial/obsolete.py

0 +6 -6

                     if ':' in key or '\0' in key:
                         raise ValueError("':' and '\0' are forbidden in metadata key'")
                     if '\0' in value:
-                        raise ValueError("':' are forbidden in metadata value'")
+                        raise ValueError("':' is forbidden in metadata value'")
                 return '\0'.join(['%s:%s' % (k, meta[k]) for k in sorted(meta)])
             def decodemeta(data):
             def _pushkeyescape(markers):
                 """encode markers into a dict suitable for pushkey exchange
-                - binary data is base86 encoded
+                - binary data is base85 encoded
-                - splitted in chunks less than 5300 bytes"""
+                - split in chunks smaller than 5300 bytes"""
                 keys = {}
                 parts = []
                 currentlen = _maxpayload * 2  # ensure we create a new part
                             # Within a marker, a successor may have divergent successors
                             # sets. In such a case, the marker will contribute multiple
                             # divergent successors sets. If multiple successors have
-                            # divergent successors sets, a cartesian product is used.
+                            # divergent successors sets, a Cartesian product is used.
                             #
                             # At the end we post-process successors sets to remove
                             # duplicated entry and successors set that are strict subset of
             def _computebumpedset(repo):
                 """the set of revs trying to obsolete public revisions"""
                 bumped = set()
-                # utils function (avoid attribute lookup in the loop)
+                # util function (avoid attribute lookup in the loop)
                 phase = repo._phasecache.phase # would be faster to grab the full list
                 public = phases.public
                 cl = repo.changelog
                 """Add obsolete markers between changesets in a repo
                 <relations> must be an iterable of (<old>, (<new>, ...)[,{metadata}])
-                tuple. `old` and `news` are changectx. metadata is an optional dictionnary
+                tuple. `old` and `news` are changectx. metadata is an optional dictionary
                 containing metadata for this marker only. It is merged with the global
                 metadata specified through the `metadata` argument of this function,

mercurial/revset.py

0 +1 -1

                 If the ascending attribute is set, that means the two structures are
                 ordered in either an ascending or descending way. Therefore, we can add
-                them mantaining the order by iterating over both at the same time
+                them maintaining the order by iterating over both at the same time
                 This class does not duck-type baseset and it's only supposed to be used
                 internally

mercurial/wireproto.py

0 +6 -6

                     The command is expected to return a stream.
-                    The stream may have been compressed in some implementaitons. This
+                    The stream may have been compressed in some implementations. This
                     function takes care of the decompression. This is the only difference
                     with _callstream.
             commands = {}
             def wireprotocommand(name, args=''):
-                """decorator for wireprotocol command"""
+                """decorator for wire protocol command"""
                 def register(func):
                     commands[name] = (func, args)
                     return func
                 - returns a lists: easy to alter
                 - change done here will be propagated to both `capabilities` and `hello`
-                  command without any other effort. without any other action needed.
+                  command without any other action needed.
                 """
                 # copy to prevent modification of the global list
                 caps = list(wireprotocaps)
                 caps.append('httpheader=1024')
                 return caps
-            # If you are writting and extension and consider wrapping this function. Wrap
+            # If you are writing an extension and consider wrapping this function. Wrap
             # `_capabilities` instead.
             @wireprotocommand('capabilities')
             def capabilities(repo, proto):
                 The format is simple: the server writes out a line with the amount
                 of files, then the total amount of bytes to be transferred (separated
                 by a space). Then, for each file, the server first writes the filename
-                and filesize (separated by the null character), then the file contents.
+                and file size (separated by the null character), then the file contents.
                 '''
                 if not _allowstream(repo.ui):
                         os.unlink(tempname)
                 except util.Abort, inst:
                     # The old code we moved used sys.stderr directly.
-                    # We did not changed it to minise code change.
+                    # We did not change it to minimise code change.
                     # This need to be moved to something proper.
                     # Feel free to do it.
                     sys.stderr.write("abort: %s\n" % inst)

tests/run-tests.py

0 +3 -3

                     help="print a test coverage report")
                 parser.add_option("-d", "--debug", action="store_true",
                     help="debug mode: write output of test scripts to console"
-                         " rather than capturing and diff'ing it (disables timeout)")
+                         " rather than capturing and diffing it (disables timeout)")
                 parser.add_option("-f", "--first", action="store_true",
                     help="exit on the first test failure")
                 parser.add_option("-H", "--htmlcov", action="store_true",
             def globmatch(el, l):
                 # The only supported special characters are * and ? plus / which also
-                # matches \ on windows. Escaping of these caracters is supported.
+                # matches \ on windows. Escaping of these characters is supported.
                 if el + '\n' == l:
                     if os.altsep:
                         # matching on "/" is not needed for this line
                 after = {}
                 pos = prepos = -1
-                # Expected shellscript output
+                # Expected shell script output
                 expected = {}
                 # We keep track of whether or not we're in a Python block so we

tests/test-ancestor.py

0 +1 -1

             # The C gca algorithm requires a real repo. These are textual descriptions of
-            # dags that have been known to be problematic.
+            # DAGs that have been known to be problematic.
             dagtests = [
                 '+2*2*2/*3/2',
                 '+3*3/*2*2/*4*4/*4/2*4/2*2',

tests/test-bookmarks-current.t

0 +1 -1

               [1]
             when a bookmark is active, hg up -r . is
-            analogus to hg book -i <active bookmark>
+            analogous to hg book -i <active bookmark>
               $ hg up -q X
               $ hg up -q .

tests/test-bundle.t

0 +1 -1

             test that verify bundle does not traceback
-            partial history bundle, fails w/ unkown parent
+            partial history bundle, fails w/ unknown parent
               $ hg -R bundle.hg verify
               abort: 00changelog.i@bbd179dfa0a7: unknown parent!

tests/test-command-template.t

0 +2 -2

 : null+2
 : null+1
-            One common tag: longuest path wins:
+            One common tag: longest path wins:
               $ hg tag -r 1 -m t1 -d '6 0' t1
               $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
               $ hg log -R a -r 8 --template '{files % r"{file}\n"}\n'
               fourth\nsecond\nthird\n
-            Test string escapeing in nested expression:
+            Test string escaping in nested expression:
               $ hg log -R a -r 8 --template '{ifeq(r"\x6e", if("1", "\x5c\x786e"), join(files, "\x5c\x786e"))}\n'
               fourth\x6esecond\x6ethird

tests/test-convert.t

0 +1 -1

                   you want to close a branch. Each entry contains a revision or hash
                   separated by white space.
-                  The tagpmap is a file that exactly analogous to the branchmap. This will
+                  The tagmap is a file that exactly analogous to the branchmap. This will
                   rename tags on the fly and prevent the 'update tags' commit usually found
                   at the end of a convert process.

tests/test-encoding-textwrap.t

0 +1 -1

               use "hg -v help show_ambig_ru" to show the global options
-            (2-2-4) display Russian ambiguous-width charactes in utf-8
+            (2-2-4) display Russian ambiguous-width characters in utf-8
               $ COLUMNS=60 HGENCODINGAMBIGUOUS=wide hg --encoding utf-8 --config extensions.show=./show.py help show_ambig_ru
               hg show_ambig_ru

tests/test-grep.t

0 +1 -1

               $ cd ..
-            Issue685: trackback in grep -r after rename
+            Issue685: traceback in grep -r after rename
             Got a traceback when using grep on a single
             revision with renamed files.

tests/test-histedit-fold.t

0 +2 -2

-            Test histedit extention: Fold commands
+            Test histedit extension: Fold commands
             ======================================
             This test file is dedicated to testing the fold command in non conflicting
             folding and creating no new change doesn't break:
             -------------------------------------------------
-            folded content is dropped during a merge. The folded commit should properly disapear.
+            folded content is dropped during a merge. The folded commit should properly disappear.
               $ mkdir fold-to-empty-test
               $ cd fold-to-empty-test

tests/test-i18n.t

0 +1 -1

               abortado: n?o foi encontrado um reposit?rio em '$TESTTMP' (.hg n?o encontrado)!
               [255]
-            Using a more accomodating encoding:
+            Using a more accommodating encoding:
               $ HGENCODING=UTF-8 LANGUAGE=pt_BR hg tip
               abortado: n\xc3\xa3o foi encontrado um reposit\xc3\xb3rio em '$TESTTMP' (.hg n\xc3\xa3o encontrado)! (esc)

tests/test-import-git.t

0 +1 -1

               a874b471193996e7cb034bb301cac7bdaf3e3f46 644   mbinary2
             Binary file and delta hunk (we build the patch using this sed hack to
-            avoid an unquoted ^, which check-code says breaks sh on solaris):
+            avoid an unquoted ^, which check-code says breaks sh on Solaris):
               $ sed 's/ caret /^/g;s/ dollarparen /$(/g' > quote-hack.patch <<'EOF'
               > diff --git a/delta b/delta

tests/test-largefiles-cache.t

0 +1 -1

             Create mirror repo, and pull from source without largefile:
             "pull" is used instead of "clone" for suppression of (1) updating to
-            tip (= cahcing largefile from source repo), and (2) recording source
+            tip (= caching largefile from source repo), and (2) recording source
             repo as "default" path in .hg/hgrc.
               $ hg init mirror

tests/test-largefiles.t

0 +2 -2

               $ cat sub2/large7
               large7
-            Test addremove: verify that files that should be added as largfiles are added as
+            Test addremove: verify that files that should be added as largefiles are added as
-            such and that already-existing largfiles are not added as normal files by
+            such and that already-existing largefiles are not added as normal files by
             accident.
               $ rm normal3

tests/test-mq-guards.t

0 +1 -1

               \x1b[0;31;1mb.patch\x1b[0m (esc)
-            excercise cornercases in "qselect --reapply"
+            excercise corner cases in "qselect --reapply"
               $ hg qpop -a
               popping c.patch

tests/test-newbranch.t

0 +1 -1

               abort: branch foobar not found
               [255]
-            Fastforward merge:
+            Fast-forward merge:
               $ hg branch ff
               marked working directory as branch ff

tests/test-obsolete-divergent.t

0 +1 -1

 fd25390da
               $ hg log -r 'divergent()'
-            Even when subsequente rewriting happen
+            Even when subsequent rewriting happen
               $ mkcommit A_3
               created new head

tests/test-phases-exchange.t

0 +1 -2

               o  0 public a-A - 054250a37db4
-            pushing a locally public and draft changesets remotly secret should make them
+            pushing a locally public and draft changesets remotely secret should make them
             appear on the remote side.
               $ hg -R ../mu phase --secret --force 967b449fbc94
               $ hg push -r 435b5d83910c ../mu
               pushing to ../mu

tests/test-phases.t

0 +3 -3

             (Issue3303)
             Check that remote secret changeset are ignore when checking creation of remote heads
-            We add a secret head into the push destination.  This secreat head shadow a
+            We add a secret head into the push destination. This secret head shadows a
             visible shared between the initial repo and the push destination.
               $ hg up -q 4 # B'
               $ hg phase .
 : secret
-            # We now try to push a new public changeset that descend from the common public
+            We now try to push a new public changeset that descend from the common public
-            # head shadowed by the remote secret head.
+            head shadowed by the remote secret head.
               $ cd ../initialrepo
               $ hg up -q 6 #B'

tests/test-propertycache.py

0 +2 -2

             mercurial.localrepo.localrepository.testcachedunfifoobar = testcachedunfifoobar
-            # create an empty repo. and instanciate it. It is important to run
+            # Create an empty repo and instantiate it. It is important to run
-            # those test on the real object to detect regression.
+            # these tests on the real object to detect regression.
             repopath = os.path.join(os.environ['TESTTMP'], 'repo')
             assert subprocess.call(['hg', 'init', repopath]) == 0
             ui = uimod.ui()

tests/test-push-warn.t

0 +1 -1

               adding file changes
               added 1 changesets with 1 changes to 1 files
-            Pushing muliple headed new branch:
+            Pushing multi headed new branch:
               $ echo 14 > foo
               $ hg -q branch f

tests/test-rebase-scenario-global.t

0 +1 -1

               o  0: 'A'
-            Test that rebase is not confused by $CWD disapearing during rebase (issue 4121)
+            Test that rebase is not confused by $CWD disappearing during rebase (issue 4121)
               $ cd ..
               $ hg init cwd-vanish

tests/test-rename-merge2.t

0 +1 -1

             Systematic and terse testing of merge merges and ancestor calculation:
-            Excpected result:
+            Expected result:
             \  a  m1  m2  dst
 -   f   f   f   "versions differ"

tests/test-revset.t

0 +1 -1

@@ -548,7 +548,7 b' test sorting two sorted collections in d'
548	6	548	6
549	2	549	2
550		550
551	test substracting something from an addset	551	test subtracting something from an addset
552		552
553	$ log '(outgoing() or removes(a)) - removes(a)'	553	$ log '(outgoing() or removes(a)) - removes(a)'
554	8	554	8

tests/test-subrepo-git.t

0 +1 -1

               da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7
               $ cd ..
-            Sticky subrepositorys, file changes
+            Sticky subrepositories, file changes
               $ touch s/f1
               $ cd s
               $ git add f1

tests/test-subrepo-svn.t

0 +1 -1

               $ cd ..
-            Sticky subrepositorys, file changes
+            Sticky subrepositories, file changes
               $ touch s/f1
               $ cd s
               $ svn add f1

tests/test-subrepo.t

0 +2 -2

               $ hg -R t id
               e95bcfa18a35
-            Sticky subrepositorys, file changes
+            Sticky subrepositories, file changes
               $ touch s/f1
               $ touch t/f1
               $ hg add -S s/f1
               $ cd ..
-            Test that comit --secret works on both repo and subrepo (issue4182)
+            Test that commit --secret works on both repo and subrepo (issue4182)
               $ cd main
               $ echo secret >> b

tests/test-transplant.t

0 +2 -2

                   "transplanted([set])"
                     Transplanted changesets in set, or all transplanted changesets.
-            test tranplanted keyword
+            test transplanted keyword
               $ hg log --template '{rev} {transplanted}\n'
 a53251cdf717679d1907b289f991534be05c997a
               $ hg ci -m appendd
               created new head
-            tranplant
+            transplant
               $ hg transplant -m 1
               applying 42dc4432fd35

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