/brz/remove-bazaar

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