Mercurial > hg
changeset 18644:3e92772d5383
spelling: fix some minor issues found by spell checker
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sun, 10 Feb 2013 18:24:29 +0100 |
| parents | cc28a84db8c9 |
| children | 76ff3a715cf2 |
| files | contrib/perf.py hgext/histedit.py hgext/largefiles/reposetup.py hgext/mq.py hgext/rebase.py mercurial/branchmap.py mercurial/context.py mercurial/localrepo.py mercurial/obsolete.py mercurial/repoview.py tests/test-obsolete-divergent.t tests/test-rebase-scenario-global.t |
| diffstat | 12 files changed, 32 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/perf.py Fri Feb 08 23:26:00 2013 +0100 +++ b/contrib/perf.py Sun Feb 10 18:24:29 2013 +0100 @@ -268,7 +268,7 @@ def perfrevset(ui, repo, expr, clear=False): """benchmark the execution time of a revset - Use the --clean option if need to evaluate the impact of build volative + Use the --clean option if need to evaluate the impact of build volatile revisions set cache on the revset execution. Volatile cache hold filtered and obsolete related cache.""" def d():
--- a/hgext/histedit.py Fri Feb 08 23:26:00 2013 +0100 +++ b/hgext/histedit.py Sun Feb 10 18:24:29 2013 +0100 @@ -179,7 +179,7 @@ def commitfuncfor(repo, src): """Build a commit function for the replacement of <src> - This function ensure we apply the same treatement to all changesets. + This function ensure we apply the same treatment to all changesets. - Add a 'histedit_source' entry in extra. @@ -626,7 +626,7 @@ newchildren) replacements.extend(repl) elif newchildren: - # otherwize update "parentctx" before proceding to further operation + # otherwise update "parentctx" before proceeding to further operation parentctx = repo[newchildren[-1]] return parentctx, replacements
--- a/hgext/largefiles/reposetup.py Fri Feb 08 23:26:00 2013 +0100 +++ b/hgext/largefiles/reposetup.py Sun Feb 10 18:24:29 2013 +0100 @@ -446,7 +446,7 @@ the largefiles. So we do the following: For directories that only have largefiles as matches, - we explicitly add the largefiles to the matchlist and remove + we explicitly add the largefiles to the match list and remove the directory. In other cases, we leave the match list unmodified. '''
--- a/hgext/mq.py Fri Feb 08 23:26:00 2013 +0100 +++ b/hgext/mq.py Sun Feb 10 18:24:29 2013 +0100 @@ -282,7 +282,7 @@ if phase is not None: backup = repo.ui.backupconfig('phases', 'new-commit') # Marking the repository as committing an mq patch can be used - # to optimize operations like _branchtags(). + # to optimize operations like branchtags(). repo._committingpatch = True try: if phase is not None: @@ -1571,7 +1571,7 @@ r = list(dd) a = list(aa) - # create 'match' that includes the files to be recommited. + # create 'match' that includes the files to be recommitted. # apply matchfn via repo.status to ensure correct case handling. cm, ca, cr, cd = repo.status(patchparent, match=matchfn)[:4] allmatches = set(cm + ca + cr + cd)
--- a/hgext/rebase.py Fri Feb 08 23:26:00 2013 +0100 +++ b/hgext/rebase.py Sun Feb 10 18:24:29 2013 +0100 @@ -692,8 +692,8 @@ # If we have multiple roots, we may have "hole" in the rebase set. # Rebase roots that descend from those "hole" should not be detached as # other root are. We use the special `revignored` to inform rebase that - # the revision should be ignored but that `defineparent` should search - # a rebase destination that make sense regarding rebaset topology. + # the revision should be ignored but that `defineparents` should search + # a rebase destination that make sense regarding rebased topology. rebasedomain = set(repo.revs('%ld::%ld', rebaseset, rebaseset)) for ignored in set(rebasedomain) - set(rebaseset): state[ignored] = revignored
--- a/mercurial/branchmap.py Fri Feb 08 23:26:00 2013 +0100 +++ b/mercurial/branchmap.py Sun Feb 10 18:24:29 2013 +0100 @@ -95,7 +95,7 @@ def _hashfiltered(self, repo): """build hash of revision filtered in the current cache - Tracking tipnode and tiprev is not enough to ensure validaty of the + Tracking tipnode and tiprev is not enough to ensure validity of the cache as they do not help to distinct cache that ignored various revision bellow tiprev. @@ -114,9 +114,9 @@ return key def validfor(self, repo): - """Is the cache content valide regarding a repo + """Is the cache content valid regarding a repo - - False when cached tipnode are unknown or if we detect a strip. + - False when cached tipnode is unknown or if we detect a strip. - True when cache is up to date or a subset of current repo.""" try: return ((self.tipnode == repo.changelog.node(self.tiprev))
--- a/mercurial/context.py Fri Feb 08 23:26:00 2013 +0100 +++ b/mercurial/context.py Sun Feb 10 18:24:29 2013 +0100 @@ -426,12 +426,12 @@ # repository is filtered this may lead to `filectx` trying to build # `changectx` for filtered revision. In such case we fallback to # creating `changectx` on the unfiltered version of the reposition. - # This fallback should not be an issue because`changectx` from - # `filectx` are not used in complexe operation that care about + # This fallback should not be an issue because `changectx` from + # `filectx` are not used in complex operations that care about # filtering. # # This fallback is a cheap and dirty fix that prevent several - # crash. It does not ensure the behavior is correct. However the + # crashes. It does not ensure the behavior is correct. However the # behavior was not correct before filtering either and "incorrect # behavior" is seen as better as "crash" #
--- a/mercurial/localrepo.py Fri Feb 08 23:26:00 2013 +0100 +++ b/mercurial/localrepo.py Sun Feb 10 18:24:29 2013 +0100 @@ -49,7 +49,7 @@ def hasunfilteredcache(repo, name): - """check if an repo and a unfilteredproperty cached value for <name>""" + """check if a repo has an unfilteredpropertycache value for <name>""" return name in vars(repo.unfiltered()) def unfilteredmethod(orig): @@ -310,13 +310,13 @@ def unfiltered(self): """Return unfiltered version of the repository - Intended to be ovewritten by filtered repo.""" + Intended to be overwritten by filtered repo.""" return self def filtered(self, name): """Return a filtered version of a repository""" # build a new class with the mixin and the current class - # (possibily subclass of the repo) + # (possibly subclass of the repo) class proxycls(repoview.repoview, self.unfiltered().__class__): pass return proxycls(self, name) @@ -962,7 +962,7 @@ delattr(self.unfiltered(), 'dirstate') def invalidate(self): - unfiltered = self.unfiltered() # all filecaches are stored on unfiltered + unfiltered = self.unfiltered() # all file caches are stored unfiltered for k in self._filecache: # dirstate is invalidated separately in invalidatedirstate() if k == 'dirstate': @@ -1397,12 +1397,6 @@ '''Inform the repository that nodes have been destroyed. Intended for use by strip and rollback, so there's a common place for anything that has to be done after destroying history. - - If you know the branchheadcache was uptodate before nodes were removed - and you also know the set of candidate new heads that may have resulted - from the destruction, you can set newheadnodes. This will enable the - code to update the branchheads cache, rather than having future code - decide it's invalid and regenerating it from scratch. ''' # When one tries to: # 1) destroy nodes thus calling this method (e.g. strip) @@ -1417,7 +1411,7 @@ self._phasecache.write() # update the 'served' branch cache to help read only server process - # Thanks to branchcach collaboration this is done from the nearest + # Thanks to branchcache collaboration this is done from the nearest # filtered subset and it is expected to be fast. branchmap.updatecache(self.filtered('served'))
--- a/mercurial/obsolete.py Fri Feb 08 23:26:00 2013 +0100 +++ b/mercurial/obsolete.py Sun Feb 10 18:24:29 2013 +0100 @@ -46,7 +46,7 @@ (A, (C, C)) We use a single marker to distinct the "split" case from the "divergence" - case. If two independants operation rewrite the same changeset A in to A' and + case. If two independents operation rewrite the same changeset A in to A' and A'' when have an error case: divergent rewriting. We can detect it because two markers will be created independently: @@ -129,8 +129,9 @@ # # But by transitivity Ad is also a successors of A. To avoid having Ad marked # as bumped too, we add the `bumpedfix` flag to the marker. <A', (Ad,)>. -# This flag mean that the successors are an interdiff that fix the bumped -# situation, breaking the transitivity of "bumped" here. +# This flag mean that the successors express the changes between the public and +# bumped version and fix the situation, breaking the transitivity of +# "bumped" here. bumpedfix = 1 def _readmarkers(data): @@ -510,7 +511,7 @@ # In such a situation, we arbitrary set the successors sets of # the node to nothing (node pruned) to break the cycle. # - # If no break was encountered we proceeed to phase 2. + # If no break was encountered we proceed to phase 2. # # Phase 2 computes successors sets of CURRENT (case 4); see details # in phase 2 itself. @@ -551,13 +552,13 @@ # successors sets of all its "successors" node. # # Each different marker is a divergence in the obsolescence - # history. It contributes successors sets dictinct from other + # history. It contributes successors sets distinct from other # markers. # # Within a marker, a successor may have divergent successors # sets. In such a case, the marker will contribute multiple # divergent successors sets. If multiple successors have - # divergents successors sets, a cartesian product is used. + # divergent successors sets, a cartesian product is used. # # At the end we post-process successors sets to remove # duplicated entry and successors set that are strict subset of
--- a/mercurial/repoview.py Fri Feb 08 23:26:00 2013 +0100 +++ b/mercurial/repoview.py Sun Feb 10 18:24:29 2013 +0100 @@ -149,7 +149,7 @@ repoview.method() --> repo.__class__.method(repoview) The inheritance has to be done dynamically because `repo` can be of any - subclasses of `localrepo`. Eg: `bundlerepo` or `httprepo`. + subclasses of `localrepo`. Eg: `bundlerepo` or `statichttprepo`. """ def __init__(self, repo, filtername): @@ -158,7 +158,7 @@ object.__setattr__(self, '_clcachekey', None) object.__setattr__(self, '_clcache', None) - # not a cacheproperty on purpose we shall implement a proper cache later + # not a propertycache on purpose we shall implement a proper cache later @property def changelog(self): """return a filtered version of the changeset @@ -210,7 +210,7 @@ def __delattr__(self, attr): return delattr(self._unfilteredrepo, attr) - # The `requirement` attribut is initialiazed during __init__. But + # The `requirements` attribute is initialized during __init__. But # __getattr__ won't be called as it also exists on the class. We need # explicit forwarding to main repo here @property
--- a/tests/test-obsolete-divergent.t Fri Feb 08 23:26:00 2013 +0100 +++ b/tests/test-obsolete-divergent.t Sun Feb 10 18:24:29 2013 +0100 @@ -1,6 +1,6 @@ Test file dedicated to testing the divergent troubles from obsolete changeset. -This is the most complexe troubles from far so we isolate it in a dedicated +This is the most complex troubles from far so we isolate it in a dedicated file. Enable obsolete @@ -294,7 +294,7 @@ e442cfc57690 $ hg log -r 'divergent()' -Check more complexe obsolescence graft (with divergence) +Check more complex obsolescence graft (with divergence) $ mkcommit B_0; hg up 0 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
--- a/tests/test-rebase-scenario-global.t Fri Feb 08 23:26:00 2013 +0100 +++ b/tests/test-rebase-scenario-global.t Sun Feb 10 18:24:29 2013 +0100 @@ -564,7 +564,7 @@ $ cd .. -More complexe rebase with multiple roots +More complex rebase with multiple roots each root have a different common ancestor with the destination and this is a detach (setup)