Merge spelling fixes

contrib/mercurial.el

@@ -461,7 +461,7 b' Each key is of the form (section . name)'
 (defun hg-complete-repo (string predicate all)
   "Attempt to complete a repository name.
 We complete on either symbolic names from Mercurial's config or real
-directory names from the file system.  We do not penalise URLs."
+directory names from the file system.  We do not penalize URLs."
   (or (if all
 	  (all-completions string hg-repo-completion-table predicate)
 	(try-completion string hg-repo-completion-table predicate))

contrib/vim/hgcommand.vim

@@ -27,7 +27,7 b''
 "
 " You still can read the documentation at the end of this file. Locate it by
 " searching the "hgcommand-contents" string (and set ft=help to have
-" appropriate syntaxic coloration).
+" appropriate syntactic coloration).
 
 " Section: Plugin header {{{1
 
@@ -752,7 +752,7 b' function! s:HGCommit(...)'
     " Protect against case and backslash issues in Windows.
     let autoPattern = '\c' . messageFileName
 
-    " Ensure existance of group
+    " Ensure existence of group
     augroup HGCommit
     augroup END
 

contrib/vim/patchreview.vim

@@ -17,7 +17,7 b''
 "
 "   0.2.1 - Minor temp directory autodetection logic and cleanup
 "
-"   0.2 - Removed the need for filterdiff by implemeting it in pure vim script
+"   0.2 - Removed the need for filterdiff by implementing it in pure vim script
 "       - Added DiffReview command for reverse (changed repository to
 "         pristine state) reviews.
 "         (PatchReview does pristine repository to patch review)

doc/hgmanpage.py

@@ -158,7 +158,7 b' class Translator(nodes.NodeVisitor):'
     """"""
 
     words_and_spaces = re.compile(r'\S+| +|\n')
-    document_start = """Man page generated from reStructeredText."""
+    document_start = """Man page generated from reStructuredText."""
 
     def __init__(self, document):
         nodes.NodeVisitor.__init__(self, document)
@@ -900,7 +900,7 b' class Translator(nodes.NodeVisitor):'
         # ``.PP`` : Start standard indented paragraph.
         # ``.LP`` : Start block paragraph, all except the first.
         # ``.P [type]``  : Start paragraph type.
-        # NOTE dont use paragraph starts because they reset indentation.
+        # NOTE don't use paragraph starts because they reset indentation.
         # ``.sp`` is only vertical space
         self.ensure_eol()
         self.body.append('.sp\n')

hgext/bugzilla.py

@@ -45,7 +45,7 b' Access via XMLRPC/email uses XMLRPC to q'
 email to the Bugzilla email interface to submit comments to bugs.
 The From: address in the email is set to the email address of the Mercurial
 user, so the comment appears to come from the Mercurial user. In the event
-that the Mercurial user email is not recognised by Bugzilla as a Bugzilla
+that the Mercurial user email is not recognized by Bugzilla as a Bugzilla
 user, the email associated with the Bugzilla username used to log into
 Bugzilla is used instead as the source of the comment. Marking bugs fixed
 works on all supported Bugzilla versions.
@@ -53,7 +53,7 b' works on all supported Bugzilla versions'
 Configuration items common to all access modes:
 
 bugzilla.version
-  This access type to use. Values recognised are:
+  The access type to use. Values recognized are:
 
   :``xmlrpc``:       Bugzilla XMLRPC interface.
   :``xmlrpc+email``: Bugzilla XMLRPC and email interfaces.
@@ -303,7 +303,7 b' class bzaccess(object):'
     # Methods to be implemented by access classes.
     #
     # 'bugs' is a dict keyed on bug id, where values are a dict holding
-    # updates to bug state. Recognised dict keys are:
+    # updates to bug state. Recognized dict keys are:
     #
     # 'hours': Value, float containing work hours to be updated.
     # 'fix':   If key present, bug is to be marked fixed. Value ignored.

hgext/convert/transport.py

@@ -43,7 +43,7 b' def _create_auth_baton(pool):'
         svn.client.get_ssl_client_cert_pw_file_provider(pool),
         svn.client.get_ssl_server_trust_file_provider(pool),
         ]
-    # Platform-dependant authentication methods
+    # Platform-dependent authentication methods
     getprovider = getattr(svn.core, 'svn_auth_get_platform_specific_provider',
                           None)
     if getprovider:

hgext/eol.py

@@ -99,7 +99,7 b" testedwith = 'internal'"
 # Matches a lone LF, i.e., one that is not part of CRLF.
 singlelf = re.compile('(^|[^\r])\n')
 # Matches a single EOL which can either be a CRLF where repeated CR
-# are removed or a LF. We do not care about old Machintosh files, so a
+# are removed or a LF. We do not care about old Macintosh files, so a
 # stray CR is an error.
 eolre = re.compile('\r*\n')
 

hgext/inotify/linux/_inotify.c

@@ -61,7 +61,7 b' PyDoc_STRVAR('
 	init_doc,
 	"init() -> fd\n"
 	"\n"
-	"Initialise an inotify instance.\n"
+	"Initialize an inotify instance.\n"
 	"Return a file descriptor associated with a new inotify event queue.");
 
 static PyObject *add_watch(PyObject *self, PyObject *args)

mercurial/commands.py

@@ -1696,7 +1696,7 b' def debugdag(ui, repo, file_=None, *revs'
     """format the changelog or an index DAG as a concise textual description
 
     If you pass a revlog index, the revlog's DAG is emitted. If you list
-    revision numbers, they get labelled in the output as rN.
+    revision numbers, they get labeled in the output as rN.
 
     Otherwise, the changelog DAG of the current repo is emitted.
     """

mercurial/config.py

@@ -67,9 +67,9 b' class config(object):'
         return self._data.get(section, {}).get(item, default)
 
     def backup(self, section, item):
-        """return a tuple allowing restore to reinstall previous values
+        """return a tuple allowing restore to reinstall a previous value
 
-        The main reason we need it is because it handle the "no data" case.
+        The main reason we need it is because it handles the "no data" case.
         """
         try:
             value = self._data[section][item]

mercurial/dagparser.py

@@ -56,13 +56,13 b' def parsedag(desc):'
         ... :forkhere  # a label for the last of the 3 nodes from above
         ... +5         # 5 more nodes on one branch
         ... :mergethis # label again
-        ... <forkhere  # set default parent to labelled fork node
+        ... <forkhere  # set default parent to labeled fork node
         ... +10        # 10 more nodes on a parallel branch
         ... @stable    # following nodes will be annotated as "stable"
         ... +5         # 5 nodes in stable
         ... !addfile   # custom command; could trigger new file in next node
         ... +2         # two more nodes
-        ... /mergethis # merge last node with labelled node
+        ... /mergethis # merge last node with labeled node
         ... +4         # 4 more nodes descending from merge node
         ...
         ... """)))

mercurial/localrepo.py

@@ -299,9 +299,9 b' class localrepository(object):'
     def hiddenrevs(self):
         """hiddenrevs: revs that should be hidden by command and tools
 
-        This set is carried on the repo to ease initialisation and lazy
+        This set is carried on the repo to ease initialization and lazy
         loading; it'll probably move back to changelog for efficiency and
-        consistency reason
+        consistency reasons.
 
         Note that the hiddenrevs will needs invalidations when
         - a new changesets is added (possible unstable above extinct)

mercurial/lock.py

@@ -122,7 +122,7 b' class lock(object):'
     def release(self):
         """release the lock and execute callback function if any
 
-        If the lock has been acquired multiple time, the actual release is
+        If the lock has been acquired multiple times, the actual release is
         delayed to the last release call."""
         if self.held > 1:
             self.held -= 1

mercurial/obsolete.py

@@ -226,9 +226,9 b' class obsstore(object):'
             self.caches.clear()
         return len(new)
 
-    def mergemarkers(self, transation, data):
+    def mergemarkers(self, transaction, data):
         markers = _readmarkers(data)
-        self.add(transation, markers)
+        self.add(transaction, markers)
 
     def _load(self, markers):
         for mark in markers:
@@ -320,7 +320,7 b' def successormarkers(ctx):'
 def anysuccessors(obsstore, node):
     """Yield every successor of <node>
 
-    This is a linear yield unsuitable to detect split changesets."""
+    This is a linear yield unsuited to detecting split changesets."""
     remaining = set([node])
     seen = set(remaining)
     while remaining:

mercurial/parser.py

@@ -13,7 +13,7 b''
 # tokenizer is an iterator that returns type, value pairs
 # elements is a mapping of types to binding strength, prefix and infix actions
 # an action is a tree node name, a tree label, and an optional match
-# __call__(program) parses program into a labelled tree
+# __call__(program) parses program into a labeled tree
 
 import error
 from i18n import _

mercurial/phases.py

@@ -315,7 +315,7 b' def listphases(repo):'
     return keys
 
 def pushphase(repo, nhex, oldphasestr, newphasestr):
-    """List phases root for serialisation over pushkey"""
+    """List phases root for serialization over pushkey"""
     lock = repo.lock()
     try:
         currentphase = repo[nhex].phase()

tests/blacklists/inotify-failures

@@ -10,7 +10,7 b' test-qrecord'
 test-strict
 
 # --inotify activates de facto the inotify extension. It does not play well
-# with inotify-specific tests, which activate/desactivate inotify at will:
+# with inotify-specific tests, which activate/deactivate inotify at will:
 test-inotify
 test-inotify-debuginotify
 test-inotify-dirty-dirstate

tests/test-bookmarks-strip.t

@@ -34,7 +34,7 b' set bookmark'
 
   $ hg book test2
 
-update to -2 (inactives the active bookmark)
+update to -2 (deactivates the active bookmark)
 
   $ hg update -r -2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-copy.t

@@ -139,7 +139,7 b' moving a missing file'
   foo3 does not exist!
   $ hg up -qC .
 
-copy --after to a nonexistant target filename
+copy --after to a nonexistent target filename
   $ hg cp -A foo dummy
   foo: not recording copy - dummy does not exist
 

tests/test-debugindexdot.t

@@ -1,4 +1,4 b''
-Just exercize debugindexdot
+Just exercise debugindexdot
 Create a short file history including a merge.
   $ hg init t
   $ cd t

tests/test-diff-issue2761.t

@@ -15,9 +15,9 b' Same issue, different code path'
 
   $ hg up -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ touch doesnt-exist-in-1
+  $ touch does-not-exist-in-1
   $ hg add
-  adding doesnt-exist-in-1
+  adding does-not-exist-in-1
   $ hg ci -m third
-  $ rm doesnt-exist-in-1
+  $ rm does-not-exist-in-1
   $ hg diff -r 1

tests/test-filelog.py

@@ -12,7 +12,7 b" fl = repo.file('foobar')"
 
 def addrev(text, renamed=False):
     if renamed:
-        # data doesnt matter. Just make sure filelog.renamed() returns True
+        # data doesn't matter. Just make sure filelog.renamed() returns True
         meta = dict(copyrev=hex(nullid), copy='bar')
     else:
         meta = {}

tests/test-hook.t

@@ -529,12 +529,12 b' test python hook configured with python:'
   [1]
 
   $ echo '[hooks]' > .hg/hgrc
-  $ echo "update.ne = python:`pwd`/nonexisting.py:testhook" >> .hg/hgrc
+  $ echo "update.ne = python:`pwd`/nonexistent.py:testhook" >> .hg/hgrc
   $ echo "pre-identify.npmd = python:`pwd`/:no_python_module_dir" >> .hg/hgrc
 
   $ hg up null
   loading update.ne hook failed:
-  abort: No such file or directory: $TESTTMP/d/repo/nonexisting.py
+  abort: No such file or directory: $TESTTMP/d/repo/nonexistent.py
   [255]
 
   $ hg id
@@ -581,7 +581,7 b' commit and update hooks should run after'
   cb9a9f314b8b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-make sure --verbose (and --quiet/--debug etc.) are propogated to the local ui
+make sure --verbose (and --quiet/--debug etc.) are propagated to the local ui
 that is passed to pre/post hooks
 
   $ echo '[hooks]' > .hg/hgrc

tests/test-inotify-issue1371.t

@@ -22,7 +22,7 b' let the daemon finish its stuff'
 
   $ sleep 1
 
-eed to test all file opperations
+eed to test all file operations
 
   $ hg rm a
   $ rm b

tests/test-keyword.t

@@ -814,7 +814,7 b' Clone to test global and local configura'
 
   $ cd ..
 
-Expansion in destinaton with global configuration
+Expansion in destination with global configuration
 
   $ hg --quiet clone Test globalconf
   $ cat globalconf/a

tests/test-merge-tools.t

@@ -191,7 +191,7 b' or true.executable not found in PATH:'
   false.whatever=
   true.priority=1
   # hg update -C 1
-  $ hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool
+  $ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -212,7 +212,7 b' or true.executable with bogus path:'
   false.whatever=
   true.priority=1
   # hg update -C 1
-  $ hg merge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool
+  $ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool
   merging f
   merging f failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -336,7 +336,7 b' merge-patterns specifies executable not '
   true.priority=1
   true.executable=cat
   # hg update -C 1
-  $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool
+  $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool
   couldn't find merge tool true specified for f
   merging f
   merging f failed!
@@ -359,7 +359,7 b' merge-patterns specifies executable with'
   true.priority=1
   true.executable=cat
   # hg update -C 1
-  $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool
+  $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool
   couldn't find merge tool true specified for f
   merging f
   merging f failed!

tests/test-mq-qimport.t

@@ -240,7 +240,7 b' qimport -e --name with --force'
 
 qimport with bad name, should abort before reading file
 
-  $ hg qimport non-existant-file --name .hg
+  $ hg qimport non-existent-file --name .hg
   abort: patch name cannot begin with ".hg"
   [255]
 

tests/test-mq-qpush-fail.t

@@ -34,7 +34,7 b' test qpush on empty series'
   $ python -c 'print "\xe9"' > message
   $ cat .hg/patches/bad-patch >> message
   $ mv message .hg/patches/bad-patch
-  $ hg qpush -a && echo 'qpush succeded?!'
+  $ hg qpush -a && echo 'qpush succeeded?!'
   applying patch1
   applying patch2
   applying bad-patch

tests/test-mq-qrefresh-replace-log-message.t

@@ -1,4 +1,4 b''
-Environement setup for MQ
+Environment setup for MQ
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH

tests/test-mq-qrefresh.t

@@ -207,7 +207,7 b' qrefresh --short tests:'
 
   $ echo 'orphan' > orphanchild
   $ hg add orphanchild
-  $ hg qrefresh nonexistingfilename # clear patch
+  $ hg qrefresh nonexistentfilename # clear patch
   $ hg qrefresh --short 1/base
   $ hg qrefresh --short 2/base
 

tests/test-mq-subrepo.t

@@ -478,7 +478,7 b" both into 'revision' and 'patch file und"
   adding .hgsub
   $ hg -R sub update -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg commit -Am '#2 in parent (but be rollbacked soon)'
+  $ hg commit -Am '#2 in parent (but will be rolled back soon)'
   $ hg rollback
   repository tip rolled back to revision 1 (undo commit)
   working directory now based on revision 1

tests/test-patchbomb.t

@@ -1877,7 +1877,7 b' test single flag for multiple patches:'
   +b
   
 
-test mutiple flags for single patch:
+test multiple flags for single patch:
   $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \
   >  -c bar -s test -r 2
   this patch series consists of 1 patches.

tests/test-pull.t

@@ -68,7 +68,7 b' Issue622: hg init && hg pull -u URL does'
 
 Test 'file:' uri handling:
 
-  $ hg pull -q file://../test-doesnt-exist
+  $ hg pull -q file://../test-does-not-exist
   abort: file:// URLs can only refer to localhost
   [255]
 

tests/test-qrecord.t

@@ -108,9 +108,9 b' qrecord patch (mq not present)'
 
 help (bad mq)
 
-  $ echo "mq=nonexistant" >> $HGRCPATH
+  $ echo "mq=nonexistent" >> $HGRCPATH
   $ hg help qrecord
-  *** failed to import extension mq from nonexistant: [Errno 2] * (glob)
+  *** failed to import extension mq from nonexistent: [Errno 2] * (glob)
   hg qrecord [OPTION]... PATCH [FILE]...
   
   interactively record a new patch
@@ -121,7 +121,7 b' help (bad mq)'
 
 help (mq present)
 
-  $ sed 's/mq=nonexistant/mq=/' $HGRCPATH > hgrc.tmp
+  $ sed 's/mq=nonexistent/mq=/' $HGRCPATH > hgrc.tmp
   $ mv hgrc.tmp $HGRCPATH
 
   $ hg help qrecord

tests/test-rebase-abort.t

@@ -78,7 +78,7 b' Abort:'
   $ cd ..
 
 
-Constrcut new repo:
+Construct new repo:
 
   $ hg init b
   $ cd b

tests/test-rename.t

@@ -66,7 +66,7 b' rename --after a single file when src an'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm d2/c
 
-rename --after a single file to a nonexistant target filename
+rename --after a single file to a nonexistent target filename
 
   $ hg rename --after d1/a dummy
   d1/a: not recording move - dummy does not exist (glob)

tests/test-simplemerge.py

@@ -138,7 +138,7 b' class TestMerge3(TestCase):'
                     ['aaa', 'bbb', 'zz'],
                     ['zz'])
 
-        # todo: should use a sentinal at end as from get_matching_blocks
+        # todo: should use a sentinel at end as from get_matching_blocks
         # to match without zz
         self.assertEquals(list(m3.find_sync_regions()),
                           [(0, 1,  2, 3,  0, 1),
@@ -156,7 +156,7 b' class TestMerge3(TestCase):'
         m3 = Merge3([],
                     ['aaa', 'bbb'],
                     [])
-        # todo: should use a sentinal at end as from get_matching_blocks
+        # todo: should use a sentinel at end as from get_matching_blocks
         # to match without zz
         self.assertEquals(list(m3.find_sync_regions()),
                           [(0, 0,  2, 2,  0, 0)])

tests/test-static-http.t

@@ -97,8 +97,8 b' trying to push'
 trying clone -r
 
   $ cd ..
-  $ hg clone -r donotexist static-http://localhost:$HGPORT/remote local0
-  abort: unknown revision 'donotexist'!
+  $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0
+  abort: unknown revision 'doesnotexist'!
   [255]
   $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0
   adding changesets

tests/test-symlinks.t

@@ -46,7 +46,7 b' test what happens if we want to trick hg'
   $ rm dir/a.o
   $ rm dir/b.o
   $ mkdir dir/a.o
-  $ ln -s nonexist dir/b.o
+  $ ln -s nonexistent dir/b.o
   $ mkfifo a.c
 
 it should show a.c, dir/a.o and dir/b.o deleted