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