~bzr-pqm/bzr/bzr.dev

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