/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6587.2.4 by Vincent Ladeuil
Allow hyphens in option names to unbreak compatibility.
1
# Copyright (C) 2005-2014, 2016 Canonical Ltd
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
2
#   Authors: Robert Collins <robert.collins@canonical.com>
2323.6.2 by Martin Pool
Move responsibility for suggesting upgrades to ui object
3
#            and others
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
4
#
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
9
#
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
# GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
17
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
18
1442.1.20 by Robert Collins
add some documentation on options
19
"""Configuration that affects the behaviour of Bazaar.
20
21
Currently this configuration resides in ~/.bazaar/bazaar.conf
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
22
and ~/.bazaar/locations.conf, which is written to by brz.
1442.1.20 by Robert Collins
add some documentation on options
23
1461 by Robert Collins
Typo in config.py (Thanks Fabbione)
24
In bazaar.conf the following options may be set:
1442.1.20 by Robert Collins
add some documentation on options
25
[DEFAULT]
26
editor=name-of-program
27
email=Your Name <your@email.address>
28
check_signatures=require|ignore|check-available(default)
29
create_signatures=always|never|when-required(default)
1442.1.56 by Robert Collins
gpg_signing_command configuration item
30
gpg_signing_command=name-of-program
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
31
log_format=name-of-format
5971.1.55 by Jonathan Riddell
add a config option to validate signatures
32
validate_signatures_in_log=true|false(default)
5971.1.56 by Jonathan Riddell
add an option for acceptable_keys in config, also make config docs match reality for signature options
33
acceptable_keys=pattern1,pattern2
6012.2.11 by Jonathan Riddell
rename config option signing_key to gpg_signing_key
34
gpg_signing_key=amy@example.com
1442.1.20 by Robert Collins
add some documentation on options
35
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
36
in locations.conf, you specify the url of a branch and options for it.
1442.1.20 by Robert Collins
add some documentation on options
37
Wildcards may be used - * and ? as normal in shell completion. Options
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
38
set in both bazaar.conf and locations.conf are overridden by the locations.conf
1442.1.20 by Robert Collins
add some documentation on options
39
setting.
40
[/home/robertc/source]
41
recurse=False|True(default)
42
email= as above
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
43
check_signatures= as above
1442.1.20 by Robert Collins
add some documentation on options
44
create_signatures= as above.
5971.1.55 by Jonathan Riddell
add a config option to validate signatures
45
validate_signatures_in_log=as above
5971.1.56 by Jonathan Riddell
add an option for acceptable_keys in config, also make config docs match reality for signature options
46
acceptable_keys=as above
1442.1.20 by Robert Collins
add some documentation on options
47
48
explanation of options
49
----------------------
50
editor - this option sets the pop up editor to use during commits.
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
51
email - this option sets the user id brz will use when committing.
52
check_signatures - this option will control whether brz will require good gpg
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
53
                   signatures, ignore them, or check them if they are
5971.1.56 by Jonathan Riddell
add an option for acceptable_keys in config, also make config docs match reality for signature options
54
                   present.  Currently it is unused except that check_signatures
55
                   turns on create_signatures.
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
56
create_signatures - this option controls whether brz will always create
5971.1.56 by Jonathan Riddell
add an option for acceptable_keys in config, also make config docs match reality for signature options
57
                    gpg signatures or not on commits.  There is an unused
6449.6.7 by Jelmer Vernooij
Fix tests.
58
                    option which in future is expected to work if
5971.1.56 by Jonathan Riddell
add an option for acceptable_keys in config, also make config docs match reality for signature options
59
                    branch settings require signatures.
1887.2.1 by Adeodato Simó
Fix some typos and grammar issues.
60
log_format - this option sets the default log format.  Possible values are
61
             long, short, line, or a plugin can register new formats.
5971.1.55 by Jonathan Riddell
add a config option to validate signatures
62
validate_signatures_in_log - show GPG signature validity in log output
5971.1.56 by Jonathan Riddell
add an option for acceptable_keys in config, also make config docs match reality for signature options
63
acceptable_keys - comma separated list of key patterns acceptable for
64
                  verify-signatures command
1553.6.2 by Erik Bågfors
documentation and NEWS
65
66
In bazaar.conf you can also define aliases in the ALIASES sections, example
67
68
[ALIASES]
69
lastlog=log --line -r-10..-1
70
ll=log --line -r-10..-1
71
h=help
72
up=pull
1442.1.20 by Robert Collins
add some documentation on options
73
"""
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
74
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
75
from __future__ import absolute_import
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
76
import os
77
import sys
5743.8.6 by Vincent Ladeuil
Add hooks for config stacks.
78
6621.5.1 by Martin
Remove internal copy of configobj and add workarounds for bugs in latest version
79
import configobj
80
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
81
import breezy
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
82
from .decorators import needs_write_lock
83
from .lazy_import import lazy_import
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
84
lazy_import(globals(), """
5912.5.7 by Martin
Minor cleanups and note about error case
85
import base64
6690.1.3 by Jelmer Vernooij
Review comments.
86
import errno
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
87
import fnmatch
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
88
import re
6690.1.3 by Jelmer Vernooij
Review comments.
89
import stat
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
90
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
91
from breezy import (
4797.59.2 by Vincent Ladeuil
Use AtomicFile and avoid all unicode/encoding issues around transport (thanks jam).
92
    atomicfile,
6207.3.3 by jelmer at samba
Fix tests and the like.
93
    controldir,
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
94
    debug,
6437.66.1 by Wouter van Heyst
Dereference directory services in cmd_config.
95
    directory_service,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
96
    errors,
5967.9.3 by Martin Pool
Explicitly use lazy_regexp where we count on its error reporting behaviour
97
    lazy_regex,
6161.1.7 by Vincent Ladeuil
Emit a warning when bzrlib.intialize) has not been called
98
    library_state,
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
99
    lockdir,
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
100
    mergetools,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
101
    osutils,
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
102
    trace,
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
103
    transport,
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
104
    ui,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
105
    urlutils,
2245.4.3 by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
106
    win32utils,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
107
    )
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
108
from breezy.i18n import gettext
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
109
""")
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
110
from . import (
5743.8.6 by Vincent Ladeuil
Add hooks for config stacks.
111
    commands,
112
    hooks,
6082.5.10 by Vincent Ladeuil
Tweaks suggested by jam during review.
113
    lazy_regex,
5904.1.2 by Martin Pool
Various pyflakes import fixes.
114
    registry,
115
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
116
from .sixish import (
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
117
    binary_type,
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
118
    BytesIO,
6677.1.1 by Martin
Go back to native str for urls and many other py3 changes
119
    PY3,
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
120
    text_type,
121
    string_types,
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
122
    )
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
123
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
124
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
125
CHECK_IF_POSSIBLE=0
126
CHECK_ALWAYS=1
127
CHECK_NEVER=2
128
129
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
130
SIGN_WHEN_REQUIRED=0
131
SIGN_ALWAYS=1
132
SIGN_NEVER=2
133
134
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
135
POLICY_NONE = 0
136
POLICY_NORECURSE = 1
137
POLICY_APPENDPATH = 2
138
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
139
_policy_name = {
140
    POLICY_NONE: None,
141
    POLICY_NORECURSE: 'norecurse',
142
    POLICY_APPENDPATH: 'appendpath',
143
    }
144
_policy_value = {
145
    None: POLICY_NONE,
146
    'none': POLICY_NONE,
147
    'norecurse': POLICY_NORECURSE,
148
    'appendpath': POLICY_APPENDPATH,
149
    }
2120.6.4 by James Henstridge
add support for specifying policy when storing options
150
151
152
STORE_LOCATION = POLICY_NONE
153
STORE_LOCATION_NORECURSE = POLICY_NORECURSE
154
STORE_LOCATION_APPENDPATH = POLICY_APPENDPATH
155
STORE_BRANCH = 3
156
STORE_GLOBAL = 4
157
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
158
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
159
def signature_policy_from_unicode(signature_string):
160
    """Convert a string to a signing policy."""
161
    if signature_string.lower() == 'check-available':
162
        return CHECK_IF_POSSIBLE
163
    if signature_string.lower() == 'ignore':
164
        return CHECK_NEVER
165
    if signature_string.lower() == 'require':
166
        return CHECK_ALWAYS
167
    raise ValueError("Invalid signatures policy '%s'"
168
                     % signature_string)
169
170
171
def signing_policy_from_unicode(signature_string):
172
    """Convert a string to a signing policy."""
173
    if signature_string.lower() == 'when-required':
174
        return SIGN_WHEN_REQUIRED
175
    if signature_string.lower() == 'never':
176
        return SIGN_NEVER
177
    if signature_string.lower() == 'always':
178
        return SIGN_ALWAYS
179
    raise ValueError("Invalid signing policy '%s'"
180
                     % signature_string)
181
182
6621.5.1 by Martin
Remove internal copy of configobj and add workarounds for bugs in latest version
183
def _has_decode_bug():
184
    """True if configobj will fail to decode to unicode on Python 2."""
185
    if sys.version_info > (3,):
186
        return False
187
    conf = configobj.ConfigObj()
188
    decode = getattr(conf, "_decode", None)
189
    if decode:
190
        result = decode(b"\xc2\xa7", "utf-8")
191
        if isinstance(result[0], str):
192
            return True
193
    return False
194
195
196
def _has_triplequote_bug():
197
    """True if triple quote logic is reversed, see lp:710410."""
198
    conf = configobj.ConfigObj()
199
    quote = getattr(conf, "_get_triple_quote", None)
200
    if quote and quote('"""') != "'''":
201
        return True
202
    return False
203
204
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
205
class ConfigObj(configobj.ConfigObj):
206
207
    def __init__(self, infile=None, **kwargs):
208
        # We define our own interpolation mechanism calling it option expansion
209
        super(ConfigObj, self).__init__(infile=infile,
210
                                        interpolation=False,
211
                                        **kwargs)
212
6621.5.1 by Martin
Remove internal copy of configobj and add workarounds for bugs in latest version
213
    if _has_decode_bug():
214
        def _decode(self, infile, encoding):
215
            if isinstance(infile, str) and encoding:
216
                return infile.decode(encoding).splitlines(True)
217
            return super(ConfigObj, self)._decode(infile, encoding)
218
219
    if _has_triplequote_bug():
220
        def _get_triple_quote(self, value):
221
            quot = super(ConfigObj, self)._get_triple_quote(value)
222
            if quot == configobj.tdquot:
223
                return configobj.tsquot
224
            return configobj.tdquot
225
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
226
    def get_bool(self, section, key):
227
        return self[section].as_bool(key)
228
229
    def get_value(self, section, name):
230
        # Try [] for the old DEFAULT section.
231
        if section == "DEFAULT":
232
            try:
233
                return self[name]
234
            except KeyError:
235
                pass
236
        return self[section][name]
237
238
5549.1.19 by Vincent Ladeuil
Push down interpolation at the config level (make tests slightly less
239
class Config(object):
240
    """A configuration policy - what username, editor, gpg needs etc."""
241
242
    def __init__(self):
243
        super(Config, self).__init__()
244
245
    def config_id(self):
246
        """Returns a unique ID for the config."""
247
        raise NotImplementedError(self.config_id)
248
249
    def get_change_editor(self, old_tree, new_tree):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
250
        from breezy import diff
5549.1.19 by Vincent Ladeuil
Push down interpolation at the config level (make tests slightly less
251
        cmd = self._get_change_editor()
252
        if cmd is None:
253
            return None
254
        return diff.DiffFromTool.from_string(cmd, old_tree, new_tree,
255
                                             sys.stdout)
256
257
    def _get_signature_checking(self):
258
        """Template method to override signature checking policy."""
259
260
    def _get_signing_policy(self):
261
        """Template method to override signature creation policy."""
262
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
263
    option_ref_re = None
264
265
    def expand_options(self, string, env=None):
266
        """Expand option references in the string in the configuration context.
267
268
        :param string: The string containing option to expand.
269
270
        :param env: An option dict defining additional configuration options or
271
            overriding existing ones.
272
273
        :returns: The expanded string.
274
        """
275
        return self._expand_options_in_string(string, env)
276
277
    def _expand_options_in_list(self, slist, env=None, _ref_stack=None):
278
        """Expand options in  a list of strings in the configuration context.
279
280
        :param slist: A list of strings.
281
282
        :param env: An option dict defining additional configuration options or
283
            overriding existing ones.
284
285
        :param _ref_stack: Private list containing the options being
286
            expanded to detect loops.
287
288
        :returns: The flatten list of expanded strings.
289
        """
290
        # expand options in each value separately flattening lists
291
        result = []
292
        for s in slist:
293
            value = self._expand_options_in_string(s, env, _ref_stack)
294
            if isinstance(value, list):
295
                result.extend(value)
296
            else:
297
                result.append(value)
298
        return result
299
300
    def _expand_options_in_string(self, string, env=None, _ref_stack=None):
301
        """Expand options in the string in the configuration context.
302
303
        :param string: The string to be expanded.
304
305
        :param env: An option dict defining additional configuration options or
306
            overriding existing ones.
307
308
        :param _ref_stack: Private list containing the options being
309
            expanded to detect loops.
310
311
        :returns: The expanded string.
312
        """
313
        if string is None:
314
            # Not much to expand there
315
            return None
316
        if _ref_stack is None:
317
            # What references are currently resolved (to detect loops)
318
            _ref_stack = []
319
        if self.option_ref_re is None:
320
            # We want to match the most embedded reference first (i.e. for
321
            # '{{foo}}' we will get '{foo}',
322
            # for '{bar{baz}}' we will get '{baz}'
323
            self.option_ref_re = re.compile('({[^{}]+})')
324
        result = string
325
        # We need to iterate until no more refs appear ({{foo}} will need two
326
        # iterations for example).
327
        while True:
5745.1.1 by Vincent Ladeuil
Remove debug code
328
            raw_chunks = self.option_ref_re.split(result)
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
329
            if len(raw_chunks) == 1:
330
                # Shorcut the trivial case: no refs
331
                return result
332
            chunks = []
333
            list_value = False
334
            # Split will isolate refs so that every other chunk is a ref
335
            chunk_is_ref = False
336
            for chunk in raw_chunks:
337
                if not chunk_is_ref:
338
                    if chunk:
339
                        # Keep only non-empty strings (or we get bogus empty
340
                        # slots when a list value is involved).
341
                        chunks.append(chunk)
342
                    chunk_is_ref = True
343
                else:
344
                    name = chunk[1:-1]
345
                    if name in _ref_stack:
346
                        raise errors.OptionExpansionLoop(string, _ref_stack)
347
                    _ref_stack.append(name)
348
                    value = self._expand_option(name, env, _ref_stack)
349
                    if value is None:
350
                        raise errors.ExpandingUnknownOption(name, string)
351
                    if isinstance(value, list):
352
                        list_value = True
353
                        chunks.extend(value)
354
                    else:
355
                        chunks.append(value)
356
                    _ref_stack.pop()
357
                    chunk_is_ref = False
358
            if list_value:
359
                # Once a list appears as the result of an expansion, all
360
                # callers will get a list result. This allows a consistent
361
                # behavior even when some options in the expansion chain
362
                # defined as strings (no comma in their value) but their
363
                # expanded value is a list.
364
                return self._expand_options_in_list(chunks, env, _ref_stack)
365
            else:
366
                result = ''.join(chunks)
367
        return result
368
369
    def _expand_option(self, name, env, _ref_stack):
370
        if env is not None and name in env:
371
            # Special case, values provided in env takes precedence over
372
            # anything else
373
            value = env[name]
374
        else:
375
            # FIXME: This is a limited implementation, what we really need is a
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
376
            # way to query the brz config for the value of an option,
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
377
            # respecting the scope rules (That is, once we implement fallback
378
            # configs, getting the option value should restart from the top
379
            # config, not the current one) -- vila 20101222
380
            value = self.get_user_option(name, expand=False)
381
            if isinstance(value, list):
382
                value = self._expand_options_in_list(value, env, _ref_stack)
383
            else:
384
                value = self._expand_options_in_string(value, env, _ref_stack)
385
        return value
386
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
387
    def _get_user_option(self, option_name):
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
388
        """Template method to provide a user option."""
389
        return None
390
6468.5.1 by Vincent Ladeuil
Change default for ``bzr.config.expand`` to True
391
    def get_user_option(self, option_name, expand=True):
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
392
        """Get a generic option - no special process, no default.
393
394
        :param option_name: The queried option.
395
396
        :param expand: Whether options references should be expanded.
397
398
        :returns: The value of the option.
399
        """
400
        value = self._get_user_option(option_name)
401
        if expand:
402
            if isinstance(value, list):
403
                value = self._expand_options_in_list(value)
404
            elif isinstance(value, dict):
405
                trace.warning('Cannot expand "%s":'
406
                              ' Dicts do not support option expansion'
407
                              % (option_name,))
408
            else:
409
                value = self._expand_options_in_string(value)
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
410
        for hook in OldConfigHooks['get']:
5743.8.25 by Vincent Ladeuil
Fix spurious spaces.
411
            hook(self, option_name, value)
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
412
        return value
413
5425.4.14 by Martin Pool
Allow get_user_option_as_bool to take a default
414
    def get_user_option_as_bool(self, option_name, expand=None, default=None):
415
        """Get a generic option as a boolean.
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
416
5425.4.14 by Martin Pool
Allow get_user_option_as_bool to take a default
417
        :param expand: Allow expanding references to other config values.
418
        :param default: Default value if nothing is configured
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
419
        :return None if the option doesn't exist or its value can't be
4840.2.4 by Vincent Ladeuil
Implement config.get_user_option_as_list.
420
            interpreted as a boolean. Returns True or False otherwise.
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
421
        """
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
422
        s = self.get_user_option(option_name, expand=expand)
4989.2.12 by Vincent Ladeuil
Display a warning if an option value is not boolean.
423
        if s is None:
424
            # The option doesn't exist
5425.4.14 by Martin Pool
Allow get_user_option_as_bool to take a default
425
            return default
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
426
        val = ui.bool_from_string(s)
4989.2.12 by Vincent Ladeuil
Display a warning if an option value is not boolean.
427
        if val is None:
428
            # The value can't be interpreted as a boolean
429
            trace.warning('Value "%s" is not a boolean for "%s"',
430
                          s, option_name)
431
        return val
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
432
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
433
    def get_user_option_as_list(self, option_name, expand=None):
4840.2.4 by Vincent Ladeuil
Implement config.get_user_option_as_list.
434
        """Get a generic option as a list - no special process, no default.
435
436
        :return None if the option doesn't exist. Returns the value as a list
437
            otherwise.
438
        """
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
439
        l = self.get_user_option(option_name, expand=expand)
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
440
        if isinstance(l, string_types):
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
441
            # A single value, most probably the user forgot (or didn't care to
442
            # add) the final ','
4840.2.4 by Vincent Ladeuil
Implement config.get_user_option_as_list.
443
            l = [l]
444
        return l
6371.1.1 by Jelmer Vernooij
Fix some whitespace in bzrlib.config.
445
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
446
    def _log_format(self):
447
        """See log_format()."""
1553.2.4 by Erik Bågfors
Support for setting the default log format at a configuration option
448
        return None
449
5971.1.55 by Jonathan Riddell
add a config option to validate signatures
450
    def validate_signatures_in_log(self):
451
        """Show GPG signature validity in log"""
452
        result = self._validate_signatures_in_log()
453
        if result == "true":
454
            result = True
455
        else:
456
            result = False
457
        return result
458
459
    def _validate_signatures_in_log(self):
460
        """See validate_signatures_in_log()."""
461
        return None
462
1472 by Robert Collins
post commit hook, first pass implementation
463
    def _post_commit(self):
464
        """See Config.post_commit."""
465
        return None
466
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
467
    def user_email(self):
468
        """Return just the email component of a username."""
1185.33.31 by Martin Pool
Make annotate cope better with revisions committed without a valid
469
        return extract_email_address(self.username())
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
470
471
    def username(self):
472
        """Return email-style username.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
473
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
474
        Something similar to 'Martin Pool <mbp@sourcefrog.net>'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
475
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
476
        $BRZ_EMAIL can be set to override this, then
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
477
        the concrete policy type is checked, and finally
1185.37.2 by Jamie Wilkinson
Fix a typo and grammar in Config.username() docstring.
478
        $EMAIL is examined.
5187.2.12 by Parth Malwankar
trivial clarification in docstring.
479
        If no username can be found, errors.NoWhoami exception is raised.
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
480
        """
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
481
        v = os.environ.get('BRZ_EMAIL')
6684.1.3 by Martin
Changes across many modules working towards Python 3 support
482
        if v:
483
            if not PY3:
484
                v = v.decode(osutils.get_user_encoding())
485
            return v
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
486
        v = self._get_user_id()
6684.1.3 by Martin
Changes across many modules working towards Python 3 support
487
        if v:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
488
            return v
6351.4.3 by Jelmer Vernooij
Review feedback from Vila.
489
        return default_email()
5187.2.3 by Parth Malwankar
init and init-repo now fail before creating dir if username is not set.
490
491
    def ensure_username(self):
5187.2.11 by Parth Malwankar
documentation updates
492
        """Raise errors.NoWhoami if username is not set.
5187.2.3 by Parth Malwankar
init and init-repo now fail before creating dir if username is not set.
493
494
        This method relies on the username() function raising the error.
495
        """
496
        self.username()
1442.1.21 by Robert Collins
create signature_needed() call for commit to trigger creating signatures
497
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
498
    def get_alias(self, value):
499
        return self._get_alias(value)
500
501
    def _get_alias(self, value):
502
        pass
503
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
504
    def get_nickname(self):
505
        return self._get_nickname()
506
507
    def _get_nickname(self):
508
        return None
509
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
510
    def get_bzr_remote_path(self):
511
        try:
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
512
            return os.environ['BZR_REMOTE_PATH']
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
513
        except KeyError:
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
514
            path = self.get_user_option("bzr_remote_path")
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
515
            if path is None:
516
                path = 'bzr'
517
            return path
518
4840.2.6 by Vincent Ladeuil
Implement config.suppress_warning.
519
    def suppress_warning(self, warning):
520
        """Should the warning be suppressed or emitted.
521
522
        :param warning: The name of the warning being tested.
523
524
        :returns: True if the warning should be suppressed, False otherwise.
525
        """
526
        warnings = self.get_user_option_as_list('suppress_warnings')
527
        if warnings is None or warning not in warnings:
528
            return False
529
        else:
530
            return True
531
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
532
    def get_merge_tools(self):
5321.1.108 by Gordon Tyler
Changed known merge tools into a default set of merge tools that are always defined but can be overridden by user-defined merge tools.
533
        tools = {}
5321.1.99 by Gordon Tyler
Fixes for changes to Config._get_options().
534
        for (oname, value, section, conf_id, parser) in self._get_options():
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
535
            if oname.startswith('bzr.mergetool.'):
536
                tool_name = oname[len('bzr.mergetool.'):]
6468.5.1 by Vincent Ladeuil
Change default for ``bzr.config.expand`` to True
537
                tools[tool_name] = self.get_user_option(oname, False)
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
538
        trace.mutter('loaded merge tools: %r' % tools)
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
539
        return tools
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
540
5321.1.103 by Gordon Tyler
Renamed _find_merge_tool back to find_merge_tool since it must be public for UI code to lookup merge tools by name, and added tests for it.
541
    def find_merge_tool(self, name):
5967.3.6 by Jonathan Riddell
use example.com for e-mails, make bzrlib/config.py pep8 happy
542
        # We fake a defaults mechanism here by checking if the given name can
5321.1.111 by Gordon Tyler
Remove predefined merge tools from list returned by get_merge_tools.
543
        # be found in the known_merge_tools if it's not found in the config.
544
        # This should be done through the proposed config defaults mechanism
545
        # when it becomes available in the future.
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
546
        command_line = (self.get_user_option('bzr.mergetool.%s' % name,
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
547
                                             expand=False)
548
                        or mergetools.known_merge_tools.get(name, None))
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
549
        return command_line
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
550
1442.1.15 by Robert Collins
make getting the signature checking policy a template method
551
5743.8.10 by Vincent Ladeuil
We don't need (nor want) to tie the config hooks to a particular class. Especially when we want to use the same hooks on both implementations.
552
class _ConfigHooks(hooks.Hooks):
553
    """A dict mapping hook names and a list of callables for configs.
554
    """
555
556
    def __init__(self):
557
        """Create the default hooks.
558
559
        These are all empty initially, because by default nothing should get
560
        notified.
561
        """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
562
        super(_ConfigHooks, self).__init__('breezy.config', 'ConfigHooks')
5743.8.10 by Vincent Ladeuil
We don't need (nor want) to tie the config hooks to a particular class. Especially when we want to use the same hooks on both implementations.
563
        self.add_hook('load',
564
                      'Invoked when a config store is loaded.'
565
                      ' The signature is (store).',
566
                      (2, 4))
567
        self.add_hook('save',
568
                      'Invoked when a config store is saved.'
569
                      ' The signature is (store).',
570
                      (2, 4))
571
        # The hooks for config options
572
        self.add_hook('get',
573
                      'Invoked when a config option is read.'
574
                      ' The signature is (stack, name, value).',
575
                      (2, 4))
576
        self.add_hook('set',
577
                      'Invoked when a config option is set.'
578
                      ' The signature is (stack, name, value).',
579
                      (2, 4))
580
        self.add_hook('remove',
581
                      'Invoked when a config option is removed.'
582
                      ' The signature is (stack, name).',
583
                      (2, 4))
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
584
ConfigHooks = _ConfigHooks()
585
586
587
class _OldConfigHooks(hooks.Hooks):
588
    """A dict mapping hook names and a list of callables for configs.
589
    """
590
591
    def __init__(self):
592
        """Create the default hooks.
593
594
        These are all empty initially, because by default nothing should get
595
        notified.
596
        """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
597
        super(_OldConfigHooks, self).__init__('breezy.config', 'OldConfigHooks')
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
598
        self.add_hook('load',
5743.8.14 by Vincent Ladeuil
Separate the hooks for old and new config implementations instead of cheating like crazy.
599
                      'Invoked when a config store is loaded.'
600
                      ' The signature is (config).',
601
                      (2, 4))
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
602
        self.add_hook('save',
5743.8.14 by Vincent Ladeuil
Separate the hooks for old and new config implementations instead of cheating like crazy.
603
                      'Invoked when a config store is saved.'
604
                      ' The signature is (config).',
605
                      (2, 4))
606
        # The hooks for config options
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
607
        self.add_hook('get',
5743.8.14 by Vincent Ladeuil
Separate the hooks for old and new config implementations instead of cheating like crazy.
608
                      'Invoked when a config option is read.'
609
                      ' The signature is (config, name, value).',
610
                      (2, 4))
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
611
        self.add_hook('set',
5743.8.14 by Vincent Ladeuil
Separate the hooks for old and new config implementations instead of cheating like crazy.
612
                      'Invoked when a config option is set.'
613
                      ' The signature is (config, name, value).',
614
                      (2, 4))
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
615
        self.add_hook('remove',
5743.8.14 by Vincent Ladeuil
Separate the hooks for old and new config implementations instead of cheating like crazy.
616
                      'Invoked when a config option is removed.'
617
                      ' The signature is (config, name).',
618
                      (2, 4))
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
619
OldConfigHooks = _OldConfigHooks()
5743.8.10 by Vincent Ladeuil
We don't need (nor want) to tie the config hooks to a particular class. Especially when we want to use the same hooks on both implementations.
620
621
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
622
class IniBasedConfig(Config):
623
    """A configuration policy that draws from ini files."""
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
624
6630.1.1 by Jelmer Vernooij
Remove deprecated functionality.
625
    def __init__(self, file_name=None):
5345.2.5 by Vincent Ladeuil
Add docstring.
626
        """Base class for configuration files using an ini-like syntax.
627
628
        :param file_name: The configuration file path.
629
        """
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
630
        super(IniBasedConfig, self).__init__()
5345.1.8 by Vincent Ladeuil
Make the test_listen_to_the_last_speaker pass and fix fallouts.
631
        self.file_name = file_name
6630.1.1 by Jelmer Vernooij
Remove deprecated functionality.
632
        self.file_name = file_name
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
633
        self._content = None
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
634
        self._parser = None
635
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
636
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
637
    def from_string(cls, str_or_unicode, file_name=None, save=False):
5345.5.13 by Vincent Ladeuil
Merge simplify-test-config-building into lockable-config-files resolving conflicts
638
        """Create a config object from a string.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
639
5345.2.9 by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string.
640
        :param str_or_unicode: A string representing the file content. This will
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
641
            be utf-8 encoded.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
642
643
        :param file_name: The configuration file path.
644
645
        :param _save: Whether the file should be saved upon creation.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
646
        """
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
647
        conf = cls(file_name=file_name)
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
648
        conf._create_from_string(str_or_unicode, save)
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
649
        return conf
650
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
651
    def _create_from_string(self, str_or_unicode, save):
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
652
        self._content = BytesIO(str_or_unicode.encode('utf-8'))
5345.1.16 by Vincent Ladeuil
Allows tests to save the config file at build time.
653
        # Some tests use in-memory configs, some other always need the config
654
        # file to exist on disk.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
655
        if save:
5345.1.16 by Vincent Ladeuil
Allows tests to save the config file at build time.
656
            self._write_config_file()
5345.5.12 by Vincent Ladeuil
Fix fallouts from replacing '_content' by 'from_bytes' for config files.
657
6630.1.1 by Jelmer Vernooij
Remove deprecated functionality.
658
    def _get_parser(self):
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
659
        if self._parser is not None:
660
            return self._parser
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
661
        if self._content is not None:
662
            co_input = self._content
663
        elif self.file_name is None:
664
            raise AssertionError('We have no content to create the config')
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
665
        else:
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
666
            co_input = self.file_name
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
667
        try:
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
668
            self._parser = ConfigObj(co_input, encoding='utf-8')
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
669
        except configobj.ConfigObjError as e:
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
670
            raise errors.ParseConfigError(e.errors, e.config.filename)
5987.1.4 by Vincent Ladeuil
Proper error messages for config files with content in non-utf encoding or that cannot be parsed
671
        except UnicodeDecodeError:
672
            raise errors.ConfigContentError(self.file_name)
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
673
        # Make sure self.reload() will use the right file name
5345.1.8 by Vincent Ladeuil
Make the test_listen_to_the_last_speaker pass and fix fallouts.
674
        self._parser.filename = self.file_name
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
675
        for hook in OldConfigHooks['load']:
5743.8.12 by Vincent Ladeuil
Fire config hooks for the actual implementation even if these calls should be deleted in the end. This will help the transition by providing *some* measurements.
676
            hook(self)
1185.12.49 by Aaron Bentley
Switched to ConfigObj
677
        return self._parser
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
678
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
679
    def reload(self):
680
        """Reload the config file from disk."""
681
        if self.file_name is None:
682
            raise AssertionError('We need a file name to reload the config')
683
        if self._parser is not None:
684
            self._parser.reload()
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
685
        for hook in ConfigHooks['load']:
5743.8.12 by Vincent Ladeuil
Fire config hooks for the actual implementation even if these calls should be deleted in the end. This will help the transition by providing *some* measurements.
686
            hook(self)
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
687
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
688
    def _get_matching_sections(self):
689
        """Return an ordered list of (section_name, extra_path) pairs.
690
691
        If the section contains inherited configuration, extra_path is
692
        a string containing the additional path components.
693
        """
694
        section = self._get_section()
695
        if section is not None:
696
            return [(section, '')]
697
        else:
698
            return []
699
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
700
    def _get_section(self):
701
        """Override this to define the section used by the config."""
702
        return "DEFAULT"
703
5447.4.12 by Vincent Ladeuil
Turn get_options() and get_sections() into private methods because section handling is too messy and needs to be discussed and settled.
704
    def _get_sections(self, name=None):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
705
        """Returns an iterator of the sections specified by ``name``.
706
707
        :param name: The section name. If None is supplied, the default
708
            configurations are yielded.
709
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
710
        :return: A tuple (name, section, config_id) for all sections that will
711
            be walked by user_get_option() in the 'right' order. The first one
712
            is where set_user_option() will update the value.
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
713
        """
714
        parser = self._get_parser()
715
        if name is not None:
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
716
            yield (name, parser[name], self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
717
        else:
718
            # No section name has been given so we fallback to the configobj
719
            # itself which holds the variables defined outside of any section.
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
720
            yield (None, parser, self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
721
5447.4.12 by Vincent Ladeuil
Turn get_options() and get_sections() into private methods because section handling is too messy and needs to be discussed and settled.
722
    def _get_options(self, sections=None):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
723
        """Return an ordered list of (name, value, section, config_id) tuples.
724
725
        All options are returned with their associated value and the section
726
        they appeared in. ``config_id`` is a unique identifier for the
727
        configuration file the option is defined in.
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
728
729
        :param sections: Default to ``_get_matching_sections`` if not
730
            specified. This gives a better control to daughter classes about
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
731
            which sections should be searched. This is a list of (name,
732
            configobj) tuples.
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
733
        """
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
734
        opts = []
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
735
        if sections is None:
736
            parser = self._get_parser()
737
            sections = []
738
            for (section_name, _) in self._get_matching_sections():
739
                try:
740
                    section = parser[section_name]
741
                except KeyError:
742
                    # This could happen for an empty file for which we define a
743
                    # DEFAULT section. FIXME: Force callers to provide sections
744
                    # instead ? -- vila 20100930
745
                    continue
746
                sections.append((section_name, section))
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
747
        config_id = self.config_id()
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
748
        for (section_name, section) in sections:
749
            for (name, value) in section.iteritems():
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
750
                yield (name, parser._quote(value), section_name,
751
                       config_id, parser)
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
752
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
753
    def _get_option_policy(self, section, option_name):
754
        """Return the policy for the given (section, option_name) pair."""
755
        return POLICY_NONE
756
4603.1.10 by Aaron Bentley
Provide change editor via config.
757
    def _get_change_editor(self):
758
        return self.get_user_option('change_editor')
759
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
760
    def _get_signature_checking(self):
761
        """See Config._get_signature_checking."""
1474 by Robert Collins
Merge from Aaron Bentley.
762
        policy = self._get_user_option('check_signatures')
763
        if policy:
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
764
            return signature_policy_from_unicode(policy)
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
765
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
766
    def _get_signing_policy(self):
1773.4.3 by Martin Pool
[merge] bzr.dev
767
        """See Config._get_signing_policy"""
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
768
        policy = self._get_user_option('create_signatures')
769
        if policy:
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
770
            return signing_policy_from_unicode(policy)
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
771
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
772
    def _get_user_id(self):
773
        """Get the user id from the 'email' key in the current section."""
1474 by Robert Collins
Merge from Aaron Bentley.
774
        return self._get_user_option('email')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
775
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
776
    def _get_user_option(self, option_name):
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
777
        """See Config._get_user_option."""
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
778
        for (section, extra_path) in self._get_matching_sections():
779
            try:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
780
                value = self._get_parser().get_value(section, option_name)
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
781
            except KeyError:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
782
                continue
783
            policy = self._get_option_policy(section, option_name)
784
            if policy == POLICY_NONE:
785
                return value
786
            elif policy == POLICY_NORECURSE:
787
                # norecurse items only apply to the exact path
788
                if extra_path:
789
                    continue
790
                else:
791
                    return value
792
            elif policy == POLICY_APPENDPATH:
2120.6.3 by James Henstridge
add some more tests for getting policy options, and behaviour of get_user_option in the presence of config policies
793
                if extra_path:
794
                    value = urlutils.join(value, extra_path)
795
                return value
2120.6.6 by James Henstridge
fix test_set_push_location test
796
            else:
797
                raise AssertionError('Unexpected config policy %r' % policy)
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
798
        else:
1993.3.1 by James Henstridge
first go at making location config lookup recursive
799
            return None
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
800
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
801
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
802
        """See Config.gpg_signing_command."""
1472 by Robert Collins
post commit hook, first pass implementation
803
        return self._get_user_option('gpg_signing_command')
1442.1.56 by Robert Collins
gpg_signing_command configuration item
804
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
805
    def _log_format(self):
806
        """See Config.log_format."""
807
        return self._get_user_option('log_format')
1553.2.4 by Erik Bågfors
Support for setting the default log format at a configuration option
808
5971.1.55 by Jonathan Riddell
add a config option to validate signatures
809
    def _validate_signatures_in_log(self):
5971.1.56 by Jonathan Riddell
add an option for acceptable_keys in config, also make config docs match reality for signature options
810
        """See Config.validate_signatures_in_log."""
5971.1.55 by Jonathan Riddell
add a config option to validate signatures
811
        return self._get_user_option('validate_signatures_in_log')
812
5971.1.56 by Jonathan Riddell
add an option for acceptable_keys in config, also make config docs match reality for signature options
813
    def _acceptable_keys(self):
814
        """See Config.acceptable_keys."""
815
        return self._get_user_option('acceptable_keys')
816
1472 by Robert Collins
post commit hook, first pass implementation
817
    def _post_commit(self):
818
        """See Config.post_commit."""
819
        return self._get_user_option('post_commit')
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
820
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
821
    def _get_alias(self, value):
822
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
823
            return self._get_parser().get_value("ALIASES",
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
824
                                                value)
825
        except KeyError:
826
            pass
827
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
828
    def _get_nickname(self):
829
        return self.get_user_option('nickname')
830
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
831
    def remove_user_option(self, option_name, section_name=None):
832
        """Remove a user option and save the configuration file.
833
834
        :param option_name: The option to be removed.
835
836
        :param section_name: The section the option is defined in, default to
837
            the default section.
838
        """
839
        self.reload()
840
        parser = self._get_parser()
841
        if section_name is None:
842
            section = parser
843
        else:
844
            section = parser[section_name]
845
        try:
846
            del section[option_name]
847
        except KeyError:
848
            raise errors.NoSuchConfigOption(option_name)
849
        self._write_config_file()
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
850
        for hook in OldConfigHooks['remove']:
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
851
            hook(self, option_name)
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
852
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
853
    def _write_config_file(self):
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
854
        if self.file_name is None:
855
            raise AssertionError('We cannot save, self.file_name is None')
5345.1.9 by Vincent Ladeuil
Refactor config dir check.
856
        conf_dir = os.path.dirname(self.file_name)
857
        ensure_config_dir_exists(conf_dir)
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
858
        atomic_file = atomicfile.AtomicFile(self.file_name)
5050.6.1 by Vincent Ladeuil
Merge 2.1 into 2.2 including fixes for bug #525571 and bug #494221
859
        self._get_parser().write(atomic_file)
860
        atomic_file.commit()
861
        atomic_file.close()
5345.3.3 by Vincent Ladeuil
Merge bzr.dev into deprecate-get-filename resolving conflicts
862
        osutils.copy_ownership_from_path(self.file_name)
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
863
        for hook in OldConfigHooks['save']:
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
864
            hook(self)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
865
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
866
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
867
class LockableConfig(IniBasedConfig):
868
    """A configuration needing explicit locking for access.
869
870
    If several processes try to write the config file, the accesses need to be
871
    serialized.
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
872
873
    Daughter classes should decorate all methods that update a config with the
874
    ``@needs_write_lock`` decorator (they call, directly or indirectly, the
875
    ``_write_config_file()`` method. These methods (typically ``set_option()``
876
    and variants must reload the config file from disk before calling
877
    ``_write_config_file()``), this can be achieved by calling the
878
    ``self.reload()`` method. Note that the lock scope should cover both the
879
    reading and the writing of the config file which is why the decorator can't
880
    be applied to ``_write_config_file()`` only.
881
882
    This should be enough to implement the following logic:
883
    - lock for exclusive write access,
884
    - reload the config file from disk,
885
    - set the new value
886
    - unlock
887
888
    This logic guarantees that a writer can update a value without erasing an
889
    update made by another writer.
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
890
    """
891
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
892
    lock_name = 'lock'
893
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
894
    def __init__(self, file_name):
895
        super(LockableConfig, self).__init__(file_name=file_name)
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
896
        self.dir = osutils.dirname(osutils.safe_unicode(self.file_name))
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
897
        # FIXME: It doesn't matter that we don't provide possible_transports
898
        # below since this is currently used only for local config files ;
899
        # local transports are not shared. But if/when we start using
900
        # LockableConfig for other kind of transports, we will need to reuse
901
        # whatever connection is already established -- vila 20100929
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
902
        self.transport = transport.get_transport_from_path(self.dir)
5743.4.9 by Vincent Ladeuil
Implement a LockableConfigObjStore to be able to mimick the actual behaviour.
903
        self._lock = lockdir.LockDir(self.transport, self.lock_name)
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
904
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
905
    def _create_from_string(self, unicode_bytes, save):
906
        super(LockableConfig, self)._create_from_string(unicode_bytes, False)
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
907
        if save:
5345.1.24 by Vincent Ladeuil
Implement _save for LockableConfig too.
908
            # We need to handle the saving here (as opposed to IniBasedConfig)
909
            # to be able to lock
910
            self.lock_write()
911
            self._write_config_file()
912
            self.unlock()
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
913
914
    def lock_write(self, token=None):
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
915
        """Takes a write lock in the directory containing the config file.
916
917
        If the directory doesn't exist it is created.
918
        """
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
919
        ensure_config_dir_exists(self.dir)
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
920
        return self._lock.lock_write(token)
921
922
    def unlock(self):
923
        self._lock.unlock()
924
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
925
    def break_lock(self):
926
        self._lock.break_lock()
927
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
928
    @needs_write_lock
929
    def remove_user_option(self, option_name, section_name=None):
930
        super(LockableConfig, self).remove_user_option(option_name,
931
                                                       section_name)
932
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
933
    def _write_config_file(self):
934
        if self._lock is None or not self._lock.is_held:
935
            # NB: if the following exception is raised it probably means a
936
            # missing @needs_write_lock decorator on one of the callers.
937
            raise errors.ObjectNotLocked(self)
938
        super(LockableConfig, self)._write_config_file()
939
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
940
941
class GlobalConfig(LockableConfig):
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
942
    """The configuration that should be used for a specific location."""
943
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
944
    def __init__(self):
945
        super(GlobalConfig, self).__init__(file_name=config_filename())
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
946
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
947
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
948
        return 'bazaar'
949
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
950
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
951
    def from_string(cls, str_or_unicode, save=False):
5345.5.13 by Vincent Ladeuil
Merge simplify-test-config-building into lockable-config-files resolving conflicts
952
        """Create a config object from a string.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
953
5345.5.13 by Vincent Ladeuil
Merge simplify-test-config-building into lockable-config-files resolving conflicts
954
        :param str_or_unicode: A string representing the file content. This
955
            will be utf-8 encoded.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
956
957
        :param save: Whether the file should be saved upon creation.
958
        """
959
        conf = cls()
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
960
        conf._create_from_string(str_or_unicode, save)
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
961
        return conf
5345.5.12 by Vincent Ladeuil
Fix fallouts from replacing '_content' by 'from_bytes' for config files.
962
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
963
    @needs_write_lock
1816.2.1 by Robey Pointer
add set_user_option to GlobalConfig, and make /etc/passwd username lookup try harder with encodings
964
    def set_user_option(self, option, value):
965
        """Save option and its value in the configuration."""
2900.3.2 by Tim Penhey
A working alias command.
966
        self._set_option(option, value, 'DEFAULT')
967
968
    def get_aliases(self):
969
        """Return the aliases section."""
970
        if 'ALIASES' in self._get_parser():
971
            return self._get_parser()['ALIASES']
972
        else:
973
            return {}
974
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
975
    @needs_write_lock
2900.3.2 by Tim Penhey
A working alias command.
976
    def set_alias(self, alias_name, alias_command):
977
        """Save the alias in the configuration."""
978
        self._set_option(alias_name, alias_command, 'ALIASES')
979
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
980
    @needs_write_lock
2900.3.2 by Tim Penhey
A working alias command.
981
    def unset_alias(self, alias_name):
982
        """Unset an existing alias."""
5345.5.10 by Vincent Ladeuil
Add a missing config.reload().
983
        self.reload()
2900.3.2 by Tim Penhey
A working alias command.
984
        aliases = self._get_parser().get('ALIASES')
2900.3.7 by Tim Penhey
Updates from Aaron's review.
985
        if not aliases or alias_name not in aliases:
986
            raise errors.NoSuchAlias(alias_name)
2900.3.2 by Tim Penhey
A working alias command.
987
        del aliases[alias_name]
2900.3.12 by Tim Penhey
Final review comments.
988
        self._write_config_file()
2900.3.2 by Tim Penhey
A working alias command.
989
990
    def _set_option(self, option, value, section):
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
991
        self.reload()
2900.3.7 by Tim Penhey
Updates from Aaron's review.
992
        self._get_parser().setdefault(section, {})[option] = value
2900.3.12 by Tim Penhey
Final review comments.
993
        self._write_config_file()
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
994
        for hook in OldConfigHooks['set']:
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
995
            hook(self, option, value)
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
996
5447.4.12 by Vincent Ladeuil
Turn get_options() and get_sections() into private methods because section handling is too messy and needs to be discussed and settled.
997
    def _get_sections(self, name=None):
998
        """See IniBasedConfig._get_sections()."""
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
999
        parser = self._get_parser()
1000
        # We don't give access to options defined outside of any section, we
1001
        # used the DEFAULT section by... default.
1002
        if name in (None, 'DEFAULT'):
1003
            # This could happen for an empty file where the DEFAULT section
1004
            # doesn't exist yet. So we force DEFAULT when yielding
1005
            name = 'DEFAULT'
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1006
            if 'DEFAULT' not in parser:
1007
               parser['DEFAULT']= {}
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1008
        yield (name, parser[name], self.config_id())
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1009
1010
    @needs_write_lock
1011
    def remove_user_option(self, option_name, section_name=None):
1012
        if section_name is None:
1013
            # We need to force the default section.
1014
            section_name = 'DEFAULT'
1015
        # We need to avoid the LockableConfig implementation or we'll lock
1016
        # twice
1017
        super(LockableConfig, self).remove_user_option(option_name,
1018
                                                       section_name)
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1019
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
1020
def _iter_for_location_by_parts(sections, location):
5764.1.3 by Vincent Ladeuil
Add a doctrsing and address the location being split for all iterations by making letting the function iterate over all sections.
1021
    """Keep only the sessions matching the specified location.
1022
1023
    :param sections: An iterable of section names.
1024
1025
    :param location: An url or a local path to match against.
1026
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
1027
    :returns: An iterator of (section, extra_path, nb_parts) where nb is the
1028
        number of path components in the section name, section is the section
1029
        name and extra_path is the difference between location and the section
1030
        name.
5743.6.19 by Vincent Ladeuil
Clarify comments about section names for Location-related objects (also fix LocationMatcher and add tests).
1031
1032
    ``location`` will always be a local path and never a 'file://' url but the
1033
    section names themselves can be in either form.
5764.1.3 by Vincent Ladeuil
Add a doctrsing and address the location being split for all iterations by making letting the function iterate over all sections.
1034
    """
5764.1.2 by Vincent Ladeuil
This put a common processing into the loop to avoid bad inputs. The
1035
    location_parts = location.rstrip('/').split('/')
1036
5764.1.3 by Vincent Ladeuil
Add a doctrsing and address the location being split for all iterations by making letting the function iterate over all sections.
1037
    for section in sections:
5743.6.19 by Vincent Ladeuil
Clarify comments about section names for Location-related objects (also fix LocationMatcher and add tests).
1038
        # location is a local path if possible, so we need to convert 'file://'
1039
        # urls in section names to local paths if necessary.
5764.1.3 by Vincent Ladeuil
Add a doctrsing and address the location being split for all iterations by making letting the function iterate over all sections.
1040
1041
        # This also avoids having file:///path be a more exact
1042
        # match than '/path'.
1043
5743.6.19 by Vincent Ladeuil
Clarify comments about section names for Location-related objects (also fix LocationMatcher and add tests).
1044
        # FIXME: This still raises an issue if a user defines both file:///path
1045
        # *and* /path. Should we raise an error in this case -- vila 20110505
1046
5764.1.3 by Vincent Ladeuil
Add a doctrsing and address the location being split for all iterations by making letting the function iterate over all sections.
1047
        if section.startswith('file://'):
1048
            section_path = urlutils.local_path_from_url(section)
1049
        else:
1050
            section_path = section
1051
        section_parts = section_path.rstrip('/').split('/')
1052
1053
        matched = True
1054
        if len(section_parts) > len(location_parts):
1055
            # More path components in the section, they can't match
1056
            matched = False
1057
        else:
1058
            # Rely on zip truncating in length to the length of the shortest
1059
            # argument sequence.
6631.2.1 by Martin
Run 2to3 zip fixer and refactor
1060
            for name in zip(location_parts, section_parts):
5764.1.3 by Vincent Ladeuil
Add a doctrsing and address the location being split for all iterations by making letting the function iterate over all sections.
1061
                if not fnmatch.fnmatch(name[0], name[1]):
1062
                    matched = False
1063
                    break
1064
        if not matched:
1065
            continue
5764.1.1 by Vincent Ladeuil
Extract _match_section_by_parts from LocationConfig._get_matching_sections and more comments to explain the behavior.
1066
        # build the path difference between the section and the location
5764.1.3 by Vincent Ladeuil
Add a doctrsing and address the location being split for all iterations by making letting the function iterate over all sections.
1067
        extra_path = '/'.join(location_parts[len(section_parts):])
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
1068
        yield section, extra_path, len(section_parts)
5764.1.1 by Vincent Ladeuil
Extract _match_section_by_parts from LocationConfig._get_matching_sections and more comments to explain the behavior.
1069
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1070
5345.5.7 by Vincent Ladeuil
Make LocationConfig use a lock too.
1071
class LocationConfig(LockableConfig):
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1072
    """A configuration object that gives the policy for a location."""
1073
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1074
    def __init__(self, location):
5345.1.2 by Vincent Ladeuil
Get rid of 'branches.conf' references.
1075
        super(LocationConfig, self).__init__(
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1076
            file_name=locations_config_filename())
1878.1.1 by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653)
1077
        # local file locations are looked up by local path, rather than
1078
        # by file url. This is because the config file is a user
1079
        # file, and we would rather not expose the user to file urls.
1080
        if location.startswith('file://'):
1081
            location = urlutils.local_path_from_url(location)
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1082
        self.location = location
1083
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1084
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1085
        return 'locations'
1086
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1087
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
1088
    def from_string(cls, str_or_unicode, location, save=False):
1089
        """Create a config object from a string.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1090
5345.2.9 by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string.
1091
        :param str_or_unicode: A string representing the file content. This will
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1092
            be utf-8 encoded.
1093
1094
        :param location: The location url to filter the configuration.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
1095
1096
        :param save: Whether the file should be saved upon creation.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1097
        """
1098
        conf = cls(location)
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
1099
        conf._create_from_string(str_or_unicode, save)
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1100
        return conf
1101
1993.3.1 by James Henstridge
first go at making location config lookup recursive
1102
    def _get_matching_sections(self):
1103
        """Return an ordered list of section names matching this location."""
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1104
        # put the longest (aka more specific) locations first
6621.20.1 by Martin
Run 2to3 tuple_params fixer and tidy up.
1105
        matches = sorted(
1106
            _iter_for_location_by_parts(self._get_parser(), self.location),
1107
            key=lambda match: (match[2], match[0]),
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
1108
            reverse=True)
1109
        for (section, extra_path, length) in matches:
1110
            yield section, extra_path
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
1111
            # should we stop looking for parent configs here?
1993.3.1 by James Henstridge
first go at making location config lookup recursive
1112
            try:
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
1113
                if self._get_parser()[section].as_bool('ignore_parents'):
1114
                    break
1993.3.1 by James Henstridge
first go at making location config lookup recursive
1115
            except KeyError:
1116
                pass
1442.1.9 by Robert Collins
exact section test passes
1117
5447.4.12 by Vincent Ladeuil
Turn get_options() and get_sections() into private methods because section handling is too messy and needs to be discussed and settled.
1118
    def _get_sections(self, name=None):
1119
        """See IniBasedConfig._get_sections()."""
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1120
        # We ignore the name here as the only sections handled are named with
1121
        # the location path and we don't expose embedded sections either.
1122
        parser = self._get_parser()
1123
        for name, extra_path in self._get_matching_sections():
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1124
            yield (name, parser[name], self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1125
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
1126
    def _get_option_policy(self, section, option_name):
1127
        """Return the policy for the given (section, option_name) pair."""
1128
        # check for the old 'recurse=False' flag
1129
        try:
1130
            recurse = self._get_parser()[section].as_bool('recurse')
1131
        except KeyError:
1132
            recurse = True
1133
        if not recurse:
1134
            return POLICY_NORECURSE
1135
2120.6.10 by James Henstridge
Catch another deprecation warning, and more cleanup
1136
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
1137
        try:
1138
            policy_name = self._get_parser()[section][policy_key]
1139
        except KeyError:
1140
            policy_name = None
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
1141
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
1142
        return _policy_value[policy_name]
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
1143
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1144
    def _set_option_policy(self, section, option_name, option_policy):
1145
        """Set the policy for the given option name in the given section."""
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1146
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
1147
        policy_name = _policy_name[option_policy]
1148
        if policy_name is not None:
1149
            self._get_parser()[section][policy_key] = policy_name
1150
        else:
1151
            if policy_key in self._get_parser()[section]:
1152
                del self._get_parser()[section][policy_key]
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1153
5345.5.7 by Vincent Ladeuil
Make LocationConfig use a lock too.
1154
    @needs_write_lock
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1155
    def set_user_option(self, option, value, store=STORE_LOCATION):
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1156
        """Save option and its value in the configuration."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1157
        if store not in [STORE_LOCATION,
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1158
                         STORE_LOCATION_NORECURSE,
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1159
                         STORE_LOCATION_APPENDPATH]:
1160
            raise ValueError('bad storage policy %r for %r' %
1161
                (store, option))
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
1162
        self.reload()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1163
        location = self.location
1164
        if location.endswith('/'):
1165
            location = location[:-1]
5345.1.24 by Vincent Ladeuil
Implement _save for LockableConfig too.
1166
        parser = self._get_parser()
5345.1.21 by Vincent Ladeuil
Slight rewrite to make the method more readable.
1167
        if not location in parser and not location + '/' in parser:
1168
            parser[location] = {}
1169
        elif location + '/' in parser:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1170
            location = location + '/'
5345.1.21 by Vincent Ladeuil
Slight rewrite to make the method more readable.
1171
        parser[location][option]=value
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1172
        # the allowed values of store match the config policies
1173
        self._set_option_policy(location, option, store)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
1174
        self._write_config_file()
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
1175
        for hook in OldConfigHooks['set']:
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
1176
            hook(self, option, value)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1177
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1178
1179
class BranchConfig(Config):
1180
    """A configuration object giving the policy for a branch."""
1181
5345.1.3 by Vincent Ladeuil
Make __init__ the first method in the BranchConfig class.
1182
    def __init__(self, branch):
1183
        super(BranchConfig, self).__init__()
1184
        self._location_config = None
1185
        self._branch_data_config = None
1186
        self._global_config = None
1187
        self.branch = branch
1188
        self.option_sources = (self._get_location_config,
1189
                               self._get_branch_data_config,
1190
                               self._get_global_config)
1191
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1192
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1193
        return 'branch'
1194
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1195
    def _get_branch_data_config(self):
1196
        if self._branch_data_config is None:
1197
            self._branch_data_config = TreeConfig(self.branch)
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1198
            self._branch_data_config.config_id = self.config_id
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1199
        return self._branch_data_config
1200
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1201
    def _get_location_config(self):
1202
        if self._location_config is None:
1203
            self._location_config = LocationConfig(self.branch.base)
1204
        return self._location_config
1205
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1206
    def _get_global_config(self):
1207
        if self._global_config is None:
1208
            self._global_config = GlobalConfig()
1209
        return self._global_config
1210
1211
    def _get_best_value(self, option_name):
1212
        """This returns a user option from local, tree or global config.
1213
1214
        They are tried in that order.  Use get_safe_value if trusted values
1215
        are necessary.
1216
        """
1217
        for source in self.option_sources:
1218
            value = getattr(source(), option_name)()
1219
            if value is not None:
1220
                return value
1221
        return None
1222
1223
    def _get_safe_value(self, option_name):
1224
        """This variant of get_best_value never returns untrusted values.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1225
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1226
        It does not return values from the branch data, because the branch may
1227
        not be controlled by the user.
1228
1229
        We may wish to allow locations.conf to control whether branches are
1230
        trusted in the future.
1231
        """
1232
        for source in (self._get_location_config, self._get_global_config):
1233
            value = getattr(source(), option_name)()
1234
            if value is not None:
1235
                return value
1236
        return None
1237
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1238
    def _get_user_id(self):
1239
        """Return the full user id for the branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1240
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
1241
        e.g. "John Hacker <jhacker@example.com>"
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1242
        This is looked up in the email controlfile for the branch.
1243
        """
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1244
        return self._get_best_value('_get_user_id')
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1245
4603.1.10 by Aaron Bentley
Provide change editor via config.
1246
    def _get_change_editor(self):
1247
        return self._get_best_value('_get_change_editor')
1248
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
1249
    def _get_signature_checking(self):
1250
        """See Config._get_signature_checking."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1251
        return self._get_best_value('_get_signature_checking')
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
1252
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
1253
    def _get_signing_policy(self):
1254
        """See Config._get_signing_policy."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1255
        return self._get_best_value('_get_signing_policy')
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
1256
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
1257
    def _get_user_option(self, option_name):
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
1258
        """See Config._get_user_option."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1259
        for source in self.option_sources:
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
1260
            value = source()._get_user_option(option_name)
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1261
            if value is not None:
1262
                return value
1263
        return None
1264
5447.4.12 by Vincent Ladeuil
Turn get_options() and get_sections() into private methods because section handling is too messy and needs to be discussed and settled.
1265
    def _get_sections(self, name=None):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1266
        """See IniBasedConfig.get_sections()."""
1267
        for source in self.option_sources:
5447.4.12 by Vincent Ladeuil
Turn get_options() and get_sections() into private methods because section handling is too messy and needs to be discussed and settled.
1268
            for section in source()._get_sections(name):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1269
                yield section
1270
5447.4.12 by Vincent Ladeuil
Turn get_options() and get_sections() into private methods because section handling is too messy and needs to be discussed and settled.
1271
    def _get_options(self, sections=None):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1272
        opts = []
1273
        # First the locations options
5447.4.12 by Vincent Ladeuil
Turn get_options() and get_sections() into private methods because section handling is too messy and needs to be discussed and settled.
1274
        for option in self._get_location_config()._get_options():
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1275
            yield option
1276
        # Then the branch options
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1277
        branch_config = self._get_branch_data_config()
1278
        if sections is None:
1279
            sections = [('DEFAULT', branch_config._get_parser())]
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1280
        # FIXME: We shouldn't have to duplicate the code in IniBasedConfig but
1281
        # Config itself has no notion of sections :( -- vila 20101001
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1282
        config_id = self.config_id()
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1283
        for (section_name, section) in sections:
1284
            for (name, value) in section.iteritems():
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
1285
                yield (name, value, section_name,
1286
                       config_id, branch_config._get_parser())
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1287
        # Then the global options
5447.4.12 by Vincent Ladeuil
Turn get_options() and get_sections() into private methods because section handling is too messy and needs to be discussed and settled.
1288
        for option in self._get_global_config()._get_options():
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1289
            yield option
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1290
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1291
    def set_user_option(self, name, value, store=STORE_BRANCH,
1292
        warn_masked=False):
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1293
        if store == STORE_BRANCH:
1770.2.6 by Aaron Bentley
Ensure branch.conf works properly
1294
            self._get_branch_data_config().set_option(value, name)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1295
        elif store == STORE_GLOBAL:
2120.6.7 by James Henstridge
Fix GlobalConfig.set_user_option() call
1296
            self._get_global_config().set_user_option(name, value)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1297
        else:
1298
            self._get_location_config().set_user_option(name, value, store)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1299
        if not warn_masked:
1300
            return
1301
        if store in (STORE_GLOBAL, STORE_BRANCH):
1302
            mask_value = self._get_location_config().get_user_option(name)
1303
            if mask_value is not None:
1304
                trace.warning('Value "%s" is masked by "%s" from'
1305
                              ' locations.conf', value, mask_value)
1306
            else:
1307
                if store == STORE_GLOBAL:
1308
                    branch_config = self._get_branch_data_config()
1309
                    mask_value = branch_config.get_user_option(name)
1310
                    if mask_value is not None:
1311
                        trace.warning('Value "%s" is masked by "%s" from'
1551.15.37 by Aaron Bentley
Don't treat a format string as a normal string
1312
                                      ' branch.conf', value, mask_value)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1313
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1314
    def remove_user_option(self, option_name, section_name=None):
1315
        self._get_branch_data_config().remove_option(option_name, section_name)
1316
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
1317
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
1318
        """See Config.gpg_signing_command."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1319
        return self._get_safe_value('_gpg_signing_command')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1320
1472 by Robert Collins
post commit hook, first pass implementation
1321
    def _post_commit(self):
1322
        """See Config.post_commit."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1323
        return self._get_safe_value('_post_commit')
1472 by Robert Collins
post commit hook, first pass implementation
1324
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1325
    def _get_nickname(self):
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
1326
        value = self._get_explicit_nickname()
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1327
        if value is not None:
1328
            return value
6437.32.1 by Aaron Bentley
Use colocated branch names as nicknames.
1329
        if self.branch.name:
1330
            return self.branch.name
2120.5.2 by Alexander Belchenko
(jam) Fix for bug #66857
1331
        return urlutils.unescape(self.branch.base.split('/')[-2])
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1332
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
1333
    def has_explicit_nickname(self):
1334
        """Return true if a nickname has been explicitly assigned."""
1335
        return self._get_explicit_nickname() is not None
1336
1337
    def _get_explicit_nickname(self):
1338
        return self._get_best_value('_get_nickname')
1339
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
1340
    def _log_format(self):
1341
        """See Config.log_format."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1342
        return self._get_best_value('_log_format')
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1343
5971.1.55 by Jonathan Riddell
add a config option to validate signatures
1344
    def _validate_signatures_in_log(self):
1345
        """See Config.validate_signatures_in_log."""
1346
        return self._get_best_value('_validate_signatures_in_log')
1347
5971.1.56 by Jonathan Riddell
add an option for acceptable_keys in config, also make config docs match reality for signature options
1348
    def _acceptable_keys(self):
1349
        """See Config.acceptable_keys."""
1350
        return self._get_best_value('_acceptable_keys')
1351
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
1352
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1353
def ensure_config_dir_exists(path=None):
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1354
    """Make sure a configuration directory exists.
1355
    This makes sure that the directory exists.
1356
    On windows, since configuration directories are 2 levels deep,
1357
    it makes sure both the directory and the parent directory exists.
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1358
    """
1359
    if path is None:
1360
        path = config_dir()
1361
    if not os.path.isdir(path):
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1362
        if sys.platform == 'win32':
1363
            parent_dir = os.path.dirname(path)
1364
            if not os.path.isdir(parent_dir):
1365
                trace.mutter('creating config parent directory: %r', parent_dir)
1366
                os.mkdir(parent_dir)
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1367
        trace.mutter('creating config directory: %r', path)
5116.2.4 by Parth Malwankar
removed mkdir_with_ownership as its probably cleaner to just use copy_ownership
1368
        os.mkdir(path)
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
1369
        osutils.copy_ownership_from_path(path)
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1370
1532 by Robert Collins
Merge in John Meinels integration branch.
1371
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
1372
def bazaar_config_dir():
6437.27.5 by Martin Packman
Document and test that config_dir now always returns unicode
1373
    """Return per-user configuration directory as unicode string
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1374
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1375
    By default this is %APPDATA%/bazaar/2.0 on Windows, ~/.bazaar on Mac OS X
6591.2.1 by Fabien Meghazi
Also honor $XDG_CONFIG_HOME specification on Mac OS X platform
1376
    and Linux.  On Mac OS X and Linux, if there is a $XDG_CONFIG_HOME/bazaar directory,
5519.4.3 by Neil Martinsen-Burrell
be permissive about using $XDG_CONFIG_HOME/bazaar, but dont complain
1377
    that will be used instead.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1378
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1379
    TODO: Global option --config-dir to override this.
1380
    """
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
1381
    base = osutils.path_from_environ('BZR_HOME')
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1382
    if sys.platform == 'win32':
1383
        if base is None:
6437.27.2 by Martin Packman
Avoid deprecated get_appdata_location_unicode name and use more robust home location fallback for win32
1384
            base = win32utils.get_appdata_location()
1385
        if base is None:
1386
            base = win32utils.get_home_location()
6437.27.4 by Martin Packman
Add notes about known issues
1387
        # GZ 2012-02-01: Really the two level subdirs only make sense inside
1388
        #                APPDATA, but hard to move. See bug 348640 for more.
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1389
        return osutils.pathjoin(base, 'bazaar', '2.0')
6437.27.3 by Martin Packman
Rearrange conditionals to avoid some duplication on the not-win32 branch
1390
    if base is None:
6591.2.1 by Fabien Meghazi
Also honor $XDG_CONFIG_HOME specification on Mac OS X platform
1391
        xdg_dir = osutils.path_from_environ('XDG_CONFIG_HOME')
1392
        if xdg_dir is None:
1393
            xdg_dir = osutils.pathjoin(osutils._get_home_dir(), ".config")
1394
        xdg_dir = osutils.pathjoin(xdg_dir, 'bazaar')
1395
        if osutils.isdir(xdg_dir):
1396
            trace.mutter(
1397
                "Using configuration in XDG directory %s." % xdg_dir)
1398
            return xdg_dir
6437.27.3 by Martin Packman
Rearrange conditionals to avoid some duplication on the not-win32 branch
1399
        base = osutils._get_home_dir()
1400
    return osutils.pathjoin(base, ".bazaar")
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1401
1532 by Robert Collins
Merge in John Meinels integration branch.
1402
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
1403
def config_dir():
1404
    """Return per-user configuration directory as unicode string
1405
1406
    By default this is %APPDATA%/breezy on Windows, $XDG_CONFIG_HOME/breezy on
1407
    Mac OS X and Linux. If the breezy config directory doesn't exist but
1408
    the bazaar one (see bazaar_config_dir()) does, use that instead.
1409
1410
    TODO: Global option --config-dir to override this.
1411
    """
1412
    base = osutils.path_from_environ('BRZ_HOME')
1413
    if sys.platform == 'win32':
1414
        if base is None:
1415
            base = win32utils.get_appdata_location()
1416
        if base is None:
1417
            base = win32utils.get_home_location()
1418
        # GZ 2012-02-01: Really the two level subdirs only make sense inside
1419
        #                APPDATA, but hard to move. See bug 348640 for more.
1420
    if base is None:
1421
        base = osutils.path_from_environ('XDG_CONFIG_HOME')
1422
        if base is None:
1423
            base = osutils.pathjoin(osutils._get_home_dir(), ".config")
1424
    breezy_dir = osutils.pathjoin(base, 'breezy')
1425
    if osutils.isdir(breezy_dir):
1426
        return breezy_dir
1427
    # If the breezy directory doesn't exist, but the bazaar one does, use that:
1428
    bazaar_dir = bazaar_config_dir()
1429
    if osutils.isdir(bazaar_dir):
1430
        trace.mutter(
1431
            "Using Bazaar configuration directory (%s)", bazaar_dir)
1432
        return bazaar_dir
1433
    return breezy_dir
1434
1435
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1436
def config_filename():
1437
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1438
    return osutils.pathjoin(config_dir(), 'bazaar.conf')
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1439
1440
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
1441
def locations_config_filename():
1442
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1443
    return osutils.pathjoin(config_dir(), 'locations.conf')
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
1444
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1445
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1446
def authentication_config_filename():
1447
    """Return per-user authentication ini file filename."""
1448
    return osutils.pathjoin(config_dir(), 'authentication.conf')
1449
1450
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
1451
def user_ignore_config_filename():
1452
    """Return the user default ignore filename"""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1453
    return osutils.pathjoin(config_dir(), 'ignore')
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
1454
1455
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1456
def crash_dir():
1457
    """Return the directory name to store crash files.
1458
1459
    This doesn't implicitly create it.
1460
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
1461
    On Windows it's in the config directory; elsewhere it's /var/crash
4634.128.18 by Martin Pool
Update apport crash tests
1462
    which may be monitored by apport.  It can be overridden by
1463
    $APPORT_CRASH_DIR.
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1464
    """
1465
    if sys.platform == 'win32':
1466
        return osutils.pathjoin(config_dir(), 'Crash')
1467
    else:
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
1468
        # XXX: hardcoded in apport_python_hook.py; therefore here too -- mbp
1469
        # 2010-01-31
4634.128.18 by Martin Pool
Update apport crash tests
1470
        return os.environ.get('APPORT_CRASH_DIR', '/var/crash')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1471
1472
1473
def xdg_cache_dir():
4584.3.23 by Martin Pool
Correction to xdg_cache_dir and add a simple test
1474
    # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html
1475
    # Possibly this should be different on Windows?
6589.2.1 by Andrew Starr-Bochicchio
The XDG Base Directory Specification uses the XDG_CACHE_HOME XDG_CACHE_HOME, not XDG_CACHE_DIR.
1476
    e = os.environ.get('XDG_CACHE_HOME', None)
4584.3.23 by Martin Pool
Correction to xdg_cache_dir and add a simple test
1477
    if e:
1478
        return e
1479
    else:
1480
        return os.path.expanduser('~/.cache')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1481
1482
6538.4.2 by Haw Loeung (hloeung)
[hloeung] Also added missing unit tests.
1483
def _get_default_mail_domain(mailname_file='/etc/mailname'):
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1484
    """If possible, return the assumed default email domain.
1485
1486
    :returns: string mail domain, or None.
1487
    """
1488
    if sys.platform == 'win32':
1489
        # No implementation yet; patches welcome
1490
        return None
1491
    try:
6538.4.2 by Haw Loeung (hloeung)
[hloeung] Also added missing unit tests.
1492
        f = open(mailname_file)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1493
    except (IOError, OSError) as e:
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1494
        return None
1495
    try:
6538.4.1 by Haw Loeung (hloeung)
[hloeung] Only read the first line from /etc/mailname - LP bug #932515.
1496
        domain = f.readline().strip()
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1497
        return domain
1498
    finally:
1499
        f.close()
1500
1501
6351.3.15 by Vincent Ladeuil
BZR_EMAIL should override all config settings, no matter how surprising it may seem.
1502
def default_email():
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1503
    v = os.environ.get('BRZ_EMAIL')
6684.1.3 by Martin
Changes across many modules working towards Python 3 support
1504
    if v:
1505
        if not PY3:
1506
            v = v.decode(osutils.get_user_encoding())
1507
        return v
6351.3.15 by Vincent Ladeuil
BZR_EMAIL should override all config settings, no matter how surprising it may seem.
1508
    v = os.environ.get('EMAIL')
6684.1.3 by Martin
Changes across many modules working towards Python 3 support
1509
    if v:
1510
        if not PY3:
1511
            v = v.decode(osutils.get_user_encoding())
1512
        return v
6351.3.15 by Vincent Ladeuil
BZR_EMAIL should override all config settings, no matter how surprising it may seem.
1513
    name, email = _auto_user_id()
1514
    if name and email:
1515
        return u'%s <%s>' % (name, email)
1516
    elif email:
1517
        return email
1518
    raise errors.NoWhoami()
1519
1520
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1521
def _auto_user_id():
1522
    """Calculate automatic user identification.
1523
1524
    :returns: (realname, email), either of which may be None if they can't be
1525
    determined.
1526
1527
    Only used when none is set in the environment or the id file.
1528
1529
    This only returns an email address if we can be fairly sure the 
1530
    address is reasonable, ie if /etc/mailname is set on unix.
1531
1532
    This doesn't use the FQDN as the default domain because that may be 
1533
    slow, and it doesn't use the hostname alone because that's not normally 
1534
    a reasonable address.
1535
    """
1536
    if sys.platform == 'win32':
1537
        # No implementation to reliably determine Windows default mail
1538
        # address; please add one.
1539
        return None, None
1540
1541
    default_mail_domain = _get_default_mail_domain()
1542
    if not default_mail_domain:
1543
        return None, None
1544
1545
    import pwd
1546
    uid = os.getuid()
1547
    try:
1548
        w = pwd.getpwuid(uid)
1549
    except KeyError:
5904.1.2 by Martin Pool
Various pyflakes import fixes.
1550
        trace.mutter('no passwd entry for uid %d?' % uid)
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1551
        return None, None
1552
1553
    # we try utf-8 first, because on many variants (like Linux),
1554
    # /etc/passwd "should" be in utf-8, and because it's unlikely to give
1555
    # false positives.  (many users will have their user encoding set to
1556
    # latin-1, which cannot raise UnicodeError.)
1557
    try:
1558
        gecos = w.pw_gecos.decode('utf-8')
1559
        encoding = 'utf-8'
1560
    except UnicodeError:
1561
        try:
1562
            encoding = osutils.get_user_encoding()
1563
            gecos = w.pw_gecos.decode(encoding)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1564
        except UnicodeError as e:
5904.1.2 by Martin Pool
Various pyflakes import fixes.
1565
            trace.mutter("cannot decode passwd entry %s" % w)
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1566
            return None, None
1567
    try:
1568
        username = w.pw_name.decode(encoding)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1569
    except UnicodeError as e:
5904.1.2 by Martin Pool
Various pyflakes import fixes.
1570
        trace.mutter("cannot decode passwd entry %s" % w)
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1571
        return None, None
1572
1573
    comma = gecos.find(',')
1574
    if comma == -1:
1575
        realname = gecos
1576
    else:
1577
        realname = gecos[:comma]
1578
1579
    return realname, (username + '@' + default_mail_domain)
1580
1581
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1582
def parse_username(username):
1583
    """Parse e-mail username and return a (name, address) tuple."""
1584
    match = re.match(r'(.*?)\s*<?([\w+.-]+@[\w+.-]+)>?', username)
1585
    if match is None:
1586
        return (username, '')
1587
    else:
1588
        return (match.group(1), match.group(2))
1589
1590
1185.16.52 by Martin Pool
- add extract_email_address
1591
def extract_email_address(e):
1592
    """Return just the address part of an email string.
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1593
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1594
    That is just the user@domain part, nothing else.
1185.16.52 by Martin Pool
- add extract_email_address
1595
    This part is required to contain only ascii characters.
1596
    If it can't be extracted, raises an error.
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1597
1185.16.52 by Martin Pool
- add extract_email_address
1598
    >>> extract_email_address('Jane Tester <jane@test.com>')
1599
    "jane@test.com"
1600
    """
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1601
    name, email = parse_username(e)
1602
    if not email:
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
1603
        raise errors.NoEmailInUsername(e)
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1604
    return email
1185.35.11 by Aaron Bentley
Added support for branch nicks
1605
1185.85.30 by John Arbash Meinel
Fixing 'bzr push' exposed that IniBasedConfig didn't handle unicode.
1606
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1607
class TreeConfig(IniBasedConfig):
1185.35.11 by Aaron Bentley
Added support for branch nicks
1608
    """Branch configuration data associated with its contents, not location"""
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1609
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
1610
    # XXX: Really needs a better name, as this is not part of the tree! -- mbp 20080507
1611
1185.35.11 by Aaron Bentley
Added support for branch nicks
1612
    def __init__(self, branch):
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
1613
        self._config = branch._get_config()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1614
        self.branch = branch
1615
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1616
    def _get_parser(self, file=None):
1617
        if file is not None:
1618
            return IniBasedConfig._get_parser(file)
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1619
        return self._config._get_configobj()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1620
1621
    def get_option(self, name, section=None, default=None):
1622
        self.branch.lock_read()
1623
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1624
            return self._config.get_option(name, section, default)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1625
        finally:
1626
            self.branch.unlock()
1627
1628
    def set_option(self, value, name, section=None):
1629
        """Set a per-branch configuration option"""
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1630
        # FIXME: We shouldn't need to lock explicitly here but rather rely on
1631
        # higher levels providing the right lock -- vila 20101004
1185.35.11 by Aaron Bentley
Added support for branch nicks
1632
        self.branch.lock_write()
1633
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1634
            self._config.set_option(value, name, section)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1635
        finally:
1636
            self.branch.unlock()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1637
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1638
    def remove_option(self, option_name, section_name=None):
1639
        # FIXME: We shouldn't need to lock explicitly here but rather rely on
1640
        # higher levels providing the right lock -- vila 20101004
1641
        self.branch.lock_write()
1642
        try:
1643
            self._config.remove_option(option_name, section_name)
1644
        finally:
1645
            self.branch.unlock()
1646
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1647
6695.4.1 by Jelmer Vernooij
Only print warning about authentication.conf permissions once.
1648
_authentication_config_permission_errors = set()
1649
1650
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1651
class AuthenticationConfig(object):
1652
    """The authentication configuration file based on a ini file.
1653
1654
    Implements the authentication.conf file described in
1655
    doc/developers/authentication-ring.txt.
1656
    """
1657
1658
    def __init__(self, _file=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1659
        self._config = None # The ConfigObj
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1660
        if _file is None:
2900.2.24 by Vincent Ladeuil
Review feedback.
1661
            self._filename = authentication_config_filename()
1662
            self._input = self._filename = authentication_config_filename()
4788.3.2 by Joke de Buhr
Emit warning message if an authentication.conf file hase insecure file permissions.
1663
            self._check_permissions()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1664
        else:
2900.2.24 by Vincent Ladeuil
Review feedback.
1665
            # Tests can provide a string as _file
1666
            self._filename = None
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1667
            self._input = _file
1668
1669
    def _get_config(self):
1670
        if self._config is not None:
1671
            return self._config
1672
        try:
2900.2.22 by Vincent Ladeuil
Polishing.
1673
            # FIXME: Should we validate something here ? Includes: empty
1674
            # sections are useless, at least one of
1675
            # user/password/password_encoding should be defined, etc.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1676
1677
            # Note: the encoding below declares that the file itself is utf-8
1678
            # encoded, but the values in the ConfigObj are always Unicode.
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1679
            self._config = ConfigObj(self._input, encoding='utf-8')
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1680
        except configobj.ConfigObjError as e:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1681
            raise errors.ParseConfigError(e.errors, e.config.filename)
5987.1.4 by Vincent Ladeuil
Proper error messages for config files with content in non-utf encoding or that cannot be parsed
1682
        except UnicodeError:
5987.1.3 by Vincent Ladeuil
Proper message when authentication.conf has non-utf8 content
1683
            raise errors.ConfigContentError(self._filename)
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1684
        return self._config
1685
4788.3.2 by Joke de Buhr
Emit warning message if an authentication.conf file hase insecure file permissions.
1686
    def _check_permissions(self):
4788.3.3 by Joke de Buhr
Don't emit warning message if the option 'no_insecure_permissions_warning'
1687
        """Check permission of auth file are user read/write able only."""
6690.1.1 by Jelmer Vernooij
Create authentication.conf in a way that it is only readable to the user.
1688
        try:
1689
            st = os.stat(self._filename)
6690.1.3 by Jelmer Vernooij
Review comments.
1690
        except OSError as e:
1691
            if e.errno != errno.ENOENT:
1692
                trace.mutter('Unable to stat %r: %r', self._filename, e)
6690.1.1 by Jelmer Vernooij
Create authentication.conf in a way that it is only readable to the user.
1693
            return
1694
        mode = stat.S_IMODE(st.st_mode)
1695
        if ((stat.S_IXOTH | stat.S_IWOTH | stat.S_IROTH | stat.S_IXGRP |
6690.1.3 by Jelmer Vernooij
Review comments.
1696
             stat.S_IWGRP | stat.S_IRGRP ) & mode):
6695.4.1 by Jelmer Vernooij
Only print warning about authentication.conf permissions once.
1697
            # Only warn once
1698
            if (not self._filename in _authentication_config_permission_errors
1699
                and not GlobalConfig().suppress_warning(
1700
                    'insecure_permissions')):
6690.1.1 by Jelmer Vernooij
Create authentication.conf in a way that it is only readable to the user.
1701
                trace.warning("The file '%s' has insecure "
4788.3.3 by Joke de Buhr
Don't emit warning message if the option 'no_insecure_permissions_warning'
1702
                        "file permissions. Saved passwords may be accessible "
6690.1.1 by Jelmer Vernooij
Create authentication.conf in a way that it is only readable to the user.
1703
                        "by other users.", self._filename)
6695.4.1 by Jelmer Vernooij
Only print warning about authentication.conf permissions once.
1704
                _authentication_config_permission_errors.add(self._filename)
4788.3.2 by Joke de Buhr
Emit warning message if an authentication.conf file hase insecure file permissions.
1705
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1706
    def _save(self):
1707
        """Save the config file, only tests should use it for now."""
2900.2.26 by Vincent Ladeuil
Fix forgotten reference to _get_filename and duplicated code.
1708
        conf_dir = os.path.dirname(self._filename)
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1709
        ensure_config_dir_exists(conf_dir)
6690.1.2 by Jelmer Vernooij
Use os.fdopen.
1710
        fd = os.open(self._filename, os.O_RDWR|os.O_CREAT, 0o600)
4708.2.2 by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib
1711
        try:
6690.1.2 by Jelmer Vernooij
Use os.fdopen.
1712
            f = os.fdopen(fd, 'wb')
1713
            self._get_config().write(f)
4708.2.2 by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib
1714
        finally:
6690.1.2 by Jelmer Vernooij
Use os.fdopen.
1715
            f.close()
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1716
1717
    def _set_option(self, section_name, option_name, value):
1718
        """Set an authentication configuration option"""
1719
        conf = self._get_config()
1720
        section = conf.get(section_name)
1721
        if section is None:
1722
            conf[section] = {}
1723
            section = conf[section]
1724
        section[option_name] = value
1725
        self._save()
1726
5743.8.25 by Vincent Ladeuil
Fix spurious spaces.
1727
    def get_credentials(self, scheme, host, port=None, user=None, path=None,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1728
                        realm=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1729
        """Returns the matching credentials from authentication.conf file.
1730
1731
        :param scheme: protocol
1732
1733
        :param host: the server address
1734
1735
        :param port: the associated port (optional)
1736
1737
        :param user: login (optional)
1738
1739
        :param path: the absolute path on the server (optional)
6371.1.1 by Jelmer Vernooij
Fix some whitespace in bzrlib.config.
1740
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1741
        :param realm: the http authentication realm (optional)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1742
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1743
        :return: A dict containing the matching credentials or None.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1744
           This includes:
1745
           - name: the section name of the credentials in the
1746
             authentication.conf file,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1747
           - user: can't be different from the provided user if any,
4107.1.7 by Jean-Francois Roy
No longer deleting the extra credentials keys in get_credentials.
1748
           - scheme: the server protocol,
1749
           - host: the server address,
1750
           - port: the server port (can be None),
1751
           - path: the absolute server path (can be None),
1752
           - realm: the http specific authentication realm (can be None),
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1753
           - password: the decoded password, could be None if the credential
1754
             defines only the user
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1755
           - verify_certificates: https specific, True if the server
1756
             certificate should be verified, False otherwise.
1757
        """
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1758
        credentials = None
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
1759
        for auth_def_name, auth_def in self._get_config().iteritems():
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
1760
            if not isinstance(auth_def, configobj.Section):
3418.2.1 by Vincent Ladeuil
Fix #217650 by catching declarations outside sections.
1761
                raise ValueError("%s defined outside a section" % auth_def_name)
1762
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1763
            a_scheme, a_host, a_user, a_path = map(
1764
                auth_def.get, ['scheme', 'host', 'user', 'path'])
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1765
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1766
            try:
1767
                a_port = auth_def.as_int('port')
1768
            except KeyError:
1769
                a_port = None
2900.2.22 by Vincent Ladeuil
Polishing.
1770
            except ValueError:
1771
                raise ValueError("'port' not numeric in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1772
            try:
1773
                a_verify_certificates = auth_def.as_bool('verify_certificates')
1774
            except KeyError:
1775
                a_verify_certificates = True
2900.2.22 by Vincent Ladeuil
Polishing.
1776
            except ValueError:
1777
                raise ValueError(
1778
                    "'verify_certificates' not boolean in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1779
1780
            # Attempt matching
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1781
            if a_scheme is not None and scheme != a_scheme:
1782
                continue
1783
            if a_host is not None:
1784
                if not (host == a_host
1785
                        or (a_host.startswith('.') and host.endswith(a_host))):
1786
                    continue
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1787
            if a_port is not None and port != a_port:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1788
                continue
1789
            if (a_path is not None and path is not None
1790
                and not path.startswith(a_path)):
1791
                continue
1792
            if (a_user is not None and user is not None
1793
                and a_user != user):
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1794
                # Never contradict the caller about the user to be used
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1795
                continue
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1796
            if a_user is None:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1797
                # Can't find a user
1798
                continue
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1799
            # Prepare a credentials dictionary with additional keys
1800
            # for the credential providers
2900.2.24 by Vincent Ladeuil
Review feedback.
1801
            credentials = dict(name=auth_def_name,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1802
                               user=a_user,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1803
                               scheme=a_scheme,
1804
                               host=host,
1805
                               port=port,
1806
                               path=path,
1807
                               realm=realm,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1808
                               password=auth_def.get('password', None),
2900.2.24 by Vincent Ladeuil
Review feedback.
1809
                               verify_certificates=a_verify_certificates)
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1810
            # Decode the password in the credentials (or get one)
2900.2.22 by Vincent Ladeuil
Polishing.
1811
            self.decode_password(credentials,
1812
                                 auth_def.get('password_encoding', None))
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1813
            if 'auth' in debug.debug_flags:
1814
                trace.mutter("Using authentication section: %r", auth_def_name)
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1815
            break
1816
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1817
        if credentials is None:
1818
            # No credentials were found in authentication.conf, try the fallback
1819
            # credentials stores.
1820
            credentials = credential_store_registry.get_fallback_credentials(
1821
                scheme, host, port, user, path, realm)
1822
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1823
        return credentials
1824
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1825
    def set_credentials(self, name, host, user, scheme=None, password=None,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1826
                        port=None, path=None, verify_certificates=None,
1827
                        realm=None):
3777.3.1 by Aaron Bentley
Update docs
1828
        """Set authentication credentials for a host.
1829
1830
        Any existing credentials with matching scheme, host, port and path
1831
        will be deleted, regardless of name.
1832
1833
        :param name: An arbitrary name to describe this set of credentials.
1834
        :param host: Name of the host that accepts these credentials.
1835
        :param user: The username portion of these credentials.
1836
        :param scheme: The URL scheme (e.g. ssh, http) the credentials apply
1837
            to.
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1838
        :param password: Password portion of these credentials.
3777.3.1 by Aaron Bentley
Update docs
1839
        :param port: The IP port on the host that these credentials apply to.
1840
        :param path: A filesystem path on the host that these credentials
1841
            apply to.
1842
        :param verify_certificates: On https, verify server certificates if
1843
            True.
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1844
        :param realm: The http authentication realm (optional).
3777.3.1 by Aaron Bentley
Update docs
1845
        """
3777.1.8 by Aaron Bentley
Commit work-in-progress
1846
        values = {'host': host, 'user': user}
1847
        if password is not None:
1848
            values['password'] = password
1849
        if scheme is not None:
1850
            values['scheme'] = scheme
1851
        if port is not None:
1852
            values['port'] = '%d' % port
1853
        if path is not None:
1854
            values['path'] = path
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1855
        if verify_certificates is not None:
1856
            values['verify_certificates'] = str(verify_certificates)
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1857
        if realm is not None:
1858
            values['realm'] = realm
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1859
        config = self._get_config()
1860
        for_deletion = []
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
1861
        for section, existing_values in config.iteritems():
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1862
            for key in ('scheme', 'host', 'port', 'path', 'realm'):
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1863
                if existing_values.get(key) != values.get(key):
1864
                    break
1865
            else:
1866
                del config[section]
1867
        config.update({name: values})
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1868
        self._save()
3777.1.8 by Aaron Bentley
Commit work-in-progress
1869
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1870
    def get_user(self, scheme, host, port=None, realm=None, path=None,
4222.3.10 by Jelmer Vernooij
Avoid using the default username in the case of SMTP.
1871
                 prompt=None, ask=False, default=None):
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1872
        """Get a user from authentication file.
1873
1874
        :param scheme: protocol
1875
1876
        :param host: the server address
1877
1878
        :param port: the associated port (optional)
1879
1880
        :param realm: the realm sent by the server (optional)
1881
1882
        :param path: the absolute path on the server (optional)
1883
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1884
        :param ask: Ask the user if there is no explicitly configured username 
1885
                    (optional)
1886
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1887
        :param default: The username returned if none is defined (optional).
1888
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1889
        :return: The found user.
1890
        """
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1891
        credentials = self.get_credentials(scheme, host, port, user=None,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1892
                                           path=path, realm=realm)
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1893
        if credentials is not None:
1894
            user = credentials['user']
1895
        else:
1896
            user = None
4222.3.2 by Jelmer Vernooij
Prompt for user names if they are not in the configuration.
1897
        if user is None:
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1898
            if ask:
1899
                if prompt is None:
1900
                    # Create a default prompt suitable for most cases
5923.1.3 by Vincent Ladeuil
Even more unicode prompts fixes revealed by pqm.
1901
                    prompt = u'%s' % (scheme.upper(),) + u' %(host)s username'
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1902
                # Special handling for optional fields in the prompt
1903
                if port is not None:
1904
                    prompt_host = '%s:%d' % (host, port)
1905
                else:
1906
                    prompt_host = host
1907
                user = ui.ui_factory.get_username(prompt, host=prompt_host)
4222.3.2 by Jelmer Vernooij
Prompt for user names if they are not in the configuration.
1908
            else:
4222.3.10 by Jelmer Vernooij
Avoid using the default username in the case of SMTP.
1909
                user = default
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1910
        return user
1911
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1912
    def get_password(self, scheme, host, user, port=None,
1913
                     realm=None, path=None, prompt=None):
1914
        """Get a password from authentication file or prompt the user for one.
1915
1916
        :param scheme: protocol
1917
1918
        :param host: the server address
1919
1920
        :param port: the associated port (optional)
1921
1922
        :param user: login
1923
1924
        :param realm: the realm sent by the server (optional)
1925
1926
        :param path: the absolute path on the server (optional)
1927
1928
        :return: The found password or the one entered by the user.
1929
        """
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1930
        credentials = self.get_credentials(scheme, host, port, user, path,
1931
                                           realm)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1932
        if credentials is not None:
1933
            password = credentials['password']
3420.1.3 by Vincent Ladeuil
John's review feedback.
1934
            if password is not None and scheme is 'ssh':
3420.1.2 by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user.
1935
                trace.warning('password ignored in section [%s],'
1936
                              ' use an ssh agent instead'
1937
                              % credentials['name'])
1938
                password = None
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1939
        else:
1940
            password = None
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1941
        # Prompt user only if we could't find a password
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1942
        if password is None:
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1943
            if prompt is None:
3420.1.2 by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user.
1944
                # Create a default prompt suitable for most cases
5923.1.3 by Vincent Ladeuil
Even more unicode prompts fixes revealed by pqm.
1945
                prompt = u'%s' % scheme.upper() + u' %(user)s@%(host)s password'
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1946
            # Special handling for optional fields in the prompt
1947
            if port is not None:
1948
                prompt_host = '%s:%d' % (host, port)
1949
            else:
1950
                prompt_host = host
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1951
            password = ui.ui_factory.get_password(prompt,
1952
                                                  host=prompt_host, user=user)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1953
        return password
1954
2900.2.22 by Vincent Ladeuil
Polishing.
1955
    def decode_password(self, credentials, encoding):
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1956
        try:
1957
            cs = credential_store_registry.get_credential_store(encoding)
1958
        except KeyError:
1959
            raise ValueError('%r is not a known password_encoding' % encoding)
1960
        credentials['password'] = cs.decode_password(credentials)
2900.2.22 by Vincent Ladeuil
Polishing.
1961
        return credentials
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1962
3242.3.17 by Aaron Bentley
Whitespace cleanup
1963
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1964
class CredentialStoreRegistry(registry.Registry):
1965
    """A class that registers credential stores.
1966
1967
    A credential store provides access to credentials via the password_encoding
1968
    field in authentication.conf sections.
1969
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
1970
    Except for stores provided by brz itself, most stores are expected to be
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1971
    provided by plugins that will therefore use
1972
    register_lazy(password_encoding, module_name, member_name, help=help,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1973
    fallback=fallback) to install themselves.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1974
1975
    A fallback credential store is one that is queried if no credentials can be
1976
    found via authentication.conf.
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1977
    """
1978
1979
    def get_credential_store(self, encoding=None):
1980
        cs = self.get(encoding)
1981
        if callable(cs):
1982
            cs = cs()
1983
        return cs
1984
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1985
    def is_fallback(self, name):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1986
        """Check if the named credentials store should be used as fallback."""
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1987
        return self.get_info(name)
1988
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1989
    def get_fallback_credentials(self, scheme, host, port=None, user=None,
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1990
                                 path=None, realm=None):
1991
        """Request credentials from all fallback credentials stores.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1992
1993
        The first credentials store that can provide credentials wins.
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1994
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1995
        credentials = None
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1996
        for name in self.keys():
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1997
            if not self.is_fallback(name):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1998
                continue
1999
            cs = self.get_credential_store(name)
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2000
            credentials = cs.get_credentials(scheme, host, port, user,
2001
                                             path, realm)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2002
            if credentials is not None:
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2003
                # We found some credentials
2004
                break
2005
        return credentials
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2006
2007
    def register(self, key, obj, help=None, override_existing=False,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2008
                 fallback=False):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2009
        """Register a new object to a name.
2010
2011
        :param key: This is the key to use to request the object later.
2012
        :param obj: The object to register.
2013
        :param help: Help text for this entry. This may be a string or
2014
                a callable. If it is a callable, it should take two
2015
                parameters (registry, key): this registry and the key that
2016
                the help was registered under.
2017
        :param override_existing: Raise KeyErorr if False and something has
2018
                already been registered for that key. If True, ignore if there
2019
                is an existing key (always register the new value).
2020
        :param fallback: Whether this credential store should be 
2021
                used as fallback.
2022
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2023
        return super(CredentialStoreRegistry,
2024
                     self).register(key, obj, help, info=fallback,
2025
                                    override_existing=override_existing)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2026
2027
    def register_lazy(self, key, module_name, member_name,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2028
                      help=None, override_existing=False,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2029
                      fallback=False):
2030
        """Register a new credential store to be loaded on request.
2031
2032
        :param module_name: The python path to the module. Such as 'os.path'.
2033
        :param member_name: The member of the module to return.  If empty or
2034
                None, get() will return the module itself.
2035
        :param help: Help text for this entry. This may be a string or
2036
                a callable.
2037
        :param override_existing: If True, replace the existing object
2038
                with the new one. If False, if there is already something
2039
                registered with the same key, raise a KeyError
2040
        :param fallback: Whether this credential store should be 
2041
                used as fallback.
2042
        """
2043
        return super(CredentialStoreRegistry, self).register_lazy(
2044
            key, module_name, member_name, help,
2045
            info=fallback, override_existing=override_existing)
2046
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2047
2048
credential_store_registry = CredentialStoreRegistry()
2049
2050
2051
class CredentialStore(object):
2052
    """An abstract class to implement storage for credentials"""
2053
2054
    def decode_password(self, credentials):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2055
        """Returns a clear text password for the provided credentials."""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2056
        raise NotImplementedError(self.decode_password)
2057
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2058
    def get_credentials(self, scheme, host, port=None, user=None, path=None,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2059
                        realm=None):
2060
        """Return the matching credentials from this credential store.
2061
2062
        This method is only called on fallback credential stores.
2063
        """
2064
        raise NotImplementedError(self.get_credentials)
2065
2066
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2067
2068
class PlainTextCredentialStore(CredentialStore):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2069
    __doc__ = """Plain text credential store for the authentication.conf file"""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2070
2071
    def decode_password(self, credentials):
2072
        """See CredentialStore.decode_password."""
2073
        return credentials['password']
2074
2075
2076
credential_store_registry.register('plain', PlainTextCredentialStore,
2077
                                   help=PlainTextCredentialStore.__doc__)
2078
credential_store_registry.default_key = 'plain'
2079
5912.5.5 by Florian Dorn
re-added blanks
2080
5912.5.6 by Martin
Revert to implementation in config rather than a plugin
2081
class Base64CredentialStore(CredentialStore):
2082
    __doc__ = """Base64 credential store for the authentication.conf file"""
6561.2.1 by Vincent Ladeuil
Add a ``progress_bar`` config option.
2083
5912.5.6 by Martin
Revert to implementation in config rather than a plugin
2084
    def decode_password(self, credentials):
2085
        """See CredentialStore.decode_password."""
5912.5.7 by Martin
Minor cleanups and note about error case
2086
        # GZ 2012-07-28: Will raise binascii.Error if password is not base64,
2087
        #                should probably propogate as something more useful.
5912.5.6 by Martin
Revert to implementation in config rather than a plugin
2088
        return base64.decodestring(credentials['password'])
2089
2090
credential_store_registry.register('base64', Base64CredentialStore,
2091
                                   help=Base64CredentialStore.__doc__)
2092
2093
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2094
class BzrDirConfig(object):
2095
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2096
    def __init__(self, bzrdir):
2097
        self._bzrdir = bzrdir
2098
        self._config = bzrdir._get_config()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2099
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2100
    def set_default_stack_on(self, value):
2101
        """Set the default stacking location.
2102
2103
        It may be set to a location, or None.
2104
6472.2.3 by Jelmer Vernooij
More control dir.
2105
        This policy affects all branches contained by this control dir, except
2106
        for those under repositories.
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2107
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2108
        if self._config is None:
6561.2.1 by Vincent Ladeuil
Add a ``progress_bar`` config option.
2109
            raise errors.BzrError("Cannot set configuration in %s"
2110
                                  % self._bzrdir)
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2111
        if value is None:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2112
            self._config.set_option('', 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2113
        else:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2114
            self._config.set_option(value, 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2115
2116
    def get_default_stack_on(self):
2117
        """Return the default stacking location.
2118
2119
        This will either be a location, or None.
2120
6472.2.3 by Jelmer Vernooij
More control dir.
2121
        This policy affects all branches contained by this control dir, except
2122
        for those under repositories.
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2123
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2124
        if self._config is None:
2125
            return None
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2126
        value = self._config.get_option('default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2127
        if value == '':
2128
            value = None
2129
        return value
2130
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2131
2132
class TransportConfig(object):
3242.1.5 by Aaron Bentley
Update per review comments
2133
    """A Config that reads/writes a config file on a Transport.
3242.1.4 by Aaron Bentley
Clean-up
2134
2135
    It is a low-level object that considers config data to be name/value pairs
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
2136
    that may be associated with a section.  Assigning meaning to these values
2137
    is done at higher levels like TreeConfig.
3242.1.4 by Aaron Bentley
Clean-up
2138
    """
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2139
2140
    def __init__(self, transport, filename):
2141
        self._transport = transport
2142
        self._filename = filename
2143
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2144
    def get_option(self, name, section=None, default=None):
2145
        """Return the value associated with a named option.
2146
2147
        :param name: The name of the value
2148
        :param section: The section the option is in (if any)
2149
        :param default: The value to return if the value is not set
2150
        :return: The value or default value
2151
        """
2152
        configobj = self._get_configobj()
2153
        if section is None:
2154
            section_obj = configobj
2155
        else:
2156
            try:
2157
                section_obj = configobj[section]
2158
            except KeyError:
2159
                return default
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
2160
        value = section_obj.get(name, default)
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
2161
        for hook in OldConfigHooks['get']:
5743.8.25 by Vincent Ladeuil
Fix spurious spaces.
2162
            hook(self, name, value)
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
2163
        return value
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2164
2165
    def set_option(self, value, name, section=None):
2166
        """Set the value associated with a named option.
2167
2168
        :param value: The value to set
2169
        :param name: The name of the value to set
2170
        :param section: The section the option is in (if any)
2171
        """
2172
        configobj = self._get_configobj()
2173
        if section is None:
2174
            configobj[name] = value
2175
        else:
2176
            configobj.setdefault(section, {})[name] = value
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
2177
        for hook in OldConfigHooks['set']:
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
2178
            hook(self, name, value)
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2179
        self._set_configobj(configobj)
2180
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2181
    def remove_option(self, option_name, section_name=None):
2182
        configobj = self._get_configobj()
2183
        if section_name is None:
2184
            del configobj[option_name]
2185
        else:
2186
            del configobj[section_name][option_name]
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
2187
        for hook in OldConfigHooks['remove']:
5743.8.15 by Vincent Ladeuil
Add tests for old config hooks covering bazaar.conf, locations.conf and branch.conf.
2188
            hook(self, option_name)
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2189
        self._set_configobj(configobj)
2190
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
2191
    def _get_config_file(self):
2192
        try:
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
2193
            f = BytesIO(self._transport.get_bytes(self._filename))
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
2194
            for hook in OldConfigHooks['load']:
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
2195
                hook(self)
2196
            return f
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
2197
        except errors.NoSuchFile:
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
2198
            return BytesIO()
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
2199
        except errors.PermissionDenied as e:
6110.5.1 by Jelmer Vernooij
Warn when a configuration file can not be opened.
2200
            trace.warning("Permission denied while trying to open "
2201
                "configuration file %s.", urlutils.unescape_for_display(
2202
                urlutils.join(self._transport.base, self._filename), "utf-8"))
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
2203
            return BytesIO()
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
2204
5987.1.4 by Vincent Ladeuil
Proper error messages for config files with content in non-utf encoding or that cannot be parsed
2205
    def _external_url(self):
2206
        return urlutils.join(self._transport.external_url(), self._filename)
2207
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2208
    def _get_configobj(self):
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
2209
        f = self._get_config_file()
2210
        try:
5987.1.4 by Vincent Ladeuil
Proper error messages for config files with content in non-utf encoding or that cannot be parsed
2211
            try:
2212
                conf = ConfigObj(f, encoding='utf-8')
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
2213
            except configobj.ConfigObjError as e:
5987.1.4 by Vincent Ladeuil
Proper error messages for config files with content in non-utf encoding or that cannot be parsed
2214
                raise errors.ParseConfigError(e.errors, self._external_url())
2215
            except UnicodeDecodeError:
2216
                raise errors.ConfigContentError(self._external_url())
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
2217
        finally:
2218
            f.close()
5987.1.4 by Vincent Ladeuil
Proper error messages for config files with content in non-utf encoding or that cannot be parsed
2219
        return conf
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2220
2221
    def _set_configobj(self, configobj):
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
2222
        out_file = BytesIO()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2223
        configobj.write(out_file)
2224
        out_file.seek(0)
2225
        self._transport.put_file(self._filename, out_file)
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
2226
        for hook in OldConfigHooks['save']:
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
2227
            hook(self)
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2228
2229
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2230
class Option(object):
5743.12.10 by Vincent Ladeuil
Add documentation.
2231
    """An option definition.
2232
2233
    The option *values* are stored in config files and found in sections.
2234
2235
    Here we define various properties about the option itself, its default
6059.1.4 by Vincent Ladeuil
Add a doc string for the Option constructor.
2236
    value, how to convert it from stores, what to do when invalid values are
2237
    encoutered, in which config files it can be stored.
5743.12.10 by Vincent Ladeuil
Add documentation.
2238
    """
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2239
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
2240
    def __init__(self, name, override_from_env=None,
2241
                 default=None, default_from_env=None,
6393.3.2 by Vincent Ladeuil
Merge trunk resolving conflicts
2242
                 help=None, from_unicode=None, invalid=None, unquote=True):
6059.1.4 by Vincent Ladeuil
Add a doc string for the Option constructor.
2243
        """Build an option definition.
2244
2245
        :param name: the name used to refer to the option.
2246
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
2247
        :param override_from_env: A list of environment variables which can
2248
           provide override any configuration setting.
2249
6059.1.4 by Vincent Ladeuil
Add a doc string for the Option constructor.
2250
        :param default: the default value to use when none exist in the config
6091.3.6 by Vincent Ladeuil
Replace ugly default value declarations with ad-hoc and limited conversion to unicode strings.
2251
            stores. This is either a string that ``from_unicode`` will convert
6349.3.1 by Vincent Ladeuil
Allow config option default value to be a python callable
2252
            into the proper type, a callable returning a unicode string so that
2253
            ``from_unicode`` can be used on the return value, or a python
2254
            object that can be stringified (so only the empty list is supported
2255
            for example).
6059.1.4 by Vincent Ladeuil
Add a doc string for the Option constructor.
2256
6082.2.1 by Vincent Ladeuil
Implement default values from environment for config options
2257
        :param default_from_env: A list of environment variables which can
2258
           provide a default value. 'default' will be used only if none of the
2259
           variables specified here are set in the environment.
2260
6059.1.4 by Vincent Ladeuil
Add a doc string for the Option constructor.
2261
        :param help: a doc string to explain the option to the user.
2262
2263
        :param from_unicode: a callable to convert the unicode string
6586.1.1 by Vincent Ladeuil
Fix various typos in docstrings. Rename 'buffer' to 'buf' since it's now a python builtin function.
2264
            representing the option value in a store or its default value.
6059.1.5 by Vincent Ladeuil
Handle invalid config option values.
2265
2266
        :param invalid: the action to be taken when an invalid value is
2267
            encountered in a store. This is called only when from_unicode is
6059.1.7 by Vincent Ladeuil
Catch TypeError when a list value is encountered while attempting to
2268
            invoked to convert a string and returns None or raise ValueError or
2269
            TypeError. Accepted values are: None (ignore invalid values),
2270
            'warning' (emit a warning), 'error' (emit an error message and
2271
            terminates).
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2272
2273
        :param unquote: should the unicode value be unquoted before conversion.
2274
           This should be used only when the store providing the values cannot
2275
           safely unquote them (see http://pad.lv/906897). It is provided so
2276
           daughter classes can handle the quoting themselves.
6059.1.4 by Vincent Ladeuil
Add a doc string for the Option constructor.
2277
        """
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
2278
        if override_from_env is None:
2279
            override_from_env = []
6082.2.1 by Vincent Ladeuil
Implement default values from environment for config options
2280
        if default_from_env is None:
2281
            default_from_env = []
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2282
        self.name = name
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
2283
        self.override_from_env = override_from_env
6091.3.6 by Vincent Ladeuil
Replace ugly default value declarations with ad-hoc and limited conversion to unicode strings.
2284
        # Convert the default value to a unicode string so all values are
2285
        # strings internally before conversion (via from_unicode) is attempted.
2286
        if default is None:
2287
            self.default = None
2288
        elif isinstance(default, list):
2289
            # Only the empty list is supported
2290
            if default:
2291
                raise AssertionError(
2292
                    'Only empty lists are supported as default values')
2293
            self.default = u','
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
2294
        elif isinstance(default, (binary_type, text_type, bool, int, float)):
6091.3.6 by Vincent Ladeuil
Replace ugly default value declarations with ad-hoc and limited conversion to unicode strings.
2295
            # Rely on python to convert strings, booleans and integers
2296
            self.default = u'%s' % (default,)
6351.3.3 by Jelmer Vernooij
Convert more stuff to use config stacks.
2297
        elif callable(default):
2298
            self.default = default
6091.3.6 by Vincent Ladeuil
Replace ugly default value declarations with ad-hoc and limited conversion to unicode strings.
2299
        else:
2300
            # other python objects are not expected
2301
            raise AssertionError('%r is not supported as a default value'
2302
                                 % (default,))
6082.2.1 by Vincent Ladeuil
Implement default values from environment for config options
2303
        self.default_from_env = default_from_env
6449.2.2 by Jelmer Vernooij
Moar tests.
2304
        self._help = help
6059.1.1 by Vincent Ladeuil
Implement from_unicode to convert config option values from store.
2305
        self.from_unicode = from_unicode
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2306
        self.unquote = unquote
6059.1.5 by Vincent Ladeuil
Handle invalid config option values.
2307
        if invalid and invalid not in ('warning', 'error'):
2308
            raise AssertionError("%s not supported for 'invalid'" % (invalid,))
2309
        self.invalid = invalid
5743.12.4 by Vincent Ladeuil
An option can provide a default value.
2310
6449.2.2 by Jelmer Vernooij
Moar tests.
2311
    @property
2312
    def help(self):
2313
        return self._help
2314
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2315
    def convert_from_unicode(self, store, unicode_value):
2316
        if self.unquote and store is not None and unicode_value is not None:
2317
            unicode_value = store.unquote(unicode_value)
6091.3.1 by Vincent Ladeuil
Add convert_from_unicode to Option and rewrite the tests to need only an
2318
        if self.from_unicode is None or unicode_value is None:
6091.3.3 by Vincent Ladeuil
Update registered option default values and also convert the default value if the first conversion fails.
2319
            # Don't convert or nothing to convert
6091.3.1 by Vincent Ladeuil
Add convert_from_unicode to Option and rewrite the tests to need only an
2320
            return unicode_value
2321
        try:
2322
            converted = self.from_unicode(unicode_value)
2323
        except (ValueError, TypeError):
2324
            # Invalid values are ignored
2325
            converted = None
2326
        if converted is None and self.invalid is not None:
2327
            # The conversion failed
2328
            if self.invalid == 'warning':
2329
                trace.warning('Value "%s" is not valid for "%s"',
2330
                              unicode_value, self.name)
2331
            elif self.invalid == 'error':
2332
                raise errors.ConfigOptionValueError(self.name, unicode_value)
2333
        return converted
2334
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
2335
    def get_override(self):
2336
        value = None
2337
        for var in self.override_from_env:
2338
            try:
2339
                # If the env variable is defined, its value takes precedence
2340
                value = os.environ[var].decode(osutils.get_user_encoding())
2341
                break
2342
            except KeyError:
2343
                continue
2344
        return value
2345
5743.12.4 by Vincent Ladeuil
An option can provide a default value.
2346
    def get_default(self):
6091.3.4 by Vincent Ladeuil
Clarify get_default.
2347
        value = None
6082.2.1 by Vincent Ladeuil
Implement default values from environment for config options
2348
        for var in self.default_from_env:
2349
            try:
6091.3.4 by Vincent Ladeuil
Clarify get_default.
2350
                # If the env variable is defined, its value is the default one
6695.1.1 by Martin
Make ui package pass tests on Python 3
2351
                value = os.environ[var]
2352
                if not PY3:
2353
                    value = value.decode(osutils.get_user_encoding())
6091.3.4 by Vincent Ladeuil
Clarify get_default.
2354
                break
6082.2.1 by Vincent Ladeuil
Implement default values from environment for config options
2355
            except KeyError:
2356
                continue
6091.3.4 by Vincent Ladeuil
Clarify get_default.
2357
        if value is None:
2358
            # Otherwise, fallback to the value defined at registration
6351.3.3 by Jelmer Vernooij
Convert more stuff to use config stacks.
2359
            if callable(self.default):
2360
                value = self.default()
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
2361
                if not isinstance(value, text_type):
6349.3.1 by Vincent Ladeuil
Allow config option default value to be a python callable
2362
                    raise AssertionError(
6523.1.1 by Vincent Ladeuil
Fix some test issues raised by mgz.
2363
                        "Callable default value for '%s' should be unicode"
2364
                        % (self.name))
6351.3.3 by Jelmer Vernooij
Convert more stuff to use config stacks.
2365
            else:
2366
                value = self.default
6091.3.4 by Vincent Ladeuil
Clarify get_default.
2367
        return value
5743.12.4 by Vincent Ladeuil
An option can provide a default value.
2368
6437.42.1 by Jelmer Vernooij
Make sure help options can provide their own help topic.
2369
    def get_help_topic(self):
2370
        return self.name
2371
6059.3.1 by Vincent Ladeuil
Provide per-config option help
2372
    def get_help_text(self, additional_see_also=None, plain=True):
2373
        result = self.help
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2374
        from breezy import help_topics
6059.3.1 by Vincent Ladeuil
Provide per-config option help
2375
        result += help_topics._format_see_also(additional_see_also)
2376
        if plain:
2377
            result = help_topics.help_as_plain_text(result)
2378
        return result
2379
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2380
6059.1.2 by Vincent Ladeuil
Define a proper converter to avoid lazy import issues.
2381
# Predefined converters to get proper values from store
2382
2383
def bool_from_store(unicode_str):
2384
    return ui.bool_from_string(unicode_str)
2385
6015.25.1 by Vincent Ladeuil
Minimal backport to fix fdatasync options handling
2386
6059.1.6 by Vincent Ladeuil
Implement integer config options.
2387
def int_from_store(unicode_str):
2388
    return int(unicode_str)
2389
2390
6385.1.7 by Vincent Ladeuil
Feedback from review and minor tweaks.
2391
_unit_suffixes = dict(K=10**3, M=10**6, G=10**9)
6378.1.1 by Vincent Ladeuil
Add int_SI_from_store as a config option helper
2392
2393
def int_SI_from_store(unicode_str):
6378.1.2 by Vincent Ladeuil
Migrate add.maximum_file_size to the new config scheme
2394
    """Convert a human readable size in SI units, e.g 10MB into an integer.
2395
2396
    Accepted suffixes are K,M,G. It is case-insensitive and may be followed
2397
    by a trailing b (i.e. Kb, MB). This is intended to be practical and not
2398
    pedantic.
2399
2400
    :return Integer, expanded to its base-10 value if a proper SI unit is 
2401
        found, None otherwise.
2402
    """
6385.1.7 by Vincent Ladeuil
Feedback from review and minor tweaks.
2403
    regexp = "^(\d+)(([" + ''.join(_unit_suffixes) + "])b?)?$"
6378.1.1 by Vincent Ladeuil
Add int_SI_from_store as a config option helper
2404
    p = re.compile(regexp, re.IGNORECASE)
2405
    m = p.match(unicode_str)
2406
    val = None
2407
    if m is not None:
2408
        val, _, unit = m.groups()
2409
        val = int(val)
2410
        if unit:
2411
            try:
6385.1.7 by Vincent Ladeuil
Feedback from review and minor tweaks.
2412
                coeff = _unit_suffixes[unit.upper()]
6378.1.1 by Vincent Ladeuil
Add int_SI_from_store as a config option helper
2413
            except KeyError:
2414
                raise ValueError(gettext('{0} is not an SI unit.').format(unit))
2415
            val *= coeff
2416
    return val
2417
2418
6133.4.35 by John Arbash Meinel
Change int_from_store into float_from_store, which allows us to set the time under 1.0s.
2419
def float_from_store(unicode_str):
2420
    return float(unicode_str)
2421
2422
6561.2.1 by Vincent Ladeuil
Add a ``progress_bar`` config option.
2423
# Use an empty dict to initialize an empty configobj avoiding all parsing and
2424
# encoding checks
6082.5.15 by Vincent Ladeuil
Use explicit kwargs for the list converter.
2425
_list_converter_config = configobj.ConfigObj(
2426
    {}, encoding='utf-8', list_values=True, interpolation=False)
2427
6082.5.14 by Vincent Ladeuil
Create a single configobj for list conversions and just reset() it when needed.
2428
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2429
class ListOption(Option):
2430
2431
    def __init__(self, name, default=None, default_from_env=None,
2432
                 help=None, invalid=None):
2433
        """A list Option definition.
2434
2435
        This overrides the base class so the conversion from a unicode string
2436
        can take quoting into account.
2437
        """
2438
        super(ListOption, self).__init__(
2439
            name, default=default, default_from_env=default_from_env,
2440
            from_unicode=self.from_unicode, help=help,
2441
            invalid=invalid, unquote=False)
2442
6385.1.7 by Vincent Ladeuil
Feedback from review and minor tweaks.
2443
    def from_unicode(self, unicode_str):
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
2444
        if not isinstance(unicode_str, string_types):
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2445
            raise TypeError
2446
        # Now inject our string directly as unicode. All callers got their
2447
        # value from configobj, so values that need to be quoted are already
2448
        # properly quoted.
2449
        _list_converter_config.reset()
6385.1.7 by Vincent Ladeuil
Feedback from review and minor tweaks.
2450
        _list_converter_config._parse([u"list=%s" % (unicode_str,)])
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2451
        maybe_list = _list_converter_config['list']
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
2452
        if isinstance(maybe_list, string_types):
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2453
            if maybe_list:
2454
                # A single value, most probably the user forgot (or didn't care
2455
                # to add) the final ','
2456
                l = [maybe_list]
2457
            else:
2458
                # The empty string, convert to empty list
2459
                l = []
6059.2.1 by Vincent Ladeuil
Implement list config options.
2460
        else:
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2461
            # We rely on ConfigObj providing us with a list already
2462
            l = maybe_list
2463
        return l
6059.2.1 by Vincent Ladeuil
Implement list config options.
2464
2465
6449.2.1 by Jelmer Vernooij
Add bzrlib.config.RegistryOption.
2466
class RegistryOption(Option):
2467
    """Option for a choice from a registry."""
2468
6449.3.1 by Jelmer Vernooij
convert bzr.transform.orphan_policy over to using config stacks.
2469
    def __init__(self, name, registry, default_from_env=None,
6449.2.1 by Jelmer Vernooij
Add bzrlib.config.RegistryOption.
2470
                 help=None, invalid=None):
2471
        """A registry based Option definition.
2472
2473
        This overrides the base class so the conversion from a unicode string
2474
        can take quoting into account.
2475
        """
2476
        super(RegistryOption, self).__init__(
6449.3.1 by Jelmer Vernooij
convert bzr.transform.orphan_policy over to using config stacks.
2477
            name, default=lambda: unicode(registry.default_key),
2478
            default_from_env=default_from_env,
6449.2.2 by Jelmer Vernooij
Moar tests.
2479
            from_unicode=self.from_unicode, help=help,
6449.2.1 by Jelmer Vernooij
Add bzrlib.config.RegistryOption.
2480
            invalid=invalid, unquote=False)
2481
        self.registry = registry
2482
2483
    def from_unicode(self, unicode_str):
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
2484
        if not isinstance(unicode_str, string_types):
6449.2.1 by Jelmer Vernooij
Add bzrlib.config.RegistryOption.
2485
            raise TypeError
2486
        try:
2487
            return self.registry.get(unicode_str)
2488
        except KeyError:
2489
            raise ValueError(
2490
                "Invalid value %s for %s."
2491
                "See help for a list of possible values." % (unicode_str,
2492
                    self.name))
2493
6449.2.2 by Jelmer Vernooij
Moar tests.
2494
    @property
2495
    def help(self):
2496
        ret = [self._help, "\n\nThe following values are supported:\n"]
6449.2.1 by Jelmer Vernooij
Add bzrlib.config.RegistryOption.
2497
        for key in self.registry.keys():
2498
            ret.append(" %s - %s\n" % (key, self.registry.get_help(key)))
2499
        return "".join(ret)
2500
2501
6587.2.4 by Vincent Ladeuil
Allow hyphens in option names to unbreak compatibility.
2502
_option_ref_re = lazy_regex.lazy_compile('({[^\d\W](?:\.\w|-\w|\w)*})')
6587.2.2 by Vincent Ladeuil
Stricter checks on configuration option names
2503
"""Describes an expandable option reference.
2504
2505
We want to match the most embedded reference first.
2506
2507
I.e. for '{{foo}}' we will get '{foo}',
2508
for '{bar{baz}}' we will get '{baz}'
2509
"""
2510
2511
def iter_option_refs(string):
2512
    # Split isolate refs so every other chunk is a ref
2513
    is_ref = False
2514
    for chunk  in _option_ref_re.split(string):
2515
        yield is_ref, chunk
2516
        is_ref = not is_ref
2517
2518
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2519
class OptionRegistry(registry.Registry):
2520
    """Register config options by their name.
2521
2522
    This overrides ``registry.Registry`` to simplify registration by acquiring
6056.2.5 by Vincent Ladeuil
Fix typos caught by jelmer.
2523
    some information from the option object itself.
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2524
    """
2525
6587.2.2 by Vincent Ladeuil
Stricter checks on configuration option names
2526
    def _check_option_name(self, option_name):
2527
        """Ensures an option name is valid.
2528
2529
        :param option_name: The name to validate.
2530
        """
2531
        if _option_ref_re.match('{%s}' % option_name) is None:
2532
            raise errors.IllegalOptionName(option_name)
2533
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2534
    def register(self, option):
2535
        """Register a new option to its name.
2536
2537
        :param option: The option to register. Its name is used as the key.
2538
        """
6587.2.2 by Vincent Ladeuil
Stricter checks on configuration option names
2539
        self._check_option_name(option.name)
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2540
        super(OptionRegistry, self).register(option.name, option,
2541
                                             help=option.help)
2542
2543
    def register_lazy(self, key, module_name, member_name):
2544
        """Register a new option to be loaded on request.
2545
6059.3.1 by Vincent Ladeuil
Provide per-config option help
2546
        :param key: the key to request the option later. Since the registration
2547
            is lazy, it should be provided and match the option name.
2548
2549
        :param module_name: the python path to the module. Such as 'os.path'.
2550
2551
        :param member_name: the member of the module to return.  If empty or 
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2552
                None, get() will return the module itself.
2553
        """
6587.2.2 by Vincent Ladeuil
Stricter checks on configuration option names
2554
        self._check_option_name(key)
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2555
        super(OptionRegistry, self).register_lazy(key,
2556
                                                  module_name, member_name)
2557
2558
    def get_help(self, key=None):
2559
        """Get the help text associated with the given key"""
2560
        option = self.get(key)
2561
        the_help = option.help
2562
        if callable(the_help):
2563
            return the_help(self, key)
2564
        return the_help
2565
2566
2567
option_registry = OptionRegistry()
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2568
5743.12.3 by Vincent Ladeuil
More basic tests for options. Start tests for all registered options.
2569
6056.2.1 by Vincent Ladeuil
Migrate output_encoding.
2570
# Registered options in lexicographical order
2571
2572
option_registry.register(
6372.4.1 by Jelmer Vernooij
Convert 'append_revisions_only' over to config stacks.
2573
    Option('append_revisions_only',
6372.4.2 by Jelmer Vernooij
Fix remaining tests.
2574
           default=None, from_unicode=bool_from_store, invalid='warning',
6372.4.1 by Jelmer Vernooij
Convert 'append_revisions_only' over to config stacks.
2575
           help='''\
2576
Whether to only append revisions to the mainline.
2577
2578
If this is set to true, then it is not possible to change the
2579
existing mainline of the branch.
2580
'''))
2581
option_registry.register(
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2582
    ListOption('acceptable_keys',
2583
           default=None,
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
2584
           help="""\
2585
List of GPG key patterns which are acceptable for verification.
2586
"""))
2587
option_registry.register(
6378.1.2 by Vincent Ladeuil
Migrate add.maximum_file_size to the new config scheme
2588
    Option('add.maximum_file_size',
2589
           default=u'20MB', from_unicode=int_SI_from_store,
6378.1.3 by Vincent Ladeuil
log_format has been migrated but the old config method needs to be deprecated.
2590
           help="""\
2591
Size above which files should be added manually.
6378.1.2 by Vincent Ladeuil
Migrate add.maximum_file_size to the new config scheme
2592
2593
Files below this size are added automatically when using ``bzr add`` without
2594
arguments.
2595
2596
A negative value means disable the size check.
2597
"""))
2598
option_registry.register(
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
2599
    Option('bound',
2600
           default=None, from_unicode=bool_from_store,
2601
           help="""\
2602
Is the branch bound to ``bound_location``.
2603
2604
If set to "True", the branch should act as a checkout, and push each commit to
2605
the bound_location.  This option is normally set by ``bind``/``unbind``.
2606
2607
See also: bound_location.
2608
"""))
2609
option_registry.register(
2610
    Option('bound_location',
2611
           default=None,
2612
           help="""\
2613
The location that commits should go to when acting as a checkout.
2614
2615
This option is normally set by ``bind``.
2616
2617
See also: bound.
2618
"""))
2619
option_registry.register(
6404.1.1 by Vincent Ladeuil
Migrate branch.fetch_tags
2620
    Option('branch.fetch_tags', default=False,  from_unicode=bool_from_store,
2621
           help="""\
2622
Whether revisions associated with tags should be fetched.
2623
"""))
6449.6.7 by Jelmer Vernooij
Fix tests.
2624
option_registry.register_lazy(
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2625
    'bzr.transform.orphan_policy', 'breezy.transform', 'opt_transform_orphan')
6404.1.1 by Vincent Ladeuil
Migrate branch.fetch_tags
2626
option_registry.register(
6082.5.9 by Vincent Ladeuil
Cleanup criss-cross merge confusion
2627
    Option('bzr.workingtree.worth_saving_limit', default=10,
6059.4.4 by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config.
2628
           from_unicode=int_from_store,  invalid='warning',
2629
           help='''\
2630
How many changes before saving the dirstate.
2631
6059.4.6 by Vincent Ladeuil
Fix the help strings as proposed by jam.
2632
-1 means that we will never rewrite the dirstate file for only
2633
stat-cache changes. Regardless of this setting, we will always rewrite
2634
the dirstate file if a file is added/removed/renamed/etc. This flag only
2635
affects the behavior of updating the dirstate file after we notice that
2636
a file has been touched.
6059.4.4 by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config.
2637
'''))
2638
option_registry.register(
6463.1.1 by Jelmer Vernooij
Migrate 'bugtracker' setting to config stacks.
2639
    Option('bugtracker', default=None,
2640
           help='''\
2641
Default bug tracker to use.
2642
2643
This bug tracker will be used for example when marking bugs
2644
as fixed using ``bzr commit --fixes``, if no explicit
2645
bug tracker was specified.
2646
'''))
2647
option_registry.register(
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
2648
    Option('check_signatures', default=CHECK_IF_POSSIBLE,
2649
           from_unicode=signature_policy_from_unicode,
2650
           help='''\
2651
GPG checking policy.
2652
2653
Possible values: require, ignore, check-available (default)
2654
2655
this option will control whether bzr will require good gpg
2656
signatures, ignore them, or check them if they are
2657
present.
2658
'''))
2659
option_registry.register(
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
2660
    Option('child_submit_format',
2661
           help='''The preferred format of submissions to this branch.'''))
2662
option_registry.register(
2663
    Option('child_submit_to',
2664
           help='''Where submissions to this branch are mailed to.'''))
2665
option_registry.register(
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
2666
    Option('create_signatures', default=SIGN_WHEN_REQUIRED,
2667
           from_unicode=signing_policy_from_unicode,
2668
           help='''\
2669
GPG Signing policy.
2670
2671
Possible values: always, never, when-required (default)
2672
2673
This option controls whether bzr will always create
2674
gpg signatures or not on commits.
2675
'''))
2676
option_registry.register(
6082.5.9 by Vincent Ladeuil
Cleanup criss-cross merge confusion
2677
    Option('dirstate.fdatasync', default=True,
6059.4.4 by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config.
2678
           from_unicode=bool_from_store,
6059.3.1 by Vincent Ladeuil
Provide per-config option help
2679
           help='''\
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2680
Flush dirstate changes onto physical disk?
2681
2682
If true (default), working tree metadata changes are flushed through the
2683
OS buffers to physical disk.  This is somewhat slower, but means data
2684
should not be lost if the machine crashes.  See also repository.fdatasync.
2685
'''))
2686
option_registry.register(
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2687
    ListOption('debug_flags', default=[],
6059.4.5 by Vincent Ladeuil
Migrate debug_flags to stack-based config.
2688
           help='Debug flags to activate.'))
2689
option_registry.register(
6082.5.9 by Vincent Ladeuil
Cleanup criss-cross merge confusion
2690
    Option('default_format', default='2a',
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2691
           help='Format used when creating branches.'))
2692
option_registry.register(
6155.2.1 by Vincent Ladeuil
Migrate dpush_strict, push_strict and send_strict options to the stack based config design, introducing get_config_stack for branches.
2693
    Option('dpush_strict', default=None,
2694
           from_unicode=bool_from_store,
2695
           help='''\
2696
The default value for ``dpush --strict``.
2697
2698
If present, defines the ``--strict`` option default value for checking
2699
uncommitted changes before pushing into a different VCS without any
2700
custom bzr metadata.
2701
'''))
2702
option_registry.register(
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2703
    Option('editor',
2704
           help='The command called to launch an editor to enter a message.'))
6351.3.3 by Jelmer Vernooij
Convert more stuff to use config stacks.
2705
option_registry.register(
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
2706
    Option('email', override_from_env=['BRZ_EMAIL'], default=default_email,
6351.3.3 by Jelmer Vernooij
Convert more stuff to use config stacks.
2707
           help='The users identity'))
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2708
option_registry.register(
6351.3.1 by Jelmer Vernooij
Add gpg_signing_command option to registry.
2709
    Option('gpg_signing_command',
2710
           default='gpg',
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
2711
           help="""\
2712
Program to use use for creating signatures.
2713
2714
This should support at least the -u and --clearsign options.
2715
"""))
2716
option_registry.register(
2717
    Option('gpg_signing_key',
2718
           default=None,
2719
           help="""\
2720
GPG key to use for signing.
2721
2722
This defaults to the first key associated with the users email.
2723
"""))
6351.3.1 by Jelmer Vernooij
Add gpg_signing_command option to registry.
2724
option_registry.register(
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2725
    Option('language',
2726
           help='Language to translate messages into.'))
2727
option_registry.register(
6082.5.9 by Vincent Ladeuil
Cleanup criss-cross merge confusion
2728
    Option('locks.steal_dead', default=False, from_unicode=bool_from_store,
6059.4.1 by Vincent Ladeuil
Migrate locks.steal_dead to stack-based config.
2729
           help='''\
2730
Steal locks that appears to be dead.
2731
6059.4.6 by Vincent Ladeuil
Fix the help strings as proposed by jam.
2732
If set to True, bzr will check if a lock is supposed to be held by an
2733
active process from the same user on the same machine. If the user and
2734
machine match, but no process with the given PID is active, then bzr
2735
will automatically break the stale lock, and create a new lock for
2736
this process.
2737
Otherwise, bzr will prompt as normal to break the lock.
6059.4.1 by Vincent Ladeuil
Migrate locks.steal_dead to stack-based config.
2738
'''))
2739
option_registry.register(
6175.2.1 by Vincent Ladeuil
Migrate log_format to the config stacks.
2740
    Option('log_format', default='long',
2741
           help= '''\
2742
Log format to use when displaying revisions.
2743
2744
Standard log formats are ``long``, ``short`` and ``line``. Additional formats
2745
may be provided by plugins.
2746
'''))
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2747
option_registry.register_lazy('mail_client', 'breezy.mail_client',
6449.5.1 by Jelmer Vernooij
Migrate mail_client to config stacks.
2748
    'opt_mail_client')
6175.2.1 by Vincent Ladeuil
Migrate log_format to the config stacks.
2749
option_registry.register(
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2750
    Option('output_encoding',
2751
           help= 'Unicode encoding for output'
2752
           ' (terminal encoding if not specified).'))
2753
option_registry.register(
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
2754
    Option('parent_location',
2755
           default=None,
2756
           help="""\
2757
The location of the default branch for pull or merge.
2758
2759
This option is normally set when creating a branch, the first ``pull`` or by
2760
``pull --remember``.
2761
"""))
2762
option_registry.register(
6351.3.5 by Jelmer Vernooij
Add post_commit.
2763
    Option('post_commit', default=None,
2764
           help='''\
2765
Post commit functions.
2766
6351.3.14 by Jelmer Vernooij
merge lp:~jelmer/bzr/commit-uses-config-stacks
2767
An ordered list of python functions to call, separated by spaces.
6351.3.5 by Jelmer Vernooij
Add post_commit.
2768
2769
Each function takes branch, rev_id as parameters.
2770
'''))
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2771
option_registry.register_lazy('progress_bar', 'breezy.ui.text',
6561.2.1 by Vincent Ladeuil
Add a ``progress_bar`` config option.
2772
                              'opt_progress_bar')
6351.3.5 by Jelmer Vernooij
Add post_commit.
2773
option_registry.register(
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
2774
    Option('public_branch',
2775
           default=None,
2776
           help="""\
2777
A publically-accessible version of this branch.
2778
2779
This implies that the branch setting this option is not publically-accessible.
2780
Used and set by ``bzr send``.
2781
"""))
2782
option_registry.register(
2783
    Option('push_location',
2784
           default=None,
2785
           help="""\
2786
The location of the default branch for push.
2787
2788
This option is normally set by the first ``push`` or ``push --remember``.
2789
"""))
2790
option_registry.register(
6155.2.1 by Vincent Ladeuil
Migrate dpush_strict, push_strict and send_strict options to the stack based config design, introducing get_config_stack for branches.
2791
    Option('push_strict', default=None,
2792
           from_unicode=bool_from_store,
2793
           help='''\
2794
The default value for ``push --strict``.
2795
2796
If present, defines the ``--strict`` option default value for checking
2797
uncommitted changes before sending a merge directive.
2798
'''))
2799
option_registry.register(
6091.3.6 by Vincent Ladeuil
Replace ugly default value declarations with ad-hoc and limited conversion to unicode strings.
2800
    Option('repository.fdatasync', default=True,
6091.3.5 by Vincent Ladeuil
Use unicode strings to make it clear default values must comply to Store API.
2801
           from_unicode=bool_from_store,
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2802
           help='''\
2803
Flush repository changes onto physical disk?
2804
2805
If true (default), repository changes are flushed through the OS buffers
2806
to physical disk.  This is somewhat slower, but means data should not be
2807
lost if the machine crashes.  See also dirstate.fdatasync.
2808
'''))
6379.8.1 by Jelmer Vernooij
Register smtp options in bzrlib.config, and use config stacks in bzrlib.smtp_conection.
2809
option_registry.register_lazy('smtp_server',
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2810
    'breezy.smtp_connection', 'smtp_server')
6379.8.1 by Jelmer Vernooij
Register smtp options in bzrlib.config, and use config stacks in bzrlib.smtp_conection.
2811
option_registry.register_lazy('smtp_password',
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2812
    'breezy.smtp_connection', 'smtp_password')
6379.8.1 by Jelmer Vernooij
Register smtp options in bzrlib.config, and use config stacks in bzrlib.smtp_conection.
2813
option_registry.register_lazy('smtp_username',
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2814
    'breezy.smtp_connection', 'smtp_username')
6319.1.1 by Martin Pool
Add selftest.timeout option, defaulting to 600
2815
option_registry.register(
2816
    Option('selftest.timeout',
2817
        default='600',
2818
        from_unicode=int_from_store,
2819
        help='Abort selftest if one test takes longer than this many seconds',
2820
        ))
2821
6155.2.1 by Vincent Ladeuil
Migrate dpush_strict, push_strict and send_strict options to the stack based config design, introducing get_config_stack for branches.
2822
option_registry.register(
2823
    Option('send_strict', default=None,
2824
           from_unicode=bool_from_store,
2825
           help='''\
2826
The default value for ``send --strict``.
2827
2828
If present, defines the ``--strict`` option default value for checking
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
2829
uncommitted changes before sending a bundle.
6155.2.1 by Vincent Ladeuil
Migrate dpush_strict, push_strict and send_strict options to the stack based config design, introducing get_config_stack for branches.
2830
'''))
6006.4.9 by Martin Pool
Add repository.fdatasync option
2831
6133.4.15 by John Arbash Meinel
Start working on exposing timeout as a configuration item.
2832
option_registry.register(
2833
    Option('serve.client_timeout',
6133.4.35 by John Arbash Meinel
Change int_from_store into float_from_store, which allows us to set the time under 1.0s.
2834
           default=300.0, from_unicode=float_from_store,
6133.4.15 by John Arbash Meinel
Start working on exposing timeout as a configuration item.
2835
           help="If we wait for a new request from a client for more than"
2836
                " X seconds, consider the client idle, and hangup."))
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
2837
option_registry.register(
2838
    Option('stacked_on_location',
2839
           default=None,
2840
           help="""The location where this branch is stacked on."""))
2841
option_registry.register(
2842
    Option('submit_branch',
2843
           default=None,
2844
           help="""\
2845
The branch you intend to submit your current work to.
2846
2847
This is automatically set by ``bzr send`` and ``bzr merge``, and is also used
2848
by the ``submit:`` revision spec.
2849
"""))
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
2850
option_registry.register(
2851
    Option('submit_to',
2852
           help='''Where submissions from this branch are mailed to.'''))
6449.1.1 by Jelmer Vernooij
Convert 'suppress_warnings' option to config stacks.
2853
option_registry.register(
2854
    ListOption('suppress_warnings',
2855
           default=[],
2856
           help="List of warning classes to suppress."))
6455.1.1 by Jelmer Vernooij
Convert validate_signatures_in_log to config stacks.
2857
option_registry.register(
2858
    Option('validate_signatures_in_log', default=False,
2859
           from_unicode=bool_from_store, invalid='warning',
6622.1.30 by Jelmer Vernooij
Some more test fixes.
2860
           help='''Whether to validate signatures in brz log.'''))
6238.2.8 by Jelmer Vernooij
Move options to bzrlib/transport/http/_urllib2_wrappers.py
2861
option_registry.register_lazy('ssl.ca_certs',
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2862
    'breezy.transport.http._urllib2_wrappers', 'opt_ssl_ca_certs')
6238.2.8 by Jelmer Vernooij
Move options to bzrlib/transport/http/_urllib2_wrappers.py
2863
2864
option_registry.register_lazy('ssl.cert_reqs',
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2865
    'breezy.transport.http._urllib2_wrappers', 'opt_ssl_cert_reqs')
6238.2.7 by Jelmer Vernooij
Add ssl.cert_reqs.
2866
2867
5743.3.11 by Vincent Ladeuil
Config sections only implement read access.
2868
class Section(object):
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2869
    """A section defines a dict of option name => value.
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2870
2871
    This is merely a read-only dict which can add some knowledge about the
5743.3.10 by Vincent Ladeuil
Fix typos mentioned in reviews.
2872
    options. It is *not* a python dict object though and doesn't try to mimic
2873
    its API.
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2874
    """
2875
2876
    def __init__(self, section_id, options):
2877
        self.id = section_id
2878
        # We re-use the dict-like object received
2879
        self.options = options
2880
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
2881
    def get(self, name, default=None, expand=True):
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2882
        return self.options.get(name, default)
2883
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
2884
    def iter_option_names(self):
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
2885
        for k in self.options.keys():
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
2886
            yield k
2887
5743.3.12 by Vincent Ladeuil
Add an ad-hoc __repr__.
2888
    def __repr__(self):
2889
        # Mostly for debugging use
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2890
        return "<config.%s id=%s>" % (self.__class__.__name__, self.id)
5743.3.12 by Vincent Ladeuil
Add an ad-hoc __repr__.
2891
5743.2.3 by Vincent Ladeuil
The option is either new or has an existing value.
2892
5743.3.6 by Vincent Ladeuil
Use a name less likely to be reused.
2893
_NewlyCreatedOption = object()
5743.2.2 by Vincent Ladeuil
Add tests for remove.
2894
"""Was the option created during the MutableSection lifetime"""
6404.5.5 by Vincent Ladeuil
Refine implementations and add more precise tests. More tests can be added for more scenarios if it doesn't seem worth it until we encounter them in real life (which is unlikely so far)
2895
_DeletedOption = object()
2896
"""Was the option deleted during the MutableSection lifetime"""
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2897
5743.2.3 by Vincent Ladeuil
The option is either new or has an existing value.
2898
5743.3.11 by Vincent Ladeuil
Config sections only implement read access.
2899
class MutableSection(Section):
5743.3.1 by Vincent Ladeuil
Add a docstring and dates to FIXMEs.
2900
    """A section allowing changes and keeping track of the original values."""
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2901
2902
    def __init__(self, section_id, options):
2903
        super(MutableSection, self).__init__(section_id, options)
6404.5.4 by Vincent Ladeuil
Saving changes is incremental and brings back updates from concurrent users
2904
        self.reset_changes()
2905
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2906
    def set(self, name, value):
5743.2.2 by Vincent Ladeuil
Add tests for remove.
2907
        if name not in self.options:
5743.2.3 by Vincent Ladeuil
The option is either new or has an existing value.
2908
            # This is a new option
5743.3.6 by Vincent Ladeuil
Use a name less likely to be reused.
2909
            self.orig[name] = _NewlyCreatedOption
5743.2.3 by Vincent Ladeuil
The option is either new or has an existing value.
2910
        elif name not in self.orig:
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2911
            self.orig[name] = self.get(name, None)
2912
        self.options[name] = value
2913
2914
    def remove(self, name):
6554.1.1 by Vincent Ladeuil
Don't record an option deletion if there is no deletion to record.
2915
        if name not in self.orig and name in self.options:
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2916
            self.orig[name] = self.get(name, None)
2917
        del self.options[name]
2918
6404.5.5 by Vincent Ladeuil
Refine implementations and add more precise tests. More tests can be added for more scenarios if it doesn't seem worth it until we encounter them in real life (which is unlikely so far)
2919
    def reset_changes(self):
2920
        self.orig = {}
2921
2922
    def apply_changes(self, dirty, store):
2923
        """Apply option value changes.
2924
2925
        ``self`` has been reloaded from the persistent storage. ``dirty``
2926
        contains the changes made since the previous loading.
2927
2928
        :param dirty: the mutable section containing the changes.
2929
2930
        :param store: the store containing the section
2931
        """
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
2932
        for k, expected in dirty.orig.items():
6404.5.5 by Vincent Ladeuil
Refine implementations and add more precise tests. More tests can be added for more scenarios if it doesn't seem worth it until we encounter them in real life (which is unlikely so far)
2933
            actual = dirty.get(k, _DeletedOption)
2934
            reloaded = self.get(k, _NewlyCreatedOption)
2935
            if actual is _DeletedOption:
2936
                if k in self.options:
2937
                    self.remove(k)
2938
            else:
2939
                self.set(k, actual)
6404.5.6 by Vincent Ladeuil
Add some doc.
2940
            # Report concurrent updates in an ad-hoc way. This should only
2941
            # occurs when different processes try to update the same option
2942
            # which is not supported (as in: the config framework is not meant
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
2943
            # to be used as a sharing mechanism).
6404.5.5 by Vincent Ladeuil
Refine implementations and add more precise tests. More tests can be added for more scenarios if it doesn't seem worth it until we encounter them in real life (which is unlikely so far)
2944
            if expected != reloaded:
2945
                if actual is _DeletedOption:
2946
                    actual = '<DELETED>'
2947
                if reloaded is _NewlyCreatedOption:
2948
                    reloaded = '<CREATED>'
2949
                if expected is _NewlyCreatedOption:
2950
                    expected = '<CREATED>'
2951
                # Someone changed the value since we get it from the persistent
2952
                # storage.
6404.5.9 by Vincent Ladeuil
Don't forget to use gettext.
2953
                trace.warning(gettext(
2954
                        "Option {0} in section {1} of {2} was changed"
2955
                        " from {3} to {4}. The {5} value will be saved.".format(
2956
                            k, self.id, store.external_url(), expected,
2957
                            reloaded, actual)))
6404.5.5 by Vincent Ladeuil
Refine implementations and add more precise tests. More tests can be added for more scenarios if it doesn't seem worth it until we encounter them in real life (which is unlikely so far)
2958
        # No need to keep track of these changes
2959
        self.reset_changes()
2960
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
2961
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2962
class Store(object):
2963
    """Abstract interface to persistent storage for configuration options."""
2964
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2965
    readonly_section_class = Section
5743.4.22 by Vincent Ladeuil
Allow daughter classes to use different Section classes if/when needed.
2966
    mutable_section_class = MutableSection
5743.4.21 by Vincent Ladeuil
All stores should provide _load_from_string to reuse the existing tests.
2967
6404.5.2 by Vincent Ladeuil
All Stores should handle dirty sections even if the actual tests are only exercising IniFileStore inplementations so far
2968
    def __init__(self):
6499.2.3 by Vincent Ladeuil
Clarify the dict usage to share dirty sections.
2969
        # Which sections need to be saved (by section id). We use a dict here
2970
        # so the dirty sections can be shared by multiple callers.
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
2971
        self.dirty_sections = {}
6404.5.2 by Vincent Ladeuil
All Stores should handle dirty sections even if the actual tests are only exercising IniFileStore inplementations so far
2972
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2973
    def is_loaded(self):
2974
        """Returns True if the Store has been loaded.
2975
2976
        This is used to implement lazy loading and ensure the persistent
2977
        storage is queried only when needed.
2978
        """
2979
        raise NotImplementedError(self.is_loaded)
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2980
2981
    def load(self):
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2982
        """Loads the Store from persistent storage."""
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2983
        raise NotImplementedError(self.load)
2984
5987.1.5 by Vincent Ladeuil
Those are just bytes.
2985
    def _load_from_string(self, bytes):
5743.4.21 by Vincent Ladeuil
All stores should provide _load_from_string to reuse the existing tests.
2986
        """Create a store from a string in configobj syntax.
2987
5987.1.5 by Vincent Ladeuil
Those are just bytes.
2988
        :param bytes: A string representing the file content.
5743.4.21 by Vincent Ladeuil
All stores should provide _load_from_string to reuse the existing tests.
2989
        """
2990
        raise NotImplementedError(self._load_from_string)
2991
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
2992
    def unload(self):
2993
        """Unloads the Store.
2994
2995
        This should make is_loaded() return False. This is used when the caller
2996
        knows that the persistent storage has changed or may have change since
2997
        the last load.
2998
        """
2999
        raise NotImplementedError(self.unload)
3000
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3001
    def quote(self, value):
3002
        """Quote a configuration option value for storing purposes.
3003
3004
        This allows Stacks to present values as they will be stored.
3005
        """
3006
        return value
3007
3008
    def unquote(self, value):
3009
        """Unquote a configuration option value into unicode.
3010
3011
        The received value is quoted as stored.
3012
        """
3013
        return value
3014
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3015
    def save(self):
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3016
        """Saves the Store to persistent storage."""
5743.4.10 by Vincent Ladeuil
Fix copy/paste, bad.
3017
        raise NotImplementedError(self.save)
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3018
6404.5.5 by Vincent Ladeuil
Refine implementations and add more precise tests. More tests can be added for more scenarios if it doesn't seem worth it until we encounter them in real life (which is unlikely so far)
3019
    def _need_saving(self):
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
3020
        for s in self.dirty_sections.values():
6404.5.5 by Vincent Ladeuil
Refine implementations and add more precise tests. More tests can be added for more scenarios if it doesn't seem worth it until we encounter them in real life (which is unlikely so far)
3021
            if s.orig:
3022
                # At least one dirty section contains a modification
3023
                return True
3024
        return False
3025
3026
    def apply_changes(self, dirty_sections):
3027
        """Apply changes from dirty sections while checking for coherency.
3028
3029
        The Store content is discarded and reloaded from persistent storage to
3030
        acquire up-to-date values.
3031
3032
        Dirty sections are MutableSection which kept track of the value they
3033
        are expected to update.
3034
        """
6404.5.7 by Vincent Ladeuil
Store load is lazy and will happen when needed
3035
        # We need an up-to-date version from the persistent storage, unload the
3036
        # store. The reload will occur when needed (triggered by the first
3037
        # get_mutable_section() call below.
6404.5.5 by Vincent Ladeuil
Refine implementations and add more precise tests. More tests can be added for more scenarios if it doesn't seem worth it until we encounter them in real life (which is unlikely so far)
3038
        self.unload()
3039
        # Apply the changes from the preserved dirty sections
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
3040
        for section_id, dirty in dirty_sections.items():
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
3041
            clean = self.get_mutable_section(section_id)
6404.5.5 by Vincent Ladeuil
Refine implementations and add more precise tests. More tests can be added for more scenarios if it doesn't seem worth it until we encounter them in real life (which is unlikely so far)
3042
            clean.apply_changes(dirty, self)
3043
        # Everything is clean now
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
3044
        self.dirty_sections = {}
6404.5.5 by Vincent Ladeuil
Refine implementations and add more precise tests. More tests can be added for more scenarios if it doesn't seem worth it until we encounter them in real life (which is unlikely so far)
3045
6404.5.4 by Vincent Ladeuil
Saving changes is incremental and brings back updates from concurrent users
3046
    def save_changes(self):
3047
        """Saves the Store to persistent storage if changes occurred.
3048
3049
        Apply the changes recorded in the mutable sections to a store content
3050
        refreshed from persistent storage.
3051
        """
3052
        raise NotImplementedError(self.save_changes)
3053
5743.5.10 by Vincent Ladeuil
Parametrize the generic tests against the concrete stores.
3054
    def external_url(self):
3055
        raise NotImplementedError(self.external_url)
3056
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3057
    def get_sections(self):
3058
        """Returns an ordered iterable of existing sections.
3059
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3060
        :returns: An iterable of (store, section).
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3061
        """
3062
        raise NotImplementedError(self.get_sections)
3063
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3064
    def get_mutable_section(self, section_id=None):
5743.4.2 by Vincent Ladeuil
Stores don't implement set_option, they just provide a mutable section.
3065
        """Returns the specified mutable section.
3066
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3067
        :param section_id: The section identifier
5743.4.2 by Vincent Ladeuil
Stores don't implement set_option, they just provide a mutable section.
3068
        """
3069
        raise NotImplementedError(self.get_mutable_section)
5743.2.12 by Vincent Ladeuil
Rename store.set to store.set_option as it's clearer in this context and will act as a safe-guard against unintended uses (set() will be used for stacks).
3070
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3071
    def __repr__(self):
3072
        # Mostly for debugging use
5743.5.17 by Vincent Ladeuil
Use external_url to identify stores.
3073
        return "<config.%s(%s)>" % (self.__class__.__name__,
5743.5.18 by Vincent Ladeuil
Fix typo.
3074
                                    self.external_url())
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3075
3076
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3077
class CommandLineStore(Store):
3078
    "A store to carry command line overrides for the config options."""
3079
3080
    def __init__(self, opts=None):
3081
        super(CommandLineStore, self).__init__()
3082
        if opts is None:
3083
            opts = {}
3084
        self.options = {}
6404.4.1 by Vincent Ladeuil
Properly support config.CommandLineStore in ``bzr config``
3085
        self.id = 'cmdline'
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3086
3087
    def _reset(self):
3088
        # The dict should be cleared but not replaced so it can be shared.
3089
        self.options.clear()
3090
3091
    def _from_cmdline(self, overrides):
3092
        # Reset before accepting new definitions
3093
        self._reset()
3094
        for over in overrides:
3095
            try:
3096
                name, value = over.split('=', 1)
3097
            except ValueError:
3098
                raise errors.BzrCommandError(
3099
                    gettext("Invalid '%s', should be of the form 'name=value'")
3100
                    % (over,))
3101
            self.options[name] = value
3102
3103
    def external_url(self):
6325.1.1 by Vincent Ladeuil
Fix various typos
3104
        # Not an url but it makes debugging easier and is never needed
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3105
        # otherwise
3106
        return 'cmdline'
3107
3108
    def get_sections(self):
6404.4.1 by Vincent Ladeuil
Properly support config.CommandLineStore in ``bzr config``
3109
        yield self,  self.readonly_section_class(None, self.options)
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3110
3111
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3112
class IniFileStore(Store):
3113
    """A config Store using ConfigObj for storage.
3114
3115
    :ivar _config_obj: Private member to hold the ConfigObj instance used to
3116
        serialize/deserialize the config file.
3117
    """
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3118
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3119
    def __init__(self):
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3120
        """A config Store using ConfigObj for storage.
3121
        """
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3122
        super(IniFileStore, self).__init__()
5743.4.18 by Vincent Ladeuil
Replace class.from_string with self._load_from_string to all stores can use it.
3123
        self._config_obj = None
3124
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3125
    def is_loaded(self):
5743.4.18 by Vincent Ladeuil
Replace class.from_string with self._load_from_string to all stores can use it.
3126
        return self._config_obj != None
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3127
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
3128
    def unload(self):
3129
        self._config_obj = None
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
3130
        self.dirty_sections = {}
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
3131
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3132
    def _load_content(self):
3133
        """Load the config file bytes.
3134
3135
        This should be provided by subclasses
3136
3137
        :return: Byte string
3138
        """
3139
        raise NotImplementedError(self._load_content)
3140
3141
    def _save_content(self, content):
3142
        """Save the config file bytes.
3143
3144
        This should be provided by subclasses
3145
3146
        :param content: Config file bytes to write
3147
        """
3148
        raise NotImplementedError(self._save_content)
3149
5743.4.19 by Vincent Ladeuil
Clarify that only Store.get_mutable_section() can accept an empty file.
3150
    def load(self):
3151
        """Load the store from the associated file."""
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3152
        if self.is_loaded():
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3153
            return
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3154
        content = self._load_content()
6110.5.5 by Vincent Ladeuil
Warn when loading, fail if saving will occur later
3155
        self._load_from_string(content)
3156
        for hook in ConfigHooks['load']:
3157
            hook(self)
5743.4.18 by Vincent Ladeuil
Replace class.from_string with self._load_from_string to all stores can use it.
3158
5987.1.5 by Vincent Ladeuil
Those are just bytes.
3159
    def _load_from_string(self, bytes):
5743.4.18 by Vincent Ladeuil
Replace class.from_string with self._load_from_string to all stores can use it.
3160
        """Create a config store from a string.
3161
5987.1.5 by Vincent Ladeuil
Those are just bytes.
3162
        :param bytes: A string representing the file content.
5743.4.18 by Vincent Ladeuil
Replace class.from_string with self._load_from_string to all stores can use it.
3163
        """
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3164
        if self.is_loaded():
5743.4.18 by Vincent Ladeuil
Replace class.from_string with self._load_from_string to all stores can use it.
3165
            raise AssertionError('Already loaded: %r' % (self._config_obj,))
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
3166
        co_input = BytesIO(bytes)
5743.4.3 by Vincent Ladeuil
Implement get_mutable_section.
3167
        try:
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3168
            # The config files are always stored utf8-encoded
6082.5.11 by Vincent Ladeuil
Disable list_values for config.Store, using a dedicated configobj object to trigger the string -> list conversion on-demand (via the option registration) only.
3169
            self._config_obj = ConfigObj(co_input, encoding='utf-8',
3170
                                         list_values=False)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
3171
        except configobj.ConfigObjError as e:
5743.4.18 by Vincent Ladeuil
Replace class.from_string with self._load_from_string to all stores can use it.
3172
            self._config_obj = None
5743.5.10 by Vincent Ladeuil
Parametrize the generic tests against the concrete stores.
3173
            raise errors.ParseConfigError(e.errors, self.external_url())
5987.1.4 by Vincent Ladeuil
Proper error messages for config files with content in non-utf encoding or that cannot be parsed
3174
        except UnicodeDecodeError:
3175
            raise errors.ConfigContentError(self.external_url())
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3176
6404.5.4 by Vincent Ladeuil
Saving changes is incremental and brings back updates from concurrent users
3177
    def save_changes(self):
3178
        if not self.is_loaded():
3179
            # Nothing to save
3180
            return
3181
        if not self._need_saving():
3182
            return
3183
        # Preserve the current version
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
3184
        dirty_sections = self.dirty_sections.copy()
6404.5.5 by Vincent Ladeuil
Refine implementations and add more precise tests. More tests can be added for more scenarios if it doesn't seem worth it until we encounter them in real life (which is unlikely so far)
3185
        self.apply_changes(dirty_sections)
6404.5.4 by Vincent Ladeuil
Saving changes is incremental and brings back updates from concurrent users
3186
        # Save to the persistent storage
3187
        self.save()
3188
5743.2.9 by Vincent Ladeuil
Implement and test store.save() and remove the 'save' parameter from store.from_string() as this won't scale well when adding class specific parameters.
3189
    def save(self):
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3190
        if not self.is_loaded():
5743.4.19 by Vincent Ladeuil
Clarify that only Store.get_mutable_section() can accept an empty file.
3191
            # Nothing to save
3192
            return
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
3193
        out = BytesIO()
5743.2.9 by Vincent Ladeuil
Implement and test store.save() and remove the 'save' parameter from store.from_string() as this won't scale well when adding class specific parameters.
3194
        self._config_obj.write(out)
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3195
        self._save_content(out.getvalue())
5743.8.10 by Vincent Ladeuil
We don't need (nor want) to tie the config hooks to a particular class. Especially when we want to use the same hooks on both implementations.
3196
        for hook in ConfigHooks['save']:
5743.8.7 by Vincent Ladeuil
Add hooks for config stores (but the load one is not in the right place).
3197
            hook(self)
5743.5.10 by Vincent Ladeuil
Parametrize the generic tests against the concrete stores.
3198
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3199
    def get_sections(self):
3200
        """Get the configobj section in the file order.
3201
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3202
        :returns: An iterable of (store, section).
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3203
        """
3204
        # We need a loaded store
5743.6.14 by Vincent Ladeuil
Parametrize the Stack tests.
3205
        try:
3206
            self.load()
6110.5.5 by Vincent Ladeuil
Warn when loading, fail if saving will occur later
3207
        except (errors.NoSuchFile, errors.PermissionDenied):
3208
            # If the file can't be read, there is no sections
5743.6.14 by Vincent Ladeuil
Parametrize the Stack tests.
3209
            return
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3210
        cobj = self._config_obj
3211
        if cobj.scalars:
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3212
            yield self, self.readonly_section_class(None, cobj)
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3213
        for section_name in cobj.sections:
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3214
            yield (self,
3215
                   self.readonly_section_class(section_name,
3216
                                               cobj[section_name]))
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3217
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3218
    def get_mutable_section(self, section_id=None):
5743.2.11 by Vincent Ladeuil
Basic store.set implementation.
3219
        # We need a loaded store
5743.4.19 by Vincent Ladeuil
Clarify that only Store.get_mutable_section() can accept an empty file.
3220
        try:
3221
            self.load()
3222
        except errors.NoSuchFile:
3223
            # The file doesn't exist, let's pretend it was empty
6695.1.1 by Martin
Make ui package pass tests on Python 3
3224
            self._load_from_string(b'')
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
3225
        if section_id in self.dirty_sections:
3226
            # We already created a mutable section for this id
3227
            return self.dirty_sections[section_id]
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3228
        if section_id is None:
5743.2.11 by Vincent Ladeuil
Basic store.set implementation.
3229
            section = self._config_obj
3230
        else:
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3231
            section = self._config_obj.setdefault(section_id, {})
6404.5.1 by Vincent Ladeuil
Setting or removing an option records the section as dirty
3232
        mutable_section = self.mutable_section_class(section_id, section)
3233
        # All mutable sections can become dirty
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
3234
        self.dirty_sections[section_id] = mutable_section
6404.5.1 by Vincent Ladeuil
Setting or removing an option records the section as dirty
3235
        return mutable_section
5743.2.11 by Vincent Ladeuil
Basic store.set implementation.
3236
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3237
    def quote(self, value):
3238
        try:
3239
            # configobj conflates automagical list values and quoting
3240
            self._config_obj.list_values = True
3241
            return self._config_obj._quote(value)
3242
        finally:
3243
            self._config_obj.list_values = False
3244
3245
    def unquote(self, value):
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
3246
        if value and isinstance(value, string_types):
6404.3.1 by Vincent Ladeuil
Robustly unquote configuration values (workaround configobj presenting a section as a dict in weird edge cases)
3247
            # _unquote doesn't handle None nor empty strings nor anything that
3248
            # is not a string, really.
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3249
            value = self._config_obj._unquote(value)
3250
        return value
3251
6402.2.3 by Vincent Ladeuil
More tests, a real implementation and some tweaks.
3252
    def external_url(self):
3253
        # Since an IniFileStore can be used without a file (at least in tests),
3254
        # it's better to provide something than raising a NotImplementedError.
3255
        # All daughter classes are supposed to provide an implementation
3256
        # anyway.
3257
        return 'In-Process Store, no URL'
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
3258
6499.3.3 by Vincent Ladeuil
Stop using _CompatibleStack now that local config files can be
3259
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3260
class TransportIniFileStore(IniFileStore):
3261
    """IniFileStore that loads files from a transport.
6402.2.3 by Vincent Ladeuil
More tests, a real implementation and some tweaks.
3262
3263
    :ivar transport: The transport object where the config file is located.
3264
3265
    :ivar file_name: The config file basename in the transport directory.
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3266
    """
3267
3268
    def __init__(self, transport, file_name):
3269
        """A Store using a ini file on a Transport
3270
3271
        :param transport: The transport object where the config file is located.
3272
        :param file_name: The config file basename in the transport directory.
3273
        """
3274
        super(TransportIniFileStore, self).__init__()
3275
        self.transport = transport
3276
        self.file_name = file_name
3277
3278
    def _load_content(self):
3279
        try:
3280
            return self.transport.get_bytes(self.file_name)
3281
        except errors.PermissionDenied:
3282
            trace.warning("Permission denied while trying to load "
3283
                          "configuration store %s.", self.external_url())
3284
            raise
3285
3286
    def _save_content(self, content):
3287
        self.transport.put_bytes(self.file_name, content)
3288
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
3289
    def external_url(self):
3290
        # FIXME: external_url should really accepts an optional relpath
3291
        # parameter (bug #750169) :-/ -- vila 2011-04-04
3292
        # The following will do in the interim but maybe we don't want to
3293
        # expose a path here but rather a config ID and its associated
3294
        # object </hand wawe>.
6677.1.1 by Martin
Go back to native str for urls and many other py3 changes
3295
        return urlutils.join(
3296
            self.transport.external_url(), urlutils.escape(self.file_name))
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
3297
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3298
5743.4.16 by Vincent Ladeuil
Some doc for the stores.
3299
# Note that LockableConfigObjStore inherits from ConfigObjStore because we need
3300
# unlockable stores for use with objects that can already ensure the locking
3301
# (think branches). If different stores (not based on ConfigObj) are created,
3302
# they may face the same issue.
3303
3304
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3305
class LockableIniFileStore(TransportIniFileStore):
5743.4.9 by Vincent Ladeuil
Implement a LockableConfigObjStore to be able to mimick the actual behaviour.
3306
    """A ConfigObjStore using locks on save to ensure store integrity."""
3307
3308
    def __init__(self, transport, file_name, lock_dir_name=None):
3309
        """A config Store using ConfigObj for storage.
3310
3311
        :param transport: The transport object where the config file is located.
3312
3313
        :param file_name: The config file basename in the transport directory.
3314
        """
3315
        if lock_dir_name is None:
3316
            lock_dir_name = 'lock'
3317
        self.lock_dir_name = lock_dir_name
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3318
        super(LockableIniFileStore, self).__init__(transport, file_name)
5743.4.9 by Vincent Ladeuil
Implement a LockableConfigObjStore to be able to mimick the actual behaviour.
3319
        self._lock = lockdir.LockDir(self.transport, self.lock_dir_name)
3320
3321
    def lock_write(self, token=None):
3322
        """Takes a write lock in the directory containing the config file.
3323
3324
        If the directory doesn't exist it is created.
3325
        """
3326
        # FIXME: This doesn't check the ownership of the created directories as
3327
        # ensure_config_dir_exists does. It should if the transport is local
3328
        # -- vila 2011-04-06
3329
        self.transport.create_prefix()
3330
        return self._lock.lock_write(token)
3331
3332
    def unlock(self):
3333
        self._lock.unlock()
3334
3335
    def break_lock(self):
3336
        self._lock.break_lock()
3337
3338
    @needs_write_lock
3339
    def save(self):
5743.6.25 by Vincent Ladeuil
Last test rewritten.
3340
        # We need to be able to override the undecorated implementation
5743.6.32 by Vincent Ladeuil
Address poolie's review comments.
3341
        self.save_without_locking()
5743.6.24 by Vincent Ladeuil
One more test with a ugly hack to allow the test to stop in the right place.
3342
5743.6.32 by Vincent Ladeuil
Address poolie's review comments.
3343
    def save_without_locking(self):
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3344
        super(LockableIniFileStore, self).save()
5743.4.9 by Vincent Ladeuil
Implement a LockableConfigObjStore to be able to mimick the actual behaviour.
3345
3346
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3347
# FIXME: global, bazaar, shouldn't that be 'user' instead or even
3348
# 'user_defaults' as opposed to 'user_overrides', 'system_defaults'
3349
# (/etc/bzr/bazaar.conf) and 'system_overrides' ? -- vila 2011-04-05
5743.5.15 by Vincent Ladeuil
Mention poolie's point about focusing tests.
3350
3351
# FIXME: Moreover, we shouldn't need classes for these stores either, factory
3352
# functions or a registry will make it easier and clearer for tests, focusing
3353
# on the relevant parts of the API that needs testing -- vila 20110503 (based
3354
# on a poolie's remark)
5743.5.13 by Vincent Ladeuil
Merge config-abstract-store into config-concrete-stores resolving conflicts
3355
class GlobalStore(LockableIniFileStore):
6499.3.13 by Vincent Ladeuil
Fix typo.
3356
    """A config store for global options.
6499.3.12 by Vincent Ladeuil
Add a reminder in the docstring that local config stores are unique by process.
3357
3358
    There is a single GlobalStore for a given process.
3359
    """
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3360
3361
    def __init__(self, possible_transports=None):
6055.1.2 by Vincent Ladeuil
Use _fs_enc instead of utf8.
3362
        t = transport.get_transport_from_path(
3363
            config_dir(), possible_transports=possible_transports)
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3364
        super(GlobalStore, self).__init__(t, 'bazaar.conf')
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3365
        self.id = 'bazaar'
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3366
3367
5743.5.13 by Vincent Ladeuil
Merge config-abstract-store into config-concrete-stores resolving conflicts
3368
class LocationStore(LockableIniFileStore):
6586.1.1 by Vincent Ladeuil
Fix various typos in docstrings. Rename 'buffer' to 'buf' since it's now a python builtin function.
3369
    """A config store for options specific to a location.
6499.3.12 by Vincent Ladeuil
Add a reminder in the docstring that local config stores are unique by process.
3370
6586.1.1 by Vincent Ladeuil
Fix various typos in docstrings. Rename 'buffer' to 'buf' since it's now a python builtin function.
3371
    There is a single LocationStore for a given process.
6499.3.12 by Vincent Ladeuil
Add a reminder in the docstring that local config stores are unique by process.
3372
    """
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3373
3374
    def __init__(self, possible_transports=None):
6055.1.2 by Vincent Ladeuil
Use _fs_enc instead of utf8.
3375
        t = transport.get_transport_from_path(
3376
            config_dir(), possible_transports=possible_transports)
5743.5.10 by Vincent Ladeuil
Parametrize the generic tests against the concrete stores.
3377
        super(LocationStore, self).__init__(t, 'locations.conf')
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3378
        self.id = 'locations'
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3379
3380
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3381
class BranchStore(TransportIniFileStore):
6499.3.13 by Vincent Ladeuil
Fix typo.
3382
    """A config store for branch options.
6499.3.12 by Vincent Ladeuil
Add a reminder in the docstring that local config stores are unique by process.
3383
3384
    There is a single BranchStore for a given branch.
3385
    """
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3386
3387
    def __init__(self, branch):
3388
        super(BranchStore, self).__init__(branch.control_transport,
3389
                                          'branch.conf')
5743.6.34 by Vincent Ladeuil
Forget weakref for branch <-> config.
3390
        self.branch = branch
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3391
        self.id = 'branch'
5743.10.5 by Vincent Ladeuil
Give up.
3392
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3393
6076.1.1 by Vincent Ladeuil
Add the missing config stacks and store
3394
class ControlStore(LockableIniFileStore):
3395
3396
    def __init__(self, bzrdir):
3397
        super(ControlStore, self).__init__(bzrdir.transport,
3398
                                          'control.conf',
3399
                                           lock_dir_name='branch_lock')
6404.4.1 by Vincent Ladeuil
Properly support config.CommandLineStore in ``bzr config``
3400
        self.id = 'control'
6076.1.1 by Vincent Ladeuil
Add the missing config stacks and store
3401
3402
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3403
class SectionMatcher(object):
3404
    """Select sections into a given Store.
3405
6123.7.1 by Vincent Ladeuil
Provide config.IdMatcher for config files defining secion names as unique ids
3406
    This is intended to be used to postpone getting an iterable of sections
3407
    from a store.
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3408
    """
3409
3410
    def __init__(self, store):
3411
        self.store = store
3412
3413
    def get_sections(self):
5743.2.29 by Vincent Ladeuil
Add doc for the section matchers.
3414
        # This is where we require loading the store so we can see all defined
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3415
        # sections.
3416
        sections = self.store.get_sections()
6260.3.2 by Vincent Ladeuil
Only the DEFAULT section is searched for the normal uses of bazaar.conf
3417
        # Walk the revisions in the order provided
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3418
        for store, s in sections:
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3419
            if self.match(s):
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3420
                yield store, s
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3421
6123.7.1 by Vincent Ladeuil
Provide config.IdMatcher for config files defining secion names as unique ids
3422
    def match(self, section):
3423
        """Does the proposed section match.
3424
3425
        :param section: A Section object.
3426
3427
        :returns: True if the section matches, False otherwise.
3428
        """
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3429
        raise NotImplementedError(self.match)
3430
3431
6123.7.2 by Vincent Ladeuil
Rename IdMatcher to NameMatcher.
3432
class NameMatcher(SectionMatcher):
6123.7.1 by Vincent Ladeuil
Provide config.IdMatcher for config files defining secion names as unique ids
3433
3434
    def __init__(self, store, section_id):
6123.7.2 by Vincent Ladeuil
Rename IdMatcher to NameMatcher.
3435
        super(NameMatcher, self).__init__(store)
6123.7.1 by Vincent Ladeuil
Provide config.IdMatcher for config files defining secion names as unique ids
3436
        self.section_id = section_id
3437
3438
    def match(self, section):
3439
        return section.id == self.section_id
3440
3441
5743.2.37 by Vincent Ladeuil
Merge config-concrete-stores into config-section-matchers resolving conflicts
3442
class LocationSection(Section):
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3443
6524.2.1 by Aaron Bentley
Implement branchname support in config files.
3444
    def __init__(self, section, extra_path, branch_name=None):
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3445
        super(LocationSection, self).__init__(section.id, section.options)
3446
        self.extra_path = extra_path
6524.2.2 by Aaron Bentley
Test branchname config var.
3447
        if branch_name is None:
3448
            branch_name = ''
6082.5.25 by Vincent Ladeuil
Add ``basename`` as a section local option
3449
        self.locals = {'relpath': extra_path,
6524.2.1 by Aaron Bentley
Implement branchname support in config files.
3450
                       'basename': urlutils.basename(extra_path),
3451
                       'branchname': branch_name}
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3452
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3453
    def get(self, name, default=None, expand=True):
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3454
        value = super(LocationSection, self).get(name, default)
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3455
        if value is not None and expand:
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3456
            policy_name = self.get(name + ':policy', None)
3457
            policy = _policy_value.get(policy_name, POLICY_NONE)
3458
            if policy == POLICY_APPENDPATH:
3459
                value = urlutils.join(value, self.extra_path)
6082.5.21 by Vincent Ladeuil
Implement 'relpath' as a section locally expanded option.
3460
            # expand section local options right now (since POLICY_APPENDPATH
3461
            # will never add options references, it's ok to expand after it).
3462
            chunks = []
3463
            for is_ref, chunk in iter_option_refs(value):
3464
                if not is_ref:
3465
                    chunks.append(chunk)
3466
                else:
3467
                    ref = chunk[1:-1]
3468
                    if ref in self.locals:
3469
                        chunks.append(self.locals[ref])
3470
                    else:
3471
                        chunks.append(chunk)
3472
            value = ''.join(chunks)
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3473
        return value
3474
3475
6402.2.6 by Vincent Ladeuil
Fix {relpath} support, realizing that when a section ends with a glob, it's not obivous to decide what should be done.
3476
class StartingPathMatcher(SectionMatcher):
6402.2.2 by Vincent Ladeuil
Bogus implementation passing smoke test
3477
    """Select sections for a given location respecting the Store order."""
3478
6402.2.8 by Vincent Ladeuil
Feedback from review.
3479
    # FIXME: Both local paths and urls can be used for section names as well as
3480
    # ``location`` to stay consistent with ``LocationMatcher`` which itself
3481
    # inherited the fuzziness from the previous ``LocationConfig``
3482
    # implementation. We probably need to revisit which encoding is allowed for
3483
    # both ``location`` and section names and how we normalize
3484
    # them. http://pad.lv/85479, http://pad.lv/437009 and http://359320 are
3485
    # related too. -- vila 2012-01-04
3486
6402.2.2 by Vincent Ladeuil
Bogus implementation passing smoke test
3487
    def __init__(self, store, location):
6402.2.6 by Vincent Ladeuil
Fix {relpath} support, realizing that when a section ends with a glob, it's not obivous to decide what should be done.
3488
        super(StartingPathMatcher, self).__init__(store)
6402.2.2 by Vincent Ladeuil
Bogus implementation passing smoke test
3489
        if location.startswith('file://'):
3490
            location = urlutils.local_path_from_url(location)
3491
        self.location = location
3492
3493
    def get_sections(self):
6402.2.5 by Vincent Ladeuil
Always return the no-name section if present.
3494
        """Get all sections matching ``location`` in the store.
3495
3496
        The most generic sections are described first in the store, then more
3497
        specific ones can be provided for reduced scopes.
3498
3499
        The returned section are therefore returned in the reversed order so
3500
        the most specific ones can be found first.
3501
        """
6402.2.6 by Vincent Ladeuil
Fix {relpath} support, realizing that when a section ends with a glob, it's not obivous to decide what should be done.
3502
        location_parts = self.location.rstrip('/').split('/')
6402.2.2 by Vincent Ladeuil
Bogus implementation passing smoke test
3503
        store = self.store
6402.2.3 by Vincent Ladeuil
More tests, a real implementation and some tweaks.
3504
        # Later sections are more specific, they should be returned first
3505
        for _, section in reversed(list(store.get_sections())):
6402.2.5 by Vincent Ladeuil
Always return the no-name section if present.
3506
            if section.id is None:
3507
                # The no-name section is always included if present
3508
                yield store, LocationSection(section, self.location)
3509
                continue
6402.2.3 by Vincent Ladeuil
More tests, a real implementation and some tweaks.
3510
            section_path = section.id
3511
            if section_path.startswith('file://'):
6402.2.6 by Vincent Ladeuil
Fix {relpath} support, realizing that when a section ends with a glob, it's not obivous to decide what should be done.
3512
                # the location is already a local path or URL, convert the
6402.2.7 by Vincent Ladeuil
Cleanup a bit and make sure we use at least one file:// url in the tests.
3513
                # section id to the same format
3514
                section_path = urlutils.local_path_from_url(section_path)
6402.2.3 by Vincent Ladeuil
More tests, a real implementation and some tweaks.
3515
            if (self.location.startswith(section_path)
3516
                or fnmatch.fnmatch(self.location, section_path)):
6402.2.6 by Vincent Ladeuil
Fix {relpath} support, realizing that when a section ends with a glob, it's not obivous to decide what should be done.
3517
                section_parts = section_path.rstrip('/').split('/')
3518
                extra_path = '/'.join(location_parts[len(section_parts):])
3519
                yield store, LocationSection(section, extra_path)
6402.2.2 by Vincent Ladeuil
Bogus implementation passing smoke test
3520
3521
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3522
class LocationMatcher(SectionMatcher):
3523
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3524
    def __init__(self, store, location):
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3525
        super(LocationMatcher, self).__init__(store)
6524.2.1 by Aaron Bentley
Implement branchname support in config files.
3526
        url, params = urlutils.split_segment_parameters(location)
5743.6.19 by Vincent Ladeuil
Clarify comments about section names for Location-related objects (also fix LocationMatcher and add tests).
3527
        if location.startswith('file://'):
3528
            location = urlutils.local_path_from_url(location)
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3529
        self.location = location
6524.2.4 by Aaron Bentley
branchname falls back to basename.
3530
        branch_name = params.get('branch')
3531
        if branch_name is None:
3532
            self.branch_name = urlutils.basename(self.location)
3533
        else:
3534
            self.branch_name = urlutils.unescape(branch_name)
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3535
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
3536
    def _get_matching_sections(self):
3537
        """Get all sections matching ``location``."""
3538
        # We slightly diverge from LocalConfig here by allowing the no-name
3539
        # section as the most generic one and the lower priority.
3540
        no_name_section = None
6015.22.1 by Vincent Ladeuil
config.LocationMatcher properly excludes unrelated sections
3541
        all_sections = []
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
3542
        # Filter out the no_name_section so _iter_for_location_by_parts can be
3543
        # used (it assumes all sections have a name).
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3544
        for _, section in self.store.get_sections():
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
3545
            if section.id is None:
3546
                no_name_section = section
3547
            else:
6015.22.1 by Vincent Ladeuil
config.LocationMatcher properly excludes unrelated sections
3548
                all_sections.append(section)
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
3549
        # Unfortunately _iter_for_location_by_parts deals with section names so
3550
        # we have to resync.
5743.2.31 by Vincent Ladeuil
Both the length and the section id should be used to sort.
3551
        filtered_sections = _iter_for_location_by_parts(
6015.22.1 by Vincent Ladeuil
config.LocationMatcher properly excludes unrelated sections
3552
            [s.id for s in all_sections], self.location)
3553
        iter_all_sections = iter(all_sections)
5743.2.27 by Vincent Ladeuil
Merge the use of _filter_for_location_by_parts, uglier, but better for
3554
        matching_sections = []
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
3555
        if no_name_section is not None:
3556
            matching_sections.append(
6402.2.1 by Vincent Ladeuil
Get rid of LocationSection.length as its not needed in the general case.
3557
                (0, LocationSection(no_name_section, self.location)))
5743.2.31 by Vincent Ladeuil
Both the length and the section id should be used to sort.
3558
        for section_id, extra_path, length in filtered_sections:
6015.22.1 by Vincent Ladeuil
config.LocationMatcher properly excludes unrelated sections
3559
            # a section id is unique for a given store so it's safe to take the
3560
            # first matching section while iterating. Also, all filtered
3561
            # sections are part of 'all_sections' and will always be found
3562
            # there.
3563
            while True:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
3564
                section = next(iter_all_sections)
6015.22.1 by Vincent Ladeuil
config.LocationMatcher properly excludes unrelated sections
3565
                if section_id == section.id:
6524.2.1 by Aaron Bentley
Implement branchname support in config files.
3566
                    section = LocationSection(section, extra_path,
3567
                                              self.branch_name)
3568
                    matching_sections.append((length, section))
6015.22.1 by Vincent Ladeuil
config.LocationMatcher properly excludes unrelated sections
3569
                    break
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
3570
        return matching_sections
3571
3572
    def get_sections(self):
3573
        # Override the default implementation as we want to change the order
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3574
        # We want the longest (aka more specific) locations first
6621.20.1 by Martin
Run 2to3 tuple_params fixer and tidy up.
3575
        sections = sorted(self._get_matching_sections(),
3576
                          key=lambda match: (match[0], match[1].id),
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3577
                          reverse=True)
3578
        # Sections mentioning 'ignore_parents' restrict the selection
6402.2.1 by Vincent Ladeuil
Get rid of LocationSection.length as its not needed in the general case.
3579
        for _, section in sections:
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3580
            # FIXME: We really want to use as_bool below -- vila 2011-04-07
3581
            ignore = section.get('ignore_parents', None)
3582
            if ignore is not None:
3583
                ignore = ui.bool_from_string(ignore)
3584
            if ignore:
3585
                break
3586
            # Finally, we have a valid section
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3587
            yield self.store, section
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3588
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3589
6499.3.10 by Vincent Ladeuil
Add news entry and cleanup
3590
# FIXME: _shared_stores should be an attribute of a library state once a
3591
# library_state object is always available.
3592
_shared_stores = {}
3593
_shared_stores_at_exit_installed = False
6082.5.20 by Vincent Ladeuil
Refactor iter_option_refs out of Stack so it can be reused.
3594
5743.1.34 by Vincent Ladeuil
Merge config-section-matchers into config-stack resolving conflicts
3595
class Stack(object):
5743.1.1 by Vincent Ladeuil
Start implementing a config stack.
3596
    """A stack of configurations where an option can be defined"""
3597
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3598
    def __init__(self, sections_def, store=None, mutable_section_id=None):
5743.1.11 by Vincent Ladeuil
Properly use MutableSection for write operations.
3599
        """Creates a stack of sections with an optional store for changes.
3600
5743.1.36 by Vincent Ladeuil
Clarify that constructor parameters are here to *define* the stack and as such can be re-used. Also make the sections_def parameter mandatory.
3601
        :param sections_def: A list of Section or callables that returns an
3602
            iterable of Section. This defines the Sections for the Stack and
3603
            can be called repeatedly if needed.
5743.1.11 by Vincent Ladeuil
Properly use MutableSection for write operations.
3604
5743.1.37 by Vincent Ladeuil
Change the way Stacks are built: requires a Store and a mutable section name instead of a callable returning the mutable section.
3605
        :param store: The optional Store where modifications will be
3606
            recorded. If none is specified, no modifications can be done.
3607
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3608
        :param mutable_section_id: The id of the MutableSection where changes
3609
            are recorded. This requires the ``store`` parameter to be
5743.1.37 by Vincent Ladeuil
Change the way Stacks are built: requires a Store and a mutable section name instead of a callable returning the mutable section.
3610
            specified.
5743.1.11 by Vincent Ladeuil
Properly use MutableSection for write operations.
3611
        """
5743.1.36 by Vincent Ladeuil
Clarify that constructor parameters are here to *define* the stack and as such can be re-used. Also make the sections_def parameter mandatory.
3612
        self.sections_def = sections_def
5743.1.37 by Vincent Ladeuil
Change the way Stacks are built: requires a Store and a mutable section name instead of a callable returning the mutable section.
3613
        self.store = store
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3614
        self.mutable_section_id = mutable_section_id
5743.1.1 by Vincent Ladeuil
Start implementing a config stack.
3615
6466.1.1 by Vincent Ladeuil
Fix RegistryOption display in bzr config output
3616
    def iter_sections(self):
3617
        """Iterate all the defined sections."""
3618
        # Ensuring lazy loading is achieved by delaying section matching (which
3619
        # implies querying the persistent storage) until it can't be avoided
3620
        # anymore by using callables to describe (possibly empty) section
3621
        # lists.
3622
        for sections in self.sections_def:
3623
            for store, section in sections():
3624
                yield store, section
3625
6468.5.2 by Vincent Ladeuil
Merge bzr.dev resolving conflicts
3626
    def get(self, name, expand=True, convert=True):
5743.1.16 by Vincent Ladeuil
Allows empty sections and empty section callables.
3627
        """Return the *first* option value found in the sections.
5743.1.13 by Vincent Ladeuil
Better explain lazy loading and make sure the mutable section respect the design.
3628
5743.1.16 by Vincent Ladeuil
Allows empty sections and empty section callables.
3629
        This is where we guarantee that sections coming from Store are loaded
3630
        lazily: the loading is delayed until we need to either check that an
5743.1.13 by Vincent Ladeuil
Better explain lazy loading and make sure the mutable section respect the design.
3631
        option exists or get its value, which in turn may require to discover
3632
        in which sections it can be defined. Both of these (section and option
3633
        existence) require loading the store (even partially).
6082.5.2 by Vincent Ladeuil
Cargo-cult the config option expansion implementation with tweaks from the old to the new config design.
3634
3635
        :param name: The queried option.
3636
3637
        :param expand: Whether options references should be expanded.
3638
6466.1.1 by Vincent Ladeuil
Fix RegistryOption display in bzr config output
3639
        :param convert: Whether the option value should be converted from
3640
            unicode (do nothing for non-registered options).
3641
6082.5.2 by Vincent Ladeuil
Cargo-cult the config option expansion implementation with tweaks from the old to the new config design.
3642
        :returns: The value of the option.
5743.1.13 by Vincent Ladeuil
Better explain lazy loading and make sure the mutable section respect the design.
3643
        """
5743.1.36 by Vincent Ladeuil
Clarify that constructor parameters are here to *define* the stack and as such can be re-used. Also make the sections_def parameter mandatory.
3644
        # FIXME: No caching of options nor sections yet -- vila 20110503
5743.12.6 by Vincent Ladeuil
Stack.get() provides the registered option default value.
3645
        value = None
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3646
        found_store = None # Where the option value has been found
6059.1.1 by Vincent Ladeuil
Implement from_unicode to convert config option values from store.
3647
        # If the option is registered, it may provide additional info about
3648
        # value handling
3649
        try:
3650
            opt = option_registry.get(name)
3651
        except KeyError:
3652
            # Not registered
3653
            opt = None
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
3654
6082.5.12 by Vincent Ladeuil
Remove duplication in stack.get() and useless code now that list conversion is explicit and delayed.
3655
        def expand_and_convert(val):
6393.3.2 by Vincent Ladeuil
Merge trunk resolving conflicts
3656
            # This may need to be called in different contexts if the value is
3657
            # None or ends up being None during expansion or conversion.
6082.5.12 by Vincent Ladeuil
Remove duplication in stack.get() and useless code now that list conversion is explicit and delayed.
3658
            if val is not None:
3659
                if expand:
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
3660
                    if isinstance(val, string_types):
6082.5.12 by Vincent Ladeuil
Remove duplication in stack.get() and useless code now that list conversion is explicit and delayed.
3661
                        val = self._expand_options_in_string(val)
3662
                    else:
3663
                        trace.warning('Cannot expand "%s":'
3664
                                      ' %s does not support option expansion'
3665
                                      % (name, type(val)))
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3666
                if opt is None:
3667
                    val = found_store.unquote(val)
6466.1.1 by Vincent Ladeuil
Fix RegistryOption display in bzr config output
3668
                elif convert:
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3669
                    val = opt.convert_from_unicode(found_store, val)
6082.5.12 by Vincent Ladeuil
Remove duplication in stack.get() and useless code now that list conversion is explicit and delayed.
3670
            return val
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
3671
3672
        # First of all, check if the environment can override the configuration
3673
        # value
3674
        if opt is not None and opt.override_from_env:
3675
            value = opt.get_override()
3676
            value = expand_and_convert(value)
3677
        if value is None:
6466.1.1 by Vincent Ladeuil
Fix RegistryOption display in bzr config output
3678
            for store, section in self.iter_sections():
3679
                value = section.get(name)
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
3680
                if value is not None:
6466.1.1 by Vincent Ladeuil
Fix RegistryOption display in bzr config output
3681
                    found_store = store
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
3682
                    break
3683
            value = expand_and_convert(value)
3684
            if opt is not None and value is None:
3685
                # If the option is registered, it may provide a default value
3686
                value = opt.get_default()
3687
                value = expand_and_convert(value)
6082.5.3 by Vincent Ladeuil
Fix the hook call.
3688
        for hook in ConfigHooks['get']:
3689
            hook(self, name, value)
6082.5.2 by Vincent Ladeuil
Cargo-cult the config option expansion implementation with tweaks from the old to the new config design.
3690
        return value
3691
3692
    def expand_options(self, string, env=None):
3693
        """Expand option references in the string in the configuration context.
3694
3695
        :param string: The string containing option(s) to expand.
3696
3697
        :param env: An option dict defining additional configuration options or
3698
            overriding existing ones.
3699
3700
        :returns: The expanded string.
3701
        """
3702
        return self._expand_options_in_string(string, env)
3703
3704
    def _expand_options_in_string(self, string, env=None, _refs=None):
3705
        """Expand options in the string in the configuration context.
3706
3707
        :param string: The string to be expanded.
3708
3709
        :param env: An option dict defining additional configuration options or
3710
            overriding existing ones.
3711
3712
        :param _refs: Private list (FIFO) containing the options being expanded
3713
            to detect loops.
3714
3715
        :returns: The expanded string.
3716
        """
3717
        if string is None:
3718
            # Not much to expand there
3719
            return None
3720
        if _refs is None:
3721
            # What references are currently resolved (to detect loops)
3722
            _refs = []
3723
        result = string
3724
        # We need to iterate until no more refs appear ({{foo}} will need two
3725
        # iterations for example).
6082.5.20 by Vincent Ladeuil
Refactor iter_option_refs out of Stack so it can be reused.
3726
        expanded = True
3727
        while expanded:
3728
            expanded = False
6082.5.2 by Vincent Ladeuil
Cargo-cult the config option expansion implementation with tweaks from the old to the new config design.
3729
            chunks = []
6082.5.20 by Vincent Ladeuil
Refactor iter_option_refs out of Stack so it can be reused.
3730
            for is_ref, chunk in iter_option_refs(result):
3731
                if not is_ref:
6082.5.12 by Vincent Ladeuil
Remove duplication in stack.get() and useless code now that list conversion is explicit and delayed.
3732
                    chunks.append(chunk)
6082.5.2 by Vincent Ladeuil
Cargo-cult the config option expansion implementation with tweaks from the old to the new config design.
3733
                else:
6082.5.20 by Vincent Ladeuil
Refactor iter_option_refs out of Stack so it can be reused.
3734
                    expanded = True
6082.5.2 by Vincent Ladeuil
Cargo-cult the config option expansion implementation with tweaks from the old to the new config design.
3735
                    name = chunk[1:-1]
3736
                    if name in _refs:
3737
                        raise errors.OptionExpansionLoop(string, _refs)
3738
                    _refs.append(name)
3739
                    value = self._expand_option(name, env, _refs)
3740
                    if value is None:
3741
                        raise errors.ExpandingUnknownOption(name, string)
6082.5.12 by Vincent Ladeuil
Remove duplication in stack.get() and useless code now that list conversion is explicit and delayed.
3742
                    chunks.append(value)
6082.5.2 by Vincent Ladeuil
Cargo-cult the config option expansion implementation with tweaks from the old to the new config design.
3743
                    _refs.pop()
6082.5.12 by Vincent Ladeuil
Remove duplication in stack.get() and useless code now that list conversion is explicit and delayed.
3744
            result = ''.join(chunks)
6082.5.2 by Vincent Ladeuil
Cargo-cult the config option expansion implementation with tweaks from the old to the new config design.
3745
        return result
3746
3747
    def _expand_option(self, name, env, _refs):
3748
        if env is not None and name in env:
3749
            # Special case, values provided in env takes precedence over
3750
            # anything else
3751
            value = env[name]
3752
        else:
6466.1.3 by Vincent Ladeuil
Values should never be converted during expansion.
3753
            value = self.get(name, expand=False, convert=False)
6082.5.12 by Vincent Ladeuil
Remove duplication in stack.get() and useless code now that list conversion is explicit and delayed.
3754
            value = self._expand_options_in_string(value, env, _refs)
5743.12.6 by Vincent Ladeuil
Stack.get() provides the registered option default value.
3755
        return value
5743.1.1 by Vincent Ladeuil
Start implementing a config stack.
3756
5743.1.37 by Vincent Ladeuil
Change the way Stacks are built: requires a Store and a mutable section name instead of a callable returning the mutable section.
3757
    def _get_mutable_section(self):
3758
        """Get the MutableSection for the Stack.
5743.1.13 by Vincent Ladeuil
Better explain lazy loading and make sure the mutable section respect the design.
3759
5743.1.15 by Vincent Ladeuil
Test and implement ConfigStack.remove.
3760
        This is where we guarantee that the mutable section is lazily loaded:
5743.1.37 by Vincent Ladeuil
Change the way Stacks are built: requires a Store and a mutable section name instead of a callable returning the mutable section.
3761
        this means we won't load the corresponding store before setting a value
3762
        or deleting an option. In practice the store will often be loaded but
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3763
        this helps catching some programming errors.
5743.1.13 by Vincent Ladeuil
Better explain lazy loading and make sure the mutable section respect the design.
3764
        """
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3765
        store = self.store
3766
        section = store.get_mutable_section(self.mutable_section_id)
3767
        return store, section
5743.1.37 by Vincent Ladeuil
Change the way Stacks are built: requires a Store and a mutable section name instead of a callable returning the mutable section.
3768
3769
    def set(self, name, value):
3770
        """Set a new value for the option."""
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3771
        store, section = self._get_mutable_section()
3772
        section.set(name, store.quote(value))
5743.8.10 by Vincent Ladeuil
We don't need (nor want) to tie the config hooks to a particular class. Especially when we want to use the same hooks on both implementations.
3773
        for hook in ConfigHooks['set']:
5743.8.6 by Vincent Ladeuil
Add hooks for config stacks.
3774
            hook(self, name, value)
5743.1.7 by Vincent Ladeuil
Simple set implementation.
3775
5743.1.15 by Vincent Ladeuil
Test and implement ConfigStack.remove.
3776
    def remove(self, name):
5743.1.37 by Vincent Ladeuil
Change the way Stacks are built: requires a Store and a mutable section name instead of a callable returning the mutable section.
3777
        """Remove an existing option."""
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3778
        _, section = self._get_mutable_section()
5743.1.15 by Vincent Ladeuil
Test and implement ConfigStack.remove.
3779
        section.remove(name)
5743.8.10 by Vincent Ladeuil
We don't need (nor want) to tie the config hooks to a particular class. Especially when we want to use the same hooks on both implementations.
3780
        for hook in ConfigHooks['remove']:
5743.8.6 by Vincent Ladeuil
Add hooks for config stacks.
3781
            hook(self, name)
5743.1.15 by Vincent Ladeuil
Test and implement ConfigStack.remove.
3782
5743.1.34 by Vincent Ladeuil
Merge config-section-matchers into config-stack resolving conflicts
3783
    def __repr__(self):
3784
        # Mostly for debugging use
3785
        return "<config.%s(%s)>" % (self.__class__.__name__, id(self))
3786
6161.1.7 by Vincent Ladeuil
Emit a warning when bzrlib.intialize) has not been called
3787
    def _get_overrides(self):
6499.3.3 by Vincent Ladeuil
Stop using _CompatibleStack now that local config files can be
3788
        # FIXME: Hack around library_state.initialize never called
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3789
        if breezy.global_state is not None:
3790
            return breezy.global_state.cmdline_overrides.get_sections()
6161.1.7 by Vincent Ladeuil
Emit a warning when bzrlib.intialize) has not been called
3791
        return []
3792
6499.3.10 by Vincent Ladeuil
Add news entry and cleanup
3793
    def get_shared_store(self, store, state=None):
3794
        """Get a known shared store.
3795
3796
        Store urls uniquely identify them and are used to ensure a single copy
3797
        is shared across all users.
3798
3799
        :param store: The store known to the caller.
3800
3801
        :param state: The library state where the known stores are kept.
3802
3803
        :returns: The store received if it's not a known one, an already known
3804
            otherwise.
3805
        """
3806
        if state is None:
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
3807
            state = breezy.global_state
6499.3.10 by Vincent Ladeuil
Add news entry and cleanup
3808
        if state is None:
3809
            global _shared_stores_at_exit_installed
3810
            stores = _shared_stores
3811
            def save_config_changes():
6677.1.1 by Martin
Go back to native str for urls and many other py3 changes
3812
                for k, store in stores.items():
6499.3.10 by Vincent Ladeuil
Add news entry and cleanup
3813
                    store.save_changes()
3814
            if not _shared_stores_at_exit_installed:
3815
                # FIXME: Ugly hack waiting for library_state to always be
3816
                # available. -- vila 20120731
3817
                import atexit
3818
                atexit.register(save_config_changes)
3819
                _shared_stores_at_exit_installed = True
3820
        else:
3821
            stores = state.config_stores
3822
        url = store.external_url()
3823
        try:
3824
            return stores[url]
3825
        except KeyError:
3826
            stores[url] = store
3827
            return store
3828
5743.1.1 by Vincent Ladeuil
Start implementing a config stack.
3829
6393.1.1 by Vincent Ladeuil
Provides MemoryStack to simplify configuration setup in tests
3830
class MemoryStack(Stack):
3831
    """A configuration stack defined from a string.
3832
3833
    This is mainly intended for tests and requires no disk resources.
3834
    """
3835
3836
    def __init__(self, content=None):
3837
        """Create an in-memory stack from a given content.
3838
3839
        It uses a single store based on configobj and support reading and
3840
        writing options.
3841
3842
        :param content: The initial content of the store. If None, the store is
3843
            not loaded and ``_load_from_string`` can and should be used if
3844
            needed.
3845
        """
3846
        store = IniFileStore()
3847
        if content is not None:
3848
            store._load_from_string(content)
3849
        super(MemoryStack, self).__init__(
3850
            [store.get_sections], store)
3851
3852
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
3853
class _CompatibleStack(Stack):
5743.6.26 by Vincent Ladeuil
Clarify _CompatibleStack aims.
3854
    """Place holder for compatibility with previous design.
3855
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
3856
    This is intended to ease the transition from the Config-based design to the
5743.6.26 by Vincent Ladeuil
Clarify _CompatibleStack aims.
3857
    Stack-based design and should not be used nor relied upon by plugins.
3858
3859
    One assumption made here is that the daughter classes will all use Stores
3860
    derived from LockableIniFileStore).
5743.6.32 by Vincent Ladeuil
Address poolie's review comments.
3861
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3862
    It implements set() and remove () by re-loading the store before applying
3863
    the modification and saving it.
5743.6.32 by Vincent Ladeuil
Address poolie's review comments.
3864
3865
    The long term plan being to implement a single write by store to save
3866
    all modifications, this class should not be used in the interim.
5743.6.26 by Vincent Ladeuil
Clarify _CompatibleStack aims.
3867
    """
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
3868
3869
    def set(self, name, value):
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
3870
        # Force a reload
3871
        self.store.unload()
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
3872
        super(_CompatibleStack, self).set(name, value)
3873
        # Force a write to persistent storage
3874
        self.store.save()
3875
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3876
    def remove(self, name):
3877
        # Force a reload
3878
        self.store.unload()
3879
        super(_CompatibleStack, self).remove(name)
3880
        # Force a write to persistent storage
3881
        self.store.save()
3882
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
3883
6499.3.3 by Vincent Ladeuil
Stop using _CompatibleStack now that local config files can be
3884
class GlobalStack(Stack):
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3885
    """Global options only stack.
3886
3887
    The following sections are queried:
3888
3889
    * command-line overrides,
3890
3891
    * the 'DEFAULT' section in bazaar.conf
3892
3893
    This stack will use the ``DEFAULT`` section in bazaar.conf as its
3894
    MutableSection.
3895
    """
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3896
3897
    def __init__(self):
6499.3.10 by Vincent Ladeuil
Add news entry and cleanup
3898
        gstore = self.get_shared_store(GlobalStore())
6161.1.1 by Vincent Ladeuil
Allow config options to be overridden from the command line
3899
        super(GlobalStack, self).__init__(
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3900
            [self._get_overrides,
3901
             NameMatcher(gstore, 'DEFAULT').get_sections],
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3902
            gstore, mutable_section_id='DEFAULT')
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3903
3904
6499.3.3 by Vincent Ladeuil
Stop using _CompatibleStack now that local config files can be
3905
class LocationStack(Stack):
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3906
    """Per-location options falling back to global options stack.
3907
3908
3909
    The following sections are queried:
3910
3911
    * command-line overrides,
3912
3913
    * the sections matching ``location`` in ``locations.conf``, the order being
3914
      defined by the number of path components in the section glob, higher
3915
      numbers first (from most specific section to most generic).
3916
3917
    * the 'DEFAULT' section in bazaar.conf
3918
3919
    This stack will use the ``location`` section in locations.conf as its
3920
    MutableSection.
3921
    """
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3922
3923
    def __init__(self, location):
6006.4.7 by Martin Pool
fdatasync on dirstate can be disabled
3924
        """Make a new stack for a location and global configuration.
6371.1.1 by Jelmer Vernooij
Fix some whitespace in bzrlib.config.
3925
6006.4.7 by Martin Pool
fdatasync on dirstate can be disabled
3926
        :param location: A URL prefix to """
6499.3.10 by Vincent Ladeuil
Add news entry and cleanup
3927
        lstore = self.get_shared_store(LocationStore())
6288.1.1 by Vincent Ladeuil
Fix windows test regressions about locations.conf handling
3928
        if location.startswith('file://'):
3929
            location = urlutils.local_path_from_url(location)
6499.3.10 by Vincent Ladeuil
Add news entry and cleanup
3930
        gstore = self.get_shared_store(GlobalStore())
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3931
        super(LocationStack, self).__init__(
6161.1.7 by Vincent Ladeuil
Emit a warning when bzrlib.intialize) has not been called
3932
            [self._get_overrides,
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3933
             LocationMatcher(lstore, location).get_sections,
3934
             NameMatcher(gstore, 'DEFAULT').get_sections],
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3935
            lstore, mutable_section_id=location)
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3936
6076.1.1 by Vincent Ladeuil
Add the missing config stacks and store
3937
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
3938
class BranchStack(Stack):
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3939
    """Per-location options falling back to branch then global options stack.
3940
3941
    The following sections are queried:
3942
3943
    * command-line overrides,
3944
3945
    * the sections matching ``location`` in ``locations.conf``, the order being
3946
      defined by the number of path components in the section glob, higher
3947
      numbers first (from most specific section to most generic),
3948
3949
    * the no-name section in branch.conf,
3950
3951
    * the ``DEFAULT`` section in ``bazaar.conf``.
3952
3953
    This stack will use the no-name section in ``branch.conf`` as its
6362.3.2 by Vincent Ladeuil
Fix as per jelmer's review.
3954
    MutableSection.
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3955
    """
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3956
3957
    def __init__(self, branch):
6499.3.10 by Vincent Ladeuil
Add news entry and cleanup
3958
        lstore = self.get_shared_store(LocationStore())
6270.1.19 by Jelmer Vernooij
Some changes discussed with vila on IRC.
3959
        bstore = branch._get_config_store()
6499.3.10 by Vincent Ladeuil
Add news entry and cleanup
3960
        gstore = self.get_shared_store(GlobalStore())
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3961
        super(BranchStack, self).__init__(
6161.1.7 by Vincent Ladeuil
Emit a warning when bzrlib.intialize) has not been called
3962
            [self._get_overrides,
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3963
             LocationMatcher(lstore, branch.base).get_sections,
3964
             NameMatcher(bstore, None).get_sections,
6260.3.2 by Vincent Ladeuil
Only the DEFAULT section is searched for the normal uses of bazaar.conf
3965
             NameMatcher(gstore, 'DEFAULT').get_sections],
5743.6.14 by Vincent Ladeuil
Parametrize the Stack tests.
3966
            bstore)
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
3967
        self.branch = branch
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3968
6404.6.7 by Vincent Ladeuil
Change set/remove to require a lock for the branch config files.
3969
    def lock_write(self, token=None):
3970
        return self.branch.lock_write(token)
3971
3972
    def unlock(self):
3973
        return self.branch.unlock()
3974
3975
    @needs_write_lock
3976
    def set(self, name, value):
3977
        super(BranchStack, self).set(name, value)
6404.6.9 by Vincent Ladeuil
Hmpf, branch.unlock() will call store.save_changes(), this should be called explicitly or no IOs are saved.
3978
        # Unlocking the branch will trigger a store.save_changes() so the last
3979
        # unlock saves all the changes.
6404.6.7 by Vincent Ladeuil
Change set/remove to require a lock for the branch config files.
3980
3981
    @needs_write_lock
3982
    def remove(self, name):
3983
        super(BranchStack, self).remove(name)
6404.6.9 by Vincent Ladeuil
Hmpf, branch.unlock() will call store.save_changes(), this should be called explicitly or no IOs are saved.
3984
        # Unlocking the branch will trigger a store.save_changes() so the last
3985
        # unlock saves all the changes.
6404.6.7 by Vincent Ladeuil
Change set/remove to require a lock for the branch config files.
3986
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3987
6499.3.3 by Vincent Ladeuil
Stop using _CompatibleStack now that local config files can be
3988
class RemoteControlStack(Stack):
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
3989
    """Remote control-only options stack."""
3990
6270.1.23 by Jelmer Vernooij
Add notes about Remote{Control,Branch}Store.
3991
    # FIXME 2011-11-22 JRV This should probably be renamed to avoid confusion
3992
    # with the stack used for remote bzr dirs. RemoteControlStack only uses
3993
    # control.conf and is used only for stack options.
3994
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
3995
    def __init__(self, bzrdir):
6270.1.21 by Jelmer Vernooij
Use _get_config_store in Remote*Stack
3996
        cstore = bzrdir._get_config_store()
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
3997
        super(RemoteControlStack, self).__init__(
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3998
            [NameMatcher(cstore, None).get_sections],
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
3999
            cstore)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
4000
        self.controldir = bzrdir
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
4001
4002
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
4003
class BranchOnlyStack(Stack):
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
4004
    """Branch-only options stack."""
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
4005
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
4006
    # FIXME: _BranchOnlyStack only uses branch.conf and is used only for the
4007
    # stacked_on_location options waiting for http://pad.lv/832042 to be fixed.
4008
    # -- vila 2011-12-16
6270.1.23 by Jelmer Vernooij
Add notes about Remote{Control,Branch}Store.
4009
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
4010
    def __init__(self, branch):
6270.1.21 by Jelmer Vernooij
Use _get_config_store in Remote*Stack
4011
        bstore = branch._get_config_store()
6379.11.2 by Vincent Ladeuil
No matter how weird BranchOnlyStack is, it's public, the FIXMEs should be enough for devs to notice.
4012
        super(BranchOnlyStack, self).__init__(
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
4013
            [NameMatcher(bstore, None).get_sections],
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
4014
            bstore)
4015
        self.branch = branch
4016
6404.6.7 by Vincent Ladeuil
Change set/remove to require a lock for the branch config files.
4017
    def lock_write(self, token=None):
4018
        return self.branch.lock_write(token)
4019
4020
    def unlock(self):
4021
        return self.branch.unlock()
4022
4023
    @needs_write_lock
4024
    def set(self, name, value):
4025
        super(BranchOnlyStack, self).set(name, value)
4026
        # Force a write to persistent storage
4027
        self.store.save_changes()
4028
4029
    @needs_write_lock
4030
    def remove(self, name):
4031
        super(BranchOnlyStack, self).remove(name)
4032
        # Force a write to persistent storage
4033
        self.store.save_changes()
4034
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
4035
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
4036
class cmd_config(commands.Command):
5447.4.19 by Vincent Ladeuil
Add some more documentation.
4037
    __doc__ = """Display, set or remove a configuration option.
4038
6561.1.1 by Vincent Ladeuil
Clarify option references expansion for `bzr config`.
4039
    Display the active value for option NAME.
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4040
4041
    If --all is specified, NAME is interpreted as a regular expression and all
6561.1.1 by Vincent Ladeuil
Clarify option references expansion for `bzr config`.
4042
    matching options are displayed mentioning their scope and without resolving
4043
    option references in the value). The active value that bzr will take into
4044
    account is the first one displayed for each option.
4045
4046
    If NAME is not given, --all .* is implied (all options are displayed for the
4047
    current scope).
4048
4049
    Setting a value is achieved by using NAME=value without spaces. The value
5447.4.19 by Vincent Ladeuil
Add some more documentation.
4050
    is set in the most relevant scope and can be checked by displaying the
4051
    option again.
6561.1.1 by Vincent Ladeuil
Clarify option references expansion for `bzr config`.
4052
4053
    Removing a value is achieved by using --remove NAME.
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
4054
    """
4055
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4056
    takes_args = ['name?']
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
4057
4058
    takes_options = [
4059
        'directory',
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
4060
        # FIXME: This should be a registry option so that plugins can register
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4061
        # their own config files (or not) and will also address
4062
        # http://pad.lv/788991 -- vila 20101115
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4063
        commands.Option('scope', help='Reduce the scope to the specified'
6259.2.5 by Martin Packman
Add full stops to various option help text so test_option_grammar passes
4064
                        ' configuration file.',
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
4065
                        type=text_type),
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4066
        commands.Option('all',
4067
            help='Display all the defined values for the matching options.',
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4068
            ),
5447.4.8 by Vincent Ladeuil
Make the test properly fail and provide a fake implementation for ``bzr config --remove opt_name``.
4069
        commands.Option('remove', help='Remove the option from'
6259.2.5 by Martin Packman
Add full stops to various option help text so test_option_grammar passes
4070
                        ' the configuration file.'),
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
4071
        ]
4072
5425.4.24 by Martin Pool
Mention 'configuration' help topic from 'bzr help config'
4073
    _see_also = ['configuration']
4074
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
4075
    @commands.display_command
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4076
    def run(self, name=None, all=False, directory=None, scope=None,
4077
            remove=False):
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
4078
        if directory is None:
4079
            directory = '.'
6437.66.1 by Wouter van Heyst
Dereference directory services in cmd_config.
4080
        directory = directory_service.directories.dereference(directory)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
4081
        directory = urlutils.normalize_url(directory)
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4082
        if remove and all:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4083
            raise errors.BzrError(
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4084
                '--all and --remove are mutually exclusive.')
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4085
        elif remove:
4086
            # Delete the option in the given scope
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4087
            self._remove_config_option(name, directory, scope)
4088
        elif name is None:
4089
            # Defaults to all options
4090
            self._show_matching_options('.*', directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
4091
        else:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4092
            try:
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4093
                name, value = name.split('=', 1)
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4094
            except ValueError:
4095
                # Display the option(s) value(s)
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4096
                if all:
4097
                    self._show_matching_options(name, directory, scope)
4098
                else:
4099
                    self._show_value(name, directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
4100
            else:
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4101
                if all:
4102
                    raise errors.BzrError(
4103
                        'Only one option can be set.')
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4104
                # Set the option value
4105
                self._set_config_option(name, value, directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
4106
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
4107
    def _get_stack(self, directory, scope=None, write_access=False):
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4108
        """Get the configuration stack specified by ``directory`` and ``scope``.
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
4109
4110
        :param directory: Where the configurations are derived from.
4111
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4112
        :param scope: A specific config to start from.
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
4113
4114
        :param write_access: Whether a write access to the stack will be
4115
            attempted.
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
4116
        """
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4117
        # FIXME: scope should allow access to plugin-specific stacks (even
4118
        # reduced to the plugin-specific store), related to
4119
        # http://pad.lv/788991 -- vila 2011-11-15
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4120
        if scope is not None:
4121
            if scope == 'bazaar':
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4122
                return GlobalStack()
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4123
            elif scope == 'locations':
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4124
                return LocationStack(directory)
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4125
            elif scope == 'branch':
6207.3.3 by jelmer at samba
Fix tests and the like.
4126
                (_, br, _) = (
4127
                    controldir.ControlDir.open_containing_tree_or_branch(
4128
                        directory))
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
4129
                if write_access:
4130
                    self.add_cleanup(br.lock_write().unlock)
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4131
                return br.get_config_stack()
4132
            raise errors.NoSuchConfig(scope)
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
4133
        else:
4134
            try:
6207.3.3 by jelmer at samba
Fix tests and the like.
4135
                (_, br, _) = (
4136
                    controldir.ControlDir.open_containing_tree_or_branch(
4137
                        directory))
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
4138
                if write_access:
4139
                    self.add_cleanup(br.lock_write().unlock)
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4140
                return br.get_config_stack()
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
4141
            except errors.NotBranchError:
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4142
                return LocationStack(directory)
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
4143
6466.1.1 by Vincent Ladeuil
Fix RegistryOption display in bzr config output
4144
    def _quote_multiline(self, value):
4145
        if '\n' in value:
4146
            value = '"""' + value + '"""'
4147
        return value
4148
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4149
    def _show_value(self, name, directory, scope):
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4150
        conf = self._get_stack(directory, scope)
6466.1.1 by Vincent Ladeuil
Fix RegistryOption display in bzr config output
4151
        value = conf.get(name, expand=True, convert=False)
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4152
        if value is not None:
4153
            # Quote the value appropriately
6466.1.1 by Vincent Ladeuil
Fix RegistryOption display in bzr config output
4154
            value = self._quote_multiline(value)
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4155
            self.outf.write('%s\n' % (value,))
4156
        else:
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4157
            raise errors.NoSuchConfigOption(name)
4158
4159
    def _show_matching_options(self, name, directory, scope):
5967.9.3 by Martin Pool
Explicitly use lazy_regexp where we count on its error reporting behaviour
4160
        name = lazy_regex.lazy_compile(name)
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4161
        # We want any error in the regexp to be raised *now* so we need to
5967.9.3 by Martin Pool
Explicitly use lazy_regexp where we count on its error reporting behaviour
4162
        # avoid the delay introduced by the lazy regexp.  But, we still do
4163
        # want the nicer errors raised by lazy_regex.
4164
        name._compile_and_collapse()
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4165
        cur_store_id = None
5533.1.1 by Vincent Ladeuil
Fix ``bzr config`` to respect policies when displaying values and also display sections when appropriate.
4166
        cur_section = None
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4167
        conf = self._get_stack(directory, scope)
6466.1.1 by Vincent Ladeuil
Fix RegistryOption display in bzr config output
4168
        for store, section in conf.iter_sections():
4169
            for oname in section.iter_option_names():
4170
                if name.search(oname):
4171
                    if cur_store_id != store.id:
4172
                        # Explain where the options are defined
4173
                        self.outf.write('%s:\n' % (store.id,))
4174
                        cur_store_id = store.id
4175
                        cur_section = None
4176
                    if (section.id is not None and cur_section != section.id):
4177
                        # Display the section id as it appears in the store
4178
                        # (None doesn't appear by definition)
4179
                        self.outf.write('  [%s]\n' % (section.id,))
4180
                        cur_section = section.id
4181
                    value = section.get(oname, expand=False)
4182
                    # Quote the value appropriately
4183
                    value = self._quote_multiline(value)
4184
                    self.outf.write('  %s = %s\n' % (oname, value))
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
4185
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4186
    def _set_config_option(self, name, value, directory, scope):
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
4187
        conf = self._get_stack(directory, scope, write_access=True)
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4188
        conf.set(name, value)
6597.1.1 by Vincent Ladeuil
Bzr config should save the changes explicitly when needed
4189
        # Explicitly save the changes
4190
        conf.store.save_changes()
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
4191
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4192
    def _remove_config_option(self, name, directory, scope):
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4193
        if name is None:
4194
            raise errors.BzrCommandError(
4195
                '--remove expects an option to remove.')
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
4196
        conf = self._get_stack(directory, scope, write_access=True)
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4197
        try:
4198
            conf.remove(name)
6597.1.1 by Vincent Ladeuil
Bzr config should save the changes explicitly when needed
4199
            # Explicitly save the changes
4200
            conf.store.save_changes()
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4201
        except KeyError:
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
4202
            raise errors.NoSuchConfigOption(name)
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
4203
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4204
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
4205
# Test registries
5743.6.29 by Vincent Ladeuil
For jam.
4206
#
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
4207
# We need adapters that can build a Store or a Stack in a test context. Test
4208
# classes, based on TestCaseWithTransport, can use the registry to parametrize
4209
# themselves. The builder will receive a test instance and should return a
5743.6.29 by Vincent Ladeuil
For jam.
4210
# ready-to-use store or stack.  Plugins that define new store/stacks can also
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
4211
# register themselves here to be tested against the tests defined in
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
4212
# breezy.tests.test_config. Note that the builder can be called multiple times
6325.1.1 by Vincent Ladeuil
Fix various typos
4213
# for the same test.
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
4214
4215
# The registered object should be a callable receiving a test instance
4216
# parameter (inheriting from tests.TestCaseWithTransport) and returning a Store
4217
# object.
4218
test_store_builder_registry = registry.Registry()
4219
5743.10.1 by Vincent Ladeuil
Derefence the ref to use it.
4220
# The registered object should be a callable receiving a test instance
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
4221
# parameter (inheriting from tests.TestCaseWithTransport) and returning a Stack
4222
# object.
4223
test_stack_builder_registry = registry.Registry()