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