Mercurial > hg
changeset 26098:ce26928cbe41
spelling: behaviour -> behavior
| author | timeless@mozdev.org |
|---|---|
| date | Fri, 28 Aug 2015 10:53:55 -0400 |
| parents | 220ee13946d3 |
| children | ab66c1dee405 |
| files | contrib/vim/patchreview.txt hgext/eol.py hgext/histedit.py hgext/mq.py mercurial/cmdutil.py mercurial/mail.py mercurial/parsers.c mercurial/scmutil.py mercurial/util.py tests/test-filecache.py tests/test-filelog.py tests/test-mq.t tests/test-pathencode.py |
| diffstat | 13 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/vim/patchreview.txt Fri Aug 28 12:18:12 2015 -0400 +++ b/contrib/vim/patchreview.txt Fri Aug 28 10:53:55 2015 -0400 @@ -30,7 +30,7 @@ software development projects. This plugin provides that missing functionality. -It also improves on |:diffpatch|'s behaviour of creating the patched files in +It also improves on |:diffpatch|'s behavior of creating the patched files in the same directory as original file which can lead to project workspace pollution.
--- a/hgext/eol.py Fri Aug 28 12:18:12 2015 -0400 +++ b/hgext/eol.py Fri Aug 28 10:53:55 2015 -0400 @@ -23,7 +23,7 @@ ``native`` is an alias for checking out in the platform's default line ending: ``LF`` on Unix (including Mac OS X) and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line endings) is Mercurial's -default behaviour; it is only needed if you need to override a later, +default behavior; it is only needed if you need to override a later, more general pattern. The optional ``[repository]`` section specifies the line endings to
--- a/hgext/histedit.py Fri Aug 28 12:18:12 2015 -0400 +++ b/hgext/histedit.py Fri Aug 28 10:53:55 2015 -0400 @@ -144,7 +144,7 @@ repo, you can add a ``--force`` option. Histedit rule lines are truncated to 80 characters by default. You -can customise this behaviour by setting a different length in your +can customise this behavior by setting a different length in your configuration file:: [histedit]
--- a/hgext/mq.py Fri Aug 28 12:18:12 2015 -0400 +++ b/hgext/mq.py Fri Aug 28 10:53:55 2015 -0400 @@ -28,7 +28,7 @@ By default, mq will automatically use git patches when required to avoid losing file mode changes, copy records, binary files or empty -files creations or deletions. This behaviour can be configured with:: +files creations or deletions. This behavior can be configured with:: [mq] git = auto/keep/yes/no
--- a/mercurial/cmdutil.py Fri Aug 28 12:18:12 2015 -0400 +++ b/mercurial/cmdutil.py Fri Aug 28 10:53:55 2015 -0400 @@ -1436,10 +1436,10 @@ showlist = templatekw.showlist - # showparents() behaviour depends on ui trace level which - # causes unexpected behaviours at templating level and makes + # showparents() behavior depends on ui trace level which + # causes unexpected behaviors at templating level and makes # it harder to extract it in a standalone function. Its - # behaviour cannot be changed so leave it here for now. + # behavior cannot be changed so leave it here for now. def showparents(**args): ctx = args['ctx'] parents = [[('rev', p.rev()), @@ -1929,7 +1929,7 @@ followfirst = 1 else: followfirst = 0 - # --follow with FILE behaviour depends on revs... + # --follow with FILE behavior depends on revs... it = iter(revs) startrev = it.next() followdescendants = startrev < next(it, startrev) @@ -2050,7 +2050,7 @@ return expr, filematcher def _logrevs(repo, opts): - # Default --rev value depends on --follow but --follow behaviour + # Default --rev value depends on --follow but --follow behavior # depends on revisions resolved from --rev... follow = opts.get('follow') or opts.get('follow_first') if opts.get('rev'):
--- a/mercurial/mail.py Fri Aug 28 12:18:12 2015 -0400 +++ b/mercurial/mail.py Fri Aug 28 10:53:55 2015 -0400 @@ -31,10 +31,10 @@ constructor, and 2.7 removed this parameter. Default argument is continuation_ws=' ', which means that the - behaviour is different in <2.7 and 2.7 + behavior is different in <2.7 and 2.7 - We consider the 2.7 behaviour to be preferable, but need - to have an unified behaviour for versions 2.4 to 2.7 + We consider the 2.7 behavior to be preferable, but need + to have an unified behavior for versions 2.4 to 2.7 """ # override continuation_ws kw['continuation_ws'] = ' '
--- a/mercurial/parsers.c Fri Aug 28 12:18:12 2015 -0400 +++ b/mercurial/parsers.c Fri Aug 28 10:53:55 2015 -0400 @@ -682,7 +682,7 @@ } nodetree; /* - * This class has two behaviours. + * This class has two behaviors. * * When used in a list-like way (with integer keys), we decode an * entry in a RevlogNG index file on demand. Our last entry is a
--- a/mercurial/scmutil.py Fri Aug 28 12:18:12 2015 -0400 +++ b/mercurial/scmutil.py Fri Aug 28 10:53:55 2015 -0400 @@ -1062,7 +1062,7 @@ Mercurial either atomic renames or appends for files under .hg, so to ensure the cache is reliable we need the filesystem to be able to tell us if a file has been replaced. If it can't, we fallback to - recreating the object on every call (essentially the same behaviour as + recreating the object on every call (essentially the same behavior as propertycache). '''
--- a/mercurial/util.py Fri Aug 28 12:18:12 2015 -0400 +++ b/mercurial/util.py Fri Aug 28 10:53:55 2015 -0400 @@ -2260,7 +2260,7 @@ class hooks(object): '''A collection of hook functions that can be used to extend a - function's behaviour. Hooks are called in lexicographic order, + function's behavior. Hooks are called in lexicographic order, based on the names of their sources.''' def __init__(self):
--- a/tests/test-filecache.py Fri Aug 28 12:18:12 2015 -0400 +++ b/tests/test-filecache.py Fri Aug 28 10:53:55 2015 -0400 @@ -130,7 +130,7 @@ util.cachestat.__init__ = originit def test_filecache_synced(): - # test old behaviour that caused filecached properties to go out of sync + # test old behavior that caused filecached properties to go out of sync os.system('hg init && echo a >> a && hg ci -qAm.') repo = hg.repository(ui.ui()) # first rollback clears the filecache, but changelog to stays in __dict__
--- a/tests/test-filelog.py Fri Aug 28 12:18:12 2015 -0400 +++ b/tests/test-filelog.py Fri Aug 28 10:53:55 2015 -0400 @@ -1,6 +1,6 @@ #!/usr/bin/env python """ -Tests the behaviour of filelog w.r.t. data starting with '\1\n' +Tests the behavior of filelog w.r.t. data starting with '\1\n' """ from mercurial import ui, hg from mercurial.node import nullid, hex
--- a/tests/test-mq.t Fri Aug 28 12:18:12 2015 -0400 +++ b/tests/test-mq.t Fri Aug 28 10:53:55 2015 -0400 @@ -39,7 +39,7 @@ By default, mq will automatically use git patches when required to avoid losing file mode changes, copy records, binary files or empty files creations - or deletions. This behaviour can be configured with: + or deletions. This behavior can be configured with: [mq] git = auto/keep/yes/no
--- a/tests/test-pathencode.py Fri Aug 28 12:18:12 2015 -0400 +++ b/tests/test-pathencode.py Fri Aug 28 10:53:55 2015 -0400 @@ -2,7 +2,7 @@ # time it is invoked, and tests the encoding of those pathnames. # # It uses a simple probabilistic model to generate valid pathnames -# that have proven likely to expose bugs and divergent behaviour in +# that have proven likely to expose bugs and divergent behavior in # different encoding implementations. from mercurial import store