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