/brz/remove-bazaar

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