/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
6437.32.1 by Aaron Bentley
Use colocated branch names as nicknames.
1485
        if self.branch.name:
1486
            return self.branch.name
2120.5.2 by Alexander Belchenko
(jam) Fix for bug #66857
1487
        return urlutils.unescape(self.branch.base.split('/')[-2])
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1488
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
1489
    def has_explicit_nickname(self):
1490
        """Return true if a nickname has been explicitly assigned."""
1491
        return self._get_explicit_nickname() is not None
1492
1493
    def _get_explicit_nickname(self):
1494
        return self._get_best_value('_get_nickname')
1495
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
1496
    def _log_format(self):
1497
        """See Config.log_format."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1498
        return self._get_best_value('_log_format')
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1499
5971.1.55 by Jonathan Riddell
add a config option to validate signatures
1500
    def _validate_signatures_in_log(self):
1501
        """See Config.validate_signatures_in_log."""
1502
        return self._get_best_value('_validate_signatures_in_log')
1503
5971.1.56 by Jonathan Riddell
add an option for acceptable_keys in config, also make config docs match reality for signature options
1504
    def _acceptable_keys(self):
1505
        """See Config.acceptable_keys."""
1506
        return self._get_best_value('_acceptable_keys')
1507
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
1508
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1509
def ensure_config_dir_exists(path=None):
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1510
    """Make sure a configuration directory exists.
1511
    This makes sure that the directory exists.
1512
    On windows, since configuration directories are 2 levels deep,
1513
    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
1514
    """
1515
    if path is None:
1516
        path = config_dir()
1517
    if not os.path.isdir(path):
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1518
        if sys.platform == 'win32':
1519
            parent_dir = os.path.dirname(path)
1520
            if not os.path.isdir(parent_dir):
1521
                trace.mutter('creating config parent directory: %r', parent_dir)
1522
                os.mkdir(parent_dir)
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1523
        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
1524
        os.mkdir(path)
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
1525
        osutils.copy_ownership_from_path(path)
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1526
1532 by Robert Collins
Merge in John Meinels integration branch.
1527
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1528
def config_dir():
6437.27.5 by Martin Packman
Document and test that config_dir now always returns unicode
1529
    """Return per-user configuration directory as unicode string
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1530
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1531
    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
1532
    and Linux.  On Linux, if there is a $XDG_CONFIG_HOME/bazaar directory,
1533
    that will be used instead.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1534
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1535
    TODO: Global option --config-dir to override this.
1536
    """
6437.27.1 by Martin Packman
Use new osutils functions over manual decoding in config_dir
1537
    base = osutils.path_from_environ('BZR_HOME')
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1538
    if sys.platform == 'win32':
1539
        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
1540
            base = win32utils.get_appdata_location()
1541
        if base is None:
1542
            base = win32utils.get_home_location()
6437.27.4 by Martin Packman
Add notes about known issues
1543
        # GZ 2012-02-01: Really the two level subdirs only make sense inside
1544
        #                APPDATA, but hard to move. See bug 348640 for more.
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1545
        return osutils.pathjoin(base, 'bazaar', '2.0')
6437.27.3 by Martin Packman
Rearrange conditionals to avoid some duplication on the not-win32 branch
1546
    if base is None:
6437.27.5 by Martin Packman
Document and test that config_dir now always returns unicode
1547
        # 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
1548
        if sys.platform != 'darwin':
6437.27.1 by Martin Packman
Use new osutils functions over manual decoding in config_dir
1549
            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
1550
            if xdg_dir is None:
6437.27.1 by Martin Packman
Use new osutils functions over manual decoding in config_dir
1551
                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
1552
            xdg_dir = osutils.pathjoin(xdg_dir, 'bazaar')
1553
            if osutils.isdir(xdg_dir):
1554
                trace.mutter(
1555
                    "Using configuration in XDG directory %s." % xdg_dir)
1556
                return xdg_dir
6437.27.3 by Martin Packman
Rearrange conditionals to avoid some duplication on the not-win32 branch
1557
        base = osutils._get_home_dir()
1558
    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 \
1559
1560
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1561
def config_filename():
1562
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1563
    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.
1564
1565
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
1566
def locations_config_filename():
1567
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1568
    return osutils.pathjoin(config_dir(), 'locations.conf')
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
1569
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1570
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1571
def authentication_config_filename():
1572
    """Return per-user authentication ini file filename."""
1573
    return osutils.pathjoin(config_dir(), 'authentication.conf')
1574
1575
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
1576
def user_ignore_config_filename():
1577
    """Return the user default ignore filename"""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1578
    return osutils.pathjoin(config_dir(), 'ignore')
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
1579
1580
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1581
def crash_dir():
1582
    """Return the directory name to store crash files.
1583
1584
    This doesn't implicitly create it.
1585
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
1586
    On Windows it's in the config directory; elsewhere it's /var/crash
4634.128.18 by Martin Pool
Update apport crash tests
1587
    which may be monitored by apport.  It can be overridden by
1588
    $APPORT_CRASH_DIR.
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1589
    """
1590
    if sys.platform == 'win32':
1591
        return osutils.pathjoin(config_dir(), 'Crash')
1592
    else:
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
1593
        # XXX: hardcoded in apport_python_hook.py; therefore here too -- mbp
1594
        # 2010-01-31
4634.128.18 by Martin Pool
Update apport crash tests
1595
        return os.environ.get('APPORT_CRASH_DIR', '/var/crash')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1596
1597
1598
def xdg_cache_dir():
4584.3.23 by Martin Pool
Correction to xdg_cache_dir and add a simple test
1599
    # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html
1600
    # Possibly this should be different on Windows?
1601
    e = os.environ.get('XDG_CACHE_DIR', None)
1602
    if e:
1603
        return e
1604
    else:
1605
        return os.path.expanduser('~/.cache')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1606
1607
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1608
def _get_default_mail_domain():
1609
    """If possible, return the assumed default email domain.
1610
1611
    :returns: string mail domain, or None.
1612
    """
1613
    if sys.platform == 'win32':
1614
        # No implementation yet; patches welcome
1615
        return None
1616
    try:
1617
        f = open('/etc/mailname')
1618
    except (IOError, OSError), e:
1619
        return None
1620
    try:
1621
        domain = f.read().strip()
1622
        return domain
1623
    finally:
1624
        f.close()
1625
1626
6351.3.15 by Vincent Ladeuil
BZR_EMAIL should override all config settings, no matter how surprising it may seem.
1627
def default_email():
6374.1.1 by Jelmer Vernooij
Fix default BZR_EMAIL use.
1628
    v = os.environ.get('BZR_EMAIL')
6374.1.3 by Jelmer Vernooij
Add tests for default_email behaviour.
1629
    if v:
6374.1.1 by Jelmer Vernooij
Fix default BZR_EMAIL use.
1630
        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.
1631
    v = os.environ.get('EMAIL')
1632
    if v:
1633
        return v.decode(osutils.get_user_encoding())
1634
    name, email = _auto_user_id()
1635
    if name and email:
1636
        return u'%s <%s>' % (name, email)
1637
    elif email:
1638
        return email
1639
    raise errors.NoWhoami()
1640
1641
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1642
def _auto_user_id():
1643
    """Calculate automatic user identification.
1644
1645
    :returns: (realname, email), either of which may be None if they can't be
1646
    determined.
1647
1648
    Only used when none is set in the environment or the id file.
1649
1650
    This only returns an email address if we can be fairly sure the 
1651
    address is reasonable, ie if /etc/mailname is set on unix.
1652
1653
    This doesn't use the FQDN as the default domain because that may be 
1654
    slow, and it doesn't use the hostname alone because that's not normally 
1655
    a reasonable address.
1656
    """
1657
    if sys.platform == 'win32':
1658
        # No implementation to reliably determine Windows default mail
1659
        # address; please add one.
1660
        return None, None
1661
1662
    default_mail_domain = _get_default_mail_domain()
1663
    if not default_mail_domain:
1664
        return None, None
1665
1666
    import pwd
1667
    uid = os.getuid()
1668
    try:
1669
        w = pwd.getpwuid(uid)
1670
    except KeyError:
5904.1.2 by Martin Pool
Various pyflakes import fixes.
1671
        trace.mutter('no passwd entry for uid %d?' % uid)
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1672
        return None, None
1673
1674
    # we try utf-8 first, because on many variants (like Linux),
1675
    # /etc/passwd "should" be in utf-8, and because it's unlikely to give
1676
    # false positives.  (many users will have their user encoding set to
1677
    # latin-1, which cannot raise UnicodeError.)
1678
    try:
1679
        gecos = w.pw_gecos.decode('utf-8')
1680
        encoding = 'utf-8'
1681
    except UnicodeError:
1682
        try:
1683
            encoding = osutils.get_user_encoding()
1684
            gecos = w.pw_gecos.decode(encoding)
1685
        except UnicodeError, e:
5904.1.2 by Martin Pool
Various pyflakes import fixes.
1686
            trace.mutter("cannot decode passwd entry %s" % w)
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1687
            return None, None
1688
    try:
1689
        username = w.pw_name.decode(encoding)
1690
    except UnicodeError, e:
5904.1.2 by Martin Pool
Various pyflakes import fixes.
1691
        trace.mutter("cannot decode passwd entry %s" % w)
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1692
        return None, None
1693
1694
    comma = gecos.find(',')
1695
    if comma == -1:
1696
        realname = gecos
1697
    else:
1698
        realname = gecos[:comma]
1699
1700
    return realname, (username + '@' + default_mail_domain)
1701
1702
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1703
def parse_username(username):
1704
    """Parse e-mail username and return a (name, address) tuple."""
1705
    match = re.match(r'(.*?)\s*<?([\w+.-]+@[\w+.-]+)>?', username)
1706
    if match is None:
1707
        return (username, '')
1708
    else:
1709
        return (match.group(1), match.group(2))
1710
1711
1185.16.52 by Martin Pool
- add extract_email_address
1712
def extract_email_address(e):
1713
    """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.
1714
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1715
    That is just the user@domain part, nothing else.
1185.16.52 by Martin Pool
- add extract_email_address
1716
    This part is required to contain only ascii characters.
1717
    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.
1718
1185.16.52 by Martin Pool
- add extract_email_address
1719
    >>> extract_email_address('Jane Tester <jane@test.com>')
1720
    "jane@test.com"
1721
    """
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1722
    name, email = parse_username(e)
1723
    if not email:
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
1724
        raise errors.NoEmailInUsername(e)
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1725
    return email
1185.35.11 by Aaron Bentley
Added support for branch nicks
1726
1185.85.30 by John Arbash Meinel
Fixing 'bzr push' exposed that IniBasedConfig didn't handle unicode.
1727
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1728
class TreeConfig(IniBasedConfig):
1185.35.11 by Aaron Bentley
Added support for branch nicks
1729
    """Branch configuration data associated with its contents, not location"""
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1730
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
1731
    # XXX: Really needs a better name, as this is not part of the tree! -- mbp 20080507
1732
1185.35.11 by Aaron Bentley
Added support for branch nicks
1733
    def __init__(self, branch):
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
1734
        self._config = branch._get_config()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1735
        self.branch = branch
1736
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1737
    def _get_parser(self, file=None):
1738
        if file is not None:
1739
            return IniBasedConfig._get_parser(file)
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1740
        return self._config._get_configobj()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1741
1742
    def get_option(self, name, section=None, default=None):
1743
        self.branch.lock_read()
1744
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1745
            return self._config.get_option(name, section, default)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1746
        finally:
1747
            self.branch.unlock()
1748
1749
    def set_option(self, value, name, section=None):
1750
        """Set a per-branch configuration option"""
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1751
        # FIXME: We shouldn't need to lock explicitly here but rather rely on
1752
        # higher levels providing the right lock -- vila 20101004
1185.35.11 by Aaron Bentley
Added support for branch nicks
1753
        self.branch.lock_write()
1754
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1755
            self._config.set_option(value, name, section)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1756
        finally:
1757
            self.branch.unlock()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1758
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1759
    def remove_option(self, option_name, section_name=None):
1760
        # FIXME: We shouldn't need to lock explicitly here but rather rely on
1761
        # higher levels providing the right lock -- vila 20101004
1762
        self.branch.lock_write()
1763
        try:
1764
            self._config.remove_option(option_name, section_name)
1765
        finally:
1766
            self.branch.unlock()
1767
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1768
1769
class AuthenticationConfig(object):
1770
    """The authentication configuration file based on a ini file.
1771
1772
    Implements the authentication.conf file described in
1773
    doc/developers/authentication-ring.txt.
1774
    """
1775
1776
    def __init__(self, _file=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1777
        self._config = None # The ConfigObj
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1778
        if _file is None:
2900.2.24 by Vincent Ladeuil
Review feedback.
1779
            self._filename = authentication_config_filename()
1780
            self._input = self._filename = authentication_config_filename()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1781
        else:
2900.2.24 by Vincent Ladeuil
Review feedback.
1782
            # Tests can provide a string as _file
1783
            self._filename = None
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1784
            self._input = _file
1785
1786
    def _get_config(self):
1787
        if self._config is not None:
1788
            return self._config
1789
        try:
2900.2.22 by Vincent Ladeuil
Polishing.
1790
            # FIXME: Should we validate something here ? Includes: empty
1791
            # sections are useless, at least one of
1792
            # user/password/password_encoding should be defined, etc.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1793
1794
            # Note: the encoding below declares that the file itself is utf-8
1795
            # encoded, but the values in the ConfigObj are always Unicode.
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1796
            self._config = ConfigObj(self._input, encoding='utf-8')
1797
        except configobj.ConfigObjError, e:
1798
            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
1799
        except UnicodeError:
5987.1.3 by Vincent Ladeuil
Proper message when authentication.conf has non-utf8 content
1800
            raise errors.ConfigContentError(self._filename)
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1801
        return self._config
1802
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1803
    def _save(self):
1804
        """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.
1805
        conf_dir = os.path.dirname(self._filename)
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1806
        ensure_config_dir_exists(conf_dir)
4708.2.2 by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib
1807
        f = file(self._filename, 'wb')
1808
        try:
1809
            self._get_config().write(f)
1810
        finally:
1811
            f.close()
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1812
1813
    def _set_option(self, section_name, option_name, value):
1814
        """Set an authentication configuration option"""
1815
        conf = self._get_config()
1816
        section = conf.get(section_name)
1817
        if section is None:
1818
            conf[section] = {}
1819
            section = conf[section]
1820
        section[option_name] = value
1821
        self._save()
1822
5743.8.25 by Vincent Ladeuil
Fix spurious spaces.
1823
    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
1824
                        realm=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1825
        """Returns the matching credentials from authentication.conf file.
1826
1827
        :param scheme: protocol
1828
1829
        :param host: the server address
1830
1831
        :param port: the associated port (optional)
1832
1833
        :param user: login (optional)
1834
1835
        :param path: the absolute path on the server (optional)
6371.1.1 by Jelmer Vernooij
Fix some whitespace in bzrlib.config.
1836
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1837
        :param realm: the http authentication realm (optional)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1838
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1839
        :return: A dict containing the matching credentials or None.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1840
           This includes:
1841
           - name: the section name of the credentials in the
1842
             authentication.conf file,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1843
           - 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.
1844
           - scheme: the server protocol,
1845
           - host: the server address,
1846
           - port: the server port (can be None),
1847
           - path: the absolute server path (can be None),
1848
           - realm: the http specific authentication realm (can be None),
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1849
           - password: the decoded password, could be None if the credential
1850
             defines only the user
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1851
           - verify_certificates: https specific, True if the server
1852
             certificate should be verified, False otherwise.
1853
        """
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1854
        credentials = None
1855
        for auth_def_name, auth_def in self._get_config().items():
3418.2.1 by Vincent Ladeuil
Fix #217650 by catching declarations outside sections.
1856
            if type(auth_def) is not configobj.Section:
1857
                raise ValueError("%s defined outside a section" % auth_def_name)
1858
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1859
            a_scheme, a_host, a_user, a_path = map(
1860
                auth_def.get, ['scheme', 'host', 'user', 'path'])
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1861
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1862
            try:
1863
                a_port = auth_def.as_int('port')
1864
            except KeyError:
1865
                a_port = None
2900.2.22 by Vincent Ladeuil
Polishing.
1866
            except ValueError:
1867
                raise ValueError("'port' not numeric in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1868
            try:
1869
                a_verify_certificates = auth_def.as_bool('verify_certificates')
1870
            except KeyError:
1871
                a_verify_certificates = True
2900.2.22 by Vincent Ladeuil
Polishing.
1872
            except ValueError:
1873
                raise ValueError(
1874
                    "'verify_certificates' not boolean in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1875
1876
            # Attempt matching
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1877
            if a_scheme is not None and scheme != a_scheme:
1878
                continue
1879
            if a_host is not None:
1880
                if not (host == a_host
1881
                        or (a_host.startswith('.') and host.endswith(a_host))):
1882
                    continue
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1883
            if a_port is not None and port != a_port:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1884
                continue
1885
            if (a_path is not None and path is not None
1886
                and not path.startswith(a_path)):
1887
                continue
1888
            if (a_user is not None and user is not None
1889
                and a_user != user):
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1890
                # Never contradict the caller about the user to be used
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1891
                continue
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1892
            if a_user is None:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1893
                # Can't find a user
1894
                continue
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1895
            # Prepare a credentials dictionary with additional keys
1896
            # for the credential providers
2900.2.24 by Vincent Ladeuil
Review feedback.
1897
            credentials = dict(name=auth_def_name,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1898
                               user=a_user,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1899
                               scheme=a_scheme,
1900
                               host=host,
1901
                               port=port,
1902
                               path=path,
1903
                               realm=realm,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1904
                               password=auth_def.get('password', None),
2900.2.24 by Vincent Ladeuil
Review feedback.
1905
                               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
1906
            # Decode the password in the credentials (or get one)
2900.2.22 by Vincent Ladeuil
Polishing.
1907
            self.decode_password(credentials,
1908
                                 auth_def.get('password_encoding', None))
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1909
            if 'auth' in debug.debug_flags:
1910
                trace.mutter("Using authentication section: %r", auth_def_name)
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1911
            break
1912
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1913
        if credentials is None:
1914
            # No credentials were found in authentication.conf, try the fallback
1915
            # credentials stores.
1916
            credentials = credential_store_registry.get_fallback_credentials(
1917
                scheme, host, port, user, path, realm)
1918
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1919
        return credentials
1920
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1921
    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
1922
                        port=None, path=None, verify_certificates=None,
1923
                        realm=None):
3777.3.1 by Aaron Bentley
Update docs
1924
        """Set authentication credentials for a host.
1925
1926
        Any existing credentials with matching scheme, host, port and path
1927
        will be deleted, regardless of name.
1928
1929
        :param name: An arbitrary name to describe this set of credentials.
1930
        :param host: Name of the host that accepts these credentials.
1931
        :param user: The username portion of these credentials.
1932
        :param scheme: The URL scheme (e.g. ssh, http) the credentials apply
1933
            to.
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1934
        :param password: Password portion of these credentials.
3777.3.1 by Aaron Bentley
Update docs
1935
        :param port: The IP port on the host that these credentials apply to.
1936
        :param path: A filesystem path on the host that these credentials
1937
            apply to.
1938
        :param verify_certificates: On https, verify server certificates if
1939
            True.
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1940
        :param realm: The http authentication realm (optional).
3777.3.1 by Aaron Bentley
Update docs
1941
        """
3777.1.8 by Aaron Bentley
Commit work-in-progress
1942
        values = {'host': host, 'user': user}
1943
        if password is not None:
1944
            values['password'] = password
1945
        if scheme is not None:
1946
            values['scheme'] = scheme
1947
        if port is not None:
1948
            values['port'] = '%d' % port
1949
        if path is not None:
1950
            values['path'] = path
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1951
        if verify_certificates is not None:
1952
            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
1953
        if realm is not None:
1954
            values['realm'] = realm
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1955
        config = self._get_config()
1956
        for_deletion = []
1957
        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
1958
            for key in ('scheme', 'host', 'port', 'path', 'realm'):
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1959
                if existing_values.get(key) != values.get(key):
1960
                    break
1961
            else:
1962
                del config[section]
1963
        config.update({name: values})
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1964
        self._save()
3777.1.8 by Aaron Bentley
Commit work-in-progress
1965
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1966
    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.
1967
                 prompt=None, ask=False, default=None):
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1968
        """Get a user from authentication file.
1969
1970
        :param scheme: protocol
1971
1972
        :param host: the server address
1973
1974
        :param port: the associated port (optional)
1975
1976
        :param realm: the realm sent by the server (optional)
1977
1978
        :param path: the absolute path on the server (optional)
1979
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1980
        :param ask: Ask the user if there is no explicitly configured username 
1981
                    (optional)
1982
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1983
        :param default: The username returned if none is defined (optional).
1984
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1985
        :return: The found user.
1986
        """
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1987
        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
1988
                                           path=path, realm=realm)
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1989
        if credentials is not None:
1990
            user = credentials['user']
1991
        else:
1992
            user = None
4222.3.2 by Jelmer Vernooij
Prompt for user names if they are not in the configuration.
1993
        if user is None:
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1994
            if ask:
1995
                if prompt is None:
1996
                    # Create a default prompt suitable for most cases
5923.1.3 by Vincent Ladeuil
Even more unicode prompts fixes revealed by pqm.
1997
                    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
1998
                # Special handling for optional fields in the prompt
1999
                if port is not None:
2000
                    prompt_host = '%s:%d' % (host, port)
2001
                else:
2002
                    prompt_host = host
2003
                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.
2004
            else:
4222.3.10 by Jelmer Vernooij
Avoid using the default username in the case of SMTP.
2005
                user = default
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
2006
        return user
2007
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
2008
    def get_password(self, scheme, host, user, port=None,
2009
                     realm=None, path=None, prompt=None):
2010
        """Get a password from authentication file or prompt the user for one.
2011
2012
        :param scheme: protocol
2013
2014
        :param host: the server address
2015
2016
        :param port: the associated port (optional)
2017
2018
        :param user: login
2019
2020
        :param realm: the realm sent by the server (optional)
2021
2022
        :param path: the absolute path on the server (optional)
2023
2024
        :return: The found password or the one entered by the user.
2025
        """
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
2026
        credentials = self.get_credentials(scheme, host, port, user, path,
2027
                                           realm)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
2028
        if credentials is not None:
2029
            password = credentials['password']
3420.1.3 by Vincent Ladeuil
John's review feedback.
2030
            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.
2031
                trace.warning('password ignored in section [%s],'
2032
                              ' use an ssh agent instead'
2033
                              % credentials['name'])
2034
                password = None
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
2035
        else:
2036
            password = None
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
2037
        # 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).
2038
        if password is None:
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
2039
            if prompt is None:
3420.1.2 by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user.
2040
                # Create a default prompt suitable for most cases
5923.1.3 by Vincent Ladeuil
Even more unicode prompts fixes revealed by pqm.
2041
                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
2042
            # Special handling for optional fields in the prompt
2043
            if port is not None:
2044
                prompt_host = '%s:%d' % (host, port)
2045
            else:
2046
                prompt_host = host
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
2047
            password = ui.ui_factory.get_password(prompt,
2048
                                                  host=prompt_host, user=user)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
2049
        return password
2050
2900.2.22 by Vincent Ladeuil
Polishing.
2051
    def decode_password(self, credentials, encoding):
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2052
        try:
2053
            cs = credential_store_registry.get_credential_store(encoding)
2054
        except KeyError:
2055
            raise ValueError('%r is not a known password_encoding' % encoding)
2056
        credentials['password'] = cs.decode_password(credentials)
2900.2.22 by Vincent Ladeuil
Polishing.
2057
        return credentials
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2058
3242.3.17 by Aaron Bentley
Whitespace cleanup
2059
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2060
class CredentialStoreRegistry(registry.Registry):
2061
    """A class that registers credential stores.
2062
2063
    A credential store provides access to credentials via the password_encoding
2064
    field in authentication.conf sections.
2065
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2066
    Except for stores provided by bzr itself, most stores are expected to be
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2067
    provided by plugins that will therefore use
2068
    register_lazy(password_encoding, module_name, member_name, help=help,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2069
    fallback=fallback) to install themselves.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2070
2071
    A fallback credential store is one that is queried if no credentials can be
2072
    found via authentication.conf.
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2073
    """
2074
2075
    def get_credential_store(self, encoding=None):
2076
        cs = self.get(encoding)
2077
        if callable(cs):
2078
            cs = cs()
2079
        return cs
2080
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
2081
    def is_fallback(self, name):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2082
        """Check if the named credentials store should be used as fallback."""
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
2083
        return self.get_info(name)
2084
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2085
    def get_fallback_credentials(self, scheme, host, port=None, user=None,
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
2086
                                 path=None, realm=None):
2087
        """Request credentials from all fallback credentials stores.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2088
2089
        The first credentials store that can provide credentials wins.
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
2090
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2091
        credentials = None
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2092
        for name in self.keys():
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
2093
            if not self.is_fallback(name):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2094
                continue
2095
            cs = self.get_credential_store(name)
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2096
            credentials = cs.get_credentials(scheme, host, port, user,
2097
                                             path, realm)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2098
            if credentials is not None:
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2099
                # We found some credentials
2100
                break
2101
        return credentials
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2102
2103
    def register(self, key, obj, help=None, override_existing=False,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2104
                 fallback=False):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2105
        """Register a new object to a name.
2106
2107
        :param key: This is the key to use to request the object later.
2108
        :param obj: The object to register.
2109
        :param help: Help text for this entry. This may be a string or
2110
                a callable. If it is a callable, it should take two
2111
                parameters (registry, key): this registry and the key that
2112
                the help was registered under.
2113
        :param override_existing: Raise KeyErorr if False and something has
2114
                already been registered for that key. If True, ignore if there
2115
                is an existing key (always register the new value).
2116
        :param fallback: Whether this credential store should be 
2117
                used as fallback.
2118
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2119
        return super(CredentialStoreRegistry,
2120
                     self).register(key, obj, help, info=fallback,
2121
                                    override_existing=override_existing)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2122
2123
    def register_lazy(self, key, module_name, member_name,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2124
                      help=None, override_existing=False,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2125
                      fallback=False):
2126
        """Register a new credential store to be loaded on request.
2127
2128
        :param module_name: The python path to the module. Such as 'os.path'.
2129
        :param member_name: The member of the module to return.  If empty or
2130
                None, get() will return the module itself.
2131
        :param help: Help text for this entry. This may be a string or
2132
                a callable.
2133
        :param override_existing: If True, replace the existing object
2134
                with the new one. If False, if there is already something
2135
                registered with the same key, raise a KeyError
2136
        :param fallback: Whether this credential store should be 
2137
                used as fallback.
2138
        """
2139
        return super(CredentialStoreRegistry, self).register_lazy(
2140
            key, module_name, member_name, help,
2141
            info=fallback, override_existing=override_existing)
2142
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2143
2144
credential_store_registry = CredentialStoreRegistry()
2145
2146
2147
class CredentialStore(object):
2148
    """An abstract class to implement storage for credentials"""
2149
2150
    def decode_password(self, credentials):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2151
        """Returns a clear text password for the provided credentials."""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2152
        raise NotImplementedError(self.decode_password)
2153
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2154
    def get_credentials(self, scheme, host, port=None, user=None, path=None,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2155
                        realm=None):
2156
        """Return the matching credentials from this credential store.
2157
2158
        This method is only called on fallback credential stores.
2159
        """
2160
        raise NotImplementedError(self.get_credentials)
2161
2162
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2163
2164
class PlainTextCredentialStore(CredentialStore):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2165
    __doc__ = """Plain text credential store for the authentication.conf file"""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2166
2167
    def decode_password(self, credentials):
2168
        """See CredentialStore.decode_password."""
2169
        return credentials['password']
2170
2171
2172
credential_store_registry.register('plain', PlainTextCredentialStore,
2173
                                   help=PlainTextCredentialStore.__doc__)
2174
credential_store_registry.default_key = 'plain'
2175
2176
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2177
class BzrDirConfig(object):
2178
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2179
    def __init__(self, bzrdir):
2180
        self._bzrdir = bzrdir
2181
        self._config = bzrdir._get_config()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2182
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2183
    def set_default_stack_on(self, value):
2184
        """Set the default stacking location.
2185
2186
        It may be set to a location, or None.
2187
2188
        This policy affects all branches contained by this bzrdir, except for
2189
        those under repositories.
2190
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2191
        if self._config is None:
2192
            raise errors.BzrError("Cannot set configuration in %s" % self._bzrdir)
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2193
        if value is None:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2194
            self._config.set_option('', 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2195
        else:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2196
            self._config.set_option(value, 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2197
2198
    def get_default_stack_on(self):
2199
        """Return the default stacking location.
2200
2201
        This will either be a location, or None.
2202
2203
        This policy affects all branches contained by this bzrdir, except for
2204
        those under repositories.
2205
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2206
        if self._config is None:
2207
            return None
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2208
        value = self._config.get_option('default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2209
        if value == '':
2210
            value = None
2211
        return value
2212
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2213
2214
class TransportConfig(object):
3242.1.5 by Aaron Bentley
Update per review comments
2215
    """A Config that reads/writes a config file on a Transport.
3242.1.4 by Aaron Bentley
Clean-up
2216
2217
    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.
2218
    that may be associated with a section.  Assigning meaning to these values
2219
    is done at higher levels like TreeConfig.
3242.1.4 by Aaron Bentley
Clean-up
2220
    """
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2221
2222
    def __init__(self, transport, filename):
2223
        self._transport = transport
2224
        self._filename = filename
2225
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2226
    def get_option(self, name, section=None, default=None):
2227
        """Return the value associated with a named option.
2228
2229
        :param name: The name of the value
2230
        :param section: The section the option is in (if any)
2231
        :param default: The value to return if the value is not set
2232
        :return: The value or default value
2233
        """
2234
        configobj = self._get_configobj()
2235
        if section is None:
2236
            section_obj = configobj
2237
        else:
2238
            try:
2239
                section_obj = configobj[section]
2240
            except KeyError:
2241
                return default
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
2242
        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.
2243
        for hook in OldConfigHooks['get']:
5743.8.25 by Vincent Ladeuil
Fix spurious spaces.
2244
            hook(self, name, value)
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
2245
        return value
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2246
2247
    def set_option(self, value, name, section=None):
2248
        """Set the value associated with a named option.
2249
2250
        :param value: The value to set
2251
        :param name: The name of the value to set
2252
        :param section: The section the option is in (if any)
2253
        """
2254
        configobj = self._get_configobj()
2255
        if section is None:
2256
            configobj[name] = value
2257
        else:
2258
            configobj.setdefault(section, {})[name] = value
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
2259
        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.
2260
            hook(self, name, value)
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2261
        self._set_configobj(configobj)
2262
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2263
    def remove_option(self, option_name, section_name=None):
2264
        configobj = self._get_configobj()
2265
        if section_name is None:
2266
            del configobj[option_name]
2267
        else:
2268
            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.
2269
        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.
2270
            hook(self, option_name)
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2271
        self._set_configobj(configobj)
2272
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
2273
    def _get_config_file(self):
2274
        try:
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
2275
            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.
2276
            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.
2277
                hook(self)
2278
            return f
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
2279
        except errors.NoSuchFile:
2280
            return StringIO()
6110.5.1 by Jelmer Vernooij
Warn when a configuration file can not be opened.
2281
        except errors.PermissionDenied, e:
2282
            trace.warning("Permission denied while trying to open "
2283
                "configuration file %s.", urlutils.unescape_for_display(
2284
                urlutils.join(self._transport.base, self._filename), "utf-8"))
2285
            return StringIO()
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
2286
5987.1.4 by Vincent Ladeuil
Proper error messages for config files with content in non-utf encoding or that cannot be parsed
2287
    def _external_url(self):
2288
        return urlutils.join(self._transport.external_url(), self._filename)
2289
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2290
    def _get_configobj(self):
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
2291
        f = self._get_config_file()
2292
        try:
5987.1.4 by Vincent Ladeuil
Proper error messages for config files with content in non-utf encoding or that cannot be parsed
2293
            try:
2294
                conf = ConfigObj(f, encoding='utf-8')
2295
            except configobj.ConfigObjError, e:
2296
                raise errors.ParseConfigError(e.errors, self._external_url())
2297
            except UnicodeDecodeError:
2298
                raise errors.ConfigContentError(self._external_url())
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
2299
        finally:
2300
            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
2301
        return conf
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2302
2303
    def _set_configobj(self, configobj):
2304
        out_file = StringIO()
2305
        configobj.write(out_file)
2306
        out_file.seek(0)
2307
        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.
2308
        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.
2309
            hook(self)
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2310
2311
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2312
class Option(object):
5743.12.10 by Vincent Ladeuil
Add documentation.
2313
    """An option definition.
2314
2315
    The option *values* are stored in config files and found in sections.
2316
2317
    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.
2318
    value, how to convert it from stores, what to do when invalid values are
2319
    encoutered, in which config files it can be stored.
5743.12.10 by Vincent Ladeuil
Add documentation.
2320
    """
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2321
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
2322
    def __init__(self, name, override_from_env=None,
2323
                 default=None, default_from_env=None,
6393.3.2 by Vincent Ladeuil
Merge trunk resolving conflicts
2324
                 help=None, from_unicode=None, invalid=None, unquote=True):
6059.1.4 by Vincent Ladeuil
Add a doc string for the Option constructor.
2325
        """Build an option definition.
2326
2327
        :param name: the name used to refer to the option.
2328
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
2329
        :param override_from_env: A list of environment variables which can
2330
           provide override any configuration setting.
2331
6059.1.4 by Vincent Ladeuil
Add a doc string for the Option constructor.
2332
        :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.
2333
            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
2334
            into the proper type, a callable returning a unicode string so that
2335
            ``from_unicode`` can be used on the return value, or a python
2336
            object that can be stringified (so only the empty list is supported
2337
            for example).
6059.1.4 by Vincent Ladeuil
Add a doc string for the Option constructor.
2338
6082.2.1 by Vincent Ladeuil
Implement default values from environment for config options
2339
        :param default_from_env: A list of environment variables which can
2340
           provide a default value. 'default' will be used only if none of the
2341
           variables specified here are set in the environment.
2342
6059.1.4 by Vincent Ladeuil
Add a doc string for the Option constructor.
2343
        :param help: a doc string to explain the option to the user.
2344
2345
        :param from_unicode: a callable to convert the unicode string
2346
            representing the option value in a store. This is not called for
2347
            the default value.
6059.1.5 by Vincent Ladeuil
Handle invalid config option values.
2348
2349
        :param invalid: the action to be taken when an invalid value is
2350
            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
2351
            invoked to convert a string and returns None or raise ValueError or
2352
            TypeError. Accepted values are: None (ignore invalid values),
2353
            'warning' (emit a warning), 'error' (emit an error message and
2354
            terminates).
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2355
2356
        :param unquote: should the unicode value be unquoted before conversion.
2357
           This should be used only when the store providing the values cannot
2358
           safely unquote them (see http://pad.lv/906897). It is provided so
2359
           daughter classes can handle the quoting themselves.
6059.1.4 by Vincent Ladeuil
Add a doc string for the Option constructor.
2360
        """
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
2361
        if override_from_env is None:
2362
            override_from_env = []
6082.2.1 by Vincent Ladeuil
Implement default values from environment for config options
2363
        if default_from_env is None:
2364
            default_from_env = []
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2365
        self.name = name
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
2366
        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.
2367
        # Convert the default value to a unicode string so all values are
2368
        # strings internally before conversion (via from_unicode) is attempted.
2369
        if default is None:
2370
            self.default = None
2371
        elif isinstance(default, list):
2372
            # Only the empty list is supported
2373
            if default:
2374
                raise AssertionError(
2375
                    'Only empty lists are supported as default values')
2376
            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.
2377
        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.
2378
            # Rely on python to convert strings, booleans and integers
2379
            self.default = u'%s' % (default,)
6351.3.3 by Jelmer Vernooij
Convert more stuff to use config stacks.
2380
        elif callable(default):
2381
            self.default = default
6091.3.6 by Vincent Ladeuil
Replace ugly default value declarations with ad-hoc and limited conversion to unicode strings.
2382
        else:
2383
            # other python objects are not expected
2384
            raise AssertionError('%r is not supported as a default value'
2385
                                 % (default,))
6082.2.1 by Vincent Ladeuil
Implement default values from environment for config options
2386
        self.default_from_env = default_from_env
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2387
        self.help = help
6059.1.1 by Vincent Ladeuil
Implement from_unicode to convert config option values from store.
2388
        self.from_unicode = from_unicode
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2389
        self.unquote = unquote
6059.1.5 by Vincent Ladeuil
Handle invalid config option values.
2390
        if invalid and invalid not in ('warning', 'error'):
2391
            raise AssertionError("%s not supported for 'invalid'" % (invalid,))
2392
        self.invalid = invalid
5743.12.4 by Vincent Ladeuil
An option can provide a default value.
2393
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2394
    def convert_from_unicode(self, store, unicode_value):
2395
        if self.unquote and store is not None and unicode_value is not None:
2396
            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
2397
        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.
2398
            # 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
2399
            return unicode_value
2400
        try:
2401
            converted = self.from_unicode(unicode_value)
2402
        except (ValueError, TypeError):
2403
            # Invalid values are ignored
2404
            converted = None
2405
        if converted is None and self.invalid is not None:
2406
            # The conversion failed
2407
            if self.invalid == 'warning':
2408
                trace.warning('Value "%s" is not valid for "%s"',
2409
                              unicode_value, self.name)
2410
            elif self.invalid == 'error':
2411
                raise errors.ConfigOptionValueError(self.name, unicode_value)
2412
        return converted
2413
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
2414
    def get_override(self):
2415
        value = None
2416
        for var in self.override_from_env:
2417
            try:
2418
                # If the env variable is defined, its value takes precedence
2419
                value = os.environ[var].decode(osutils.get_user_encoding())
2420
                break
2421
            except KeyError:
2422
                continue
2423
        return value
2424
5743.12.4 by Vincent Ladeuil
An option can provide a default value.
2425
    def get_default(self):
6091.3.4 by Vincent Ladeuil
Clarify get_default.
2426
        value = None
6082.2.1 by Vincent Ladeuil
Implement default values from environment for config options
2427
        for var in self.default_from_env:
2428
            try:
6091.3.4 by Vincent Ladeuil
Clarify get_default.
2429
                # If the env variable is defined, its value is the default one
6351.3.6 by Jelmer Vernooij
More fixes for unicode handling.
2430
                value = os.environ[var].decode(osutils.get_user_encoding())
6091.3.4 by Vincent Ladeuil
Clarify get_default.
2431
                break
6082.2.1 by Vincent Ladeuil
Implement default values from environment for config options
2432
            except KeyError:
2433
                continue
6091.3.4 by Vincent Ladeuil
Clarify get_default.
2434
        if value is None:
2435
            # Otherwise, fallback to the value defined at registration
6351.3.3 by Jelmer Vernooij
Convert more stuff to use config stacks.
2436
            if callable(self.default):
2437
                value = self.default()
6349.3.1 by Vincent Ladeuil
Allow config option default value to be a python callable
2438
                if not isinstance(value, unicode):
2439
                    raise AssertionError(
2440
                    'Callable default values should be unicode')
6351.3.3 by Jelmer Vernooij
Convert more stuff to use config stacks.
2441
            else:
2442
                value = self.default
6091.3.4 by Vincent Ladeuil
Clarify get_default.
2443
        return value
5743.12.4 by Vincent Ladeuil
An option can provide a default value.
2444
6437.52.1 by Jelmer Vernooij
Make sure configuration options can provide their own help topics.
2445
    def get_help_topic(self):
2446
        return self.name
2447
6059.3.1 by Vincent Ladeuil
Provide per-config option help
2448
    def get_help_text(self, additional_see_also=None, plain=True):
2449
        result = self.help
2450
        from bzrlib import help_topics
2451
        result += help_topics._format_see_also(additional_see_also)
2452
        if plain:
2453
            result = help_topics.help_as_plain_text(result)
2454
        return result
2455
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2456
6059.1.2 by Vincent Ladeuil
Define a proper converter to avoid lazy import issues.
2457
# Predefined converters to get proper values from store
2458
2459
def bool_from_store(unicode_str):
2460
    return ui.bool_from_string(unicode_str)
2461
6015.25.1 by Vincent Ladeuil
Minimal backport to fix fdatasync options handling
2462
6059.1.6 by Vincent Ladeuil
Implement integer config options.
2463
def int_from_store(unicode_str):
2464
    return int(unicode_str)
2465
2466
6385.1.7 by Vincent Ladeuil
Feedback from review and minor tweaks.
2467
_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
2468
2469
def int_SI_from_store(unicode_str):
6378.1.2 by Vincent Ladeuil
Migrate add.maximum_file_size to the new config scheme
2470
    """Convert a human readable size in SI units, e.g 10MB into an integer.
2471
2472
    Accepted suffixes are K,M,G. It is case-insensitive and may be followed
2473
    by a trailing b (i.e. Kb, MB). This is intended to be practical and not
2474
    pedantic.
2475
2476
    :return Integer, expanded to its base-10 value if a proper SI unit is 
2477
        found, None otherwise.
2478
    """
6385.1.7 by Vincent Ladeuil
Feedback from review and minor tweaks.
2479
    regexp = "^(\d+)(([" + ''.join(_unit_suffixes) + "])b?)?$"
6378.1.1 by Vincent Ladeuil
Add int_SI_from_store as a config option helper
2480
    p = re.compile(regexp, re.IGNORECASE)
2481
    m = p.match(unicode_str)
2482
    val = None
2483
    if m is not None:
2484
        val, _, unit = m.groups()
2485
        val = int(val)
2486
        if unit:
2487
            try:
6385.1.7 by Vincent Ladeuil
Feedback from review and minor tweaks.
2488
                coeff = _unit_suffixes[unit.upper()]
6378.1.1 by Vincent Ladeuil
Add int_SI_from_store as a config option helper
2489
            except KeyError:
2490
                raise ValueError(gettext('{0} is not an SI unit.').format(unit))
2491
            val *= coeff
2492
    return val
2493
2494
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.
2495
def float_from_store(unicode_str):
2496
    return float(unicode_str)
2497
2498
6082.5.14 by Vincent Ladeuil
Create a single configobj for list conversions and just reset() it when needed.
2499
# Use a an empty dict to initialize an empty configobj avoiding all
2500
# parsing and encoding checks
6082.5.15 by Vincent Ladeuil
Use explicit kwargs for the list converter.
2501
_list_converter_config = configobj.ConfigObj(
2502
    {}, encoding='utf-8', list_values=True, interpolation=False)
2503
6082.5.14 by Vincent Ladeuil
Create a single configobj for list conversions and just reset() it when needed.
2504
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2505
class ListOption(Option):
2506
2507
    def __init__(self, name, default=None, default_from_env=None,
2508
                 help=None, invalid=None):
2509
        """A list Option definition.
2510
2511
        This overrides the base class so the conversion from a unicode string
2512
        can take quoting into account.
2513
        """
2514
        super(ListOption, self).__init__(
2515
            name, default=default, default_from_env=default_from_env,
2516
            from_unicode=self.from_unicode, help=help,
2517
            invalid=invalid, unquote=False)
2518
6385.1.7 by Vincent Ladeuil
Feedback from review and minor tweaks.
2519
    def from_unicode(self, unicode_str):
2520
        if not isinstance(unicode_str, basestring):
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2521
            raise TypeError
2522
        # Now inject our string directly as unicode. All callers got their
2523
        # value from configobj, so values that need to be quoted are already
2524
        # properly quoted.
2525
        _list_converter_config.reset()
6385.1.7 by Vincent Ladeuil
Feedback from review and minor tweaks.
2526
        _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
2527
        maybe_list = _list_converter_config['list']
2528
        if isinstance(maybe_list, basestring):
2529
            if maybe_list:
2530
                # A single value, most probably the user forgot (or didn't care
2531
                # to add) the final ','
2532
                l = [maybe_list]
2533
            else:
2534
                # The empty string, convert to empty list
2535
                l = []
6059.2.1 by Vincent Ladeuil
Implement list config options.
2536
        else:
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2537
            # We rely on ConfigObj providing us with a list already
2538
            l = maybe_list
2539
        return l
6059.2.1 by Vincent Ladeuil
Implement list config options.
2540
2541
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2542
class OptionRegistry(registry.Registry):
2543
    """Register config options by their name.
2544
2545
    This overrides ``registry.Registry`` to simplify registration by acquiring
6056.2.5 by Vincent Ladeuil
Fix typos caught by jelmer.
2546
    some information from the option object itself.
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2547
    """
2548
2549
    def register(self, option):
2550
        """Register a new option to its name.
2551
2552
        :param option: The option to register. Its name is used as the key.
2553
        """
2554
        super(OptionRegistry, self).register(option.name, option,
2555
                                             help=option.help)
2556
2557
    def register_lazy(self, key, module_name, member_name):
2558
        """Register a new option to be loaded on request.
2559
6059.3.1 by Vincent Ladeuil
Provide per-config option help
2560
        :param key: the key to request the option later. Since the registration
2561
            is lazy, it should be provided and match the option name.
2562
2563
        :param module_name: the python path to the module. Such as 'os.path'.
2564
2565
        :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.
2566
                None, get() will return the module itself.
2567
        """
2568
        super(OptionRegistry, self).register_lazy(key,
2569
                                                  module_name, member_name)
2570
2571
    def get_help(self, key=None):
2572
        """Get the help text associated with the given key"""
2573
        option = self.get(key)
2574
        the_help = option.help
2575
        if callable(the_help):
2576
            return the_help(self, key)
2577
        return the_help
2578
2579
2580
option_registry = OptionRegistry()
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2581
5743.12.3 by Vincent Ladeuil
More basic tests for options. Start tests for all registered options.
2582
6056.2.1 by Vincent Ladeuil
Migrate output_encoding.
2583
# Registered options in lexicographical order
2584
2585
option_registry.register(
6372.4.1 by Jelmer Vernooij
Convert 'append_revisions_only' over to config stacks.
2586
    Option('append_revisions_only',
6372.4.2 by Jelmer Vernooij
Fix remaining tests.
2587
           default=None, from_unicode=bool_from_store, invalid='warning',
6372.4.1 by Jelmer Vernooij
Convert 'append_revisions_only' over to config stacks.
2588
           help='''\
2589
Whether to only append revisions to the mainline.
2590
2591
If this is set to true, then it is not possible to change the
2592
existing mainline of the branch.
2593
'''))
2594
option_registry.register(
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2595
    ListOption('acceptable_keys',
2596
           default=None,
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
2597
           help="""\
2598
List of GPG key patterns which are acceptable for verification.
2599
"""))
2600
option_registry.register(
6378.1.2 by Vincent Ladeuil
Migrate add.maximum_file_size to the new config scheme
2601
    Option('add.maximum_file_size',
2602
           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.
2603
           help="""\
2604
Size above which files should be added manually.
6378.1.2 by Vincent Ladeuil
Migrate add.maximum_file_size to the new config scheme
2605
2606
Files below this size are added automatically when using ``bzr add`` without
2607
arguments.
2608
2609
A negative value means disable the size check.
2610
"""))
2611
option_registry.register(
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
2612
    Option('bound',
2613
           default=None, from_unicode=bool_from_store,
2614
           help="""\
2615
Is the branch bound to ``bound_location``.
2616
2617
If set to "True", the branch should act as a checkout, and push each commit to
2618
the bound_location.  This option is normally set by ``bind``/``unbind``.
2619
2620
See also: bound_location.
2621
"""))
2622
option_registry.register(
2623
    Option('bound_location',
2624
           default=None,
2625
           help="""\
2626
The location that commits should go to when acting as a checkout.
2627
2628
This option is normally set by ``bind``.
2629
2630
See also: bound.
2631
"""))
2632
option_registry.register(
6404.1.1 by Vincent Ladeuil
Migrate branch.fetch_tags
2633
    Option('branch.fetch_tags', default=False,  from_unicode=bool_from_store,
2634
           help="""\
2635
Whether revisions associated with tags should be fetched.
2636
"""))
2637
option_registry.register(
6082.5.9 by Vincent Ladeuil
Cleanup criss-cross merge confusion
2638
    Option('bzr.workingtree.worth_saving_limit', default=10,
6059.4.4 by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config.
2639
           from_unicode=int_from_store,  invalid='warning',
2640
           help='''\
2641
How many changes before saving the dirstate.
2642
6059.4.6 by Vincent Ladeuil
Fix the help strings as proposed by jam.
2643
-1 means that we will never rewrite the dirstate file for only
2644
stat-cache changes. Regardless of this setting, we will always rewrite
2645
the dirstate file if a file is added/removed/renamed/etc. This flag only
2646
affects the behavior of updating the dirstate file after we notice that
2647
a file has been touched.
6059.4.4 by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config.
2648
'''))
2649
option_registry.register(
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
2650
    Option('check_signatures', default=CHECK_IF_POSSIBLE,
2651
           from_unicode=signature_policy_from_unicode,
2652
           help='''\
2653
GPG checking policy.
2654
2655
Possible values: require, ignore, check-available (default)
2656
2657
this option will control whether bzr will require good gpg
2658
signatures, ignore them, or check them if they are
2659
present.
2660
'''))
2661
option_registry.register(
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
2662
    Option('child_submit_format',
2663
           help='''The preferred format of submissions to this branch.'''))
2664
option_registry.register(
2665
    Option('child_submit_to',
2666
           help='''Where submissions to this branch are mailed to.'''))
2667
option_registry.register(
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
2668
    Option('create_signatures', default=SIGN_WHEN_REQUIRED,
2669
           from_unicode=signing_policy_from_unicode,
2670
           help='''\
2671
GPG Signing policy.
2672
2673
Possible values: always, never, when-required (default)
2674
2675
This option controls whether bzr will always create
2676
gpg signatures or not on commits.
2677
'''))
2678
option_registry.register(
6082.5.9 by Vincent Ladeuil
Cleanup criss-cross merge confusion
2679
    Option('dirstate.fdatasync', default=True,
6059.4.4 by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config.
2680
           from_unicode=bool_from_store,
6059.3.1 by Vincent Ladeuil
Provide per-config option help
2681
           help='''\
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2682
Flush dirstate changes onto physical disk?
2683
2684
If true (default), working tree metadata changes are flushed through the
2685
OS buffers to physical disk.  This is somewhat slower, but means data
2686
should not be lost if the machine crashes.  See also repository.fdatasync.
2687
'''))
2688
option_registry.register(
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
2689
    ListOption('debug_flags', default=[],
6059.4.5 by Vincent Ladeuil
Migrate debug_flags to stack-based config.
2690
           help='Debug flags to activate.'))
2691
option_registry.register(
6082.5.9 by Vincent Ladeuil
Cleanup criss-cross merge confusion
2692
    Option('default_format', default='2a',
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2693
           help='Format used when creating branches.'))
2694
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.
2695
    Option('dpush_strict', default=None,
2696
           from_unicode=bool_from_store,
2697
           help='''\
2698
The default value for ``dpush --strict``.
2699
2700
If present, defines the ``--strict`` option default value for checking
2701
uncommitted changes before pushing into a different VCS without any
2702
custom bzr metadata.
2703
'''))
2704
option_registry.register(
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2705
    Option('editor',
2706
           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.
2707
option_registry.register(
6393.3.3 by Vincent Ladeuil
Add Option.override_from_env allowing environ variables to override config settings
2708
    Option('email', override_from_env=['BZR_EMAIL'], default=default_email,
6351.3.3 by Jelmer Vernooij
Convert more stuff to use config stacks.
2709
           help='The users identity'))
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2710
option_registry.register(
6351.3.1 by Jelmer Vernooij
Add gpg_signing_command option to registry.
2711
    Option('gpg_signing_command',
2712
           default='gpg',
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
2713
           help="""\
2714
Program to use use for creating signatures.
2715
2716
This should support at least the -u and --clearsign options.
2717
"""))
2718
option_registry.register(
2719
    Option('gpg_signing_key',
2720
           default=None,
2721
           help="""\
2722
GPG key to use for signing.
2723
2724
This defaults to the first key associated with the users email.
2725
"""))
6351.3.1 by Jelmer Vernooij
Add gpg_signing_command option to registry.
2726
option_registry.register(
6082.5.9 by Vincent Ladeuil
Cleanup criss-cross merge confusion
2727
    Option('ignore_missing_extensions', default=False,
6059.4.2 by Vincent Ladeuil
Migrate ignore_missing_extensions to stack-based config.
2728
           from_unicode=bool_from_store,
2729
           help='''\
2730
Control the missing extensions warning display.
2731
2732
The warning will not be emitted if set to True.
2733
'''))
2734
option_registry.register(
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2735
    Option('language',
2736
           help='Language to translate messages into.'))
2737
option_registry.register(
6082.5.9 by Vincent Ladeuil
Cleanup criss-cross merge confusion
2738
    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.
2739
           help='''\
2740
Steal locks that appears to be dead.
2741
6059.4.6 by Vincent Ladeuil
Fix the help strings as proposed by jam.
2742
If set to True, bzr will check if a lock is supposed to be held by an
2743
active process from the same user on the same machine. If the user and
2744
machine match, but no process with the given PID is active, then bzr
2745
will automatically break the stale lock, and create a new lock for
2746
this process.
2747
Otherwise, bzr will prompt as normal to break the lock.
6059.4.1 by Vincent Ladeuil
Migrate locks.steal_dead to stack-based config.
2748
'''))
2749
option_registry.register(
6175.2.1 by Vincent Ladeuil
Migrate log_format to the config stacks.
2750
    Option('log_format', default='long',
2751
           help= '''\
2752
Log format to use when displaying revisions.
2753
2754
Standard log formats are ``long``, ``short`` and ``line``. Additional formats
2755
may be provided by plugins.
2756
'''))
2757
option_registry.register(
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2758
    Option('output_encoding',
2759
           help= 'Unicode encoding for output'
2760
           ' (terminal encoding if not specified).'))
2761
option_registry.register(
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
2762
    Option('parent_location',
2763
           default=None,
2764
           help="""\
2765
The location of the default branch for pull or merge.
2766
2767
This option is normally set when creating a branch, the first ``pull`` or by
2768
``pull --remember``.
2769
"""))
2770
option_registry.register(
6351.3.5 by Jelmer Vernooij
Add post_commit.
2771
    Option('post_commit', default=None,
2772
           help='''\
2773
Post commit functions.
2774
6351.3.14 by Jelmer Vernooij
merge lp:~jelmer/bzr/commit-uses-config-stacks
2775
An ordered list of python functions to call, separated by spaces.
6351.3.5 by Jelmer Vernooij
Add post_commit.
2776
2777
Each function takes branch, rev_id as parameters.
2778
'''))
2779
option_registry.register(
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
2780
    Option('public_branch',
2781
           default=None,
2782
           help="""\
2783
A publically-accessible version of this branch.
2784
2785
This implies that the branch setting this option is not publically-accessible.
2786
Used and set by ``bzr send``.
2787
"""))
2788
option_registry.register(
2789
    Option('push_location',
2790
           default=None,
2791
           help="""\
2792
The location of the default branch for push.
2793
2794
This option is normally set by the first ``push`` or ``push --remember``.
2795
"""))
2796
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.
2797
    Option('push_strict', default=None,
2798
           from_unicode=bool_from_store,
2799
           help='''\
2800
The default value for ``push --strict``.
2801
2802
If present, defines the ``--strict`` option default value for checking
2803
uncommitted changes before sending a merge directive.
2804
'''))
2805
option_registry.register(
6091.3.6 by Vincent Ladeuil
Replace ugly default value declarations with ad-hoc and limited conversion to unicode strings.
2806
    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.
2807
           from_unicode=bool_from_store,
6056.2.4 by Vincent Ladeuil
Option help is now part of the object itself.
2808
           help='''\
2809
Flush repository changes onto physical disk?
2810
2811
If true (default), repository changes are flushed through the OS buffers
2812
to physical disk.  This is somewhat slower, but means data should not be
2813
lost if the machine crashes.  See also dirstate.fdatasync.
2814
'''))
6379.8.1 by Jelmer Vernooij
Register smtp options in bzrlib.config, and use config stacks in bzrlib.smtp_conection.
2815
option_registry.register_lazy('smtp_server',
2816
    'bzrlib.smtp_connection', 'smtp_server')
2817
option_registry.register_lazy('smtp_password',
2818
    'bzrlib.smtp_connection', 'smtp_password')
2819
option_registry.register_lazy('smtp_username',
2820
    'bzrlib.smtp_connection', 'smtp_username')
6319.1.1 by Martin Pool
Add selftest.timeout option, defaulting to 600
2821
option_registry.register(
2822
    Option('selftest.timeout',
2823
        default='600',
2824
        from_unicode=int_from_store,
2825
        help='Abort selftest if one test takes longer than this many seconds',
2826
        ))
2827
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.
2828
option_registry.register(
2829
    Option('send_strict', default=None,
2830
           from_unicode=bool_from_store,
2831
           help='''\
2832
The default value for ``send --strict``.
2833
2834
If present, defines the ``--strict`` option default value for checking
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
2835
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.
2836
'''))
6006.4.9 by Martin Pool
Add repository.fdatasync option
2837
6133.4.15 by John Arbash Meinel
Start working on exposing timeout as a configuration item.
2838
option_registry.register(
2839
    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.
2840
           default=300.0, from_unicode=float_from_store,
6133.4.15 by John Arbash Meinel
Start working on exposing timeout as a configuration item.
2841
           help="If we wait for a new request from a client for more than"
2842
                " X seconds, consider the client idle, and hangup."))
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
2843
option_registry.register(
2844
    Option('stacked_on_location',
2845
           default=None,
2846
           help="""The location where this branch is stacked on."""))
2847
option_registry.register(
2848
    Option('submit_branch',
2849
           default=None,
2850
           help="""\
2851
The branch you intend to submit your current work to.
2852
2853
This is automatically set by ``bzr send`` and ``bzr merge``, and is also used
2854
by the ``submit:`` revision spec.
2855
"""))
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
2856
option_registry.register(
2857
    Option('submit_to',
2858
           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.
2859
6238.2.8 by Jelmer Vernooij
Move options to bzrlib/transport/http/_urllib2_wrappers.py
2860
option_registry.register_lazy('ssl.ca_certs',
2861
    'bzrlib.transport.http._urllib2_wrappers', 'opt_ssl_ca_certs')
2862
2863
option_registry.register_lazy('ssl.cert_reqs',
2864
    'bzrlib.transport.http._urllib2_wrappers', 'opt_ssl_cert_reqs')
6238.2.7 by Jelmer Vernooij
Add ssl.cert_reqs.
2865
2866
5743.12.3 by Vincent Ladeuil
More basic tests for options. Start tests for all registered options.
2867
5743.3.11 by Vincent Ladeuil
Config sections only implement read access.
2868
class Section(object):
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2869
    """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.
2870
2871
    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.
2872
    options. It is *not* a python dict object though and doesn't try to mimic
2873
    its API.
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2874
    """
2875
2876
    def __init__(self, section_id, options):
2877
        self.id = section_id
2878
        # We re-use the dict-like object received
2879
        self.options = options
2880
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
2881
    def get(self, name, default=None, expand=True):
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2882
        return self.options.get(name, default)
2883
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
2884
    def iter_option_names(self):
2885
        for k in self.options.iterkeys():
2886
            yield k
2887
5743.3.12 by Vincent Ladeuil
Add an ad-hoc __repr__.
2888
    def __repr__(self):
2889
        # Mostly for debugging use
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2890
        return "<config.%s id=%s>" % (self.__class__.__name__, self.id)
5743.3.12 by Vincent Ladeuil
Add an ad-hoc __repr__.
2891
5743.2.3 by Vincent Ladeuil
The option is either new or has an existing value.
2892
5743.3.6 by Vincent Ladeuil
Use a name less likely to be reused.
2893
_NewlyCreatedOption = object()
5743.2.2 by Vincent Ladeuil
Add tests for remove.
2894
"""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)
2895
_DeletedOption = object()
2896
"""Was the option deleted during the MutableSection lifetime"""
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2897
5743.2.3 by Vincent Ladeuil
The option is either new or has an existing value.
2898
5743.3.11 by Vincent Ladeuil
Config sections only implement read access.
2899
class MutableSection(Section):
5743.3.1 by Vincent Ladeuil
Add a docstring and dates to FIXMEs.
2900
    """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.
2901
2902
    def __init__(self, section_id, options):
2903
        super(MutableSection, self).__init__(section_id, options)
6404.5.4 by Vincent Ladeuil
Saving changes is incremental and brings back updates from concurrent users
2904
        self.reset_changes()
2905
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2906
    def set(self, name, value):
5743.2.2 by Vincent Ladeuil
Add tests for remove.
2907
        if name not in self.options:
5743.2.3 by Vincent Ladeuil
The option is either new or has an existing value.
2908
            # This is a new option
5743.3.6 by Vincent Ladeuil
Use a name less likely to be reused.
2909
            self.orig[name] = _NewlyCreatedOption
5743.2.3 by Vincent Ladeuil
The option is either new or has an existing value.
2910
        elif name not in self.orig:
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2911
            self.orig[name] = self.get(name, None)
2912
        self.options[name] = value
2913
2914
    def remove(self, name):
2915
        if name not in self.orig:
2916
            self.orig[name] = self.get(name, None)
2917
        del self.options[name]
2918
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)
2919
    def reset_changes(self):
2920
        self.orig = {}
2921
2922
    def apply_changes(self, dirty, store):
2923
        """Apply option value changes.
2924
2925
        ``self`` has been reloaded from the persistent storage. ``dirty``
2926
        contains the changes made since the previous loading.
2927
2928
        :param dirty: the mutable section containing the changes.
2929
2930
        :param store: the store containing the section
2931
        """
2932
        for k, expected in dirty.orig.iteritems():
2933
            actual = dirty.get(k, _DeletedOption)
2934
            reloaded = self.get(k, _NewlyCreatedOption)
2935
            if actual is _DeletedOption:
2936
                if k in self.options:
2937
                    self.remove(k)
2938
            else:
2939
                self.set(k, actual)
6404.5.6 by Vincent Ladeuil
Add some doc.
2940
            # Report concurrent updates in an ad-hoc way. This should only
2941
            # occurs when different processes try to update the same option
2942
            # which is not supported (as in: the config framework is not meant
2943
            # 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)
2944
            if expected != reloaded:
2945
                if actual is _DeletedOption:
2946
                    actual = '<DELETED>'
2947
                if reloaded is _NewlyCreatedOption:
2948
                    reloaded = '<CREATED>'
2949
                if expected is _NewlyCreatedOption:
2950
                    expected = '<CREATED>'
2951
                # Someone changed the value since we get it from the persistent
2952
                # storage.
6404.5.9 by Vincent Ladeuil
Don't forget to use gettext.
2953
                trace.warning(gettext(
2954
                        "Option {0} in section {1} of {2} was changed"
2955
                        " from {3} to {4}. The {5} value will be saved.".format(
2956
                            k, self.id, store.external_url(), expected,
2957
                            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)
2958
        # No need to keep track of these changes
2959
        self.reset_changes()
2960
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
2961
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2962
class Store(object):
2963
    """Abstract interface to persistent storage for configuration options."""
2964
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2965
    readonly_section_class = Section
5743.4.22 by Vincent Ladeuil
Allow daughter classes to use different Section classes if/when needed.
2966
    mutable_section_class = MutableSection
5743.4.21 by Vincent Ladeuil
All stores should provide _load_from_string to reuse the existing tests.
2967
6404.5.2 by Vincent Ladeuil
All Stores should handle dirty sections even if the actual tests are only exercising IniFileStore inplementations so far
2968
    def __init__(self):
2969
        # Which sections need to be saved
2970
        self.dirty_sections = []
2971
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2972
    def is_loaded(self):
2973
        """Returns True if the Store has been loaded.
2974
2975
        This is used to implement lazy loading and ensure the persistent
2976
        storage is queried only when needed.
2977
        """
2978
        raise NotImplementedError(self.is_loaded)
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2979
2980
    def load(self):
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2981
        """Loads the Store from persistent storage."""
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2982
        raise NotImplementedError(self.load)
2983
5987.1.5 by Vincent Ladeuil
Those are just bytes.
2984
    def _load_from_string(self, bytes):
5743.4.21 by Vincent Ladeuil
All stores should provide _load_from_string to reuse the existing tests.
2985
        """Create a store from a string in configobj syntax.
2986
5987.1.5 by Vincent Ladeuil
Those are just bytes.
2987
        :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.
2988
        """
2989
        raise NotImplementedError(self._load_from_string)
2990
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
2991
    def unload(self):
2992
        """Unloads the Store.
2993
2994
        This should make is_loaded() return False. This is used when the caller
2995
        knows that the persistent storage has changed or may have change since
2996
        the last load.
2997
        """
2998
        raise NotImplementedError(self.unload)
2999
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3000
    def quote(self, value):
3001
        """Quote a configuration option value for storing purposes.
3002
3003
        This allows Stacks to present values as they will be stored.
3004
        """
3005
        return value
3006
3007
    def unquote(self, value):
3008
        """Unquote a configuration option value into unicode.
3009
3010
        The received value is quoted as stored.
3011
        """
3012
        return value
3013
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3014
    def save(self):
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3015
        """Saves the Store to persistent storage."""
5743.4.10 by Vincent Ladeuil
Fix copy/paste, bad.
3016
        raise NotImplementedError(self.save)
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3017
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)
3018
    def _need_saving(self):
3019
        for s in self.dirty_sections:
3020
            if s.orig:
3021
                # At least one dirty section contains a modification
3022
                return True
3023
        return False
3024
3025
    def apply_changes(self, dirty_sections):
3026
        """Apply changes from dirty sections while checking for coherency.
3027
3028
        The Store content is discarded and reloaded from persistent storage to
3029
        acquire up-to-date values.
3030
3031
        Dirty sections are MutableSection which kept track of the value they
3032
        are expected to update.
3033
        """
6404.5.7 by Vincent Ladeuil
Store load is lazy and will happen when needed
3034
        # We need an up-to-date version from the persistent storage, unload the
3035
        # store. The reload will occur when needed (triggered by the first
3036
        # 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)
3037
        self.unload()
3038
        # Apply the changes from the preserved dirty sections
3039
        for dirty in dirty_sections:
3040
            clean = self.get_mutable_section(dirty.id)
3041
            clean.apply_changes(dirty, self)
3042
        # Everything is clean now
3043
        self.dirty_sections = []
3044
6404.5.4 by Vincent Ladeuil
Saving changes is incremental and brings back updates from concurrent users
3045
    def save_changes(self):
3046
        """Saves the Store to persistent storage if changes occurred.
3047
3048
        Apply the changes recorded in the mutable sections to a store content
3049
        refreshed from persistent storage.
3050
        """
3051
        raise NotImplementedError(self.save_changes)
3052
5743.5.10 by Vincent Ladeuil
Parametrize the generic tests against the concrete stores.
3053
    def external_url(self):
3054
        raise NotImplementedError(self.external_url)
3055
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3056
    def get_sections(self):
3057
        """Returns an ordered iterable of existing sections.
3058
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3059
        :returns: An iterable of (store, section).
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3060
        """
3061
        raise NotImplementedError(self.get_sections)
3062
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3063
    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.
3064
        """Returns the specified mutable section.
3065
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3066
        :param section_id: The section identifier
5743.4.2 by Vincent Ladeuil
Stores don't implement set_option, they just provide a mutable section.
3067
        """
3068
        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).
3069
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3070
    def __repr__(self):
3071
        # Mostly for debugging use
5743.5.17 by Vincent Ladeuil
Use external_url to identify stores.
3072
        return "<config.%s(%s)>" % (self.__class__.__name__,
5743.5.18 by Vincent Ladeuil
Fix typo.
3073
                                    self.external_url())
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3074
3075
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3076
class CommandLineStore(Store):
3077
    "A store to carry command line overrides for the config options."""
3078
3079
    def __init__(self, opts=None):
3080
        super(CommandLineStore, self).__init__()
3081
        if opts is None:
3082
            opts = {}
3083
        self.options = {}
6404.4.1 by Vincent Ladeuil
Properly support config.CommandLineStore in ``bzr config``
3084
        self.id = 'cmdline'
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3085
3086
    def _reset(self):
3087
        # The dict should be cleared but not replaced so it can be shared.
3088
        self.options.clear()
3089
3090
    def _from_cmdline(self, overrides):
3091
        # Reset before accepting new definitions
3092
        self._reset()
3093
        for over in overrides:
3094
            try:
3095
                name, value = over.split('=', 1)
3096
            except ValueError:
3097
                raise errors.BzrCommandError(
3098
                    gettext("Invalid '%s', should be of the form 'name=value'")
3099
                    % (over,))
3100
            self.options[name] = value
3101
3102
    def external_url(self):
6325.1.1 by Vincent Ladeuil
Fix various typos
3103
        # 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
3104
        # otherwise
3105
        return 'cmdline'
3106
3107
    def get_sections(self):
6404.4.1 by Vincent Ladeuil
Properly support config.CommandLineStore in ``bzr config``
3108
        yield self,  self.readonly_section_class(None, self.options)
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3109
3110
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3111
class IniFileStore(Store):
3112
    """A config Store using ConfigObj for storage.
3113
3114
    :ivar _config_obj: Private member to hold the ConfigObj instance used to
3115
        serialize/deserialize the config file.
3116
    """
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3117
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3118
    def __init__(self):
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3119
        """A config Store using ConfigObj for storage.
3120
        """
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3121
        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.
3122
        self._config_obj = None
3123
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3124
    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.
3125
        return self._config_obj != None
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3126
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
3127
    def unload(self):
3128
        self._config_obj = None
6404.5.4 by Vincent Ladeuil
Saving changes is incremental and brings back updates from concurrent users
3129
        self.dirty_sections = []
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
3130
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3131
    def _load_content(self):
3132
        """Load the config file bytes.
3133
3134
        This should be provided by subclasses
3135
3136
        :return: Byte string
3137
        """
3138
        raise NotImplementedError(self._load_content)
3139
3140
    def _save_content(self, content):
3141
        """Save the config file bytes.
3142
3143
        This should be provided by subclasses
3144
3145
        :param content: Config file bytes to write
3146
        """
3147
        raise NotImplementedError(self._save_content)
3148
5743.4.19 by Vincent Ladeuil
Clarify that only Store.get_mutable_section() can accept an empty file.
3149
    def load(self):
3150
        """Load the store from the associated file."""
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3151
        if self.is_loaded():
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3152
            return
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3153
        content = self._load_content()
6110.5.5 by Vincent Ladeuil
Warn when loading, fail if saving will occur later
3154
        self._load_from_string(content)
3155
        for hook in ConfigHooks['load']:
3156
            hook(self)
5743.4.18 by Vincent Ladeuil
Replace class.from_string with self._load_from_string to all stores can use it.
3157
5987.1.5 by Vincent Ladeuil
Those are just bytes.
3158
    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.
3159
        """Create a config store from a string.
3160
5987.1.5 by Vincent Ladeuil
Those are just bytes.
3161
        :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.
3162
        """
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3163
        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.
3164
            raise AssertionError('Already loaded: %r' % (self._config_obj,))
5987.1.5 by Vincent Ladeuil
Those are just bytes.
3165
        co_input = StringIO(bytes)
5743.4.3 by Vincent Ladeuil
Implement get_mutable_section.
3166
        try:
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3167
            # 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.
3168
            self._config_obj = ConfigObj(co_input, encoding='utf-8',
3169
                                         list_values=False)
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3170
        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.
3171
            self._config_obj = None
5743.5.10 by Vincent Ladeuil
Parametrize the generic tests against the concrete stores.
3172
            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
3173
        except UnicodeDecodeError:
3174
            raise errors.ConfigContentError(self.external_url())
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
3175
6404.5.4 by Vincent Ladeuil
Saving changes is incremental and brings back updates from concurrent users
3176
    def save_changes(self):
3177
        if not self.is_loaded():
3178
            # Nothing to save
3179
            return
3180
        if not self._need_saving():
3181
            return
3182
        # Preserve the current version
3183
        current = self._config_obj
3184
        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)
3185
        self.apply_changes(dirty_sections)
6404.5.4 by Vincent Ladeuil
Saving changes is incremental and brings back updates from concurrent users
3186
        # Save to the persistent storage
3187
        self.save()
3188
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.
3189
    def save(self):
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3190
        if not self.is_loaded():
5743.4.19 by Vincent Ladeuil
Clarify that only Store.get_mutable_section() can accept an empty file.
3191
            # Nothing to save
3192
            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.
3193
        out = StringIO()
3194
        self._config_obj.write(out)
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3195
        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.
3196
        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).
3197
            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.
3198
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3199
    def get_sections(self):
3200
        """Get the configobj section in the file order.
3201
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3202
        :returns: An iterable of (store, section).
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3203
        """
3204
        # We need a loaded store
5743.6.14 by Vincent Ladeuil
Parametrize the Stack tests.
3205
        try:
3206
            self.load()
6110.5.5 by Vincent Ladeuil
Warn when loading, fail if saving will occur later
3207
        except (errors.NoSuchFile, errors.PermissionDenied):
3208
            # If the file can't be read, there is no sections
5743.6.14 by Vincent Ladeuil
Parametrize the Stack tests.
3209
            return
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3210
        cobj = self._config_obj
3211
        if cobj.scalars:
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3212
            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.
3213
        for section_name in cobj.sections:
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3214
            yield (self,
3215
                   self.readonly_section_class(section_name,
3216
                                               cobj[section_name]))
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
3217
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3218
    def get_mutable_section(self, section_id=None):
5743.2.11 by Vincent Ladeuil
Basic store.set implementation.
3219
        # We need a loaded store
5743.4.19 by Vincent Ladeuil
Clarify that only Store.get_mutable_section() can accept an empty file.
3220
        try:
3221
            self.load()
3222
        except errors.NoSuchFile:
3223
            # The file doesn't exist, let's pretend it was empty
3224
            self._load_from_string('')
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3225
        if section_id is None:
5743.2.11 by Vincent Ladeuil
Basic store.set implementation.
3226
            section = self._config_obj
3227
        else:
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3228
            section = self._config_obj.setdefault(section_id, {})
6404.5.1 by Vincent Ladeuil
Setting or removing an option records the section as dirty
3229
        mutable_section = self.mutable_section_class(section_id, section)
3230
        # All mutable sections can become dirty
3231
        self.dirty_sections.append(mutable_section)
3232
        return mutable_section
5743.2.11 by Vincent Ladeuil
Basic store.set implementation.
3233
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3234
    def quote(self, value):
3235
        try:
3236
            # configobj conflates automagical list values and quoting
3237
            self._config_obj.list_values = True
3238
            return self._config_obj._quote(value)
3239
        finally:
3240
            self._config_obj.list_values = False
3241
3242
    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)
3243
        if value and isinstance(value, basestring):
3244
            # _unquote doesn't handle None nor empty strings nor anything that
3245
            # is not a string, really.
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3246
            value = self._config_obj._unquote(value)
3247
        return value
3248
6402.2.3 by Vincent Ladeuil
More tests, a real implementation and some tweaks.
3249
    def external_url(self):
3250
        # Since an IniFileStore can be used without a file (at least in tests),
3251
        # it's better to provide something than raising a NotImplementedError.
3252
        # All daughter classes are supposed to provide an implementation
3253
        # anyway.
3254
        return 'In-Process Store, no URL'
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
3255
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3256
class TransportIniFileStore(IniFileStore):
3257
    """IniFileStore that loads files from a transport.
6402.2.3 by Vincent Ladeuil
More tests, a real implementation and some tweaks.
3258
3259
    :ivar transport: The transport object where the config file is located.
3260
3261
    :ivar file_name: The config file basename in the transport directory.
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3262
    """
3263
3264
    def __init__(self, transport, file_name):
3265
        """A Store using a ini file on a Transport
3266
3267
        :param transport: The transport object where the config file is located.
3268
        :param file_name: The config file basename in the transport directory.
3269
        """
3270
        super(TransportIniFileStore, self).__init__()
3271
        self.transport = transport
3272
        self.file_name = file_name
3273
3274
    def _load_content(self):
3275
        try:
3276
            return self.transport.get_bytes(self.file_name)
3277
        except errors.PermissionDenied:
3278
            trace.warning("Permission denied while trying to load "
3279
                          "configuration store %s.", self.external_url())
3280
            raise
3281
3282
    def _save_content(self, content):
3283
        self.transport.put_bytes(self.file_name, content)
3284
6270.1.6 by Jelmer Vernooij
Provide RemoteControlStore and RemoteBranchStore.
3285
    def external_url(self):
3286
        # FIXME: external_url should really accepts an optional relpath
3287
        # parameter (bug #750169) :-/ -- vila 2011-04-04
3288
        # The following will do in the interim but maybe we don't want to
3289
        # expose a path here but rather a config ID and its associated
3290
        # object </hand wawe>.
3291
        return urlutils.join(self.transport.external_url(), self.file_name)
3292
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3293
5743.4.16 by Vincent Ladeuil
Some doc for the stores.
3294
# Note that LockableConfigObjStore inherits from ConfigObjStore because we need
3295
# unlockable stores for use with objects that can already ensure the locking
3296
# (think branches). If different stores (not based on ConfigObj) are created,
3297
# they may face the same issue.
3298
3299
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3300
class LockableIniFileStore(TransportIniFileStore):
5743.4.9 by Vincent Ladeuil
Implement a LockableConfigObjStore to be able to mimick the actual behaviour.
3301
    """A ConfigObjStore using locks on save to ensure store integrity."""
3302
3303
    def __init__(self, transport, file_name, lock_dir_name=None):
3304
        """A config Store using ConfigObj for storage.
3305
3306
        :param transport: The transport object where the config file is located.
3307
3308
        :param file_name: The config file basename in the transport directory.
3309
        """
3310
        if lock_dir_name is None:
3311
            lock_dir_name = 'lock'
3312
        self.lock_dir_name = lock_dir_name
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3313
        super(LockableIniFileStore, self).__init__(transport, file_name)
5743.4.9 by Vincent Ladeuil
Implement a LockableConfigObjStore to be able to mimick the actual behaviour.
3314
        self._lock = lockdir.LockDir(self.transport, self.lock_dir_name)
3315
3316
    def lock_write(self, token=None):
3317
        """Takes a write lock in the directory containing the config file.
3318
3319
        If the directory doesn't exist it is created.
3320
        """
3321
        # FIXME: This doesn't check the ownership of the created directories as
3322
        # ensure_config_dir_exists does. It should if the transport is local
3323
        # -- vila 2011-04-06
3324
        self.transport.create_prefix()
3325
        return self._lock.lock_write(token)
3326
3327
    def unlock(self):
3328
        self._lock.unlock()
3329
3330
    def break_lock(self):
3331
        self._lock.break_lock()
3332
3333
    @needs_write_lock
3334
    def save(self):
5743.6.25 by Vincent Ladeuil
Last test rewritten.
3335
        # We need to be able to override the undecorated implementation
5743.6.32 by Vincent Ladeuil
Address poolie's review comments.
3336
        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.
3337
5743.6.32 by Vincent Ladeuil
Address poolie's review comments.
3338
    def save_without_locking(self):
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
3339
        super(LockableIniFileStore, self).save()
5743.4.9 by Vincent Ladeuil
Implement a LockableConfigObjStore to be able to mimick the actual behaviour.
3340
3341
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3342
# FIXME: global, bazaar, shouldn't that be 'user' instead or even
3343
# 'user_defaults' as opposed to 'user_overrides', 'system_defaults'
3344
# (/etc/bzr/bazaar.conf) and 'system_overrides' ? -- vila 2011-04-05
5743.5.15 by Vincent Ladeuil
Mention poolie's point about focusing tests.
3345
3346
# FIXME: Moreover, we shouldn't need classes for these stores either, factory
3347
# functions or a registry will make it easier and clearer for tests, focusing
3348
# on the relevant parts of the API that needs testing -- vila 20110503 (based
3349
# on a poolie's remark)
5743.5.13 by Vincent Ladeuil
Merge config-abstract-store into config-concrete-stores resolving conflicts
3350
class GlobalStore(LockableIniFileStore):
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3351
3352
    def __init__(self, possible_transports=None):
6055.1.2 by Vincent Ladeuil
Use _fs_enc instead of utf8.
3353
        t = transport.get_transport_from_path(
3354
            config_dir(), possible_transports=possible_transports)
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3355
        super(GlobalStore, self).__init__(t, 'bazaar.conf')
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3356
        self.id = 'bazaar'
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3357
3358
5743.5.13 by Vincent Ladeuil
Merge config-abstract-store into config-concrete-stores resolving conflicts
3359
class LocationStore(LockableIniFileStore):
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3360
3361
    def __init__(self, possible_transports=None):
6055.1.2 by Vincent Ladeuil
Use _fs_enc instead of utf8.
3362
        t = transport.get_transport_from_path(
3363
            config_dir(), possible_transports=possible_transports)
5743.5.10 by Vincent Ladeuil
Parametrize the generic tests against the concrete stores.
3364
        super(LocationStore, self).__init__(t, 'locations.conf')
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3365
        self.id = 'locations'
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3366
3367
6270.1.5 by Jelmer Vernooij
Add TransportIniFileStore.
3368
class BranchStore(TransportIniFileStore):
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3369
3370
    def __init__(self, branch):
3371
        super(BranchStore, self).__init__(branch.control_transport,
3372
                                          'branch.conf')
5743.6.34 by Vincent Ladeuil
Forget weakref for branch <-> config.
3373
        self.branch = branch
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3374
        self.id = 'branch'
5743.10.5 by Vincent Ladeuil
Give up.
3375
5743.9.1 by Vincent Ladeuil
Properly implement locking for BranchStore by delegating all the lock operations to the branch itself.
3376
    def lock_write(self, token=None):
5743.6.34 by Vincent Ladeuil
Forget weakref for branch <-> config.
3377
        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.
3378
3379
    def unlock(self):
5743.6.34 by Vincent Ladeuil
Forget weakref for branch <-> config.
3380
        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.
3381
3382
    @needs_write_lock
3383
    def save(self):
3384
        # 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.
3385
        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.
3386
5743.9.5 by Vincent Ladeuil
Fix test failure, forgot a call site when renaming _save to save_without_locking.
3387
    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.
3388
        super(BranchStore, self).save()
3389
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3390
6076.1.1 by Vincent Ladeuil
Add the missing config stacks and store
3391
class ControlStore(LockableIniFileStore):
3392
3393
    def __init__(self, bzrdir):
3394
        super(ControlStore, self).__init__(bzrdir.transport,
3395
                                          'control.conf',
3396
                                           lock_dir_name='branch_lock')
6404.4.1 by Vincent Ladeuil
Properly support config.CommandLineStore in ``bzr config``
3397
        self.id = 'control'
6076.1.1 by Vincent Ladeuil
Add the missing config stacks and store
3398
3399
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3400
class SectionMatcher(object):
3401
    """Select sections into a given Store.
3402
6123.7.1 by Vincent Ladeuil
Provide config.IdMatcher for config files defining secion names as unique ids
3403
    This is intended to be used to postpone getting an iterable of sections
3404
    from a store.
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3405
    """
3406
3407
    def __init__(self, store):
3408
        self.store = store
3409
3410
    def get_sections(self):
5743.2.29 by Vincent Ladeuil
Add doc for the section matchers.
3411
        # 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.
3412
        # sections.
3413
        sections = self.store.get_sections()
6260.3.2 by Vincent Ladeuil
Only the DEFAULT section is searched for the normal uses of bazaar.conf
3414
        # Walk the revisions in the order provided
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3415
        for store, s in sections:
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3416
            if self.match(s):
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3417
                yield store, s
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3418
6123.7.1 by Vincent Ladeuil
Provide config.IdMatcher for config files defining secion names as unique ids
3419
    def match(self, section):
3420
        """Does the proposed section match.
3421
3422
        :param section: A Section object.
3423
3424
        :returns: True if the section matches, False otherwise.
3425
        """
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3426
        raise NotImplementedError(self.match)
3427
3428
6123.7.2 by Vincent Ladeuil
Rename IdMatcher to NameMatcher.
3429
class NameMatcher(SectionMatcher):
6123.7.1 by Vincent Ladeuil
Provide config.IdMatcher for config files defining secion names as unique ids
3430
3431
    def __init__(self, store, section_id):
6123.7.2 by Vincent Ladeuil
Rename IdMatcher to NameMatcher.
3432
        super(NameMatcher, self).__init__(store)
6123.7.1 by Vincent Ladeuil
Provide config.IdMatcher for config files defining secion names as unique ids
3433
        self.section_id = section_id
3434
3435
    def match(self, section):
3436
        return section.id == self.section_id
3437
3438
5743.2.37 by Vincent Ladeuil
Merge config-concrete-stores into config-section-matchers resolving conflicts
3439
class LocationSection(Section):
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3440
6402.2.1 by Vincent Ladeuil
Get rid of LocationSection.length as its not needed in the general case.
3441
    def __init__(self, section, extra_path):
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3442
        super(LocationSection, self).__init__(section.id, section.options)
3443
        self.extra_path = extra_path
6082.5.25 by Vincent Ladeuil
Add ``basename`` as a section local option
3444
        self.locals = {'relpath': extra_path,
3445
                       'basename': urlutils.basename(extra_path)}
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3446
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3447
    def get(self, name, default=None, expand=True):
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3448
        value = super(LocationSection, self).get(name, default)
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3449
        if value is not None and expand:
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3450
            policy_name = self.get(name + ':policy', None)
3451
            policy = _policy_value.get(policy_name, POLICY_NONE)
3452
            if policy == POLICY_APPENDPATH:
3453
                value = urlutils.join(value, self.extra_path)
6082.5.21 by Vincent Ladeuil
Implement 'relpath' as a section locally expanded option.
3454
            # expand section local options right now (since POLICY_APPENDPATH
3455
            # will never add options references, it's ok to expand after it).
3456
            chunks = []
3457
            for is_ref, chunk in iter_option_refs(value):
3458
                if not is_ref:
3459
                    chunks.append(chunk)
3460
                else:
3461
                    ref = chunk[1:-1]
3462
                    if ref in self.locals:
3463
                        chunks.append(self.locals[ref])
3464
                    else:
3465
                        chunks.append(chunk)
3466
            value = ''.join(chunks)
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3467
        return value
3468
3469
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.
3470
class StartingPathMatcher(SectionMatcher):
6402.2.2 by Vincent Ladeuil
Bogus implementation passing smoke test
3471
    """Select sections for a given location respecting the Store order."""
3472
6402.2.8 by Vincent Ladeuil
Feedback from review.
3473
    # FIXME: Both local paths and urls can be used for section names as well as
3474
    # ``location`` to stay consistent with ``LocationMatcher`` which itself
3475
    # inherited the fuzziness from the previous ``LocationConfig``
3476
    # implementation. We probably need to revisit which encoding is allowed for
3477
    # both ``location`` and section names and how we normalize
3478
    # them. http://pad.lv/85479, http://pad.lv/437009 and http://359320 are
3479
    # related too. -- vila 2012-01-04
3480
6402.2.2 by Vincent Ladeuil
Bogus implementation passing smoke test
3481
    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.
3482
        super(StartingPathMatcher, self).__init__(store)
6402.2.2 by Vincent Ladeuil
Bogus implementation passing smoke test
3483
        if location.startswith('file://'):
3484
            location = urlutils.local_path_from_url(location)
3485
        self.location = location
3486
3487
    def get_sections(self):
6402.2.5 by Vincent Ladeuil
Always return the no-name section if present.
3488
        """Get all sections matching ``location`` in the store.
3489
3490
        The most generic sections are described first in the store, then more
3491
        specific ones can be provided for reduced scopes.
3492
3493
        The returned section are therefore returned in the reversed order so
3494
        the most specific ones can be found first.
3495
        """
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.
3496
        location_parts = self.location.rstrip('/').split('/')
6402.2.2 by Vincent Ladeuil
Bogus implementation passing smoke test
3497
        store = self.store
6402.2.3 by Vincent Ladeuil
More tests, a real implementation and some tweaks.
3498
        sections = []
3499
        # Later sections are more specific, they should be returned first
3500
        for _, section in reversed(list(store.get_sections())):
6402.2.5 by Vincent Ladeuil
Always return the no-name section if present.
3501
            if section.id is None:
3502
                # The no-name section is always included if present
3503
                yield store, LocationSection(section, self.location)
3504
                continue
6402.2.3 by Vincent Ladeuil
More tests, a real implementation and some tweaks.
3505
            section_path = section.id
3506
            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.
3507
                # 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.
3508
                # section id to the same format
3509
                section_path = urlutils.local_path_from_url(section_path)
6402.2.3 by Vincent Ladeuil
More tests, a real implementation and some tweaks.
3510
            if (self.location.startswith(section_path)
3511
                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.
3512
                section_parts = section_path.rstrip('/').split('/')
3513
                extra_path = '/'.join(location_parts[len(section_parts):])
3514
                yield store, LocationSection(section, extra_path)
6402.2.2 by Vincent Ladeuil
Bogus implementation passing smoke test
3515
3516
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3517
class LocationMatcher(SectionMatcher):
3518
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3519
    def __init__(self, store, location):
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3520
        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).
3521
        if location.startswith('file://'):
3522
            location = urlutils.local_path_from_url(location)
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3523
        self.location = location
3524
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
3525
    def _get_matching_sections(self):
3526
        """Get all sections matching ``location``."""
3527
        # We slightly diverge from LocalConfig here by allowing the no-name
3528
        # section as the most generic one and the lower priority.
3529
        no_name_section = None
6015.22.1 by Vincent Ladeuil
config.LocationMatcher properly excludes unrelated sections
3530
        all_sections = []
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
3531
        # Filter out the no_name_section so _iter_for_location_by_parts can be
3532
        # used (it assumes all sections have a name).
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3533
        for _, section in self.store.get_sections():
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
3534
            if section.id is None:
3535
                no_name_section = section
3536
            else:
6015.22.1 by Vincent Ladeuil
config.LocationMatcher properly excludes unrelated sections
3537
                all_sections.append(section)
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
3538
        # Unfortunately _iter_for_location_by_parts deals with section names so
3539
        # we have to resync.
5743.2.31 by Vincent Ladeuil
Both the length and the section id should be used to sort.
3540
        filtered_sections = _iter_for_location_by_parts(
6015.22.1 by Vincent Ladeuil
config.LocationMatcher properly excludes unrelated sections
3541
            [s.id for s in all_sections], self.location)
3542
        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
3543
        matching_sections = []
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
3544
        if no_name_section is not None:
3545
            matching_sections.append(
6402.2.1 by Vincent Ladeuil
Get rid of LocationSection.length as its not needed in the general case.
3546
                (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.
3547
        for section_id, extra_path, length in filtered_sections:
6015.22.1 by Vincent Ladeuil
config.LocationMatcher properly excludes unrelated sections
3548
            # a section id is unique for a given store so it's safe to take the
3549
            # first matching section while iterating. Also, all filtered
3550
            # sections are part of 'all_sections' and will always be found
3551
            # there.
3552
            while True:
3553
                section = iter_all_sections.next()
3554
                if section_id == section.id:
3555
                    matching_sections.append(
6402.2.1 by Vincent Ladeuil
Get rid of LocationSection.length as its not needed in the general case.
3556
                        (length, LocationSection(section, extra_path)))
6015.22.1 by Vincent Ladeuil
config.LocationMatcher properly excludes unrelated sections
3557
                    break
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
3558
        return matching_sections
3559
3560
    def get_sections(self):
3561
        # Override the default implementation as we want to change the order
3562
        matching_sections = self._get_matching_sections()
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3563
        # 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.
3564
        sections = sorted(matching_sections,
6402.2.1 by Vincent Ladeuil
Get rid of LocationSection.length as its not needed in the general case.
3565
                          key=lambda (length, section): (length, section.id),
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3566
                          reverse=True)
3567
        # 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.
3568
        for _, section in sections:
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
3569
            # FIXME: We really want to use as_bool below -- vila 2011-04-07
3570
            ignore = section.get('ignore_parents', None)
3571
            if ignore is not None:
3572
                ignore = ui.bool_from_string(ignore)
3573
            if ignore:
3574
                break
3575
            # Finally, we have a valid section
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3576
            yield self.store, section
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
3577
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
3578
6351.1.1 by Vincent Ladeuil
Don't accept \n as part of a config option reference
3579
_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.
3580
"""Describes an expandable option reference.
3581
3582
We want to match the most embedded reference first.
3583
3584
I.e. for '{{foo}}' we will get '{foo}',
3585
for '{bar{baz}}' we will get '{baz}'
3586
"""
3587
3588
def iter_option_refs(string):
3589
    # Split isolate refs so every other chunk is a ref
3590
    is_ref = False
3591
    for chunk  in _option_ref_re.split(string):
3592
        yield is_ref, chunk
3593
        is_ref = not is_ref
3594
3595
5743.1.34 by Vincent Ladeuil
Merge config-section-matchers into config-stack resolving conflicts
3596
class Stack(object):
5743.1.1 by Vincent Ladeuil
Start implementing a config stack.
3597
    """A stack of configurations where an option can be defined"""
3598
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3599
    def __init__(self, sections_def, store=None, mutable_section_id=None):
5743.1.11 by Vincent Ladeuil
Properly use MutableSection for write operations.
3600
        """Creates a stack of sections with an optional store for changes.
3601
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.
3602
        :param sections_def: A list of Section or callables that returns an
3603
            iterable of Section. This defines the Sections for the Stack and
3604
            can be called repeatedly if needed.
5743.1.11 by Vincent Ladeuil
Properly use MutableSection for write operations.
3605
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
        :param store: The optional Store where modifications will be
3607
            recorded. If none is specified, no modifications can be done.
3608
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3609
        :param mutable_section_id: The id of the MutableSection where changes
3610
            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.
3611
            specified.
5743.1.11 by Vincent Ladeuil
Properly use MutableSection for write operations.
3612
        """
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.
3613
        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.
3614
        self.store = store
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3615
        self.mutable_section_id = mutable_section_id
5743.1.1 by Vincent Ladeuil
Start implementing a config stack.
3616
6082.5.2 by Vincent Ladeuil
Cargo-cult the config option expansion implementation with tweaks from the old to the new config design.
3617
    def get(self, name, expand=None):
5743.1.16 by Vincent Ladeuil
Allows empty sections and empty section callables.
3618
        """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.
3619
5743.1.16 by Vincent Ladeuil
Allows empty sections and empty section callables.
3620
        This is where we guarantee that sections coming from Store are loaded
3621
        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.
3622
        option exists or get its value, which in turn may require to discover
3623
        in which sections it can be defined. Both of these (section and option
3624
        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.
3625
3626
        :param name: The queried option.
3627
3628
        :param expand: Whether options references should be expanded.
3629
3630
        :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.
3631
        """
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.
3632
        # 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.
3633
        if expand is None:
3634
            expand = _get_expand_default_value()
5743.12.6 by Vincent Ladeuil
Stack.get() provides the registered option default value.
3635
        value = None
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3636
        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.
3637
        # If the option is registered, it may provide additional info about
3638
        # value handling
3639
        try:
3640
            opt = option_registry.get(name)
3641
        except KeyError:
3642
            # Not registered
3643
            opt = None
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
3644
6082.5.12 by Vincent Ladeuil
Remove duplication in stack.get() and useless code now that list conversion is explicit and delayed.
3645
        def expand_and_convert(val):
6393.3.2 by Vincent Ladeuil
Merge trunk resolving conflicts
3646
            # This may need to be called in different contexts if the value is
3647
            # 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.
3648
            if val is not None:
3649
                if expand:
3650
                    if isinstance(val, basestring):
3651
                        val = self._expand_options_in_string(val)
3652
                    else:
3653
                        trace.warning('Cannot expand "%s":'
3654
                                      ' %s does not support option expansion'
3655
                                      % (name, type(val)))
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3656
                if opt is None:
3657
                    val = found_store.unquote(val)
3658
                else:
3659
                    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.
3660
            return val
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
3661
3662
        # First of all, check if the environment can override the configuration
3663
        # value
3664
        if opt is not None and opt.override_from_env:
3665
            value = opt.get_override()
3666
            value = expand_and_convert(value)
3667
        if value is None:
3668
            # Ensuring lazy loading is achieved by delaying section matching
3669
            # (which implies querying the persistent storage) until it can't be
3670
            # avoided anymore by using callables to describe (possibly empty)
3671
            # section lists.
3672
            for sections in self.sections_def:
3673
                for store, section in sections():
3674
                    value = section.get(name)
3675
                    if value is not None:
6393.3.2 by Vincent Ladeuil
Merge trunk resolving conflicts
3676
                        found_store = store
6393.3.1 by Vincent Ladeuil
Configuration option value can be overridden by os environ variables
3677
                        break
3678
                if value is not None:
3679
                    break
3680
            value = expand_and_convert(value)
3681
            if opt is not None and value is None:
3682
                # If the option is registered, it may provide a default value
3683
                value = opt.get_default()
3684
                value = expand_and_convert(value)
6082.5.3 by Vincent Ladeuil
Fix the hook call.
3685
        for hook in ConfigHooks['get']:
3686
            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.
3687
        return value
3688
3689
    def expand_options(self, string, env=None):
3690
        """Expand option references in the string in the configuration context.
3691
3692
        :param string: The string containing option(s) to expand.
3693
3694
        :param env: An option dict defining additional configuration options or
3695
            overriding existing ones.
3696
3697
        :returns: The expanded string.
3698
        """
3699
        return self._expand_options_in_string(string, env)
3700
3701
    def _expand_options_in_string(self, string, env=None, _refs=None):
3702
        """Expand options in the string in the configuration context.
3703
3704
        :param string: The string to be expanded.
3705
3706
        :param env: An option dict defining additional configuration options or
3707
            overriding existing ones.
3708
3709
        :param _refs: Private list (FIFO) containing the options being expanded
3710
            to detect loops.
3711
3712
        :returns: The expanded string.
3713
        """
3714
        if string is None:
3715
            # Not much to expand there
3716
            return None
3717
        if _refs is None:
3718
            # What references are currently resolved (to detect loops)
3719
            _refs = []
3720
        result = string
3721
        # We need to iterate until no more refs appear ({{foo}} will need two
3722
        # iterations for example).
6082.5.20 by Vincent Ladeuil
Refactor iter_option_refs out of Stack so it can be reused.
3723
        expanded = True
3724
        while expanded:
3725
            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.
3726
            chunks = []
6082.5.20 by Vincent Ladeuil
Refactor iter_option_refs out of Stack so it can be reused.
3727
            for is_ref, chunk in iter_option_refs(result):
3728
                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.
3729
                    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.
3730
                else:
6082.5.20 by Vincent Ladeuil
Refactor iter_option_refs out of Stack so it can be reused.
3731
                    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.
3732
                    name = chunk[1:-1]
3733
                    if name in _refs:
3734
                        raise errors.OptionExpansionLoop(string, _refs)
3735
                    _refs.append(name)
3736
                    value = self._expand_option(name, env, _refs)
3737
                    if value is None:
3738
                        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.
3739
                    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.
3740
                    _refs.pop()
6082.5.12 by Vincent Ladeuil
Remove duplication in stack.get() and useless code now that list conversion is explicit and delayed.
3741
            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.
3742
        return result
3743
3744
    def _expand_option(self, name, env, _refs):
3745
        if env is not None and name in env:
3746
            # Special case, values provided in env takes precedence over
3747
            # anything else
3748
            value = env[name]
3749
        else:
3750
            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.
3751
            value = self._expand_options_in_string(value, env, _refs)
5743.12.6 by Vincent Ladeuil
Stack.get() provides the registered option default value.
3752
        return value
5743.1.1 by Vincent Ladeuil
Start implementing a config stack.
3753
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.
3754
    def _get_mutable_section(self):
3755
        """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.
3756
5743.1.15 by Vincent Ladeuil
Test and implement ConfigStack.remove.
3757
        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.
3758
        this means we won't load the corresponding store before setting a value
3759
        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
3760
        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.
3761
        """
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3762
        store = self.store
3763
        section = store.get_mutable_section(self.mutable_section_id)
3764
        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.
3765
3766
    def set(self, name, value):
3767
        """Set a new value for the option."""
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3768
        store, section = self._get_mutable_section()
3769
        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.
3770
        for hook in ConfigHooks['set']:
5743.8.6 by Vincent Ladeuil
Add hooks for config stacks.
3771
            hook(self, name, value)
5743.1.7 by Vincent Ladeuil
Simple set implementation.
3772
5743.1.15 by Vincent Ladeuil
Test and implement ConfigStack.remove.
3773
    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.
3774
        """Remove an existing option."""
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3775
        _, section = self._get_mutable_section()
5743.1.15 by Vincent Ladeuil
Test and implement ConfigStack.remove.
3776
        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.
3777
        for hook in ConfigHooks['remove']:
5743.8.6 by Vincent Ladeuil
Add hooks for config stacks.
3778
            hook(self, name)
5743.1.15 by Vincent Ladeuil
Test and implement ConfigStack.remove.
3779
5743.1.34 by Vincent Ladeuil
Merge config-section-matchers into config-stack resolving conflicts
3780
    def __repr__(self):
3781
        # Mostly for debugging use
3782
        return "<config.%s(%s)>" % (self.__class__.__name__, id(self))
3783
6161.1.7 by Vincent Ladeuil
Emit a warning when bzrlib.intialize) has not been called
3784
    def _get_overrides(self):
3785
        # Hack around library_state.initialize never called
3786
        if bzrlib.global_state is not None:
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3787
            return bzrlib.global_state.cmdline_overrides.get_sections()
6161.1.7 by Vincent Ladeuil
Emit a warning when bzrlib.intialize) has not been called
3788
        return []
3789
5743.1.1 by Vincent Ladeuil
Start implementing a config stack.
3790
6393.1.1 by Vincent Ladeuil
Provides MemoryStack to simplify configuration setup in tests
3791
class MemoryStack(Stack):
3792
    """A configuration stack defined from a string.
3793
3794
    This is mainly intended for tests and requires no disk resources.
3795
    """
3796
3797
    def __init__(self, content=None):
3798
        """Create an in-memory stack from a given content.
3799
3800
        It uses a single store based on configobj and support reading and
3801
        writing options.
3802
3803
        :param content: The initial content of the store. If None, the store is
3804
            not loaded and ``_load_from_string`` can and should be used if
3805
            needed.
3806
        """
3807
        store = IniFileStore()
3808
        if content is not None:
3809
            store._load_from_string(content)
3810
        super(MemoryStack, self).__init__(
3811
            [store.get_sections], store)
3812
3813
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
3814
class _CompatibleStack(Stack):
5743.6.26 by Vincent Ladeuil
Clarify _CompatibleStack aims.
3815
    """Place holder for compatibility with previous design.
3816
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
3817
    This is intended to ease the transition from the Config-based design to the
5743.6.26 by Vincent Ladeuil
Clarify _CompatibleStack aims.
3818
    Stack-based design and should not be used nor relied upon by plugins.
3819
3820
    One assumption made here is that the daughter classes will all use Stores
3821
    derived from LockableIniFileStore).
5743.6.32 by Vincent Ladeuil
Address poolie's review comments.
3822
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3823
    It implements set() and remove () by re-loading the store before applying
3824
    the modification and saving it.
5743.6.32 by Vincent Ladeuil
Address poolie's review comments.
3825
3826
    The long term plan being to implement a single write by store to save
3827
    all modifications, this class should not be used in the interim.
5743.6.26 by Vincent Ladeuil
Clarify _CompatibleStack aims.
3828
    """
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
3829
3830
    def set(self, name, value):
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
3831
        # Force a reload
3832
        self.store.unload()
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
3833
        super(_CompatibleStack, self).set(name, value)
3834
        # Force a write to persistent storage
3835
        self.store.save()
3836
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3837
    def remove(self, name):
3838
        # Force a reload
3839
        self.store.unload()
3840
        super(_CompatibleStack, self).remove(name)
3841
        # Force a write to persistent storage
3842
        self.store.save()
3843
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
3844
3845
class GlobalStack(_CompatibleStack):
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3846
    """Global options only stack.
3847
3848
    The following sections are queried:
3849
3850
    * command-line overrides,
3851
3852
    * the 'DEFAULT' section in bazaar.conf
3853
3854
    This stack will use the ``DEFAULT`` section in bazaar.conf as its
3855
    MutableSection.
3856
    """
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3857
3858
    def __init__(self):
3859
        gstore = GlobalStore()
6161.1.1 by Vincent Ladeuil
Allow config options to be overridden from the command line
3860
        super(GlobalStack, self).__init__(
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3861
            [self._get_overrides,
3862
             NameMatcher(gstore, 'DEFAULT').get_sections],
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3863
            gstore, mutable_section_id='DEFAULT')
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3864
3865
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
3866
class LocationStack(_CompatibleStack):
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3867
    """Per-location options falling back to global options stack.
3868
3869
3870
    The following sections are queried:
3871
3872
    * command-line overrides,
3873
3874
    * the sections matching ``location`` in ``locations.conf``, the order being
3875
      defined by the number of path components in the section glob, higher
3876
      numbers first (from most specific section to most generic).
3877
3878
    * the 'DEFAULT' section in bazaar.conf
3879
3880
    This stack will use the ``location`` section in locations.conf as its
3881
    MutableSection.
3882
    """
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3883
3884
    def __init__(self, location):
6006.4.7 by Martin Pool
fdatasync on dirstate can be disabled
3885
        """Make a new stack for a location and global configuration.
6371.1.1 by Jelmer Vernooij
Fix some whitespace in bzrlib.config.
3886
6006.4.7 by Martin Pool
fdatasync on dirstate can be disabled
3887
        :param location: A URL prefix to """
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3888
        lstore = LocationStore()
6288.1.1 by Vincent Ladeuil
Fix windows test regressions about locations.conf handling
3889
        if location.startswith('file://'):
3890
            location = urlutils.local_path_from_url(location)
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3891
        gstore = GlobalStore()
3892
        super(LocationStack, self).__init__(
6161.1.7 by Vincent Ladeuil
Emit a warning when bzrlib.intialize) has not been called
3893
            [self._get_overrides,
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3894
             LocationMatcher(lstore, location).get_sections,
3895
             NameMatcher(gstore, 'DEFAULT').get_sections],
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3896
            lstore, mutable_section_id=location)
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3897
6076.1.1 by Vincent Ladeuil
Add the missing config stacks and store
3898
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
3899
class BranchStack(_CompatibleStack):
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3900
    """Per-location options falling back to branch then global options stack.
3901
3902
    The following sections are queried:
3903
3904
    * command-line overrides,
3905
3906
    * the sections matching ``location`` in ``locations.conf``, the order being
3907
      defined by the number of path components in the section glob, higher
3908
      numbers first (from most specific section to most generic),
3909
3910
    * the no-name section in branch.conf,
3911
3912
    * the ``DEFAULT`` section in ``bazaar.conf``.
3913
3914
    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.
3915
    MutableSection.
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3916
    """
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3917
3918
    def __init__(self, branch):
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3919
        lstore = LocationStore()
6270.1.19 by Jelmer Vernooij
Some changes discussed with vila on IRC.
3920
        bstore = branch._get_config_store()
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3921
        gstore = GlobalStore()
3922
        super(BranchStack, self).__init__(
6161.1.7 by Vincent Ladeuil
Emit a warning when bzrlib.intialize) has not been called
3923
            [self._get_overrides,
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3924
             LocationMatcher(lstore, branch.base).get_sections,
3925
             NameMatcher(bstore, None).get_sections,
6260.3.2 by Vincent Ladeuil
Only the DEFAULT section is searched for the normal uses of bazaar.conf
3926
             NameMatcher(gstore, 'DEFAULT').get_sections],
5743.6.14 by Vincent Ladeuil
Parametrize the Stack tests.
3927
            bstore)
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
3928
        self.branch = branch
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
3929
3930
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
3931
class RemoteControlStack(_CompatibleStack):
3932
    """Remote control-only options stack."""
3933
6270.1.23 by Jelmer Vernooij
Add notes about Remote{Control,Branch}Store.
3934
    # FIXME 2011-11-22 JRV This should probably be renamed to avoid confusion
3935
    # with the stack used for remote bzr dirs. RemoteControlStack only uses
3936
    # control.conf and is used only for stack options.
3937
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
3938
    def __init__(self, bzrdir):
6270.1.21 by Jelmer Vernooij
Use _get_config_store in Remote*Stack
3939
        cstore = bzrdir._get_config_store()
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
3940
        super(RemoteControlStack, self).__init__(
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3941
            [NameMatcher(cstore, None).get_sections],
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
3942
            cstore)
3943
        self.bzrdir = bzrdir
3944
3945
6379.11.2 by Vincent Ladeuil
No matter how weird BranchOnlyStack is, it's public, the FIXMEs should be enough for devs to notice.
3946
class BranchOnlyStack(_CompatibleStack):
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
3947
    """Branch-only options stack."""
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
3948
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
3949
    # FIXME: _BranchOnlyStack only uses branch.conf and is used only for the
3950
    # stacked_on_location options waiting for http://pad.lv/832042 to be fixed.
3951
    # -- vila 2011-12-16
6270.1.23 by Jelmer Vernooij
Add notes about Remote{Control,Branch}Store.
3952
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
3953
    def __init__(self, branch):
6270.1.21 by Jelmer Vernooij
Use _get_config_store in Remote*Stack
3954
        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.
3955
        super(BranchOnlyStack, self).__init__(
6362.3.1 by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks.
3956
            [NameMatcher(bstore, None).get_sections],
6270.1.20 by Jelmer Vernooij
Revert RemoteBranchStack / RemoteControlStack changes.
3957
            bstore)
3958
        self.branch = branch
3959
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
3960
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
3961
# Use a an empty dict to initialize an empty configobj avoiding all
3962
# parsing and encoding checks
3963
_quoting_config = configobj.ConfigObj(
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
3964
    {}, encoding='utf-8', interpolation=False, list_values=True)
6076.1.1 by Vincent Ladeuil
Add the missing config stacks and store
3965
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
3966
class cmd_config(commands.Command):
5447.4.19 by Vincent Ladeuil
Add some more documentation.
3967
    __doc__ = """Display, set or remove a configuration option.
3968
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
3969
    Display the active value for a given option.
3970
3971
    If --all is specified, NAME is interpreted as a regular expression and all
3972
    matching options are displayed mentioning their scope. The active value
3973
    that bzr will take into account is the first one displayed for each option.
3974
3975
    If no NAME is given, --all .* is implied.
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
3976
5447.4.19 by Vincent Ladeuil
Add some more documentation.
3977
    Setting a value is achieved by using name=value without spaces. The value
3978
    is set in the most relevant scope and can be checked by displaying the
3979
    option again.
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
3980
    """
3981
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
3982
    takes_args = ['name?']
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
3983
3984
    takes_options = [
3985
        'directory',
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
3986
        # 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
3987
        # their own config files (or not) and will also address
3988
        # http://pad.lv/788991 -- vila 20101115
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
3989
        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
3990
                        ' configuration file.',
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
3991
                        type=unicode),
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
3992
        commands.Option('all',
3993
            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.
3994
            ),
5447.4.8 by Vincent Ladeuil
Make the test properly fail and provide a fake implementation for ``bzr config --remove opt_name``.
3995
        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
3996
                        ' the configuration file.'),
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
3997
        ]
3998
5425.4.24 by Martin Pool
Mention 'configuration' help topic from 'bzr help config'
3999
    _see_also = ['configuration']
4000
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
4001
    @commands.display_command
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4002
    def run(self, name=None, all=False, directory=None, scope=None,
4003
            remove=False):
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
4004
        if directory is None:
4005
            directory = '.'
4006
        directory = urlutils.normalize_url(directory)
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4007
        if remove and all:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4008
            raise errors.BzrError(
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4009
                '--all and --remove are mutually exclusive.')
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4010
        elif remove:
4011
            # Delete the option in the given scope
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4012
            self._remove_config_option(name, directory, scope)
4013
        elif name is None:
4014
            # Defaults to all options
4015
            self._show_matching_options('.*', directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
4016
        else:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4017
            try:
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4018
                name, value = name.split('=', 1)
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4019
            except ValueError:
4020
                # Display the option(s) value(s)
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4021
                if all:
4022
                    self._show_matching_options(name, directory, scope)
4023
                else:
4024
                    self._show_value(name, directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
4025
            else:
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4026
                if all:
4027
                    raise errors.BzrError(
4028
                        'Only one option can be set.')
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4029
                # Set the option value
4030
                self._set_config_option(name, value, directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
4031
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4032
    def _get_stack(self, directory, scope=None):
4033
        """Get the configuration stack specified by ``directory`` and ``scope``.
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
4034
4035
        :param directory: Where the configurations are derived from.
4036
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4037
        :param scope: A specific config to start from.
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
4038
        """
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4039
        # FIXME: scope should allow access to plugin-specific stacks (even
4040
        # reduced to the plugin-specific store), related to
4041
        # http://pad.lv/788991 -- vila 2011-11-15
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4042
        if scope is not None:
4043
            if scope == 'bazaar':
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4044
                return GlobalStack()
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4045
            elif scope == 'locations':
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4046
                return LocationStack(directory)
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4047
            elif scope == 'branch':
6207.3.3 by jelmer at samba
Fix tests and the like.
4048
                (_, br, _) = (
4049
                    controldir.ControlDir.open_containing_tree_or_branch(
4050
                        directory))
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4051
                return br.get_config_stack()
4052
            raise errors.NoSuchConfig(scope)
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
4053
        else:
4054
            try:
6207.3.3 by jelmer at samba
Fix tests and the like.
4055
                (_, br, _) = (
4056
                    controldir.ControlDir.open_containing_tree_or_branch(
4057
                        directory))
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4058
                return br.get_config_stack()
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
4059
            except errors.NotBranchError:
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4060
                return LocationStack(directory)
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
4061
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4062
    def _show_value(self, name, directory, scope):
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4063
        conf = self._get_stack(directory, scope)
4064
        value = conf.get(name, expand=True)
4065
        if value is not None:
4066
            # Quote the value appropriately
4067
            value = _quoting_config._quote(value)
4068
            self.outf.write('%s\n' % (value,))
4069
        else:
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4070
            raise errors.NoSuchConfigOption(name)
4071
4072
    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
4073
        name = lazy_regex.lazy_compile(name)
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
4074
        # 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
4075
        # avoid the delay introduced by the lazy regexp.  But, we still do
4076
        # want the nicer errors raised by lazy_regex.
4077
        name._compile_and_collapse()
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4078
        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.
4079
        cur_section = None
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4080
        conf = self._get_stack(directory, scope)
4081
        for sections in conf.sections_def:
4082
            for store, section in sections():
4083
                for oname in section.iter_option_names():
4084
                    if name.search(oname):
4085
                        if cur_store_id != store.id:
4086
                            # Explain where the options are defined
4087
                            self.outf.write('%s:\n' % (store.id,))
4088
                            cur_store_id = store.id
4089
                            cur_section = None
6393.2.2 by Vincent Ladeuil
Display [DEFAULT] when reporting options from bazaar.conf.
4090
                        if (section.id is not None
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4091
                            and cur_section != section.id):
6393.2.2 by Vincent Ladeuil
Display [DEFAULT] when reporting options from bazaar.conf.
4092
                            # Display the section id as it appears in the store
4093
                            # (None doesn't appear by definition)
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4094
                            self.outf.write('  [%s]\n' % (section.id,))
4095
                            cur_section = section.id
4096
                        value = section.get(oname, expand=False)
6385.1.1 by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted
4097
                        # Since we don't use the stack, we need to restore a
4098
                        # proper quoting.
4099
                        try:
4100
                            opt = option_registry.get(oname)
4101
                            value = opt.convert_from_unicode(store, value)
4102
                        except KeyError:
4103
                            value = store.unquote(value)
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4104
                        value = _quoting_config._quote(value)
4105
                        self.outf.write('  %s = %s\n' % (oname, value))
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
4106
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4107
    def _set_config_option(self, name, value, directory, scope):
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4108
        conf = self._get_stack(directory, scope)
4109
        conf.set(name, value)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
4110
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
4111
    def _remove_config_option(self, name, directory, scope):
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
4112
        if name is None:
4113
            raise errors.BzrCommandError(
4114
                '--remove expects an option to remove.')
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4115
        conf = self._get_stack(directory, scope)
4116
        try:
4117
            conf.remove(name)
4118
        except KeyError:
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
4119
            raise errors.NoSuchConfigOption(name)
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
4120
6260.3.1 by Vincent Ladeuil
Switch ``bzr config`` to the new config implementation
4121
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
4122
# Test registries
5743.6.29 by Vincent Ladeuil
For jam.
4123
#
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
4124
# We need adapters that can build a Store or a Stack in a test context. Test
4125
# classes, based on TestCaseWithTransport, can use the registry to parametrize
4126
# themselves. The builder will receive a test instance and should return a
5743.6.29 by Vincent Ladeuil
For jam.
4127
# 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
4128
# 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.
4129
# bzrlib.tests.test_config. Note that the builder can be called multiple times
6325.1.1 by Vincent Ladeuil
Fix various typos
4130
# for the same test.
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
4131
4132
# The registered object should be a callable receiving a test instance
4133
# parameter (inheriting from tests.TestCaseWithTransport) and returning a Store
4134
# object.
4135
test_store_builder_registry = registry.Registry()
4136
5743.10.1 by Vincent Ladeuil
Derefence the ref to use it.
4137
# 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
4138
# parameter (inheriting from tests.TestCaseWithTransport) and returning a Stack
4139
# object.
4140
test_stack_builder_registry = registry.Registry()