spelling: random spell checker fixes

hgext/mq.py

@@ -80,12 +80,12 b' cmdtable = {}'
 command = cmdutil.command(cmdtable)
 testedwith = 'internal'
 
-# force load strip extension formely included in mq and import some utility
+# force load strip extension formerly included in mq and import some utility
 try:
     stripext = extensions.find('strip')
 except KeyError:
     # note: load is lazy so we could avoid the try-except,
-    # but I (marmoute) prefer this explicite code.
+    # but I (marmoute) prefer this explicit code.
     class dummyui(object):
         def debug(self, msg):
             pass
@@ -651,7 +651,7 b' class queue(object):'
         """return the mq handled parent or p1
 
         In some case where mq get himself in being the parent of a merge the
-        paappropriate parent may be p2.
+        appropriate parent may be p2.
         (eg: an in progress merge started with mq disabled)
 
         If no parent are managed by mq, p1 is returned.

hgext/rebase.py

@@ -636,7 +636,7 b' def restorestatus(repo):'
         raise util.Abort(_('no rebase in progress'))
 
 def inrebase(repo, originalwd, state):
-    '''check whether the workdir is in an interrupted rebase'''
+    '''check whether the working dir is in an interrupted rebase'''
     parents = [p.rev() for p in repo.parents()]
     if originalwd in parents:
         return True

hgext/shelve.py

@@ -190,7 +190,7 b' def createcmd(ui, repo, pats, opts):'
         lock = repo.lock()
 
         bms = repo._bookmarks.copy()
-        # use an uncommited transaction to generate the bundle to avoid
+        # use an uncommitted transaction to generate the bundle to avoid
         # pull races. ensure we don't print the abort message to stderr.
         tr = repo.transaction('commit', report=lambda x: None)
 

hgext/transplant.py

@@ -533,7 +533,7 b' def transplant(ui, repo, *revs, **opts):'
     --source/-s specifies another repository to use for selecting changesets,
     just as if it temporarily had been pulled.
     If --branch/-b is specified, these revisions will be used as
-    heads when deciding which changsets to transplant, just as if only
+    heads when deciding which changesets to transplant, just as if only
     these revisions had been pulled.
     If --all/-a is specified, all the revisions up to the heads specified
     with --branch will be transplanted.

mercurial/bookmarks.py

@@ -312,5 +312,5 b' def validdest(repo, old, new):'
     elif repo.obsstore:
         return new.node() in obsolete.foreground(repo, [old.node()])
     else:
-        # still an independant clause as it is lazyer (and therefore faster)
+        # still an independent clause as it is lazyer (and therefore faster)
         return old.descendant(new)

mercurial/context.py

@@ -197,7 +197,7 b' class basectx(object):'
 
 class changectx(basectx):
     """A changecontext object makes access to data related to a particular
-    changeset convenient. It represents a read-only context already presnt in
+    changeset convenient. It represents a read-only context already present in
     the repo."""
     def __init__(self, repo, changeid=''):
         """changeid is a revision number, node, or tag"""

mercurial/hgweb/common.py

@@ -22,7 +22,7 b' def ismember(ui, username, userlist):'
     """Check if username is a member of userlist.
 
     If userlist has a single '*' member, all users are considered members.
-    Can be overriden by extensions to provide more complex authorization
+    Can be overridden by extensions to provide more complex authorization
     schemes.
     """
     return userlist == ['*'] or username in userlist

mercurial/hgweb/webcommands.py

@@ -161,7 +161,7 b' def _search(web, req, tmpl):'
             ctx = web.repo[query]
         except (error.RepoError, error.LookupError):
             # query is not an exact revision pointer, need to
-            # decide if it's a revset expession or keywords
+            # decide if it's a revset expression or keywords
             pass
         else:
             return MODE_REVISION, ctx

mercurial/merge.py

@@ -725,7 +725,7 b' def update(repo, node, branchmerge, forc'
                 repo.hook('update', parent1=xp2, parent2='', error=0)
                 return 0, 0, 0, 0
 
-            if pa not in (p1, p2):  # nolinear
+            if pa not in (p1, p2):  # nonlinear
                 dirty = wc.dirty(missing=True)
                 if dirty or onode is None:
                     # Branching is a bit strange to ensure we do the minimal

mercurial/obsolete.py

@@ -373,7 +373,7 b' def pushmarker(repo, key, old, new):'
 def syncpush(repo, remote):
     """utility function to push obsolete markers to a remote
 
-    Exist mostly to allow overridding for experimentation purpose"""
+    Exist mostly to allow overriding for experimentation purpose"""
     if (_enabled and repo.obsstore and
         'obsolete' in remote.listkeys('namespaces')):
         rslts = []
@@ -393,7 +393,7 b' def syncpull(repo, remote, gettransactio'
     one if necessary. We return the transaction to inform the calling code that
     a new transaction have been created (when applicable).
 
-    Exists mostly to allow overridding for experimentation purpose"""
+    Exists mostly to allow overriding for experimentation purpose"""
     tr = None
     if _enabled:
         repo.ui.debug('fetching remote obsolete markers\n')
@@ -446,10 +446,10 b' def foreground(repo, nodes):'
     """return all nodes in the "foreground" of other node
 
     The foreground of a revision is anything reachable using parent -> children
-    or precursor -> sucessor relation. It is very similars to "descendant" but
+    or precursor -> successor relation. It is very similar to "descendant" but
     augmented with obsolescence information.
 
-    Beware that possible obsolescence cycle may result if complexe situation.
+    Beware that possible obsolescence cycle may result if complex situation.
     """
     repo = repo.unfiltered()
     foreground = set(repo.set('%ln::', nodes))

mercurial/phases.py

@@ -267,12 +267,12 b' class phasecache(object):'
         if filtered:
             self.dirty = True
         # filterunknown is called by repo.destroyed, we may have no changes in
-        # root but phaserevs contents is certainly invalide (or at least we
-        # have not proper way to check that. related to issue 3858.
+        # root but phaserevs contents is certainly invalid (or at least we
+        # have not proper way to check that). related to issue 3858.
         #
         # The other caller is __init__ that have no _phaserevs initialized
         # anyway. If this change we should consider adding a dedicated
-        # "destroyed" function to phasecache or a proper cache key mechanisme
+        # "destroyed" function to phasecache or a proper cache key mechanism
         # (see branchmap one)
         self._phaserevs = None
 

mercurial/util.py

@@ -283,7 +283,7 b' class propertycache(object):'
         return result
 
     def cachevalue(self, obj, value):
-        # __dict__ assigment required to bypass __setattr__ (eg: repoview)
+        # __dict__ assignment required to bypass __setattr__ (eg: repoview)
         obj.__dict__[self.name] = value
 
 def pipefilter(s, cmd):

tests/test-propertycache.py

@@ -1,6 +1,6 b''
 """test behavior of propertycache and unfiltered propertycache
 
-The repoview overlay is quite complexe. We test the behavior of
+The repoview overlay is quite complex. We test the behavior of
 property cache of both localrepo and repoview to prevent
 regression."""
 

tests/test-strip.t

@@ -386,7 +386,7 b' applied patches after stripping ancestor'
 
   $ hg qapplied
 
-Verify strip protects against stripping wc parent when there are uncommited mods
+Verify strip protects against stripping wc parent when there are uncommitted mods
 
   $ echo b > b
   $ hg add b