# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1445036326 -7200
# Node ID 1aee2ab0f90293010b78f05c3daf2697866b1f30
# Parent  bbf544b5f2e99eff3a787f9212b4920d447ac9ce
spelling: trivial spell checking

diff -r bbf544b5f2e9 -r 1aee2ab0f902 contrib/import-checker.py
--- a/contrib/import-checker.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/contrib/import-checker.py	Sat Oct 17 00:58:46 2015 +0200
@@ -65,7 +65,7 @@
     Mercurial specific) modules.
 
     This function assumes that module names not existing in
-    `localmods` are ones of Python standard libarary.
+    `localmods` are from the Python standard library.
 
     This function returns the function, which takes `name` argument,
     and returns `(absname, dottedpath, hassubmod)` tuple if `name`
diff -r bbf544b5f2e9 -r 1aee2ab0f902 contrib/revsetbenchmarks.py
--- a/contrib/revsetbenchmarks.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/contrib/revsetbenchmarks.py	Sat Oct 17 00:58:46 2015 +0200
@@ -61,7 +61,7 @@
     except CalledProcessError as exc:
         print >> sys.stderr, 'abort: cannot run revset benchmark: %s' % exc.cmd
         if exc.output is None:
-            print >> sys.stderr, '(no ouput)'
+            print >> sys.stderr, '(no output)'
         else:
             print >> sys.stderr, exc.output
         return None
@@ -114,7 +114,7 @@
 def getfactor(main, other, field, sensitivity=0.05):
     """return the relative factor between values for 'field' in main and other
 
-    Return None if the factor is insignicant (less than <sensitivity>
+    Return None if the factor is insignificant (less than <sensitivity>
     variation)."""
     factor = 1
     if main is not None:
@@ -218,7 +218,7 @@
 
 helptext="""This script will run multiple variants of provided revsets using
 different revisions in your mercurial repository. After the benchmark are run
-summary output is provided. Use itto demonstrate speed improvements or pin
+summary output is provided. Use it to demonstrate speed improvements or pin
 point regressions. Revsets to run are specified in a file (or from stdin), one
 revsets per line. Line starting with '#' will be ignored, allowing insertion of
 comments."""
diff -r bbf544b5f2e9 -r 1aee2ab0f902 doc/hgmanpage.py
--- a/doc/hgmanpage.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/doc/hgmanpage.py	Sat Oct 17 00:58:46 2015 +0200
@@ -427,7 +427,7 @@
         pass
 
     def visit_block_quote(self, node):
-        # BUG/HACK: indent always uses the _last_ indention,
+        # BUG/HACK: indent always uses the _last_ indentation,
         # thus we need two of them.
         self.indent(BLOCKQOUTE_INDENT)
         self.indent(0)
diff -r bbf544b5f2e9 -r 1aee2ab0f902 hgeditor
--- a/hgeditor	Wed Oct 14 03:30:27 2015 -0400
+++ b/hgeditor	Sat Oct 17 00:58:46 2015 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # This is an example of using HGEDITOR to create of diff to review the
-# changes while commiting.
+# changes while committing.
 
 # If you want to pass your favourite editor some other parameters
 # only for Mercurial, modify this:
diff -r bbf544b5f2e9 -r 1aee2ab0f902 hgext/censor.py
--- a/hgext/censor.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/hgext/censor.py	Sat Oct 17 00:58:46 2015 +0200
@@ -13,7 +13,7 @@
 
 Typical uses for censor are due to security or legal requirements, including::
 
- * Passwords, private keys, crytographic material
+ * Passwords, private keys, cryptographic material
  * Licensed data/code/libraries for which the license has expired
  * Personally Identifiable Information or other private data
 
diff -r bbf544b5f2e9 -r 1aee2ab0f902 hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/hgext/largefiles/overrides.py	Sat Oct 17 00:58:46 2015 +0200
@@ -324,7 +324,7 @@
             back = util.pconvert(m.rel(hglf)[:-len(hglf)])
 
             def tostandin(f):
-                # The file may already be a standin, so trucate the back
+                # The file may already be a standin, so truncate the back
                 # prefix and test before mangling it.  This avoids turning
                 # 'glob:../.hglf/foo*' into 'glob:../.hglf/../.hglf/foo*'.
                 if f.startswith(back) and lfutil.splitstandin(f[len(back):]):
diff -r bbf544b5f2e9 -r 1aee2ab0f902 hgext/rebase.py
--- a/hgext/rebase.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/hgext/rebase.py	Sat Oct 17 00:58:46 2015 +0200
@@ -198,8 +198,8 @@
     originalwd = target = None
     activebookmark = None
     external = nullrev
-    # Mapping between thes old revision id and either what is the new rebased
-    # revision or what needs to be done with the old revsion. The state dict
+    # Mapping between the old revision id and either what is the new rebased
+    # revision or what needs to be done with the old revision. The state dict
     # will be what contains most of the rebase progress state.
     state = {}
     skipped = set()
@@ -1172,7 +1172,7 @@
     rebased that have a successors in the destination"""
     obsoletenotrebased = {}
 
-    # Build a mapping succesor => obsolete nodes for the obsolete
+    # Build a mapping successor => obsolete nodes for the obsolete
     # nodes to be rebased
     allsuccessors = {}
     cl = repo.changelog
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/bookmarks.py
--- a/mercurial/bookmarks.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/bookmarks.py	Sat Oct 17 00:58:46 2015 +0200
@@ -171,7 +171,7 @@
 
 def deactivate(repo):
     """
-    Unset the active bookmark in this reposiotry.
+    Unset the active bookmark in this repository.
     """
     wlock = repo.wlock()
     try:
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/cmdutil.py	Sat Oct 17 00:58:46 2015 +0200
@@ -63,7 +63,7 @@
     """ Prompts the user to filter the originalhunks and return a list of
     selected hunks.
     *operation* is used for ui purposes to indicate the user
-    what kind of filtering they are doing: reverting, commiting, shelving, etc.
+    what kind of filtering they are doing: reverting, committing, shelving, etc.
     *operation* has to be a translated string.
     """
     usecurses =  ui.configbool('experimental', 'crecord', False)
@@ -841,7 +841,7 @@
 # arguments:
 # - repo: the localrepository instance,
 # - patchdata: data extracted from patch header (cf m.patch.patchheadermap),
-# - extra: the future extra dictionnary of the changeset, please mutate it,
+# - extra: the future extra dictionary of the changeset, please mutate it,
 # - opts: the import options.
 # XXX ideally, we would just pass an ctx ready to be computed, that would allow
 # mutation of in memory commit and more. Feel free to rework the code to get
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/copies.py
--- a/mercurial/copies.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/copies.py	Sat Oct 17 00:58:46 2015 +0200
@@ -241,7 +241,7 @@
     """return a 'getfctx' function suitable for checkcopies usage
 
     We have to re-setup the function building 'filectx' for each
-    'checkcopies' to ensure the linkrev adjustement is properly setup for
+    'checkcopies' to ensure the linkrev adjustment is properly setup for
     each. Linkrev adjustment is important to avoid bug in rename
     detection. Moreover, having a proper '_ancestrycontext' setup ensures
     the performance impact of this adjustment is kept limited. Without it,
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/crecord.py
--- a/mercurial/crecord.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/crecord.py	Sat Oct 17 00:58:46 2015 +0200
@@ -195,7 +195,7 @@
 class uiheader(patchnode):
     """patch header
 
-    xxx shoudn't we move this to mercurial/patch.py ?
+    xxx shouldn't we move this to mercurial/patch.py ?
     """
 
     def __init__(self, header):
@@ -1434,7 +1434,7 @@
         """
         once we scrolled with pg up pg down we can be pointing outside of the
         display zone. we print the patch with towin=False to compute the
-        location of the selected item eventhough it is outside of the displayed
+        location of the selected item even though it is outside of the displayed
         zone and then update the scroll.
         """
         self.printitem(towin=False)
@@ -1442,7 +1442,7 @@
 
     def toggleedit(self, item=None, test=False):
         """
-            edit the currently chelected chunk
+            edit the currently selected chunk
         """
         def updateui(self):
             self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/dirstate.py
--- a/mercurial/dirstate.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/dirstate.py	Sat Oct 17 00:58:46 2015 +0200
@@ -80,7 +80,7 @@
         self._filename = 'dirstate'
         self._pendingfilename = '%s.pending' % self._filename
 
-        # for consitent view between _pl() and _read() invocations
+        # for consistent view between _pl() and _read() invocations
         self._pendingmode = None
 
     def beginparentchange(self):
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/exchange.py
--- a/mercurial/exchange.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/exchange.py	Sat Oct 17 00:58:46 2015 +0200
@@ -610,7 +610,7 @@
 def _pushb2ctxcheckheads(pushop, bundler):
     """Generate race condition checking parts
 
-    Exists as an indepedent function to aid extensions
+    Exists as an independent function to aid extensions
     """
     if not pushop.force:
         bundler.newpart('check:heads', data=iter(pushop.remoteheads))
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/extensions.py
--- a/mercurial/extensions.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/extensions.py	Sat Oct 17 00:58:46 2015 +0200
@@ -205,7 +205,7 @@
 
       The ``remotenames`` extension adds the ``--remote`` and ``--all`` (``-a``)
       flags to the bookmarks command. Either flag will show the remote bookmarks
-      known to the repository; ``--remote`` will also supress the output of the
+      known to the repository; ``--remote`` will also suppress the output of the
       local bookmarks.
       """
 
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/help/hgweb.txt
--- a/mercurial/help/hgweb.txt	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/help/hgweb.txt	Sat Oct 17 00:58:46 2015 +0200
@@ -74,7 +74,7 @@
 
 Many commands take a ``{revision}`` URL parameter. This defines the
 changeset to operate on. This is commonly specified as the short,
-12 digit hexidecimal abbreviation for the full 40 character unique
+12 digit hexadecimal abbreviation for the full 40 character unique
 revision identifier. However, any value described by
 :hg:`help revisions` typically works.
 
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/hg.py
--- a/mercurial/hg.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/hg.py	Sat Oct 17 00:58:46 2015 +0200
@@ -824,7 +824,7 @@
 
 # Files of interest
 # Used to check if the repository has changed looking at mtime and size of
-# theses files.
+# these files.
 foi = [('spath', '00changelog.i'),
        ('spath', 'phaseroots'), # ! phase can change content at the same size
        ('spath', 'obsstore'),
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/hgweb/webcommands.py	Sat Oct 17 00:58:46 2015 +0200
@@ -740,7 +740,7 @@
 
     The ``filediff`` template is rendered.
 
-    This hander is registered under both the ``/diff`` and ``/filediff``
+    This handler is registered under both the ``/diff`` and ``/filediff``
     paths. ``/diff`` is used in modern code.
     """
     fctx, ctx = None, None
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/localrepo.py	Sat Oct 17 00:58:46 2015 +0200
@@ -1306,7 +1306,7 @@
             l.lock()
             return l
 
-        # We do not need to check for non-waiting lock aquisition.  Such
+        # We do not need to check for non-waiting lock acquisition.  Such
         # acquisition would not cause dead-lock as they would just fail.
         if wait and (self.ui.configbool('devel', 'all-warnings')
                      or self.ui.configbool('devel', 'check-locks')):
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/match.py
--- a/mercurial/match.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/match.py	Sat Oct 17 00:58:46 2015 +0200
@@ -263,7 +263,7 @@
         '''True if the matcher won't always match.
 
         Although it's just the inverse of _always in this implementation,
-        an extenion such as narrowhg might make it return something
+        an extension such as narrowhg might make it return something
         slightly different.'''
         return not self._always
 
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/minirst.py
--- a/mercurial/minirst.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/minirst.py	Sat Oct 17 00:58:46 2015 +0200
@@ -515,7 +515,7 @@
     if block['type'] == 'bullet':
         if block['lines'][0].startswith('| '):
             # Remove bullet for line blocks and add no extra
-            # indention.
+            # indentation.
             block['lines'][0] = block['lines'][0][2:]
         else:
             m = _bulletre.match(block['lines'][0])
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/patch.py
--- a/mercurial/patch.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/patch.py	Sat Oct 17 00:58:46 2015 +0200
@@ -163,7 +163,7 @@
 
     patch can be a normal patch or contained in an email message.
 
-    return a dictionnary. Standard keys are:
+    return a dictionary. Standard keys are:
       - filename,
       - message,
       - user,
@@ -172,7 +172,7 @@
       - node,
       - p1,
       - p2.
-    Any item can be missing from the dictionary. If filename is mising,
+    Any item can be missing from the dictionary. If filename is missing,
     fileobj did not contain a patch. Caller must unlink filename when done.'''
 
     # attempt to detect the start of a patch
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/progress.py
--- a/mercurial/progress.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/progress.py	Sat Oct 17 00:58:46 2015 +0200
@@ -22,7 +22,7 @@
         ui._isatty(sys.stderr) or ui.configbool('progress', 'assume-tty'))
 
 def fmtremaining(seconds):
-    """format a number of remaining seconds in humain readable way
+    """format a number of remaining seconds in human readable way
 
     This will properly display seconds, minutes, hours, days if needed"""
     if seconds < 60:
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/sshpeer.py
--- a/mercurial/sshpeer.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/sshpeer.py	Sat Oct 17 00:58:46 2015 +0200
@@ -58,7 +58,7 @@
 
     The main pipe is expected to be a 'bufferedinputpipe' from the util module
     that handle all the os specific bites. This class lives in this module
-    because it focus on behavior specifig to the ssh protocol."""
+    because it focus on behavior specific to the ssh protocol."""
 
     def __init__(self, ui, main, side):
         self._ui = ui
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/subrepo.py
--- a/mercurial/subrepo.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/subrepo.py	Sat Oct 17 00:58:46 2015 +0200
@@ -418,7 +418,7 @@
         ``ctx`` is the context referring this subrepository in the
         parent repository.
 
-        ``path`` is the path to this subrepositiry as seen from
+        ``path`` is the path to this subrepository as seen from
         innermost repository.
         """
         self.ui = ctx.repo().ui
@@ -1056,7 +1056,7 @@
 
     @propertycache
     def wvfs(self):
-        """return own wvfs for efficiency and consitency
+        """return own wvfs for efficiency and consistency
         """
         return self._repo.wvfs
 
diff -r bbf544b5f2e9 -r 1aee2ab0f902 mercurial/ui.py
--- a/mercurial/ui.py	Wed Oct 14 03:30:27 2015 -0400
+++ b/mercurial/ui.py	Sat Oct 17 00:58:46 2015 +0200
@@ -931,7 +931,7 @@
 
     def _progclear(self):
         """clear progress bar output if any. use it before any output"""
-        if '_progbar' not in vars(self): # nothing loadef yet
+        if '_progbar' not in vars(self): # nothing loaded yet
             return
         if self._progbar is not None and self._progbar.printed:
             self._progbar.clear()
diff -r bbf544b5f2e9 -r 1aee2ab0f902 tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t	Wed Oct 14 03:30:27 2015 -0400
+++ b/tests/test-bookmarks-pushpull.t	Sat Oct 17 00:58:46 2015 +0200
@@ -539,7 +539,7 @@
   $ hg clone -U source repo1
 
 (test that incoming/outgoing exit with 1, if there is no bookmark to
-be excahnged)
+be exchanged)
 
   $ hg -R repo1 incoming -B
   comparing with $TESTTMP/bmcomparison/source
diff -r bbf544b5f2e9 -r 1aee2ab0f902 tests/test-churn.t
--- a/tests/test-churn.t	Wed Oct 14 03:30:27 2015 -0400
+++ b/tests/test-churn.t	Sat Oct 17 00:58:46 2015 +0200
@@ -171,7 +171,7 @@
   El Ni\xc3\xb1o         1 *************** (esc)
   with space      1 ***************
 
-Test --template argument, with backwards compatiblity
+Test --template argument, with backwards compatibility
 
   $ hg churn -t '{author|user}'
   user1      4 ***************************************************************
diff -r bbf544b5f2e9 -r 1aee2ab0f902 tests/test-commit-interactive-curses.t
--- a/tests/test-commit-interactive-curses.t	Wed Oct 14 03:30:27 2015 -0400
+++ b/tests/test-commit-interactive-curses.t	Sat Oct 17 00:58:46 2015 +0200
@@ -71,7 +71,7 @@
 - unfold it
 - go down to second hunk (1 for the first hunk, 1 for the first hunkline, 1 for the second hunk, 1 for the second hunklike)
 - toggle the second hunk
-- edit the hunk and quit the editor imediately with non-zero status
+- edit the hunk and quit the editor immediately with non-zero status
 - commit
 
   $ printf "printf 'editor ran\n'; exit 1" > editor.sh