/brz/remove-bazaar

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