Patchwork [6,of,6] spelling: random spell checker fixes

login
register
mail settings
Submitter Mads Kiilerich
Date Oct. 23, 2013, 5:54 p.m.
Message ID <f0c6ed4d21746897304d.1382550851@localhost.localdomain>
Download mbox | patch
Permalink /patch/2811/
State Accepted
Commit d51c4d85ec23a67292f07b3121a9353452364f6d
Headers show

Comments

Mads Kiilerich - Oct. 23, 2013, 5:54 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1382550596 -28800
#      Thu Oct 24 01:49:56 2013 +0800
# Branch stable
# Node ID f0c6ed4d21746897304de9004602892b8a287655
# Parent  3dfc3d1101286114d2bd0b2e42ea9ba21c879c04
spelling: random spell checker fixes
Matt Mackall - Oct. 23, 2013, 6:30 p.m.
On Thu, 2013-10-24 at 01:54 +0800, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1382550596 -28800
> #      Thu Oct 24 01:49:56 2013 +0800
> # Branch stable
> # Node ID f0c6ed4d21746897304de9004602892b8a287655
> # Parent  3dfc3d1101286114d2bd0b2e42ea9ba21c879c04
> spelling: random spell checker fixes

These are queued for stable, thanks.

Patch

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -80,12 +80,12 @@  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 @@  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.
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -636,7 +636,7 @@  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
diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -190,7 +190,7 @@  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)
 
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -533,7 +533,7 @@  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.
diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -312,5 +312,5 @@  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)
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -197,7 +197,7 @@  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"""
diff --git a/mercurial/hgweb/common.py b/mercurial/hgweb/common.py
--- a/mercurial/hgweb/common.py
+++ b/mercurial/hgweb/common.py
@@ -22,7 +22,7 @@  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
diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py
+++ b/mercurial/hgweb/webcommands.py
@@ -161,7 +161,7 @@  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
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -725,7 +725,7 @@  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
diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py
--- a/mercurial/obsolete.py
+++ b/mercurial/obsolete.py
@@ -373,7 +373,7 @@  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 @@  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 @@  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))
diff --git a/mercurial/phases.py b/mercurial/phases.py
--- a/mercurial/phases.py
+++ b/mercurial/phases.py
@@ -267,12 +267,12 @@  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
 
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -283,7 +283,7 @@  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):
diff --git a/tests/test-propertycache.py b/tests/test-propertycache.py
--- a/tests/test-propertycache.py
+++ b/tests/test-propertycache.py
@@ -1,6 +1,6 @@ 
 """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."""
 
diff --git a/tests/test-strip.t b/tests/test-strip.t
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -386,7 +386,7 @@  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