[PATCH] spelling: fixes from proofreading of spell checker issues

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1397767658 -7200
#      Thu Apr 17 22:47:38 2014 +0200
# Node ID 4901e6ad8a11fb76449599a0314040dd338346c7
# Parent  416c133145ee78c8e83865b7370e185eed69c1be
spelling: fixes from proofreading of spell checker issues

diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py
--- a/hgext/largefiles/lfutil.py
+++ b/hgext/largefiles/lfutil.py
@@ -538,7 +538,7 @@ def updatestandinsbymatch(repo, match):
     return match
 
 class automatedcommithook(object):
-    '''Statefull hook to update standins at the 1st commit of resuming
+    '''Stateful hook to update standins at the 1st commit of resuming
 
     For efficiency, updating standins in the working directory should
     be avoided while automated committing (like rebase, transplant and
@@ -562,7 +562,7 @@ def getstatuswriter(ui, repo, forcibly=N
     '''Return the function to write largefiles specific status out
 
     If ``forcibly`` is ``None``, this returns the last element of
-    ``repo._lfupdatereporters`` as "default" writer function.
+    ``repo._lfstatuswriters`` as "default" writer function.
 
     Otherwise, this returns the function to always write out (or
     ignore if ``not forcibly``) status.
@@ -571,6 +571,6 @@ def getstatuswriter(ui, repo, forcibly=N
         return repo._lfstatuswriters[-1]
     else:
         if forcibly:
-            return ui.status # forcibly WRITE OUT
+            return ui.status
         else:
-            return lambda *msg, **opts: None # forcibly IGNORE
+            return lambda *msg, **opts: None
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -54,7 +54,7 @@ def restorematchfn():
     was called.  no-op if scmutil.match is its original function.
 
     Note that n calls to installmatchfn will require n calls to
-    restore matchfn to reverse'''
+    restore the original matchfn.'''
     scmutil.match = getattr(scmutil.match, 'oldmatch')
 
 def installmatchandpatsfn(f):
@@ -69,7 +69,7 @@ def restorematchandpatsfn():
     is its original function.
 
     Note that n calls to installmatchandpatsfn will require n calls
-    to restore matchfn to reverse'''
+    to restore the original matchfn.'''
     scmutil.matchandpats = getattr(scmutil.matchandpats, 'oldmatchandpats',
             scmutil.matchandpats)
 
@@ -375,7 +375,7 @@ def overrideupdate(orig, ui, repo, *pats
         wlock.release()
 
 # Before starting the manifest merge, merge.updates will call
-# checkunknown to check if there are any files in the merged-in
+# _checkunknownfile to check if there are any files in the merged-in
 # changeset that collide with unknown files in the working copy.
 #
 # The largefiles are seen as unknown, so this prevents us from merging
diff --git a/hgext/largefiles/reposetup.py b/hgext/largefiles/reposetup.py
--- a/hgext/largefiles/reposetup.py
+++ b/hgext/largefiles/reposetup.py
@@ -285,7 +285,7 @@ def reposetup(ui, repo):
         def _subdirlfs(self, files, lfiles):
             '''
             Adjust matched file list
-            If we pass a directory to commit whose only commitable files
+            If we pass a directory to commit whose only committable files
             are largefiles, the core commit code aborts before finding
             the largefiles.
             So we do the following:
@@ -343,7 +343,7 @@ def reposetup(ui, repo):
     repo._lfcommithooks = [lfutil.updatestandinsbymatch]
 
     # Stack of status writer functions taking "*msg, **opts" arguments
-    # like "ui.status()". Only last element ("_lfupdatereporters[-1]")
+    # like "ui.status()". Only last element ("_lfstatuswriters[-1]")
     # is used to write status out.
     repo._lfstatuswriters = [ui.status]
 
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1038,8 +1038,8 @@ class committablectx(basectx):
         """generate a manifest corresponding to the values in self._status
 
         This reuse the file nodeid from parent, but we append an extra letter
-        when modified.  Modified files get an extra 'm' while added files get
-        appened an extra 'a'. This is used by manifests merge to see that files
+        when modified. Modified files get an extra 'm' while added files get
+        an extra 'a'. This is used by manifests merge to see that files
         are different and by update logic to avoid deleting newly added files.
         """
 
@@ -1426,9 +1426,9 @@ class workingctx(committablectx):
         against its parent (repo['.']).
         """
         s = self._dirstatestatus(match, listignored, listclean, listunknown)
-        # Filter out symlinks that, in the case of FAT32 and NTFS filesytems,
+        # Filter out symlinks that, in the case of FAT32 and NTFS filesystems,
         # might have accidentally ended up with the entire contents of the file
-        # they are susposed to be linking to.
+        # they are supposed to be linking to.
         s.modified[:] = self._filtersuspectsymlink(s.modified)
         if other != self._repo['.']:
             s = super(workingctx, self)._buildstatus(other, s, match,
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -824,7 +824,7 @@ class pulloperation(object):
         return self.trmanager.transaction()
 
 class transactionmanager(object):
-    """An object to manages the lifecycle of a transaction
+    """An object to manage the life cycle of a transaction
 
     It creates the transaction on demand and calls the appropriate hooks when
     closing the transaction."""
diff --git a/mercurial/transaction.py b/mercurial/transaction.py
--- a/mercurial/transaction.py
+++ b/mercurial/transaction.py
@@ -129,13 +129,13 @@ class transaction(object):
 
         # hold file generations to be performed on commit
         self._filegenerators = {}
-        # hold callbalk to write pending data for hooks
+        # hold callback to write pending data for hooks
         self._pendingcallback = {}
         # True is any pending data have been written ever
         self._anypending = False
         # holds callback to call when writing the transaction
         self._finalizecallback = {}
-        # hold callbalk for post transaction close
+        # hold callback for post transaction close
         self._postclosecallback = {}
 
     def __del__(self):
@@ -250,7 +250,7 @@ class transaction(object):
 
         The `location` arguments may be used to indicate the files are located
         outside of the the standard directory for transaction. It should match
-        one of the key of the `transaction.vfsmap` dictionnary.
+        one of the key of the `transaction.vfsmap` dictionary.
         """
         # For now, we are unable to do proper backup and restore of custom vfs
         # but for bookmarks that are handled outside this mechanism.
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -552,7 +552,7 @@ def nogc(func):
     container objects (the number being defined by gc.get_threshold()) are
     allocated even when marked not to be tracked by the collector. Tracking has
     no effect on when GCs are triggered, only on what objects the GC looks
-    into. As a workaround, disable GC while building complexe (huge)
+    into. As a workaround, disable GC while building complex (huge)
     containers.
 
     This garbage collector issue have been fixed in 2.7.
diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -55,7 +55,7 @@ import bookmark by name
   Y	4e3505fd95835d721066b76e75dbb8cc554d7f77
   Z	4e3505fd95835d721066b76e75dbb8cc554d7f77
 
-delete the bookmark to repull it
+delete the bookmark to re-pull it
 
   $ hg book -d X
   $ hg pull -B X ../a
@@ -177,7 +177,7 @@ divergent bookmarks
      Y                         0:4e3505fd9583
      Z                         1:0d2164f0ce0d
 
-explicite pull should overwrite the local version (issue4439)
+explicit pull should overwrite the local version (issue4439)
 
   $ hg pull --config paths.foo=../a foo -B X
   pulling from $TESTTMP/a (glob)
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
@@ -80,7 +80,7 @@ Create an extension to test bundle2 API
   >           ('r', 'rev', [], 'includes those changeset in the bundle'),],
   >          '[OUTPUTFILE]')
   > def cmdbundle2(ui, repo, path=None, **opts):
-  >     """write a bundle2 container on standard ouput"""
+  >     """write a bundle2 container on standard output"""
   >     bundler = bundle2.bundle20(ui)
   >     for p in opts['param']:
   >         p = p.split('=', 1)
diff --git a/tests/test-merge-force.t b/tests/test-merge-force.t
--- a/tests/test-merge-force.t
+++ b/tests/test-merge-force.t
@@ -228,11 +228,11 @@ Merge with remote
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
 
-Check which files need to be resolved (should correspond to the ouput above).
+Check which files need to be resolved (should correspond to the output above).
 This should be the files for which the base (1st filename segment), the remote
 (2nd segment) and the working copy (4th segment) are all different.
 
-Interestingly, one untracked file got merged and added, which corresponds the
+Interestingly, one untracked file got merged and added, which corresponds to the
 odd 'if force and branchmerge and different' case in manifestmerge().
 
   $ hg resolve -l