From 09567db49a12845abb1a9524865f25d2a48de816 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sat, 17 Oct 2015 00:58:46 +0200 Subject: [PATCH] spelling: trivial spell checking --- contrib/import-checker.py | 2 +- contrib/revsetbenchmarks.py | 6 +++--- doc/hgmanpage.py | 2 +- hgeditor | 2 +- hgext/censor.py | 2 +- hgext/largefiles/overrides.py | 2 +- hgext/rebase.py | 6 +++--- mercurial/bookmarks.py | 2 +- mercurial/cmdutil.py | 4 ++-- mercurial/copies.py | 2 +- mercurial/crecord.py | 6 +++--- mercurial/dirstate.py | 2 +- mercurial/exchange.py | 2 +- mercurial/extensions.py | 2 +- mercurial/help/hgweb.txt | 2 +- mercurial/hg.py | 2 +- mercurial/hgweb/webcommands.py | 2 +- mercurial/localrepo.py | 2 +- mercurial/match.py | 2 +- mercurial/minirst.py | 2 +- mercurial/patch.py | 4 ++-- mercurial/progress.py | 2 +- mercurial/sshpeer.py | 2 +- mercurial/subrepo.py | 4 ++-- mercurial/ui.py | 2 +- tests/test-bookmarks-pushpull.t | 2 +- tests/test-churn.t | 2 +- tests/test-commit-interactive-curses.t | 2 +- 28 files changed, 37 insertions(+), 37 deletions(-) diff --git a/contrib/import-checker.py b/contrib/import-checker.py index 55dee316e9..1da73e5abd 100644 --- a/contrib/import-checker.py +++ b/contrib/import-checker.py @@ -65,7 +65,7 @@ def fromlocalfunc(modulename, localmods): 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 --git a/contrib/revsetbenchmarks.py b/contrib/revsetbenchmarks.py index 055104f884..4a27cc91fe 100755 --- a/contrib/revsetbenchmarks.py +++ b/contrib/revsetbenchmarks.py @@ -61,7 +61,7 @@ def perf(revset, target=None): 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 idxwidth(nbidx): 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 + Return None if the factor is insignificant (less than variation).""" factor = 1 if main is not None: @@ -218,7 +218,7 @@ def applyvariants(revset, variant): 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 --git a/doc/hgmanpage.py b/doc/hgmanpage.py index 4fa14070c7..47464ab8da 100644 --- a/doc/hgmanpage.py +++ b/doc/hgmanpage.py @@ -427,7 +427,7 @@ class Translator(nodes.NodeVisitor): 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 --git a/hgeditor b/hgeditor index e8fce736c2..7b1a6adb01 100755 --- a/hgeditor +++ b/hgeditor @@ -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 --git a/hgext/censor.py b/hgext/censor.py index 5f153af078..4155e48c17 100644 --- a/hgext/censor.py +++ b/hgext/censor.py @@ -13,7 +13,7 @@ data. 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 --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py index 3e91b7625e..8897792a9a 100644 --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -324,7 +324,7 @@ def overridelog(orig, ui, repo, *pats, **opts): 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 --git a/hgext/rebase.py b/hgext/rebase.py index 289f7299a4..e3de600c40 100644 --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -198,8 +198,8 @@ def rebase(ui, repo, **opts): 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 @@ def _computeobsoletenotrebased(repo, rebasesetrevs, dest): 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 --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py index a74c1703fe..71912e55c0 100644 --- a/mercurial/bookmarks.py +++ b/mercurial/bookmarks.py @@ -171,7 +171,7 @@ def activate(repo, mark): def deactivate(repo): """ - Unset the active bookmark in this reposiotry. + Unset the active bookmark in this repository. """ wlock = repo.wlock() try: diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py index 789c746301..9d873038b4 100644 --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -63,7 +63,7 @@ def recordfilter(ui, originalhunks, operation=None): """ 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 @@ extrapostimport = [] # run after commit # 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 --git a/mercurial/copies.py b/mercurial/copies.py index dbd8e223d6..1b0a6e4925 100644 --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -241,7 +241,7 @@ def _makegetfctx(ctx): """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 --git a/mercurial/crecord.py b/mercurial/crecord.py index b930535d86..5aa4e63d59 100644 --- a/mercurial/crecord.py +++ b/mercurial/crecord.py @@ -195,7 +195,7 @@ class patch(patchnode, list): # todo: rename patchroot 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 @@ are you sure you want to review/edit and confirm the selected changes [yn]? """ 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 @@ are you sure you want to review/edit and confirm the selected changes [yn]? 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 --git a/mercurial/dirstate.py b/mercurial/dirstate.py index ecd47e5d21..027bc82404 100644 --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -80,7 +80,7 @@ class dirstate(object): 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 --git a/mercurial/exchange.py b/mercurial/exchange.py index ed40f04519..b73979a895 100644 --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -610,7 +610,7 @@ def b2partsgenerator(stepname, idx=None): 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 --git a/mercurial/extensions.py b/mercurial/extensions.py index 6fe7812e19..e459adffd7 100644 --- a/mercurial/extensions.py +++ b/mercurial/extensions.py @@ -205,7 +205,7 @@ def wrapcommand(table, command, wrapper, synopsis=None, docstring=None): 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 --git a/mercurial/help/hgweb.txt b/mercurial/help/hgweb.txt index 345d684294..7b632f3a9d 100644 --- a/mercurial/help/hgweb.txt +++ b/mercurial/help/hgweb.txt @@ -74,7 +74,7 @@ rendering the page. 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 --git a/mercurial/hg.py b/mercurial/hg.py index 4a645ab635..c49df91a67 100644 --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -824,7 +824,7 @@ def remoteui(src, opts): # 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 --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py index 4dee9aa41d..be980d58f0 100644 --- a/mercurial/hgweb/webcommands.py +++ b/mercurial/hgweb/webcommands.py @@ -740,7 +740,7 @@ def filediff(web, req, tmpl): 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 --git a/mercurial/localrepo.py b/mercurial/localrepo.py index 4979a29569..fd6e8e5d86 100644 --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1306,7 +1306,7 @@ class localrepository(object): 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 --git a/mercurial/match.py b/mercurial/match.py index 61c2504cbb..5c4c26945a 100644 --- a/mercurial/match.py +++ b/mercurial/match.py @@ -263,7 +263,7 @@ class match(object): '''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 --git a/mercurial/minirst.py b/mercurial/minirst.py index 1656b10d87..e7b81560b6 100644 --- a/mercurial/minirst.py +++ b/mercurial/minirst.py @@ -515,7 +515,7 @@ def formatblock(block, width): 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 --git a/mercurial/patch.py b/mercurial/patch.py index 4685f8f835..b1ff4f5eff 100644 --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -163,7 +163,7 @@ def extract(ui, fileobj): 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 @@ def extract(ui, fileobj): - 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 --git a/mercurial/progress.py b/mercurial/progress.py index ef50c914fc..dc4abe7a44 100644 --- a/mercurial/progress.py +++ b/mercurial/progress.py @@ -22,7 +22,7 @@ def shouldprint(ui): 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 --git a/mercurial/sshpeer.py b/mercurial/sshpeer.py index a00c965499..ef29b83037 100644 --- a/mercurial/sshpeer.py +++ b/mercurial/sshpeer.py @@ -58,7 +58,7 @@ class doublepipe(object): 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 --git a/mercurial/subrepo.py b/mercurial/subrepo.py index 827b68221b..b8a5643f04 100644 --- a/mercurial/subrepo.py +++ b/mercurial/subrepo.py @@ -418,7 +418,7 @@ class abstractsubrepo(object): ``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 @@ class hgsubrepo(abstractsubrepo): @propertycache def wvfs(self): - """return own wvfs for efficiency and consitency + """return own wvfs for efficiency and consistency """ return self._repo.wvfs diff --git a/mercurial/ui.py b/mercurial/ui.py index 34a3947f0c..a8b21b1571 100644 --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -931,7 +931,7 @@ class ui(object): 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 --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t index 5f6c31f706..708f6ce094 100644 --- a/tests/test-bookmarks-pushpull.t +++ b/tests/test-bookmarks-pushpull.t @@ -539,7 +539,7 @@ Test to show result of bookmarks comparision $ 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 --git a/tests/test-churn.t b/tests/test-churn.t index 20f7b644c3..613fae15ac 100644 --- a/tests/test-churn.t +++ b/tests/test-churn.t @@ -171,7 +171,7 @@ Test multibyte sequences in names 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 --git a/tests/test-commit-interactive-curses.t b/tests/test-commit-interactive-curses.t index a49e3e9d1f..9738433f72 100644 --- a/tests/test-commit-interactive-curses.t +++ b/tests/test-commit-interactive-curses.t @@ -71,7 +71,7 @@ Committing only one hunk while aborting edition of hunk - 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