##// END OF EJS Templates
spelling: behaviour -> behavior
timeless@mozdev.org -
r26098:ce26928c default
parent child Browse files
Show More
@@ -30,7 +30,7 b' but can not handle patch files containin'
30 software development projects. This plugin provides that missing
30 software development projects. This plugin provides that missing
31 functionality.
31 functionality.
32
32
33 It also improves on |:diffpatch|'s behaviour of creating the patched files in
33 It also improves on |:diffpatch|'s behavior of creating the patched files in
34 the same directory as original file which can lead to project workspace
34 the same directory as original file which can lead to project workspace
35 pollution.
35 pollution.
36
36
@@ -23,7 +23,7 b' declared to be binary (``BIN``) are left'
23 ``native`` is an alias for checking out in the platform's default line
23 ``native`` is an alias for checking out in the platform's default line
24 ending: ``LF`` on Unix (including Mac OS X) and ``CRLF`` on
24 ending: ``LF`` on Unix (including Mac OS X) and ``CRLF`` on
25 Windows. Note that ``BIN`` (do nothing to line endings) is Mercurial's
25 Windows. Note that ``BIN`` (do nothing to line endings) is Mercurial's
26 default behaviour; it is only needed if you need to override a later,
26 default behavior; it is only needed if you need to override a later,
27 more general pattern.
27 more general pattern.
28
28
29 The optional ``[repository]`` section specifies the line endings to
29 The optional ``[repository]`` section specifies the line endings to
@@ -144,7 +144,7 b' repository that Mercurial does not detec'
144 repo, you can add a ``--force`` option.
144 repo, you can add a ``--force`` option.
145
145
146 Histedit rule lines are truncated to 80 characters by default. You
146 Histedit rule lines are truncated to 80 characters by default. You
147 can customise this behaviour by setting a different length in your
147 can customise this behavior by setting a different length in your
148 configuration file::
148 configuration file::
149
149
150 [histedit]
150 [histedit]
@@ -28,7 +28,7 b' Common tasks (use :hg:`help command` for'
28
28
29 By default, mq will automatically use git patches when required to
29 By default, mq will automatically use git patches when required to
30 avoid losing file mode changes, copy records, binary files or empty
30 avoid losing file mode changes, copy records, binary files or empty
31 files creations or deletions. This behaviour can be configured with::
31 files creations or deletions. This behavior can be configured with::
32
32
33 [mq]
33 [mq]
34 git = auto/keep/yes/no
34 git = auto/keep/yes/no
@@ -1436,10 +1436,10 b' class changeset_templater(changeset_prin'
1436
1436
1437 showlist = templatekw.showlist
1437 showlist = templatekw.showlist
1438
1438
1439 # showparents() behaviour depends on ui trace level which
1439 # showparents() behavior depends on ui trace level which
1440 # causes unexpected behaviours at templating level and makes
1440 # causes unexpected behaviors at templating level and makes
1441 # it harder to extract it in a standalone function. Its
1441 # it harder to extract it in a standalone function. Its
1442 # behaviour cannot be changed so leave it here for now.
1442 # behavior cannot be changed so leave it here for now.
1443 def showparents(**args):
1443 def showparents(**args):
1444 ctx = args['ctx']
1444 ctx = args['ctx']
1445 parents = [[('rev', p.rev()),
1445 parents = [[('rev', p.rev()),
@@ -1929,7 +1929,7 b' def _makelogrevset(repo, pats, opts, rev'
1929 followfirst = 1
1929 followfirst = 1
1930 else:
1930 else:
1931 followfirst = 0
1931 followfirst = 0
1932 # --follow with FILE behaviour depends on revs...
1932 # --follow with FILE behavior depends on revs...
1933 it = iter(revs)
1933 it = iter(revs)
1934 startrev = it.next()
1934 startrev = it.next()
1935 followdescendants = startrev < next(it, startrev)
1935 followdescendants = startrev < next(it, startrev)
@@ -2050,7 +2050,7 b' def _makelogrevset(repo, pats, opts, rev'
2050 return expr, filematcher
2050 return expr, filematcher
2051
2051
2052 def _logrevs(repo, opts):
2052 def _logrevs(repo, opts):
2053 # Default --rev value depends on --follow but --follow behaviour
2053 # Default --rev value depends on --follow but --follow behavior
2054 # depends on revisions resolved from --rev...
2054 # depends on revisions resolved from --rev...
2055 follow = opts.get('follow') or opts.get('follow_first')
2055 follow = opts.get('follow') or opts.get('follow_first')
2056 if opts.get('rev'):
2056 if opts.get('rev'):
@@ -31,10 +31,10 b' def _unifiedheaderinit(self, *args, **kw'
31 constructor, and 2.7 removed this parameter.
31 constructor, and 2.7 removed this parameter.
32
32
33 Default argument is continuation_ws=' ', which means that the
33 Default argument is continuation_ws=' ', which means that the
34 behaviour is different in <2.7 and 2.7
34 behavior is different in <2.7 and 2.7
35
35
36 We consider the 2.7 behaviour to be preferable, but need
36 We consider the 2.7 behavior to be preferable, but need
37 to have an unified behaviour for versions 2.4 to 2.7
37 to have an unified behavior for versions 2.4 to 2.7
38 """
38 """
39 # override continuation_ws
39 # override continuation_ws
40 kw['continuation_ws'] = ' '
40 kw['continuation_ws'] = ' '
@@ -682,7 +682,7 b' typedef struct {'
682 } nodetree;
682 } nodetree;
683
683
684 /*
684 /*
685 * This class has two behaviours.
685 * This class has two behaviors.
686 *
686 *
687 * When used in a list-like way (with integer keys), we decode an
687 * When used in a list-like way (with integer keys), we decode an
688 * entry in a RevlogNG index file on demand. Our last entry is a
688 * entry in a RevlogNG index file on demand. Our last entry is a
@@ -1062,7 +1062,7 b' class filecache(object):'
1062 Mercurial either atomic renames or appends for files under .hg,
1062 Mercurial either atomic renames or appends for files under .hg,
1063 so to ensure the cache is reliable we need the filesystem to be able
1063 so to ensure the cache is reliable we need the filesystem to be able
1064 to tell us if a file has been replaced. If it can't, we fallback to
1064 to tell us if a file has been replaced. If it can't, we fallback to
1065 recreating the object on every call (essentially the same behaviour as
1065 recreating the object on every call (essentially the same behavior as
1066 propertycache).
1066 propertycache).
1067
1067
1068 '''
1068 '''
@@ -2260,7 +2260,7 b' def sizetoint(s):'
2260
2260
2261 class hooks(object):
2261 class hooks(object):
2262 '''A collection of hook functions that can be used to extend a
2262 '''A collection of hook functions that can be used to extend a
2263 function's behaviour. Hooks are called in lexicographic order,
2263 function's behavior. Hooks are called in lexicographic order,
2264 based on the names of their sources.'''
2264 based on the names of their sources.'''
2265
2265
2266 def __init__(self):
2266 def __init__(self):
@@ -130,7 +130,7 b' def fakeuncacheable():'
130 util.cachestat.__init__ = originit
130 util.cachestat.__init__ = originit
131
131
132 def test_filecache_synced():
132 def test_filecache_synced():
133 # test old behaviour that caused filecached properties to go out of sync
133 # test old behavior that caused filecached properties to go out of sync
134 os.system('hg init && echo a >> a && hg ci -qAm.')
134 os.system('hg init && echo a >> a && hg ci -qAm.')
135 repo = hg.repository(ui.ui())
135 repo = hg.repository(ui.ui())
136 # first rollback clears the filecache, but changelog to stays in __dict__
136 # first rollback clears the filecache, but changelog to stays in __dict__
@@ -1,6 +1,6 b''
1 #!/usr/bin/env python
1 #!/usr/bin/env python
2 """
2 """
3 Tests the behaviour of filelog w.r.t. data starting with '\1\n'
3 Tests the behavior of filelog w.r.t. data starting with '\1\n'
4 """
4 """
5 from mercurial import ui, hg
5 from mercurial import ui, hg
6 from mercurial.node import nullid, hex
6 from mercurial.node import nullid, hex
@@ -39,7 +39,7 b' help'
39
39
40 By default, mq will automatically use git patches when required to avoid
40 By default, mq will automatically use git patches when required to avoid
41 losing file mode changes, copy records, binary files or empty files creations
41 losing file mode changes, copy records, binary files or empty files creations
42 or deletions. This behaviour can be configured with:
42 or deletions. This behavior can be configured with:
43
43
44 [mq]
44 [mq]
45 git = auto/keep/yes/no
45 git = auto/keep/yes/no
@@ -2,7 +2,7 b''
2 # time it is invoked, and tests the encoding of those pathnames.
2 # time it is invoked, and tests the encoding of those pathnames.
3 #
3 #
4 # It uses a simple probabilistic model to generate valid pathnames
4 # It uses a simple probabilistic model to generate valid pathnames
5 # that have proven likely to expose bugs and divergent behaviour in
5 # that have proven likely to expose bugs and divergent behavior in
6 # different encoding implementations.
6 # different encoding implementations.
7
7
8 from mercurial import store
8 from mercurial import store
General Comments 0
You need to be logged in to leave comments. Login now