Commit 69c179c1 authored by Mads Kiilerich's avatar Mads Kiilerich

spelling: fixes of non-dictionary words

parent b19291e5d506
......@@ -8,7 +8,7 @@
#
# Please update this file with any revsets you use for benchmarking a change so
# that future contributors can easily find and retest it when doing further
# modification. Feel free to highlight interresting variants if needed.
# modification. Feel free to highlight interesting variants if needed.
## Revset from this section are all extracted from changelog when this file was
......
......@@ -720,7 +720,7 @@ function! <SID>_GenericReview(argslist) "{{{
let s:origtabpagenr = tabpagenr()
silent! exe 'tabedit ' . StrippedRelativeFilePath
if exists('patchcmd')
" modelines in loaded files mess with diff comparision
" modelines in loaded files mess with diff comparison
let s:keep_modeline=&modeline
let &modeline=0
silent! exe 'vert diffsplit ' . tmpname . '.file'
......
......@@ -629,7 +629,7 @@ class chgunixservicehandler(object):
def chgunixservice(ui, repo, opts):
if repo:
# one chgserver can serve multiple repos. drop repo infomation
# one chgserver can serve multiple repos. drop repo information
ui.setconfig('bundle', 'mainreporoot', '', 'repo')
h = chgunixservicehandler(ui)
return commandserver.unixforkingservice(ui, repo=None, opts=opts, handler=h)
......
......@@ -563,7 +563,7 @@ def wrapsymlink(orig, source, link_name):
pass
class state_update(object):
''' This context mananger is responsible for dispatching the state-enter
''' This context manager is responsible for dispatching the state-enter
and state-leave signals to the watchman service '''
def __init__(self, repo, node, distance, partial):
......
......@@ -1405,12 +1405,12 @@ def verifyactions(actions, state, ctxs):
% node.short(missing[0]))
def adjustreplacementsfrommarkers(repo, oldreplacements):
"""Adjust replacements from obsolescense markers
"""Adjust replacements from obsolescence markers
Replacements structure is originally generated based on
histedit's state and does not account for changes that are
not recorded there. This function fixes that by adding
data read from obsolescense markers"""
data read from obsolescence markers"""
if not obsolete.isenabled(repo, obsolete.createmarkersopt):
return oldreplacements
......
......@@ -27,7 +27,7 @@ For example::
would log the warning message and traceback of any failed command dispatch.
Scripts are run asychronously as detached daemon processes; mercurial will
Scripts are run asynchronously as detached daemon processes; mercurial will
not ensure that they exit cleanly.
"""
......
......@@ -1385,7 +1385,7 @@ def _computeobsoletenotrebased(repo, rebaseobsrevs, dest):
"""return a mapping obsolete => successor for all obsolete nodes to be
rebased that have a successors in the destination
obsolete => None entries in the mapping indicate nodes with no succesor"""
obsolete => None entries in the mapping indicate nodes with no successor"""
obsoletenotrebased = {}
# Build a mapping successor => obsolete nodes for the obsolete
......
......@@ -6747,7 +6747,7 @@ msgid ""
msgstr ""
msgid ""
"Scripts are run asychronously as detached daemon processes; mercurial will\n"
"Scripts are run asynchronously as detached daemon processes; mercurial will\n"
"not ensure that they exit cleanly."
msgstr ""
......@@ -10366,7 +10366,7 @@ msgid "corrupted shelved state file"
msgstr "shelve 状態管理ファイルが破損しています"
msgid "please run hg unshelve --abort to abort unshelve operation"
msgstr "'hg unshelve --abort' を実施して unshleve 操作を中断してください"
msgstr "'hg unshelve --abort' を実施して unshelve 操作を中断してください"
msgid ""
"could not read shelved state file, your working copy may be in an unexpected "
......@@ -14200,7 +14200,7 @@ msgid "cannot delete obsmarkers in the middle of transaction."
msgstr "トランザクション実施途中は廃止マーカを破棄できません"
#, python-format
msgid "deleted %i obsolescense markers\n"
msgid "deleted %i obsolescence markers\n"
msgstr "%i 個の廃止マーカを破棄\n"
#, python-format
......@@ -32665,8 +32665,8 @@ msgstr ""
msgid "revset expects one or more arguments"
msgstr "revset の引数は1個以上です"
msgid ":rstdoc(text, style): Format ReStructuredText."
msgstr ":rstdoc(text, style): 出力を ReStructuredText として整形します。"
msgid ":rstdoc(text, style): Format reStructuredText."
msgstr ":rstdoc(text, style): 出力を reStructuredText として整形します。"
#. i18n: "rstdoc" is a keyword
msgid "rstdoc expects two arguments"
......@@ -6761,7 +6761,7 @@ msgstr ""
"falhasse."
msgid ""
"Scripts are run asychronously as detached daemon processes; mercurial will\n"
"Scripts are run asynchronously as detached daemon processes; mercurial will\n"
"not ensure that they exit cleanly."
msgstr ""
"Os scripts são executados assincronamente como processos desanexados;\n"
......@@ -14438,7 +14438,7 @@ msgstr ""
"não é possível apagar marcações de obsolescência durante uma transação."
#, python-format
msgid "deleted %i obsolescense markers\n"
msgid "deleted %i obsolescence markers\n"
msgstr "%i marcações de obsolescência apagadas\n"
#, python-format
......@@ -33523,8 +33523,8 @@ msgstr ""
msgid "revset expects one or more arguments"
msgstr "revset espera um ou mais argumentos"
msgid ":rstdoc(text, style): Format ReStructuredText."
msgstr ":rstdoc(texto, estilo): Formata ReStructuredText."
msgid ":rstdoc(text, style): Format reStructuredText."
msgstr ":rstdoc(texto, estilo): Formata reStructuredText."
#. i18n: "rstdoc" is a keyword
msgid "rstdoc expects two arguments"
......@@ -3471,7 +3471,7 @@ def howtocontinue(repo):
'''Check for an unfinished operation and return the command to finish
it.
afterresolvedstates tupples define a .hg/{file} and the corresponding
afterresolvedstates tuples define a .hg/{file} and the corresponding
command needed to finish it.
Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
......
......@@ -3068,7 +3068,7 @@ def debugobsolete(ui, repo, precursor=None, *successors, **opts):
with repo.lock():
n = repair.deleteobsmarkers(repo.obsstore, indices)
ui.write(_('deleted %i obsolescense markers\n') % n)
ui.write(_('deleted %i obsolescence markers\n') % n)
return
......
......@@ -1401,13 +1401,13 @@ are you sure you want to review/edit and confirm the selected changes [yn]?
"Press any key to continue.")
elif opts.get('amend') is None:
opts['amend'] = True
msg = ("Amend option is turned on -- commiting the currently "
msg = ("Amend option is turned on -- committing the currently "
"selected changes will not create a new changeset, but "
"instead update the most recently committed changeset.\n\n"
"Press any key to continue.")
elif opts.get('amend') is True:
opts['amend'] = None
msg = ("Amend option is turned off -- commiting the currently "
msg = ("Amend option is turned off -- committing the currently "
"selected changes will create a new changeset.\n\n"
"Press any key to continue.")
if not test:
......@@ -1610,7 +1610,7 @@ are you sure you want to review/edit and confirm the selected changes [yn]?
except curses.error:
self.initerr = _('this diff is too large to be displayed')
return
# initialize selecteitemendline (initial start-line is 0)
# initialize selecteditemendline (initial start-line is 0)
self.selecteditemendline = self.getnumlinesdisplayed(
self.currentselecteditem, recursechildren=False)
......
......@@ -133,7 +133,7 @@ def _destupdatebranchfallback(repo, clean, check):
assert node is not None, "'tip' exists even in empty repository"
return node, movemark, None
# order in which each step should be evalutated
# order in which each step should be evaluated
# steps are run until one finds a destination
destupdatesteps = ['evolution', 'bookmark', 'branch', 'branchfallback']
# mapping to ease extension overriding steps.
......
......@@ -84,7 +84,7 @@ class NoMergeDestAbort(MergeDestAbort):
"""Raised when an update is aborted because there is nothing to merge"""
class ManyMergeDestAbort(MergeDestAbort):
"""Raised when an update is aborted because destination is ambigious"""
"""Raised when an update is aborted because destination is ambiguous"""
class ResponseExpected(Abort):
"""Raised when an EOF is received for a prompt"""
......
......@@ -64,7 +64,7 @@ def parsebundlespec(repo, spec, strict=True, externalnames=False):
Where <compression> is one of the supported compression formats
and <type> is (currently) a version string. A ";" can follow the type and
all text afterwards is interpretted as URI encoded, ";" delimited key=value
all text afterwards is interpreted as URI encoded, ";" delimited key=value
pairs.
If ``strict`` is True (the default) <compression> is required. Otherwise,
......@@ -282,7 +282,7 @@ def _forcebundle1(op):
This function is used to allow testing of the older bundle version"""
ui = op.repo.ui
forcebundle1 = False
# The goal is this config is to allow developper to choose the bundle
# The goal is this config is to allow developer to choose the bundle
# version used during exchanged. This is especially handy during test.
# Value is a list of bundle version to be picked from, highest version
# should be used.
......@@ -1425,7 +1425,7 @@ def _pullapplyphases(pullop, remotephases):
pullop.stepsdone.add('phases')
publishing = bool(remotephases.get('publishing', False))
if remotephases and not publishing:
# remote is new and unpublishing
# remote is new and non-publishing
pheads, _dr = phases.analyzeremotephases(pullop.repo,
pullop.pulledsubset,
remotephases)
......
......@@ -1502,7 +1502,7 @@ class localrepository(object):
return fparent1
def checkcommitpatterns(self, wctx, vdirs, match, status, fail):
"""check for commit arguments that aren't commitable"""
"""check for commit arguments that aren't committable"""
if match.isexact() or match.prefix():
matched = set(status.modified + status.added + status.removed)
......
......@@ -66,7 +66,7 @@ class mergestate(object):
(experimental)
m: the external merge driver defined for this merge plus its run state
(experimental)
f: a (filename, dictonary) tuple of optional values for a given file
f: a (filename, dictionary) tuple of optional values for a given file
X: unsupported mandatory record type (used in tests)
x: unsupported advisory record type (used in tests)
l: the labels for the parts of the merge.
......
......@@ -248,7 +248,7 @@ class basealiasrules(object):
This is a helper for fileset/revset/template aliases. A concrete rule set
should be made by sub-classing this and implementing class/static methods.
It supports alias expansion of symbol and funciton-call styles::
It supports alias expansion of symbol and function-call styles::
# decl = defn
h = heads(default)
......
......@@ -84,7 +84,7 @@ class pathauditor(object):
normparts.pop()
prefixes = []
# It's important that we check the path parts starting from the root.
# This means we won't accidentaly traverse a symlink into some other
# This means we won't accidentally traverse a symlink into some other
# filesystem (which is potentially expensive to access).
for i in range(len(parts)):
prefix = os.sep.join(parts[:i + 1])
......
......@@ -13,7 +13,7 @@ from . import (
)
class _funcregistrarbase(object):
"""Base of decorator to register a fuction for specific purpose
"""Base of decorator to register a function for specific purpose
This decorator stores decorated functions into own dict 'table'.
......@@ -177,7 +177,7 @@ class templatekeyword(_templateregistrarbase):
Usage::
templaetkeyword = registrar.templatekeyword()
templatekeyword = registrar.templatekeyword()
@templatekeyword('mykeyword')
def mykeywordfunc(repo, ctx, templ, cache, revcache, **args):
......
......@@ -1443,7 +1443,7 @@ def only(repo, subset, x):
results = set(cl.findmissingrevs(common=exclude, heads=include))
# XXX we should turn this into a baseset instead of a set, smartset may do
# some optimisations from the fact this is a baseset.
# some optimizations from the fact this is a baseset.
return subset & results
@predicate('origin([set])', safe=True)
......@@ -1475,7 +1475,7 @@ def origin(repo, subset, x):
o = set([_firstsrc(r) for r in dests])
o -= set([None])
# XXX we should turn this into a baseset instead of a set, smartset may do
# some optimisations from the fact this is a baseset.
# some optimizations from the fact this is a baseset.
return subset & o
@predicate('outgoing([path])', safe=True)
......@@ -1521,7 +1521,7 @@ def p1(repo, subset, x):
ps.add(cl.parentrevs(r)[0])
ps -= set([node.nullrev])
# XXX we should turn this into a baseset instead of a set, smartset may do
# some optimisations from the fact this is a baseset.
# some optimizations from the fact this is a baseset.
return subset & ps
@predicate('p2([set])', safe=True)
......@@ -1544,7 +1544,7 @@ def p2(repo, subset, x):
ps.add(cl.parentrevs(r)[1])
ps -= set([node.nullrev])
# XXX we should turn this into a baseset instead of a set, smartset may do
# some optimisations from the fact this is a baseset.
# some optimizations from the fact this is a baseset.
return subset & ps
def parentpost(repo, subset, x, order):
......@@ -3198,7 +3198,7 @@ class filteredset(abstractsmartset):
def __len__(self):
# Basic implementation to be changed in future patches.
# until this gets improved, we use generator expression
# here, since list compr is free to call __len__ again
# here, since list comprehensions are free to call __len__ again
# causing infinite recursion
l = baseset(r for r in self)
return len(l)
......
......@@ -274,7 +274,7 @@ class Merge3Text(object):
def minimize(self, merge_regions):
"""Trim conflict regions of lines where A and B sides match.
Lines where both A and B have made the same changes at the begining
Lines where both A and B have made the same changes at the beginning
or the end of each merge region are eliminated from the conflict
region and are instead considered the same.
"""
......
......@@ -638,7 +638,7 @@ def _verifycert(cert, hostname):
# According to RFC 2818 the most specific Common Name must
# be used.
if key == 'commonName':
# 'subject' entries are unicide.
# 'subject' entries are unicode.
try:
value = value.encode('ascii')
except UnicodeEncodeError:
......@@ -764,7 +764,7 @@ def _defaultcacerts(ui):
return None
def validatesocket(sock):
"""Validate a socket meets security requiremnets.
"""Validate a socket meets security requirements.
The passed socket must have been created with ``wrapsocket()``.
"""
......
......@@ -286,11 +286,11 @@ def generatebundlev1(repo, compression='UN'):
def consumev1(repo, fp, filecount, bytecount):
"""Apply the contents from version 1 of a streaming clone file handle.
This takes the output from "streamout" and applies it to the specified
This takes the output from "stream_out" and applies it to the specified
repository.
Like "streamout," the status line added by the wire protocol is not handled
by this function.
Like "stream_out," the status line added by the wire protocol is not
handled by this function.
"""
with repo.lock():
repo.ui.status(_('%d files to transfer, %s of data\n') %
......
......@@ -792,7 +792,7 @@ def revset(context, mapping, args):
@templatefunc('rstdoc(text, style)')
def rstdoc(context, mapping, args):
"""Format ReStructuredText."""
"""Format reStructuredText."""
if len(args) != 2:
# i18n: "rstdoc" is a keyword
raise error.ParseError(_("rstdoc expects two arguments"))
......
......@@ -736,7 +736,7 @@ class ui(object):
is curses, the interface for histedit is text and the interface for
selecting chunk is crecord (the best curses interface available).
Consider the following exemple:
Consider the following example:
ui.interface = curses
ui.interface.histedit = text
......
......@@ -1456,7 +1456,7 @@ class filestat(object):
def __eq__(self, old):
try:
# if ambiguity between stat of new and old file is
# avoided, comparision of size, ctime and mtime is enough
# avoided, comparison of size, ctime and mtime is enough
# to exactly detect change of a file regardless of platform
return (self.stat.st_size == old.stat.st_size and
self.stat.st_ctime == old.stat.st_ctime and
......
# extension to emulate interupting filemerge._filemerge
# extension to emulate interrupting filemerge._filemerge
from __future__ import absolute_import
......
......@@ -68,7 +68,7 @@ class testatomictempfile(unittest.TestCase):
repetition = 3
# repeat atomic write with checkambig=True, to examine
# whether st_mtime is advanced multiple times as expecetd
# whether st_mtime is advanced multiple times as expected
for j in xrange(repetition):
atomicwrite(True)
newstat = os.stat(self._filename)
......@@ -77,7 +77,7 @@ class testatomictempfile(unittest.TestCase):
continue
# st_mtime should be advanced "repetition" times, because
# all atomicwrite() occured at same time (in sec)
# all atomicwrite() occurred at same time (in sec)
self.assertTrue(newstat.st_mtime ==
((oldstat.st_mtime + repetition) & 0x7fffffff))
# no more examination is needed, if assumption above is true
......
......@@ -272,7 +272,7 @@ external hook process
(1) update to REV1 (REV2 => REV1)
(2) revert by REV1^1
(3) commit backnig out revision (REV3)
(3) commit backing out revision (REV3)
(4) update to REV2 (REV3 => REV2)
(5) merge with REV3 (REV2 => REV2, REV3)
......@@ -287,7 +287,7 @@ external hook process
> preupdate.visibility = sh $TESTTMP/checkvisibility.sh preupdate
> EOF
("-m" is needed to avoid writing dirstte changes out at other than
("-m" is needed to avoid writing dirstate changes out at other than
invocation of the hook to be examined)
$ hg backout --merge -d '3 0' 1 --tool=true -m 'fixed comment'
......
......@@ -550,7 +550,7 @@ hgweb
$ cd ..
Test to show result of bookmarks comparision
Test to show result of bookmarks comparison
$ mkdir bmcomparison
$ cd bmcomparison
......
......@@ -734,7 +734,7 @@ tipmost surviving ancestor of the stripped revision.
summary: 0
no-op update doesn't deactive bookmarks
no-op update doesn't deactivate bookmarks
$ hg bookmarks
* four 3:9ba5f110a0b3
......
......@@ -817,7 +817,7 @@ cases.
$ echo foo > foo
$ hg add foo
(failuer before finalization)
(failure before finalization)
>>> from hgclient import readchannel, runcommand, check
>>> @check
......@@ -836,7 +836,7 @@ cases.
*** runcommand log
*** runcommand verify -q
(failuer after finalization)
(failure after finalization)
>>> from hgclient import readchannel, runcommand, check
>>> @check
......
......@@ -251,10 +251,10 @@ Check absolute/relative import of extension specific modules
#if demandimport absimport
Examine whether module loading is delayed until actual refering, even
Examine whether module loading is delayed until actual referring, even
though module is imported with "absolute_import" feature.
Files below in each packages are used for descirbed purpose:
Files below in each packages are used for described purpose:
- "called": examine whether "from MODULE import ATTR" works correctly
- "unused": examine whether loading is delayed correctly
......
......@@ -197,7 +197,7 @@ def antiambiguity():
repetition = 3
# repeat changing via checkambigatclosing, to examine whether
# st_mtime is advanced multiple times as expecetd
# st_mtime is advanced multiple times as expected
for i in xrange(repetition):
# explicit closing
fp = scmutil.checkambigatclosing(open(filename, 'a'))
......@@ -214,7 +214,7 @@ def antiambiguity():
continue
# st_mtime should be advanced "repetition * 2" times, because
# all changes occured at same time (in sec)
# all changes occurred at same time (in sec)
expected = (oldstat.st_mtime + repetition * 2) & 0x7fffffff
if newstat.st_mtime != expected:
print("'newstat.st_mtime %s is not %s (as %s + %s * 2)" %
......
......@@ -74,7 +74,7 @@ commit.
$ cd ..
Test "usegeneraldelta" config
(repo are general delta, but incoming bundle are not re-deltified)
(repo are general delta, but incoming bundle are not re-deltafied)
delta coming from the server base delta server are not recompressed.
(also include the aggressive version for comparison)
......
......@@ -379,7 +379,7 @@ Changing the cipher string works
Fingerprints
- works without cacerts (hostkeyfingerprints)
- works without cacerts (hostfingerprints)
$ hg -R copy-pull id https://localhost:$HGPORT/ --insecure --config hostfingerprints.localhost=ec:d8:7c:d6:b3:86:d0:4f:c1:b8:b4:1c:9d:8f:5e:16:8e:ef:1c:03
warning: connecting to localhost using legacy security technology (TLS 1.0); see https://mercurial-scm.org/wiki/SecureConnections for more info (?)
5fed3813f7f5
......
......@@ -431,10 +431,10 @@ patches: import patch1 patch2; rollback
parent: 0
Test that "hg rollback" doesn't restore dirstate to one at the
beginning of the rollbacked transaction in not-"parent-gone" case.
beginning of the rolled back transaction in not-"parent-gone" case.
invoking pretxncommit hook will cause marking '.hg/dirstate' as a file
to be restored at rollbacking, after DirstateTransactionPlan (see wiki
to be restored when rolling back, after DirstateTransactionPlan (see wiki
page for detail).
$ hg --cwd b branch -q foobar
......@@ -451,7 +451,7 @@ page for detail).
$ hg --cwd b update -q -C 0
$ hg --cwd b --config extensions.strip= strip -q 1
Test visibility of in-memory distate changes inside transaction to
Test visibility of in-memory dirstate changes inside transaction to
external process
$ echo foo > a/foo
......
......@@ -388,7 +388,7 @@ available locally.
$ killdaemons.py
largefiles should not ask for password again after succesfull authorization
largefiles should not ask for password again after successful authorization
$ hg init credentialmain
$ cd credentialmain
......
......@@ -199,7 +199,7 @@ Test saving last-message.txt:
test saving last-message.txt
Test visibility of in-memory distate changes outside transaction to
Test visibility of in-memory dirstate changes outside transaction to
external process
$ cat > $TESTTMP/checkvisibility.sh <<EOF
......
......@@ -1211,7 +1211,7 @@ Test the --delete option of debugobsolete command
2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re)
3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'user': 'test'} (re)
$ hg debugobsolete --delete 1 --delete 3
deleted 2 obsolescense markers
deleted 2 obsolescence markers
$ hg debugobsolete
cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'user': 'test'} (re)
1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re)
......
......@@ -130,7 +130,7 @@ explicit destination of the update.
Test that updating deactivates current active bookmark, if the
destination of the update is explicitly specified, and it doesn't
match with the name of any exsiting bookmarks.
match with the name of any existing bookmarks.
$ cd ../t
$ hg bookmark -d active-after-pull
......
......@@ -838,7 +838,7 @@ Test experimental revset
$ cd ..
Make the repo a bit more interresting
Make the repo a bit more interesting
$ hg up 1