/brz/remove-bazaar

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