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