/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
1442.1.20 by Robert Collins
add some documentation on options
32
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
33
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
34
Wildcards may be used - * and ? as normal in shell completion. Options
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
35
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
36
setting.
37
[/home/robertc/source]
38
recurse=False|True(default)
39
email= as above
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
40
check_signatures= as above
1442.1.20 by Robert Collins
add some documentation on options
41
create_signatures= as above.
42
43
explanation of options
44
----------------------
45
editor - this option sets the pop up editor to use during commits.
46
email - this option sets the user id bzr will use when committing.
47
check_signatures - this option controls whether bzr will require good gpg
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
48
                   signatures, ignore them, or check them if they are
1442.1.20 by Robert Collins
add some documentation on options
49
                   present.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
50
create_signatures - this option controls whether bzr will always create
1442.1.20 by Robert Collins
add some documentation on options
51
                    gpg signatures, never create them, or create them if the
52
                    branch is configured to require them.
1887.2.1 by Adeodato Simó
Fix some typos and grammar issues.
53
log_format - this option sets the default log format.  Possible values are
54
             long, short, line, or a plugin can register new formats.
1553.6.2 by Erik Bågfors
documentation and NEWS
55
56
In bazaar.conf you can also define aliases in the ALIASES sections, example
57
58
[ALIASES]
59
lastlog=log --line -r-10..-1
60
ll=log --line -r-10..-1
61
h=help
62
up=pull
1442.1.20 by Robert Collins
add some documentation on options
63
"""
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
64
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
65
import os
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
66
import string
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
67
import sys
5743.8.6 by Vincent Ladeuil
Add hooks for config stacks.
68
69
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
70
from bzrlib.decorators import needs_write_lock
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
71
from bzrlib.lazy_import import lazy_import
72
lazy_import(globals(), """
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
73
import fnmatch
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
74
import re
2900.2.22 by Vincent Ladeuil
Polishing.
75
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.
76
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
77
from bzrlib import (
4797.59.2 by Vincent Ladeuil
Use AtomicFile and avoid all unicode/encoding issues around transport (thanks jam).
78
    atomicfile,
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
79
    bzrdir,
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
80
    debug,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
81
    errors,
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
82
    lockdir,
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
83
    mail_client,
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
84
    mergetools,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
85
    osutils,
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
86
    symbol_versioning,
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
87
    trace,
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
88
    transport,
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
89
    ui,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
90
    urlutils,
2245.4.3 by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
91
    win32utils,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
92
    )
2991.2.4 by Vincent Ladeuil
Various fixes following local testing environment rebuild.
93
from bzrlib.util.configobj import configobj
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
94
""")
5904.1.2 by Martin Pool
Various pyflakes import fixes.
95
from bzrlib import (
5743.8.6 by Vincent Ladeuil
Add hooks for config stacks.
96
    commands,
97
    hooks,
5904.1.2 by Martin Pool
Various pyflakes import fixes.
98
    registry,
99
    )
5743.13.1 by Vincent Ladeuil
Deprecate _get_editor to identify its usages.
100
from bzrlib.symbol_versioning import (
101
    deprecated_in,
102
    deprecated_method,
103
    )
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
104
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
105
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
106
CHECK_IF_POSSIBLE=0
107
CHECK_ALWAYS=1
108
CHECK_NEVER=2
109
110
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
111
SIGN_WHEN_REQUIRED=0
112
SIGN_ALWAYS=1
113
SIGN_NEVER=2
114
115
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
116
POLICY_NONE = 0
117
POLICY_NORECURSE = 1
118
POLICY_APPENDPATH = 2
119
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
120
_policy_name = {
121
    POLICY_NONE: None,
122
    POLICY_NORECURSE: 'norecurse',
123
    POLICY_APPENDPATH: 'appendpath',
124
    }
125
_policy_value = {
126
    None: POLICY_NONE,
127
    'none': POLICY_NONE,
128
    'norecurse': POLICY_NORECURSE,
129
    'appendpath': POLICY_APPENDPATH,
130
    }
2120.6.4 by James Henstridge
add support for specifying policy when storing options
131
132
133
STORE_LOCATION = POLICY_NONE
134
STORE_LOCATION_NORECURSE = POLICY_NORECURSE
135
STORE_LOCATION_APPENDPATH = POLICY_APPENDPATH
136
STORE_BRANCH = 3
137
STORE_GLOBAL = 4
138
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
139
140
class ConfigObj(configobj.ConfigObj):
141
142
    def __init__(self, infile=None, **kwargs):
143
        # We define our own interpolation mechanism calling it option expansion
144
        super(ConfigObj, self).__init__(infile=infile,
145
                                        interpolation=False,
146
                                        **kwargs)
147
148
    def get_bool(self, section, key):
149
        return self[section].as_bool(key)
150
151
    def get_value(self, section, name):
152
        # Try [] for the old DEFAULT section.
153
        if section == "DEFAULT":
154
            try:
155
                return self[name]
156
            except KeyError:
157
                pass
158
        return self[section][name]
159
160
5743.8.6 by Vincent Ladeuil
Add hooks for config stacks.
161
# FIXME: Until we can guarantee that each config file is loaded once and
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
162
# only once for a given bzrlib session, we don't want to re-read the file every
163
# time we query for an option so we cache the value (bad ! watch out for tests
164
# needing to restore the proper value).This shouldn't be part of 2.4.0 final,
165
# yell at mgz^W vila and the RM if this is still present at that time
166
# -- vila 20110219
167
_expand_default_value = None
168
def _get_expand_default_value():
169
    global _expand_default_value
170
    if _expand_default_value is not None:
171
        return _expand_default_value
172
    conf = GlobalConfig()
173
    # Note that we must not use None for the expand value below or we'll run
174
    # into infinite recursion. Using False really would be quite silly ;)
175
    expand = conf.get_user_option_as_bool('bzr.config.expand', expand=True)
176
    if expand is None:
177
        # This is an opt-in feature, you *really* need to clearly say you want
178
        # to activate it !
179
        expand = False
180
    _expand_default_value = expand
181
    return expand
5549.1.31 by Vincent Ladeuil
Implement a default value for config option expansion (what ? No tests ?).
182
5549.1.19 by Vincent Ladeuil
Push down interpolation at the config level (make tests slightly less
183
184
class Config(object):
185
    """A configuration policy - what username, editor, gpg needs etc."""
186
187
    def __init__(self):
188
        super(Config, self).__init__()
189
190
    def config_id(self):
191
        """Returns a unique ID for the config."""
192
        raise NotImplementedError(self.config_id)
193
5743.13.1 by Vincent Ladeuil
Deprecate _get_editor to identify its usages.
194
    @deprecated_method(deprecated_in((2, 4, 0)))
5549.1.19 by Vincent Ladeuil
Push down interpolation at the config level (make tests slightly less
195
    def get_editor(self):
196
        """Get the users pop up editor."""
197
        raise NotImplementedError
198
199
    def get_change_editor(self, old_tree, new_tree):
200
        from bzrlib import diff
201
        cmd = self._get_change_editor()
202
        if cmd is None:
203
            return None
204
        return diff.DiffFromTool.from_string(cmd, old_tree, new_tree,
205
                                             sys.stdout)
206
207
    def get_mail_client(self):
208
        """Get a mail client to use"""
209
        selected_client = self.get_user_option('mail_client')
210
        _registry = mail_client.mail_client_registry
211
        try:
212
            mail_client_class = _registry.get(selected_client)
213
        except KeyError:
214
            raise errors.UnknownMailClient(selected_client)
215
        return mail_client_class(self)
216
217
    def _get_signature_checking(self):
218
        """Template method to override signature checking policy."""
219
220
    def _get_signing_policy(self):
221
        """Template method to override signature creation policy."""
222
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
223
    option_ref_re = None
224
225
    def expand_options(self, string, env=None):
226
        """Expand option references in the string in the configuration context.
227
228
        :param string: The string containing option to expand.
229
230
        :param env: An option dict defining additional configuration options or
231
            overriding existing ones.
232
233
        :returns: The expanded string.
234
        """
235
        return self._expand_options_in_string(string, env)
236
237
    def _expand_options_in_list(self, slist, env=None, _ref_stack=None):
238
        """Expand options in  a list of strings in the configuration context.
239
240
        :param slist: A list of strings.
241
242
        :param env: An option dict defining additional configuration options or
243
            overriding existing ones.
244
245
        :param _ref_stack: Private list containing the options being
246
            expanded to detect loops.
247
248
        :returns: The flatten list of expanded strings.
249
        """
250
        # expand options in each value separately flattening lists
251
        result = []
252
        for s in slist:
253
            value = self._expand_options_in_string(s, env, _ref_stack)
254
            if isinstance(value, list):
255
                result.extend(value)
256
            else:
257
                result.append(value)
258
        return result
259
260
    def _expand_options_in_string(self, string, env=None, _ref_stack=None):
261
        """Expand options in the string in the configuration context.
262
263
        :param string: The string to be expanded.
264
265
        :param env: An option dict defining additional configuration options or
266
            overriding existing ones.
267
268
        :param _ref_stack: Private list containing the options being
269
            expanded to detect loops.
270
271
        :returns: The expanded string.
272
        """
273
        if string is None:
274
            # Not much to expand there
275
            return None
276
        if _ref_stack is None:
277
            # What references are currently resolved (to detect loops)
278
            _ref_stack = []
279
        if self.option_ref_re is None:
280
            # We want to match the most embedded reference first (i.e. for
281
            # '{{foo}}' we will get '{foo}',
282
            # for '{bar{baz}}' we will get '{baz}'
283
            self.option_ref_re = re.compile('({[^{}]+})')
284
        result = string
285
        # We need to iterate until no more refs appear ({{foo}} will need two
286
        # iterations for example).
287
        while True:
5745.1.1 by Vincent Ladeuil
Remove debug code
288
            raw_chunks = self.option_ref_re.split(result)
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
289
            if len(raw_chunks) == 1:
290
                # Shorcut the trivial case: no refs
291
                return result
292
            chunks = []
293
            list_value = False
294
            # Split will isolate refs so that every other chunk is a ref
295
            chunk_is_ref = False
296
            for chunk in raw_chunks:
297
                if not chunk_is_ref:
298
                    if chunk:
299
                        # Keep only non-empty strings (or we get bogus empty
300
                        # slots when a list value is involved).
301
                        chunks.append(chunk)
302
                    chunk_is_ref = True
303
                else:
304
                    name = chunk[1:-1]
305
                    if name in _ref_stack:
306
                        raise errors.OptionExpansionLoop(string, _ref_stack)
307
                    _ref_stack.append(name)
308
                    value = self._expand_option(name, env, _ref_stack)
309
                    if value is None:
310
                        raise errors.ExpandingUnknownOption(name, string)
311
                    if isinstance(value, list):
312
                        list_value = True
313
                        chunks.extend(value)
314
                    else:
315
                        chunks.append(value)
316
                    _ref_stack.pop()
317
                    chunk_is_ref = False
318
            if list_value:
319
                # Once a list appears as the result of an expansion, all
320
                # callers will get a list result. This allows a consistent
321
                # behavior even when some options in the expansion chain
322
                # defined as strings (no comma in their value) but their
323
                # expanded value is a list.
324
                return self._expand_options_in_list(chunks, env, _ref_stack)
325
            else:
326
                result = ''.join(chunks)
327
        return result
328
329
    def _expand_option(self, name, env, _ref_stack):
330
        if env is not None and name in env:
331
            # Special case, values provided in env takes precedence over
332
            # anything else
333
            value = env[name]
334
        else:
335
            # FIXME: This is a limited implementation, what we really need is a
336
            # way to query the bzr config for the value of an option,
337
            # respecting the scope rules (That is, once we implement fallback
338
            # configs, getting the option value should restart from the top
339
            # config, not the current one) -- vila 20101222
340
            value = self.get_user_option(name, expand=False)
341
            if isinstance(value, list):
342
                value = self._expand_options_in_list(value, env, _ref_stack)
343
            else:
344
                value = self._expand_options_in_string(value, env, _ref_stack)
345
        return value
346
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
347
    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.
348
        """Template method to provide a user option."""
349
        return None
350
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
351
    def get_user_option(self, option_name, expand=None):
352
        """Get a generic option - no special process, no default.
353
354
        :param option_name: The queried option.
355
356
        :param expand: Whether options references should be expanded.
357
358
        :returns: The value of the option.
359
        """
360
        if expand is None:
361
            expand = _get_expand_default_value()
362
        value = self._get_user_option(option_name)
363
        if expand:
364
            if isinstance(value, list):
365
                value = self._expand_options_in_list(value)
366
            elif isinstance(value, dict):
367
                trace.warning('Cannot expand "%s":'
368
                              ' Dicts do not support option expansion'
369
                              % (option_name,))
370
            else:
371
                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.
372
        for hook in OldConfigHooks['get']:
5743.8.25 by Vincent Ladeuil
Fix spurious spaces.
373
            hook(self, option_name, value)
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
374
        return value
375
5425.4.14 by Martin Pool
Allow get_user_option_as_bool to take a default
376
    def get_user_option_as_bool(self, option_name, expand=None, default=None):
377
        """Get a generic option as a boolean.
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
378
5425.4.14 by Martin Pool
Allow get_user_option_as_bool to take a default
379
        :param expand: Allow expanding references to other config values.
380
        :param default: Default value if nothing is configured
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
381
        :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.
382
            interpreted as a boolean. Returns True or False otherwise.
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
383
        """
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
384
        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.
385
        if s is None:
386
            # The option doesn't exist
5425.4.14 by Martin Pool
Allow get_user_option_as_bool to take a default
387
            return default
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
388
        val = ui.bool_from_string(s)
4989.2.12 by Vincent Ladeuil
Display a warning if an option value is not boolean.
389
        if val is None:
390
            # The value can't be interpreted as a boolean
391
            trace.warning('Value "%s" is not a boolean for "%s"',
392
                          s, option_name)
393
        return val
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
394
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
395
    def get_user_option_as_list(self, option_name, expand=None):
4840.2.4 by Vincent Ladeuil
Implement config.get_user_option_as_list.
396
        """Get a generic option as a list - no special process, no default.
397
398
        :return None if the option doesn't exist. Returns the value as a list
399
            otherwise.
400
        """
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
401
        l = self.get_user_option(option_name, expand=expand)
4840.2.4 by Vincent Ladeuil
Implement config.get_user_option_as_list.
402
        if isinstance(l, (str, unicode)):
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
403
            # A single value, most probably the user forgot (or didn't care to
404
            # add) the final ','
4840.2.4 by Vincent Ladeuil
Implement config.get_user_option_as_list.
405
            l = [l]
406
        return l
407
1442.1.56 by Robert Collins
gpg_signing_command configuration item
408
    def gpg_signing_command(self):
409
        """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.
410
        result = self._gpg_signing_command()
411
        if result is None:
412
            result = "gpg"
413
        return result
414
415
    def _gpg_signing_command(self):
416
        """See gpg_signing_command()."""
417
        return None
1442.1.56 by Robert Collins
gpg_signing_command configuration item
418
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
419
    def log_format(self):
420
        """What log format should be used"""
421
        result = self._log_format()
1553.2.4 by Erik Bågfors
Support for setting the default log format at a configuration option
422
        if result is None:
423
            result = "long"
424
        return result
425
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
426
    def _log_format(self):
427
        """See log_format()."""
1553.2.4 by Erik Bågfors
Support for setting the default log format at a configuration option
428
        return None
429
1472 by Robert Collins
post commit hook, first pass implementation
430
    def post_commit(self):
431
        """An ordered list of python functions to call.
432
433
        Each function takes branch, rev_id as parameters.
434
        """
435
        return self._post_commit()
436
437
    def _post_commit(self):
438
        """See Config.post_commit."""
439
        return None
440
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
441
    def user_email(self):
442
        """Return just the email component of a username."""
1185.33.31 by Martin Pool
Make annotate cope better with revisions committed without a valid
443
        return extract_email_address(self.username())
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
444
445
    def username(self):
446
        """Return email-style username.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
447
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
448
        Something similar to 'Martin Pool <mbp@sourcefrog.net>'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
449
5187.2.1 by Parth Malwankar
removed comment about deprecated BZREMAIL.
450
        $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
451
        the concrete policy type is checked, and finally
1185.37.2 by Jamie Wilkinson
Fix a typo and grammar in Config.username() docstring.
452
        $EMAIL is examined.
5187.2.12 by Parth Malwankar
trivial clarification in docstring.
453
        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
454
        """
1861.4.1 by Matthieu Moy
BZREMAIL renamed to BZR_EMAIL.
455
        v = os.environ.get('BZR_EMAIL')
456
        if v:
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
457
            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
458
        v = self._get_user_id()
459
        if v:
460
            return v
461
        v = os.environ.get('EMAIL')
462
        if v:
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
463
            return v.decode(osutils.get_user_encoding())
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
464
        name, email = _auto_user_id()
465
        if name and email:
466
            return '%s <%s>' % (name, email)
467
        elif email:
468
            return email
5187.2.6 by Parth Malwankar
lockdir no long mandates whoami but uses unicode version of getuser
469
        raise errors.NoWhoami()
5187.2.3 by Parth Malwankar
init and init-repo now fail before creating dir if username is not set.
470
471
    def ensure_username(self):
5187.2.11 by Parth Malwankar
documentation updates
472
        """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.
473
474
        This method relies on the username() function raising the error.
475
        """
476
        self.username()
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
477
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
478
    def signature_checking(self):
479
        """What is the current policy for signature checking?."""
1442.1.15 by Robert Collins
make getting the signature checking policy a template method
480
        policy = self._get_signature_checking()
481
        if policy is not None:
482
            return policy
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
483
        return CHECK_IF_POSSIBLE
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
484
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
485
    def signing_policy(self):
486
        """What is the current policy for signature checking?."""
487
        policy = self._get_signing_policy()
488
        if policy is not None:
489
            return policy
490
        return SIGN_WHEN_REQUIRED
491
1442.1.21 by Robert Collins
create signature_needed() call for commit to trigger creating signatures
492
    def signature_needed(self):
493
        """Is a signature needed when committing ?."""
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
494
        policy = self._get_signing_policy()
495
        if policy is None:
496
            policy = self._get_signature_checking()
497
            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
498
                #this warning should go away once check_signatures is
499
                #implemented (if not before)
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
500
                trace.warning("Please use create_signatures,"
501
                              " not check_signatures to set signing policy.")
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
502
        elif policy == SIGN_ALWAYS:
1442.1.21 by Robert Collins
create signature_needed() call for commit to trigger creating signatures
503
            return True
504
        return False
505
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
506
    def get_alias(self, value):
507
        return self._get_alias(value)
508
509
    def _get_alias(self, value):
510
        pass
511
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
512
    def get_nickname(self):
513
        return self._get_nickname()
514
515
    def _get_nickname(self):
516
        return None
517
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
518
    def get_bzr_remote_path(self):
519
        try:
520
            return os.environ['BZR_REMOTE_PATH']
521
        except KeyError:
522
            path = self.get_user_option("bzr_remote_path")
523
            if path is None:
524
                path = 'bzr'
525
            return path
526
4840.2.6 by Vincent Ladeuil
Implement config.suppress_warning.
527
    def suppress_warning(self, warning):
528
        """Should the warning be suppressed or emitted.
529
530
        :param warning: The name of the warning being tested.
531
532
        :returns: True if the warning should be suppressed, False otherwise.
533
        """
534
        warnings = self.get_user_option_as_list('suppress_warnings')
535
        if warnings is None or warning not in warnings:
536
            return False
537
        else:
538
            return True
539
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
540
    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.
541
        tools = {}
5321.1.99 by Gordon Tyler
Fixes for changes to Config._get_options().
542
        for (oname, value, section, conf_id, parser) in self._get_options():
5321.2.3 by Vincent Ladeuil
Prefix mergetools option names with 'bzr.'.
543
            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.
544
                tool_name = oname[len('bzr.mergetool.'):]
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
545
                tools[tool_name] = value
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
546
        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.
547
        return tools
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
548
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.
549
    def find_merge_tool(self, name):
5967.3.6 by Jonathan Riddell
use example.com for e-mails, make bzrlib/config.py pep8 happy
550
        # 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.
551
        # be found in the known_merge_tools if it's not found in the config.
552
        # This should be done through the proposed config defaults mechanism
553
        # when it becomes available in the future.
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
554
        command_line = (self.get_user_option('bzr.mergetool.%s' % name,
555
                                             expand=False)
556
                        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.
557
        return command_line
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
558
1442.1.15 by Robert Collins
make getting the signature checking policy a template method
559
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.
560
class _ConfigHooks(hooks.Hooks):
561
    """A dict mapping hook names and a list of callables for configs.
562
    """
563
564
    def __init__(self):
565
        """Create the default hooks.
566
567
        These are all empty initially, because by default nothing should get
568
        notified.
569
        """
570
        super(_ConfigHooks, self).__init__('bzrlib.config', 'ConfigHooks')
571
        self.add_hook('load',
572
                      'Invoked when a config store is loaded.'
573
                      ' The signature is (store).',
574
                      (2, 4))
575
        self.add_hook('save',
576
                      'Invoked when a config store is saved.'
577
                      ' The signature is (store).',
578
                      (2, 4))
579
        # The hooks for config options
580
        self.add_hook('get',
581
                      'Invoked when a config option is read.'
582
                      ' The signature is (stack, name, value).',
583
                      (2, 4))
584
        self.add_hook('set',
585
                      'Invoked when a config option is set.'
586
                      ' The signature is (stack, name, value).',
587
                      (2, 4))
588
        self.add_hook('remove',
589
                      'Invoked when a config option is removed.'
590
                      ' The signature is (stack, name).',
591
                      (2, 4))
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
592
ConfigHooks = _ConfigHooks()
593
594
595
class _OldConfigHooks(hooks.Hooks):
596
    """A dict mapping hook names and a list of callables for configs.
597
    """
598
599
    def __init__(self):
600
        """Create the default hooks.
601
602
        These are all empty initially, because by default nothing should get
603
        notified.
604
        """
605
        super(_OldConfigHooks, self).__init__('bzrlib.config', 'OldConfigHooks')
606
        self.add_hook('load',
5743.8.14 by Vincent Ladeuil
Separate the hooks for old and new config implementations instead of cheating like crazy.
607
                      'Invoked when a config store is loaded.'
608
                      ' The signature is (config).',
609
                      (2, 4))
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
610
        self.add_hook('save',
5743.8.14 by Vincent Ladeuil
Separate the hooks for old and new config implementations instead of cheating like crazy.
611
                      'Invoked when a config store is saved.'
612
                      ' The signature is (config).',
613
                      (2, 4))
614
        # The hooks for config options
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
615
        self.add_hook('get',
5743.8.14 by Vincent Ladeuil
Separate the hooks for old and new config implementations instead of cheating like crazy.
616
                      'Invoked when a config option is read.'
617
                      ' The signature is (config, name, value).',
618
                      (2, 4))
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
619
        self.add_hook('set',
5743.8.14 by Vincent Ladeuil
Separate the hooks for old and new config implementations instead of cheating like crazy.
620
                      'Invoked when a config option is set.'
621
                      ' The signature is (config, name, value).',
622
                      (2, 4))
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
623
        self.add_hook('remove',
5743.8.14 by Vincent Ladeuil
Separate the hooks for old and new config implementations instead of cheating like crazy.
624
                      'Invoked when a config option is removed.'
625
                      ' The signature is (config, name).',
626
                      (2, 4))
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
627
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.
628
629
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
630
class IniBasedConfig(Config):
631
    """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
632
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
633
    def __init__(self, get_filename=symbol_versioning.DEPRECATED_PARAMETER,
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
634
                 file_name=None):
5345.2.5 by Vincent Ladeuil
Add docstring.
635
        """Base class for configuration files using an ini-like syntax.
636
637
        :param file_name: The configuration file path.
638
        """
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
639
        super(IniBasedConfig, self).__init__()
5345.1.8 by Vincent Ladeuil
Make the test_listen_to_the_last_speaker pass and fix fallouts.
640
        self.file_name = file_name
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
641
        if symbol_versioning.deprecated_passed(get_filename):
642
            symbol_versioning.warn(
643
                'IniBasedConfig.__init__(get_filename) was deprecated in 2.3.'
644
                ' Use file_name instead.',
645
                DeprecationWarning,
646
                stacklevel=2)
5345.1.8 by Vincent Ladeuil
Make the test_listen_to_the_last_speaker pass and fix fallouts.
647
            if get_filename is not None:
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
648
                self.file_name = get_filename()
649
        else:
650
            self.file_name = file_name
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
651
        self._content = None
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
652
        self._parser = None
653
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
654
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
655
    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
656
        """Create a config object from a string.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
657
5345.2.9 by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string.
658
        :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.
659
            be utf-8 encoded.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
660
661
        :param file_name: The configuration file path.
662
663
        :param _save: Whether the file should be saved upon creation.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
664
        """
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
665
        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
666
        conf._create_from_string(str_or_unicode, save)
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
667
        return conf
668
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
669
    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
670
        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.
671
        # Some tests use in-memory configs, some other always need the config
672
        # file to exist on disk.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
673
        if save:
5345.1.16 by Vincent Ladeuil
Allows tests to save the config file at build time.
674
            self._write_config_file()
5345.5.12 by Vincent Ladeuil
Fix fallouts from replacing '_content' by 'from_bytes' for config files.
675
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
676
    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
677
        if self._parser is not None:
678
            return self._parser
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
679
        if symbol_versioning.deprecated_passed(file):
680
            symbol_versioning.warn(
681
                '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.
682
                ' Use IniBasedConfig(_content=xxx) instead.',
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
683
                DeprecationWarning,
684
                stacklevel=2)
685
        if self._content is not None:
686
            co_input = self._content
687
        elif self.file_name is None:
688
            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
689
        else:
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
690
            co_input = self.file_name
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
691
        try:
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
692
            self._parser = ConfigObj(co_input, encoding='utf-8')
1474 by Robert Collins
Merge from Aaron Bentley.
693
        except configobj.ConfigObjError, e:
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
694
            raise errors.ParseConfigError(e.errors, e.config.filename)
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
695
        # 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.
696
        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.
697
        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.
698
            hook(self)
1185.12.49 by Aaron Bentley
Switched to ConfigObj
699
        return self._parser
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
700
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
701
    def reload(self):
702
        """Reload the config file from disk."""
703
        if self.file_name is None:
704
            raise AssertionError('We need a file name to reload the config')
705
        if self._parser is not None:
706
            self._parser.reload()
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
707
        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.
708
            hook(self)
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
709
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
710
    def _get_matching_sections(self):
711
        """Return an ordered list of (section_name, extra_path) pairs.
712
713
        If the section contains inherited configuration, extra_path is
714
        a string containing the additional path components.
715
        """
716
        section = self._get_section()
717
        if section is not None:
718
            return [(section, '')]
719
        else:
720
            return []
721
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
722
    def _get_section(self):
723
        """Override this to define the section used by the config."""
724
        return "DEFAULT"
725
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.
726
    def _get_sections(self, name=None):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
727
        """Returns an iterator of the sections specified by ``name``.
728
729
        :param name: The section name. If None is supplied, the default
730
            configurations are yielded.
731
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
732
        :return: A tuple (name, section, config_id) for all sections that will
733
            be walked by user_get_option() in the 'right' order. The first one
734
            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.
735
        """
736
        parser = self._get_parser()
737
        if name is not None:
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
738
            yield (name, parser[name], self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
739
        else:
740
            # No section name has been given so we fallback to the configobj
741
            # 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.
742
            yield (None, parser, self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
743
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.
744
    def _get_options(self, sections=None):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
745
        """Return an ordered list of (name, value, section, config_id) tuples.
746
747
        All options are returned with their associated value and the section
748
        they appeared in. ``config_id`` is a unique identifier for the
749
        configuration file the option is defined in.
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
750
751
        :param sections: Default to ``_get_matching_sections`` if not
752
            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.
753
            which sections should be searched. This is a list of (name,
754
            configobj) tuples.
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
755
        """
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
756
        opts = []
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
757
        if sections is None:
758
            parser = self._get_parser()
759
            sections = []
760
            for (section_name, _) in self._get_matching_sections():
761
                try:
762
                    section = parser[section_name]
763
                except KeyError:
764
                    # This could happen for an empty file for which we define a
765
                    # DEFAULT section. FIXME: Force callers to provide sections
766
                    # instead ? -- vila 20100930
767
                    continue
768
                sections.append((section_name, section))
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
769
        config_id = self.config_id()
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
770
        for (section_name, section) in sections:
771
            for (name, value) in section.iteritems():
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
772
                yield (name, parser._quote(value), section_name,
773
                       config_id, parser)
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
774
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
775
    def _get_option_policy(self, section, option_name):
776
        """Return the policy for the given (section, option_name) pair."""
777
        return POLICY_NONE
778
4603.1.10 by Aaron Bentley
Provide change editor via config.
779
    def _get_change_editor(self):
780
        return self.get_user_option('change_editor')
781
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
782
    def _get_signature_checking(self):
783
        """See Config._get_signature_checking."""
1474 by Robert Collins
Merge from Aaron Bentley.
784
        policy = self._get_user_option('check_signatures')
785
        if policy:
786
            return self._string_to_signature_policy(policy)
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
787
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
788
    def _get_signing_policy(self):
1773.4.3 by Martin Pool
[merge] bzr.dev
789
        """See Config._get_signing_policy"""
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
790
        policy = self._get_user_option('create_signatures')
791
        if policy:
792
            return self._string_to_signing_policy(policy)
793
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
794
    def _get_user_id(self):
795
        """Get the user id from the 'email' key in the current section."""
1474 by Robert Collins
Merge from Aaron Bentley.
796
        return self._get_user_option('email')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
797
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
798
    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.
799
        """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
800
        for (section, extra_path) in self._get_matching_sections():
801
            try:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
802
                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
803
            except KeyError:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
804
                continue
805
            policy = self._get_option_policy(section, option_name)
806
            if policy == POLICY_NONE:
807
                return value
808
            elif policy == POLICY_NORECURSE:
809
                # norecurse items only apply to the exact path
810
                if extra_path:
811
                    continue
812
                else:
813
                    return value
814
            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
815
                if extra_path:
816
                    value = urlutils.join(value, extra_path)
817
                return value
2120.6.6 by James Henstridge
fix test_set_push_location test
818
            else:
819
                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
820
        else:
1993.3.1 by James Henstridge
first go at making location config lookup recursive
821
            return None
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
822
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
823
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
824
        """See Config.gpg_signing_command."""
1472 by Robert Collins
post commit hook, first pass implementation
825
        return self._get_user_option('gpg_signing_command')
1442.1.56 by Robert Collins
gpg_signing_command configuration item
826
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
827
    def _log_format(self):
828
        """See Config.log_format."""
829
        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
830
1472 by Robert Collins
post commit hook, first pass implementation
831
    def _post_commit(self):
832
        """See Config.post_commit."""
833
        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
834
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
835
    def _string_to_signature_policy(self, signature_string):
836
        """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
837
        if signature_string.lower() == 'check-available':
838
            return CHECK_IF_POSSIBLE
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
839
        if signature_string.lower() == 'ignore':
840
            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
841
        if signature_string.lower() == 'require':
842
            return CHECK_ALWAYS
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
843
        raise errors.BzrError("Invalid signatures policy '%s'"
844
                              % signature_string)
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
845
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
846
    def _string_to_signing_policy(self, signature_string):
847
        """Convert a string to a signing policy."""
848
        if signature_string.lower() == 'when-required':
849
            return SIGN_WHEN_REQUIRED
850
        if signature_string.lower() == 'never':
851
            return SIGN_NEVER
852
        if signature_string.lower() == 'always':
853
            return SIGN_ALWAYS
854
        raise errors.BzrError("Invalid signing policy '%s'"
855
                              % signature_string)
856
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
857
    def _get_alias(self, value):
858
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
859
            return self._get_parser().get_value("ALIASES",
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
860
                                                value)
861
        except KeyError:
862
            pass
863
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
864
    def _get_nickname(self):
865
        return self.get_user_option('nickname')
866
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
867
    def remove_user_option(self, option_name, section_name=None):
868
        """Remove a user option and save the configuration file.
869
870
        :param option_name: The option to be removed.
871
872
        :param section_name: The section the option is defined in, default to
873
            the default section.
874
        """
875
        self.reload()
876
        parser = self._get_parser()
877
        if section_name is None:
878
            section = parser
879
        else:
880
            section = parser[section_name]
881
        try:
882
            del section[option_name]
883
        except KeyError:
884
            raise errors.NoSuchConfigOption(option_name)
885
        self._write_config_file()
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
886
        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.
887
            hook(self, option_name)
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
888
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
889
    def _write_config_file(self):
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
890
        if self.file_name is None:
891
            raise AssertionError('We cannot save, self.file_name is None')
5345.1.9 by Vincent Ladeuil
Refactor config dir check.
892
        conf_dir = os.path.dirname(self.file_name)
893
        ensure_config_dir_exists(conf_dir)
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
894
        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
895
        self._get_parser().write(atomic_file)
896
        atomic_file.commit()
897
        atomic_file.close()
5345.3.3 by Vincent Ladeuil
Merge bzr.dev into deprecate-get-filename resolving conflicts
898
        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.
899
        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.
900
            hook(self)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
901
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
902
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
903
class LockableConfig(IniBasedConfig):
904
    """A configuration needing explicit locking for access.
905
906
    If several processes try to write the config file, the accesses need to be
907
    serialized.
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
908
909
    Daughter classes should decorate all methods that update a config with the
910
    ``@needs_write_lock`` decorator (they call, directly or indirectly, the
911
    ``_write_config_file()`` method. These methods (typically ``set_option()``
912
    and variants must reload the config file from disk before calling
913
    ``_write_config_file()``), this can be achieved by calling the
914
    ``self.reload()`` method. Note that the lock scope should cover both the
915
    reading and the writing of the config file which is why the decorator can't
916
    be applied to ``_write_config_file()`` only.
917
918
    This should be enough to implement the following logic:
919
    - lock for exclusive write access,
920
    - reload the config file from disk,
921
    - set the new value
922
    - unlock
923
924
    This logic guarantees that a writer can update a value without erasing an
925
    update made by another writer.
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
926
    """
927
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
928
    lock_name = 'lock'
929
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
930
    def __init__(self, file_name):
931
        super(LockableConfig, self).__init__(file_name=file_name)
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
932
        self.dir = osutils.dirname(osutils.safe_unicode(self.file_name))
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
933
        # FIXME: It doesn't matter that we don't provide possible_transports
934
        # below since this is currently used only for local config files ;
935
        # local transports are not shared. But if/when we start using
936
        # LockableConfig for other kind of transports, we will need to reuse
937
        # whatever connection is already established -- vila 20100929
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
938
        self.transport = transport.get_transport(self.dir)
5743.4.9 by Vincent Ladeuil
Implement a LockableConfigObjStore to be able to mimick the actual behaviour.
939
        self._lock = lockdir.LockDir(self.transport, self.lock_name)
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
940
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
941
    def _create_from_string(self, unicode_bytes, save):
942
        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.
943
        if save:
5345.1.24 by Vincent Ladeuil
Implement _save for LockableConfig too.
944
            # We need to handle the saving here (as opposed to IniBasedConfig)
945
            # to be able to lock
946
            self.lock_write()
947
            self._write_config_file()
948
            self.unlock()
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
949
950
    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.
951
        """Takes a write lock in the directory containing the config file.
952
953
        If the directory doesn't exist it is created.
954
        """
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
955
        ensure_config_dir_exists(self.dir)
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
956
        return self._lock.lock_write(token)
957
958
    def unlock(self):
959
        self._lock.unlock()
960
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
961
    def break_lock(self):
962
        self._lock.break_lock()
963
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
964
    @needs_write_lock
965
    def remove_user_option(self, option_name, section_name=None):
966
        super(LockableConfig, self).remove_user_option(option_name,
967
                                                       section_name)
968
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
969
    def _write_config_file(self):
970
        if self._lock is None or not self._lock.is_held:
971
            # NB: if the following exception is raised it probably means a
972
            # missing @needs_write_lock decorator on one of the callers.
973
            raise errors.ObjectNotLocked(self)
974
        super(LockableConfig, self)._write_config_file()
975
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
976
977
class GlobalConfig(LockableConfig):
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
978
    """The configuration that should be used for a specific location."""
979
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
980
    def __init__(self):
981
        super(GlobalConfig, self).__init__(file_name=config_filename())
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
982
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
983
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
984
        return 'bazaar'
985
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
986
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
987
    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
988
        """Create a config object from a string.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
989
5345.5.13 by Vincent Ladeuil
Merge simplify-test-config-building into lockable-config-files resolving conflicts
990
        :param str_or_unicode: A string representing the file content. This
991
            will be utf-8 encoded.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
992
993
        :param save: Whether the file should be saved upon creation.
994
        """
995
        conf = cls()
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
996
        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.
997
        return conf
5345.5.12 by Vincent Ladeuil
Fix fallouts from replacing '_content' by 'from_bytes' for config files.
998
5743.13.1 by Vincent Ladeuil
Deprecate _get_editor to identify its usages.
999
    @deprecated_method(deprecated_in((2, 4, 0)))
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
1000
    def get_editor(self):
1474 by Robert Collins
Merge from Aaron Bentley.
1001
        return self._get_user_option('editor')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
1002
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
1003
    @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
1004
    def set_user_option(self, option, value):
1005
        """Save option and its value in the configuration."""
2900.3.2 by Tim Penhey
A working alias command.
1006
        self._set_option(option, value, 'DEFAULT')
1007
1008
    def get_aliases(self):
1009
        """Return the aliases section."""
1010
        if 'ALIASES' in self._get_parser():
1011
            return self._get_parser()['ALIASES']
1012
        else:
1013
            return {}
1014
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
1015
    @needs_write_lock
2900.3.2 by Tim Penhey
A working alias command.
1016
    def set_alias(self, alias_name, alias_command):
1017
        """Save the alias in the configuration."""
1018
        self._set_option(alias_name, alias_command, 'ALIASES')
1019
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
1020
    @needs_write_lock
2900.3.2 by Tim Penhey
A working alias command.
1021
    def unset_alias(self, alias_name):
1022
        """Unset an existing alias."""
5345.5.10 by Vincent Ladeuil
Add a missing config.reload().
1023
        self.reload()
2900.3.2 by Tim Penhey
A working alias command.
1024
        aliases = self._get_parser().get('ALIASES')
2900.3.7 by Tim Penhey
Updates from Aaron's review.
1025
        if not aliases or alias_name not in aliases:
1026
            raise errors.NoSuchAlias(alias_name)
2900.3.2 by Tim Penhey
A working alias command.
1027
        del aliases[alias_name]
2900.3.12 by Tim Penhey
Final review comments.
1028
        self._write_config_file()
2900.3.2 by Tim Penhey
A working alias command.
1029
1030
    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.
1031
        self.reload()
2900.3.7 by Tim Penhey
Updates from Aaron's review.
1032
        self._get_parser().setdefault(section, {})[option] = value
2900.3.12 by Tim Penhey
Final review comments.
1033
        self._write_config_file()
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
1034
        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.
1035
            hook(self, option, value)
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
1036
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.
1037
    def _get_sections(self, name=None):
1038
        """See IniBasedConfig._get_sections()."""
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1039
        parser = self._get_parser()
1040
        # We don't give access to options defined outside of any section, we
1041
        # used the DEFAULT section by... default.
1042
        if name in (None, 'DEFAULT'):
1043
            # This could happen for an empty file where the DEFAULT section
1044
            # doesn't exist yet. So we force DEFAULT when yielding
1045
            name = 'DEFAULT'
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1046
            if 'DEFAULT' not in parser:
1047
               parser['DEFAULT']= {}
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1048
        yield (name, parser[name], self.config_id())
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1049
1050
    @needs_write_lock
1051
    def remove_user_option(self, option_name, section_name=None):
1052
        if section_name is None:
1053
            # We need to force the default section.
1054
            section_name = 'DEFAULT'
1055
        # We need to avoid the LockableConfig implementation or we'll lock
1056
        # twice
1057
        super(LockableConfig, self).remove_user_option(option_name,
1058
                                                       section_name)
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1059
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
1060
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.
1061
    """Keep only the sessions matching the specified location.
1062
1063
    :param sections: An iterable of section names.
1064
1065
    :param location: An url or a local path to match against.
1066
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
1067
    :returns: An iterator of (section, extra_path, nb_parts) where nb is the
1068
        number of path components in the section name, section is the section
1069
        name and extra_path is the difference between location and the section
1070
        name.
5743.6.19 by Vincent Ladeuil
Clarify comments about section names for Location-related objects (also fix LocationMatcher and add tests).
1071
1072
    ``location`` will always be a local path and never a 'file://' url but the
1073
    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.
1074
    """
5764.1.2 by Vincent Ladeuil
This put a common processing into the loop to avoid bad inputs. The
1075
    location_parts = location.rstrip('/').split('/')
1076
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.
1077
    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).
1078
        # location is a local path if possible, so we need to convert 'file://'
1079
        # 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.
1080
1081
        # This also avoids having file:///path be a more exact
1082
        # match than '/path'.
1083
5743.6.19 by Vincent Ladeuil
Clarify comments about section names for Location-related objects (also fix LocationMatcher and add tests).
1084
        # FIXME: This still raises an issue if a user defines both file:///path
1085
        # *and* /path. Should we raise an error in this case -- vila 20110505
1086
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.
1087
        if section.startswith('file://'):
1088
            section_path = urlutils.local_path_from_url(section)
1089
        else:
1090
            section_path = section
1091
        section_parts = section_path.rstrip('/').split('/')
1092
1093
        matched = True
1094
        if len(section_parts) > len(location_parts):
1095
            # More path components in the section, they can't match
1096
            matched = False
1097
        else:
1098
            # Rely on zip truncating in length to the length of the shortest
1099
            # argument sequence.
1100
            names = zip(location_parts, section_parts)
1101
            for name in names:
1102
                if not fnmatch.fnmatch(name[0], name[1]):
1103
                    matched = False
1104
                    break
1105
        if not matched:
1106
            continue
5764.1.1 by Vincent Ladeuil
Extract _match_section_by_parts from LocationConfig._get_matching_sections and more comments to explain the behavior.
1107
        # 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.
1108
        extra_path = '/'.join(location_parts[len(section_parts):])
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
1109
        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.
1110
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1111
5345.5.7 by Vincent Ladeuil
Make LocationConfig use a lock too.
1112
class LocationConfig(LockableConfig):
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1113
    """A configuration object that gives the policy for a location."""
1114
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1115
    def __init__(self, location):
5345.1.2 by Vincent Ladeuil
Get rid of 'branches.conf' references.
1116
        super(LocationConfig, self).__init__(
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1117
            file_name=locations_config_filename())
1878.1.1 by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653)
1118
        # local file locations are looked up by local path, rather than
1119
        # by file url. This is because the config file is a user
1120
        # file, and we would rather not expose the user to file urls.
1121
        if location.startswith('file://'):
1122
            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
1123
        self.location = location
1124
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1125
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1126
        return 'locations'
1127
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1128
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
1129
    def from_string(cls, str_or_unicode, location, save=False):
1130
        """Create a config object from a string.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1131
5345.2.9 by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string.
1132
        :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.
1133
            be utf-8 encoded.
1134
1135
        :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.
1136
1137
        :param save: Whether the file should be saved upon creation.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1138
        """
1139
        conf = cls(location)
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
1140
        conf._create_from_string(str_or_unicode, save)
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1141
        return conf
1142
1993.3.1 by James Henstridge
first go at making location config lookup recursive
1143
    def _get_matching_sections(self):
1144
        """Return an ordered list of section names matching this location."""
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
1145
        matches = list(_iter_for_location_by_parts(self._get_parser(),
1146
                                                   self.location))
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1147
        # put the longest (aka more specific) locations first
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
1148
        matches.sort(
1149
            key=lambda (section, extra_path, length): (length, section),
1150
            reverse=True)
1151
        for (section, extra_path, length) in matches:
1152
            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
1153
            # should we stop looking for parent configs here?
1993.3.1 by James Henstridge
first go at making location config lookup recursive
1154
            try:
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
1155
                if self._get_parser()[section].as_bool('ignore_parents'):
1156
                    break
1993.3.1 by James Henstridge
first go at making location config lookup recursive
1157
            except KeyError:
1158
                pass
1442.1.9 by Robert Collins
exact section test passes
1159
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.
1160
    def _get_sections(self, name=None):
1161
        """See IniBasedConfig._get_sections()."""
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1162
        # We ignore the name here as the only sections handled are named with
1163
        # the location path and we don't expose embedded sections either.
1164
        parser = self._get_parser()
1165
        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.
1166
            yield (name, parser[name], self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1167
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
1168
    def _get_option_policy(self, section, option_name):
1169
        """Return the policy for the given (section, option_name) pair."""
1170
        # check for the old 'recurse=False' flag
1171
        try:
1172
            recurse = self._get_parser()[section].as_bool('recurse')
1173
        except KeyError:
1174
            recurse = True
1175
        if not recurse:
1176
            return POLICY_NORECURSE
1177
2120.6.10 by James Henstridge
Catch another deprecation warning, and more cleanup
1178
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
1179
        try:
1180
            policy_name = self._get_parser()[section][policy_key]
1181
        except KeyError:
1182
            policy_name = None
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
1183
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
1184
        return _policy_value[policy_name]
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
1185
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1186
    def _set_option_policy(self, section, option_name, option_policy):
1187
        """Set the policy for the given option name in the given section."""
1188
        # The old recurse=False option affects all options in the
1189
        # section.  To handle multiple policies in the section, we
1190
        # need to convert it to a policy_norecurse key.
1191
        try:
1192
            recurse = self._get_parser()[section].as_bool('recurse')
1193
        except KeyError:
1194
            pass
1195
        else:
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1196
            symbol_versioning.warn(
2120.6.11 by James Henstridge
s/0.13/0.14/ in deprecation warning
1197
                'The recurse option is deprecated as of 0.14.  '
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1198
                'The section "%s" has been converted to use policies.'
1199
                % section,
1200
                DeprecationWarning)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1201
            del self._get_parser()[section]['recurse']
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1202
            if not recurse:
1203
                for key in self._get_parser()[section].keys():
1204
                    if not key.endswith(':policy'):
1205
                        self._get_parser()[section][key +
1206
                                                    ':policy'] = 'norecurse'
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1207
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1208
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
1209
        policy_name = _policy_name[option_policy]
1210
        if policy_name is not None:
1211
            self._get_parser()[section][policy_key] = policy_name
1212
        else:
1213
            if policy_key in self._get_parser()[section]:
1214
                del self._get_parser()[section][policy_key]
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1215
5345.5.7 by Vincent Ladeuil
Make LocationConfig use a lock too.
1216
    @needs_write_lock
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1217
    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.
1218
        """Save option and its value in the configuration."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1219
        if store not in [STORE_LOCATION,
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1220
                         STORE_LOCATION_NORECURSE,
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1221
                         STORE_LOCATION_APPENDPATH]:
1222
            raise ValueError('bad storage policy %r for %r' %
1223
                (store, option))
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
1224
        self.reload()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1225
        location = self.location
1226
        if location.endswith('/'):
1227
            location = location[:-1]
5345.1.24 by Vincent Ladeuil
Implement _save for LockableConfig too.
1228
        parser = self._get_parser()
5345.1.21 by Vincent Ladeuil
Slight rewrite to make the method more readable.
1229
        if not location in parser and not location + '/' in parser:
1230
            parser[location] = {}
1231
        elif location + '/' in parser:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1232
            location = location + '/'
5345.1.21 by Vincent Ladeuil
Slight rewrite to make the method more readable.
1233
        parser[location][option]=value
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1234
        # the allowed values of store match the config policies
1235
        self._set_option_policy(location, option, store)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
1236
        self._write_config_file()
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
1237
        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.
1238
            hook(self, option, value)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1239
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1240
1241
class BranchConfig(Config):
1242
    """A configuration object giving the policy for a branch."""
1243
5345.1.3 by Vincent Ladeuil
Make __init__ the first method in the BranchConfig class.
1244
    def __init__(self, branch):
1245
        super(BranchConfig, self).__init__()
1246
        self._location_config = None
1247
        self._branch_data_config = None
1248
        self._global_config = None
1249
        self.branch = branch
1250
        self.option_sources = (self._get_location_config,
1251
                               self._get_branch_data_config,
1252
                               self._get_global_config)
1253
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1254
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1255
        return 'branch'
1256
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1257
    def _get_branch_data_config(self):
1258
        if self._branch_data_config is None:
1259
            self._branch_data_config = TreeConfig(self.branch)
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1260
            self._branch_data_config.config_id = self.config_id
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1261
        return self._branch_data_config
1262
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1263
    def _get_location_config(self):
1264
        if self._location_config is None:
1265
            self._location_config = LocationConfig(self.branch.base)
1266
        return self._location_config
1267
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1268
    def _get_global_config(self):
1269
        if self._global_config is None:
1270
            self._global_config = GlobalConfig()
1271
        return self._global_config
1272
1273
    def _get_best_value(self, option_name):
1274
        """This returns a user option from local, tree or global config.
1275
1276
        They are tried in that order.  Use get_safe_value if trusted values
1277
        are necessary.
1278
        """
1279
        for source in self.option_sources:
1280
            value = getattr(source(), option_name)()
1281
            if value is not None:
1282
                return value
1283
        return None
1284
1285
    def _get_safe_value(self, option_name):
1286
        """This variant of get_best_value never returns untrusted values.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1287
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1288
        It does not return values from the branch data, because the branch may
1289
        not be controlled by the user.
1290
1291
        We may wish to allow locations.conf to control whether branches are
1292
        trusted in the future.
1293
        """
1294
        for source in (self._get_location_config, self._get_global_config):
1295
            value = getattr(source(), option_name)()
1296
            if value is not None:
1297
                return value
1298
        return None
1299
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1300
    def _get_user_id(self):
1301
        """Return the full user id for the branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1302
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
1303
        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
1304
        This is looked up in the email controlfile for the branch.
1305
        """
1306
        try:
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1307
            return (self.branch._transport.get_bytes("email")
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
1308
                    .decode(osutils.get_user_encoding())
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1309
                    .rstrip("\r\n"))
1310
        except errors.NoSuchFile, e:
1311
            pass
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1312
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1313
        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
1314
4603.1.10 by Aaron Bentley
Provide change editor via config.
1315
    def _get_change_editor(self):
1316
        return self._get_best_value('_get_change_editor')
1317
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
1318
    def _get_signature_checking(self):
1319
        """See Config._get_signature_checking."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1320
        return self._get_best_value('_get_signature_checking')
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
1321
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
1322
    def _get_signing_policy(self):
1323
        """See Config._get_signing_policy."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1324
        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
1325
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
1326
    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.
1327
        """See Config._get_user_option."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1328
        for source in self.option_sources:
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
1329
            value = source()._get_user_option(option_name)
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1330
            if value is not None:
1331
                return value
1332
        return None
1333
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.
1334
    def _get_sections(self, name=None):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1335
        """See IniBasedConfig.get_sections()."""
1336
        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.
1337
            for section in source()._get_sections(name):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1338
                yield section
1339
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.
1340
    def _get_options(self, sections=None):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1341
        opts = []
1342
        # 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.
1343
        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.
1344
            yield option
1345
        # Then the branch options
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1346
        branch_config = self._get_branch_data_config()
1347
        if sections is None:
1348
            sections = [('DEFAULT', branch_config._get_parser())]
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1349
        # FIXME: We shouldn't have to duplicate the code in IniBasedConfig but
1350
        # 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.
1351
        config_id = self.config_id()
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1352
        for (section_name, section) in sections:
1353
            for (name, value) in section.iteritems():
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
1354
                yield (name, value, section_name,
1355
                       config_id, branch_config._get_parser())
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1356
        # 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.
1357
        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.
1358
            yield option
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1359
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1360
    def set_user_option(self, name, value, store=STORE_BRANCH,
1361
        warn_masked=False):
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1362
        if store == STORE_BRANCH:
1770.2.6 by Aaron Bentley
Ensure branch.conf works properly
1363
            self._get_branch_data_config().set_option(value, name)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1364
        elif store == STORE_GLOBAL:
2120.6.7 by James Henstridge
Fix GlobalConfig.set_user_option() call
1365
            self._get_global_config().set_user_option(name, value)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1366
        else:
1367
            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)
1368
        if not warn_masked:
1369
            return
1370
        if store in (STORE_GLOBAL, STORE_BRANCH):
1371
            mask_value = self._get_location_config().get_user_option(name)
1372
            if mask_value is not None:
1373
                trace.warning('Value "%s" is masked by "%s" from'
1374
                              ' locations.conf', value, mask_value)
1375
            else:
1376
                if store == STORE_GLOBAL:
1377
                    branch_config = self._get_branch_data_config()
1378
                    mask_value = branch_config.get_user_option(name)
1379
                    if mask_value is not None:
1380
                        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
1381
                                      ' branch.conf', value, mask_value)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1382
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1383
    def remove_user_option(self, option_name, section_name=None):
1384
        self._get_branch_data_config().remove_option(option_name, section_name)
1385
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
1386
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
1387
        """See Config.gpg_signing_command."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1388
        return self._get_safe_value('_gpg_signing_command')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1389
1472 by Robert Collins
post commit hook, first pass implementation
1390
    def _post_commit(self):
1391
        """See Config.post_commit."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1392
        return self._get_safe_value('_post_commit')
1472 by Robert Collins
post commit hook, first pass implementation
1393
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1394
    def _get_nickname(self):
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
1395
        value = self._get_explicit_nickname()
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1396
        if value is not None:
1397
            return value
2120.5.2 by Alexander Belchenko
(jam) Fix for bug #66857
1398
        return urlutils.unescape(self.branch.base.split('/')[-2])
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1399
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
1400
    def has_explicit_nickname(self):
1401
        """Return true if a nickname has been explicitly assigned."""
1402
        return self._get_explicit_nickname() is not None
1403
1404
    def _get_explicit_nickname(self):
1405
        return self._get_best_value('_get_nickname')
1406
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
1407
    def _log_format(self):
1408
        """See Config.log_format."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1409
        return self._get_best_value('_log_format')
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1410
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
1411
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1412
def ensure_config_dir_exists(path=None):
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1413
    """Make sure a configuration directory exists.
1414
    This makes sure that the directory exists.
1415
    On windows, since configuration directories are 2 levels deep,
1416
    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
1417
    """
1418
    if path is None:
1419
        path = config_dir()
1420
    if not os.path.isdir(path):
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1421
        if sys.platform == 'win32':
1422
            parent_dir = os.path.dirname(path)
1423
            if not os.path.isdir(parent_dir):
1424
                trace.mutter('creating config parent directory: %r', parent_dir)
1425
                os.mkdir(parent_dir)
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1426
        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
1427
        os.mkdir(path)
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
1428
        osutils.copy_ownership_from_path(path)
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1429
1532 by Robert Collins
Merge in John Meinels integration branch.
1430
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1431
def config_dir():
1432
    """Return per-user configuration directory.
1433
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1434
    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
1435
    and Linux.  On Linux, if there is a $XDG_CONFIG_HOME/bazaar directory,
1436
    that will be used instead.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1437
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1438
    TODO: Global option --config-dir to override this.
1439
    """
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1440
    base = os.environ.get('BZR_HOME', None)
1441
    if sys.platform == 'win32':
5598.2.2 by John Arbash Meinel
Change the comment slightly
1442
        # environ variables on Windows are in user encoding/mbcs. So decode
1443
        # 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.
1444
        if base is not None:
1445
            base = base.decode('mbcs')
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1446
        if base is None:
2245.4.3 by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
1447
            base = win32utils.get_appdata_location_unicode()
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1448
        if base is None:
1449
            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.
1450
            if base is not None:
1451
                base = base.decode('mbcs')
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1452
        if base is None:
2991.2.2 by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0.
1453
            raise errors.BzrError('You must have one of BZR_HOME, APPDATA,'
1454
                                  ' or HOME set')
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1455
        return osutils.pathjoin(base, 'bazaar', '2.0')
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1456
    elif sys.platform == 'darwin':
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1457
        if base is None:
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1458
            # this takes into account $HOME
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1459
            base = os.path.expanduser("~")
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1460
        return osutils.pathjoin(base, '.bazaar')
1461
    else:
1462
        if base is None:
5519.4.3 by Neil Martinsen-Burrell
be permissive about using $XDG_CONFIG_HOME/bazaar, but dont complain
1463
1464
            xdg_dir = os.environ.get('XDG_CONFIG_HOME', None)
1465
            if xdg_dir is None:
1466
                xdg_dir = osutils.pathjoin(os.path.expanduser("~"), ".config")
1467
            xdg_dir = osutils.pathjoin(xdg_dir, 'bazaar')
1468
            if osutils.isdir(xdg_dir):
1469
                trace.mutter(
1470
                    "Using configuration in XDG directory %s." % xdg_dir)
1471
                return xdg_dir
1472
1473
            base = os.path.expanduser("~")
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1474
        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 \
1475
1476
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1477
def config_filename():
1478
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1479
    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.
1480
1481
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
1482
def locations_config_filename():
1483
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1484
    return osutils.pathjoin(config_dir(), 'locations.conf')
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
1485
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1486
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1487
def authentication_config_filename():
1488
    """Return per-user authentication ini file filename."""
1489
    return osutils.pathjoin(config_dir(), 'authentication.conf')
1490
1491
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
1492
def user_ignore_config_filename():
1493
    """Return the user default ignore filename"""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1494
    return osutils.pathjoin(config_dir(), 'ignore')
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
1495
1496
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1497
def crash_dir():
1498
    """Return the directory name to store crash files.
1499
1500
    This doesn't implicitly create it.
1501
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
1502
    On Windows it's in the config directory; elsewhere it's /var/crash
4634.128.18 by Martin Pool
Update apport crash tests
1503
    which may be monitored by apport.  It can be overridden by
1504
    $APPORT_CRASH_DIR.
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1505
    """
1506
    if sys.platform == 'win32':
1507
        return osutils.pathjoin(config_dir(), 'Crash')
1508
    else:
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
1509
        # XXX: hardcoded in apport_python_hook.py; therefore here too -- mbp
1510
        # 2010-01-31
4634.128.18 by Martin Pool
Update apport crash tests
1511
        return os.environ.get('APPORT_CRASH_DIR', '/var/crash')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1512
1513
1514
def xdg_cache_dir():
4584.3.23 by Martin Pool
Correction to xdg_cache_dir and add a simple test
1515
    # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html
1516
    # Possibly this should be different on Windows?
1517
    e = os.environ.get('XDG_CACHE_DIR', None)
1518
    if e:
1519
        return e
1520
    else:
1521
        return os.path.expanduser('~/.cache')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1522
1523
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1524
def _get_default_mail_domain():
1525
    """If possible, return the assumed default email domain.
1526
1527
    :returns: string mail domain, or None.
1528
    """
1529
    if sys.platform == 'win32':
1530
        # No implementation yet; patches welcome
1531
        return None
1532
    try:
1533
        f = open('/etc/mailname')
1534
    except (IOError, OSError), e:
1535
        return None
1536
    try:
1537
        domain = f.read().strip()
1538
        return domain
1539
    finally:
1540
        f.close()
1541
1542
1543
def _auto_user_id():
1544
    """Calculate automatic user identification.
1545
1546
    :returns: (realname, email), either of which may be None if they can't be
1547
    determined.
1548
1549
    Only used when none is set in the environment or the id file.
1550
1551
    This only returns an email address if we can be fairly sure the 
1552
    address is reasonable, ie if /etc/mailname is set on unix.
1553
1554
    This doesn't use the FQDN as the default domain because that may be 
1555
    slow, and it doesn't use the hostname alone because that's not normally 
1556
    a reasonable address.
1557
    """
1558
    if sys.platform == 'win32':
1559
        # No implementation to reliably determine Windows default mail
1560
        # address; please add one.
1561
        return None, None
1562
1563
    default_mail_domain = _get_default_mail_domain()
1564
    if not default_mail_domain:
1565
        return None, None
1566
1567
    import pwd
1568
    uid = os.getuid()
1569
    try:
1570
        w = pwd.getpwuid(uid)
1571
    except KeyError:
5904.1.2 by Martin Pool
Various pyflakes import fixes.
1572
        trace.mutter('no passwd entry for uid %d?' % uid)
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1573
        return None, None
1574
1575
    # we try utf-8 first, because on many variants (like Linux),
1576
    # /etc/passwd "should" be in utf-8, and because it's unlikely to give
1577
    # false positives.  (many users will have their user encoding set to
1578
    # latin-1, which cannot raise UnicodeError.)
1579
    try:
1580
        gecos = w.pw_gecos.decode('utf-8')
1581
        encoding = 'utf-8'
1582
    except UnicodeError:
1583
        try:
1584
            encoding = osutils.get_user_encoding()
1585
            gecos = w.pw_gecos.decode(encoding)
1586
        except UnicodeError, e:
5904.1.2 by Martin Pool
Various pyflakes import fixes.
1587
            trace.mutter("cannot decode passwd entry %s" % w)
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1588
            return None, None
1589
    try:
1590
        username = w.pw_name.decode(encoding)
1591
    except UnicodeError, e:
5904.1.2 by Martin Pool
Various pyflakes import fixes.
1592
        trace.mutter("cannot decode passwd entry %s" % w)
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1593
        return None, None
1594
1595
    comma = gecos.find(',')
1596
    if comma == -1:
1597
        realname = gecos
1598
    else:
1599
        realname = gecos[:comma]
1600
1601
    return realname, (username + '@' + default_mail_domain)
1602
1603
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1604
def parse_username(username):
1605
    """Parse e-mail username and return a (name, address) tuple."""
1606
    match = re.match(r'(.*?)\s*<?([\w+.-]+@[\w+.-]+)>?', username)
1607
    if match is None:
1608
        return (username, '')
1609
    else:
1610
        return (match.group(1), match.group(2))
1611
1612
1185.16.52 by Martin Pool
- add extract_email_address
1613
def extract_email_address(e):
1614
    """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.
1615
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1616
    That is just the user@domain part, nothing else.
1185.16.52 by Martin Pool
- add extract_email_address
1617
    This part is required to contain only ascii characters.
1618
    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.
1619
1185.16.52 by Martin Pool
- add extract_email_address
1620
    >>> extract_email_address('Jane Tester <jane@test.com>')
1621
    "jane@test.com"
1622
    """
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1623
    name, email = parse_username(e)
1624
    if not email:
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
1625
        raise errors.NoEmailInUsername(e)
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1626
    return email
1185.35.11 by Aaron Bentley
Added support for branch nicks
1627
1185.85.30 by John Arbash Meinel
Fixing 'bzr push' exposed that IniBasedConfig didn't handle unicode.
1628
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1629
class TreeConfig(IniBasedConfig):
1185.35.11 by Aaron Bentley
Added support for branch nicks
1630
    """Branch configuration data associated with its contents, not location"""
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1631
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
1632
    # XXX: Really needs a better name, as this is not part of the tree! -- mbp 20080507
1633
1185.35.11 by Aaron Bentley
Added support for branch nicks
1634
    def __init__(self, branch):
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
1635
        self._config = branch._get_config()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1636
        self.branch = branch
1637
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1638
    def _get_parser(self, file=None):
1639
        if file is not None:
1640
            return IniBasedConfig._get_parser(file)
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1641
        return self._config._get_configobj()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1642
1643
    def get_option(self, name, section=None, default=None):
1644
        self.branch.lock_read()
1645
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1646
            return self._config.get_option(name, section, default)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1647
        finally:
1648
            self.branch.unlock()
1649
1650
    def set_option(self, value, name, section=None):
1651
        """Set a per-branch configuration option"""
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1652
        # FIXME: We shouldn't need to lock explicitly here but rather rely on
1653
        # higher levels providing the right lock -- vila 20101004
1185.35.11 by Aaron Bentley
Added support for branch nicks
1654
        self.branch.lock_write()
1655
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1656
            self._config.set_option(value, name, section)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1657
        finally:
1658
            self.branch.unlock()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1659
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1660
    def remove_option(self, option_name, section_name=None):
1661
        # FIXME: We shouldn't need to lock explicitly here but rather rely on
1662
        # higher levels providing the right lock -- vila 20101004
1663
        self.branch.lock_write()
1664
        try:
1665
            self._config.remove_option(option_name, section_name)
1666
        finally:
1667
            self.branch.unlock()
1668
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1669
1670
class AuthenticationConfig(object):
1671
    """The authentication configuration file based on a ini file.
1672
1673
    Implements the authentication.conf file described in
1674
    doc/developers/authentication-ring.txt.
1675
    """
1676
1677
    def __init__(self, _file=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1678
        self._config = None # The ConfigObj
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1679
        if _file is None:
2900.2.24 by Vincent Ladeuil
Review feedback.
1680
            self._filename = authentication_config_filename()
1681
            self._input = self._filename = authentication_config_filename()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1682
        else:
2900.2.24 by Vincent Ladeuil
Review feedback.
1683
            # Tests can provide a string as _file
1684
            self._filename = None
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1685
            self._input = _file
1686
1687
    def _get_config(self):
1688
        if self._config is not None:
1689
            return self._config
1690
        try:
2900.2.22 by Vincent Ladeuil
Polishing.
1691
            # FIXME: Should we validate something here ? Includes: empty
1692
            # sections are useless, at least one of
1693
            # user/password/password_encoding should be defined, etc.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1694
1695
            # Note: the encoding below declares that the file itself is utf-8
1696
            # encoded, but the values in the ConfigObj are always Unicode.
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1697
            self._config = ConfigObj(self._input, encoding='utf-8')
1698
        except configobj.ConfigObjError, e:
1699
            raise errors.ParseConfigError(e.errors, e.config.filename)
1700
        return self._config
1701
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1702
    def _save(self):
1703
        """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.
1704
        conf_dir = os.path.dirname(self._filename)
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1705
        ensure_config_dir_exists(conf_dir)
4708.2.2 by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib
1706
        f = file(self._filename, 'wb')
1707
        try:
1708
            self._get_config().write(f)
1709
        finally:
1710
            f.close()
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1711
1712
    def _set_option(self, section_name, option_name, value):
1713
        """Set an authentication configuration option"""
1714
        conf = self._get_config()
1715
        section = conf.get(section_name)
1716
        if section is None:
1717
            conf[section] = {}
1718
            section = conf[section]
1719
        section[option_name] = value
1720
        self._save()
1721
5743.8.25 by Vincent Ladeuil
Fix spurious spaces.
1722
    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
1723
                        realm=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1724
        """Returns the matching credentials from authentication.conf file.
1725
1726
        :param scheme: protocol
1727
1728
        :param host: the server address
1729
1730
        :param port: the associated port (optional)
1731
1732
        :param user: login (optional)
1733
1734
        :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
1735
        
1736
        :param realm: the http authentication realm (optional)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1737
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1738
        :return: A dict containing the matching credentials or None.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1739
           This includes:
1740
           - name: the section name of the credentials in the
1741
             authentication.conf file,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1742
           - 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.
1743
           - scheme: the server protocol,
1744
           - host: the server address,
1745
           - port: the server port (can be None),
1746
           - path: the absolute server path (can be None),
1747
           - realm: the http specific authentication realm (can be None),
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1748
           - password: the decoded password, could be None if the credential
1749
             defines only the user
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1750
           - verify_certificates: https specific, True if the server
1751
             certificate should be verified, False otherwise.
1752
        """
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1753
        credentials = None
1754
        for auth_def_name, auth_def in self._get_config().items():
3418.2.1 by Vincent Ladeuil
Fix #217650 by catching declarations outside sections.
1755
            if type(auth_def) is not configobj.Section:
1756
                raise ValueError("%s defined outside a section" % auth_def_name)
1757
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1758
            a_scheme, a_host, a_user, a_path = map(
1759
                auth_def.get, ['scheme', 'host', 'user', 'path'])
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1760
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1761
            try:
1762
                a_port = auth_def.as_int('port')
1763
            except KeyError:
1764
                a_port = None
2900.2.22 by Vincent Ladeuil
Polishing.
1765
            except ValueError:
1766
                raise ValueError("'port' not numeric in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1767
            try:
1768
                a_verify_certificates = auth_def.as_bool('verify_certificates')
1769
            except KeyError:
1770
                a_verify_certificates = True
2900.2.22 by Vincent Ladeuil
Polishing.
1771
            except ValueError:
1772
                raise ValueError(
1773
                    "'verify_certificates' not boolean in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1774
1775
            # Attempt matching
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1776
            if a_scheme is not None and scheme != a_scheme:
1777
                continue
1778
            if a_host is not None:
1779
                if not (host == a_host
1780
                        or (a_host.startswith('.') and host.endswith(a_host))):
1781
                    continue
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1782
            if a_port is not None and port != a_port:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1783
                continue
1784
            if (a_path is not None and path is not None
1785
                and not path.startswith(a_path)):
1786
                continue
1787
            if (a_user is not None and user is not None
1788
                and a_user != user):
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1789
                # Never contradict the caller about the user to be used
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1790
                continue
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1791
            if a_user is None:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1792
                # Can't find a user
1793
                continue
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1794
            # Prepare a credentials dictionary with additional keys
1795
            # for the credential providers
2900.2.24 by Vincent Ladeuil
Review feedback.
1796
            credentials = dict(name=auth_def_name,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1797
                               user=a_user,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1798
                               scheme=a_scheme,
1799
                               host=host,
1800
                               port=port,
1801
                               path=path,
1802
                               realm=realm,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1803
                               password=auth_def.get('password', None),
2900.2.24 by Vincent Ladeuil
Review feedback.
1804
                               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
1805
            # Decode the password in the credentials (or get one)
2900.2.22 by Vincent Ladeuil
Polishing.
1806
            self.decode_password(credentials,
1807
                                 auth_def.get('password_encoding', None))
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1808
            if 'auth' in debug.debug_flags:
1809
                trace.mutter("Using authentication section: %r", auth_def_name)
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1810
            break
1811
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1812
        if credentials is None:
1813
            # No credentials were found in authentication.conf, try the fallback
1814
            # credentials stores.
1815
            credentials = credential_store_registry.get_fallback_credentials(
1816
                scheme, host, port, user, path, realm)
1817
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1818
        return credentials
1819
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1820
    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
1821
                        port=None, path=None, verify_certificates=None,
1822
                        realm=None):
3777.3.1 by Aaron Bentley
Update docs
1823
        """Set authentication credentials for a host.
1824
1825
        Any existing credentials with matching scheme, host, port and path
1826
        will be deleted, regardless of name.
1827
1828
        :param name: An arbitrary name to describe this set of credentials.
1829
        :param host: Name of the host that accepts these credentials.
1830
        :param user: The username portion of these credentials.
1831
        :param scheme: The URL scheme (e.g. ssh, http) the credentials apply
1832
            to.
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1833
        :param password: Password portion of these credentials.
3777.3.1 by Aaron Bentley
Update docs
1834
        :param port: The IP port on the host that these credentials apply to.
1835
        :param path: A filesystem path on the host that these credentials
1836
            apply to.
1837
        :param verify_certificates: On https, verify server certificates if
1838
            True.
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1839
        :param realm: The http authentication realm (optional).
3777.3.1 by Aaron Bentley
Update docs
1840
        """
3777.1.8 by Aaron Bentley
Commit work-in-progress
1841
        values = {'host': host, 'user': user}
1842
        if password is not None:
1843
            values['password'] = password
1844
        if scheme is not None:
1845
            values['scheme'] = scheme
1846
        if port is not None:
1847
            values['port'] = '%d' % port
1848
        if path is not None:
1849
            values['path'] = path
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1850
        if verify_certificates is not None:
1851
            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
1852
        if realm is not None:
1853
            values['realm'] = realm
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1854
        config = self._get_config()
1855
        for_deletion = []
1856
        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
1857
            for key in ('scheme', 'host', 'port', 'path', 'realm'):
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1858
                if existing_values.get(key) != values.get(key):
1859
                    break
1860
            else:
1861
                del config[section]
1862
        config.update({name: values})
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1863
        self._save()
3777.1.8 by Aaron Bentley
Commit work-in-progress
1864
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1865
    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.
1866
                 prompt=None, ask=False, default=None):
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1867
        """Get a user from authentication file.
1868
1869
        :param scheme: protocol
1870
1871
        :param host: the server address
1872
1873
        :param port: the associated port (optional)
1874
1875
        :param realm: the realm sent by the server (optional)
1876
1877
        :param path: the absolute path on the server (optional)
1878
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1879
        :param ask: Ask the user if there is no explicitly configured username 
1880
                    (optional)
1881
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1882
        :param default: The username returned if none is defined (optional).
1883
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1884
        :return: The found user.
1885
        """
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1886
        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
1887
                                           path=path, realm=realm)
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1888
        if credentials is not None:
1889
            user = credentials['user']
1890
        else:
1891
            user = None
4222.3.2 by Jelmer Vernooij
Prompt for user names if they are not in the configuration.
1892
        if user is None:
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1893
            if ask:
1894
                if prompt is None:
1895
                    # Create a default prompt suitable for most cases
5923.1.3 by Vincent Ladeuil
Even more unicode prompts fixes revealed by pqm.
1896
                    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
1897
                # Special handling for optional fields in the prompt
1898
                if port is not None:
1899
                    prompt_host = '%s:%d' % (host, port)
1900
                else:
1901
                    prompt_host = host
1902
                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.
1903
            else:
4222.3.10 by Jelmer Vernooij
Avoid using the default username in the case of SMTP.
1904
                user = default
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1905
        return user
1906
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1907
    def get_password(self, scheme, host, user, port=None,
1908
                     realm=None, path=None, prompt=None):
1909
        """Get a password from authentication file or prompt the user for one.
1910
1911
        :param scheme: protocol
1912
1913
        :param host: the server address
1914
1915
        :param port: the associated port (optional)
1916
1917
        :param user: login
1918
1919
        :param realm: the realm sent by the server (optional)
1920
1921
        :param path: the absolute path on the server (optional)
1922
1923
        :return: The found password or the one entered by the user.
1924
        """
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1925
        credentials = self.get_credentials(scheme, host, port, user, path,
1926
                                           realm)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1927
        if credentials is not None:
1928
            password = credentials['password']
3420.1.3 by Vincent Ladeuil
John's review feedback.
1929
            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.
1930
                trace.warning('password ignored in section [%s],'
1931
                              ' use an ssh agent instead'
1932
                              % credentials['name'])
1933
                password = None
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1934
        else:
1935
            password = None
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1936
        # 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).
1937
        if password is None:
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1938
            if prompt is None:
3420.1.2 by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user.
1939
                # Create a default prompt suitable for most cases
5923.1.3 by Vincent Ladeuil
Even more unicode prompts fixes revealed by pqm.
1940
                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
1941
            # Special handling for optional fields in the prompt
1942
            if port is not None:
1943
                prompt_host = '%s:%d' % (host, port)
1944
            else:
1945
                prompt_host = host
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1946
            password = ui.ui_factory.get_password(prompt,
1947
                                                  host=prompt_host, user=user)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1948
        return password
1949
2900.2.22 by Vincent Ladeuil
Polishing.
1950
    def decode_password(self, credentials, encoding):
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1951
        try:
1952
            cs = credential_store_registry.get_credential_store(encoding)
1953
        except KeyError:
1954
            raise ValueError('%r is not a known password_encoding' % encoding)
1955
        credentials['password'] = cs.decode_password(credentials)
2900.2.22 by Vincent Ladeuil
Polishing.
1956
        return credentials
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1957
3242.3.17 by Aaron Bentley
Whitespace cleanup
1958
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1959
class CredentialStoreRegistry(registry.Registry):
1960
    """A class that registers credential stores.
1961
1962
    A credential store provides access to credentials via the password_encoding
1963
    field in authentication.conf sections.
1964
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1965
    Except for stores provided by bzr itself, most stores are expected to be
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1966
    provided by plugins that will therefore use
1967
    register_lazy(password_encoding, module_name, member_name, help=help,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1968
    fallback=fallback) to install themselves.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1969
1970
    A fallback credential store is one that is queried if no credentials can be
1971
    found via authentication.conf.
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1972
    """
1973
1974
    def get_credential_store(self, encoding=None):
1975
        cs = self.get(encoding)
1976
        if callable(cs):
1977
            cs = cs()
1978
        return cs
1979
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1980
    def is_fallback(self, name):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1981
        """Check if the named credentials store should be used as fallback."""
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1982
        return self.get_info(name)
1983
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1984
    def get_fallback_credentials(self, scheme, host, port=None, user=None,
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1985
                                 path=None, realm=None):
1986
        """Request credentials from all fallback credentials stores.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1987
1988
        The first credentials store that can provide credentials wins.
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1989
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1990
        credentials = None
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1991
        for name in self.keys():
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1992
            if not self.is_fallback(name):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1993
                continue
1994
            cs = self.get_credential_store(name)
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1995
            credentials = cs.get_credentials(scheme, host, port, user,
1996
                                             path, realm)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1997
            if credentials is not None:
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1998
                # We found some credentials
1999
                break
2000
        return credentials
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2001
2002
    def register(self, key, obj, help=None, override_existing=False,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2003
                 fallback=False):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2004
        """Register a new object to a name.
2005
2006
        :param key: This is the key to use to request the object later.
2007
        :param obj: The object to register.
2008
        :param help: Help text for this entry. This may be a string or
2009
                a callable. If it is a callable, it should take two
2010
                parameters (registry, key): this registry and the key that
2011
                the help was registered under.
2012
        :param override_existing: Raise KeyErorr if False and something has
2013
                already been registered for that key. If True, ignore if there
2014
                is an existing key (always register the new value).
2015
        :param fallback: Whether this credential store should be 
2016
                used as fallback.
2017
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2018
        return super(CredentialStoreRegistry,
2019
                     self).register(key, obj, help, info=fallback,
2020
                                    override_existing=override_existing)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2021
2022
    def register_lazy(self, key, module_name, member_name,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2023
                      help=None, override_existing=False,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2024
                      fallback=False):
2025
        """Register a new credential store to be loaded on request.
2026
2027
        :param module_name: The python path to the module. Such as 'os.path'.
2028
        :param member_name: The member of the module to return.  If empty or
2029
                None, get() will return the module itself.
2030
        :param help: Help text for this entry. This may be a string or
2031
                a callable.
2032
        :param override_existing: If True, replace the existing object
2033
                with the new one. If False, if there is already something
2034
                registered with the same key, raise a KeyError
2035
        :param fallback: Whether this credential store should be 
2036
                used as fallback.
2037
        """
2038
        return super(CredentialStoreRegistry, self).register_lazy(
2039
            key, module_name, member_name, help,
2040
            info=fallback, override_existing=override_existing)
2041
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2042
2043
credential_store_registry = CredentialStoreRegistry()
2044
2045
2046
class CredentialStore(object):
2047
    """An abstract class to implement storage for credentials"""
2048
2049
    def decode_password(self, credentials):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2050
        """Returns a clear text password for the provided credentials."""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2051
        raise NotImplementedError(self.decode_password)
2052
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
2053
    def get_credentials(self, scheme, host, port=None, user=None, path=None,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
2054
                        realm=None):
2055
        """Return the matching credentials from this credential store.
2056
2057
        This method is only called on fallback credential stores.
2058
        """
2059
        raise NotImplementedError(self.get_credentials)
2060
2061
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2062
2063
class PlainTextCredentialStore(CredentialStore):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2064
    __doc__ = """Plain text credential store for the authentication.conf file"""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
2065
2066
    def decode_password(self, credentials):
2067
        """See CredentialStore.decode_password."""
2068
        return credentials['password']
2069
2070
2071
credential_store_registry.register('plain', PlainTextCredentialStore,
2072
                                   help=PlainTextCredentialStore.__doc__)
2073
credential_store_registry.default_key = 'plain'
2074
2075
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2076
class BzrDirConfig(object):
2077
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2078
    def __init__(self, bzrdir):
2079
        self._bzrdir = bzrdir
2080
        self._config = bzrdir._get_config()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2081
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2082
    def set_default_stack_on(self, value):
2083
        """Set the default stacking location.
2084
2085
        It may be set to a location, or None.
2086
2087
        This policy affects all branches contained by this bzrdir, except for
2088
        those under repositories.
2089
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2090
        if self._config is None:
2091
            raise errors.BzrError("Cannot set configuration in %s" % self._bzrdir)
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2092
        if value is None:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2093
            self._config.set_option('', 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2094
        else:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2095
            self._config.set_option(value, 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2096
2097
    def get_default_stack_on(self):
2098
        """Return the default stacking location.
2099
2100
        This will either be a location, or None.
2101
2102
        This policy affects all branches contained by this bzrdir, except for
2103
        those under repositories.
2104
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2105
        if self._config is None:
2106
            return None
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2107
        value = self._config.get_option('default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2108
        if value == '':
2109
            value = None
2110
        return value
2111
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2112
2113
class TransportConfig(object):
3242.1.5 by Aaron Bentley
Update per review comments
2114
    """A Config that reads/writes a config file on a Transport.
3242.1.4 by Aaron Bentley
Clean-up
2115
2116
    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.
2117
    that may be associated with a section.  Assigning meaning to these values
2118
    is done at higher levels like TreeConfig.
3242.1.4 by Aaron Bentley
Clean-up
2119
    """
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2120
2121
    def __init__(self, transport, filename):
2122
        self._transport = transport
2123
        self._filename = filename
2124
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2125
    def get_option(self, name, section=None, default=None):
2126
        """Return the value associated with a named option.
2127
2128
        :param name: The name of the value
2129
        :param section: The section the option is in (if any)
2130
        :param default: The value to return if the value is not set
2131
        :return: The value or default value
2132
        """
2133
        configobj = self._get_configobj()
2134
        if section is None:
2135
            section_obj = configobj
2136
        else:
2137
            try:
2138
                section_obj = configobj[section]
2139
            except KeyError:
2140
                return default
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
2141
        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.
2142
        for hook in OldConfigHooks['get']:
5743.8.25 by Vincent Ladeuil
Fix spurious spaces.
2143
            hook(self, name, value)
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
2144
        return value
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2145
2146
    def set_option(self, value, name, section=None):
2147
        """Set the value associated with a named option.
2148
2149
        :param value: The value to set
2150
        :param name: The name of the value to set
2151
        :param section: The section the option is in (if any)
2152
        """
2153
        configobj = self._get_configobj()
2154
        if section is None:
2155
            configobj[name] = value
2156
        else:
2157
            configobj.setdefault(section, {})[name] = value
5743.8.24 by Vincent Ladeuil
Clearly seaparate both sets of hooks for the old and new config implementations.
2158
        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.
2159
            hook(self, name, value)
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2160
        self._set_configobj(configobj)
2161
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2162
    def remove_option(self, option_name, section_name=None):
2163
        configobj = self._get_configobj()
2164
        if section_name is None:
2165
            del configobj[option_name]
2166
        else:
2167
            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.
2168
        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.
2169
            hook(self, option_name)
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2170
        self._set_configobj(configobj)
2171
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
2172
    def _get_config_file(self):
2173
        try:
5743.8.13 by Vincent Ladeuil
Fix config calls for the actual implementation, including typos in parameters and TransportConfig support.
2174
            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.
2175
            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.
2176
                hook(self)
2177
            return f
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
2178
        except errors.NoSuchFile:
2179
            return StringIO()
2180
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2181
    def _get_configobj(self):
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
2182
        f = self._get_config_file()
2183
        try:
2184
            return ConfigObj(f, encoding='utf-8')
2185
        finally:
2186
            f.close()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2187
2188
    def _set_configobj(self, configobj):
2189
        out_file = StringIO()
2190
        configobj.write(out_file)
2191
        out_file.seek(0)
2192
        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.
2193
        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.
2194
            hook(self)
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2195
2196
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2197
class Option(object):
5743.12.10 by Vincent Ladeuil
Add documentation.
2198
    """An option definition.
2199
2200
    The option *values* are stored in config files and found in sections.
2201
2202
    Here we define various properties about the option itself, its default
2203
    value, in which config files it can be stored, etc (TBC).
2204
    """
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2205
5743.12.4 by Vincent Ladeuil
An option can provide a default value.
2206
    def __init__(self, name, default=None):
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2207
        self.name = name
5743.12.4 by Vincent Ladeuil
An option can provide a default value.
2208
        self.default = default
2209
2210
    def get_default(self):
2211
        return self.default
2212
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2213
2214
# Options registry
2215
2216
option_registry = registry.Registry()
2217
5743.12.3 by Vincent Ladeuil
More basic tests for options. Start tests for all registered options.
2218
5743.13.6 by Vincent Ladeuil
Register the 'editor' option.
2219
option_registry.register(
2220
    'editor', Option('editor'),
2221
    help='The command called to launch an editor to enter a message.')
5743.12.3 by Vincent Ladeuil
More basic tests for options. Start tests for all registered options.
2222
2223
5743.3.11 by Vincent Ladeuil
Config sections only implement read access.
2224
class Section(object):
5743.12.2 by Vincent Ladeuil
Basic registry for options.
2225
    """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.
2226
2227
    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.
2228
    options. It is *not* a python dict object though and doesn't try to mimic
2229
    its API.
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2230
    """
2231
2232
    def __init__(self, section_id, options):
2233
        self.id = section_id
2234
        # We re-use the dict-like object received
2235
        self.options = options
2236
2237
    def get(self, name, default=None):
2238
        return self.options.get(name, default)
2239
5743.3.12 by Vincent Ladeuil
Add an ad-hoc __repr__.
2240
    def __repr__(self):
2241
        # Mostly for debugging use
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2242
        return "<config.%s id=%s>" % (self.__class__.__name__, self.id)
5743.3.12 by Vincent Ladeuil
Add an ad-hoc __repr__.
2243
5743.2.3 by Vincent Ladeuil
The option is either new or has an existing value.
2244
5743.3.6 by Vincent Ladeuil
Use a name less likely to be reused.
2245
_NewlyCreatedOption = object()
5743.2.2 by Vincent Ladeuil
Add tests for remove.
2246
"""Was the option created during the MutableSection lifetime"""
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2247
5743.2.3 by Vincent Ladeuil
The option is either new or has an existing value.
2248
5743.3.11 by Vincent Ladeuil
Config sections only implement read access.
2249
class MutableSection(Section):
5743.3.1 by Vincent Ladeuil
Add a docstring and dates to FIXMEs.
2250
    """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.
2251
2252
    def __init__(self, section_id, options):
2253
        super(MutableSection, self).__init__(section_id, options)
2254
        self.orig = {}
2255
2256
    def set(self, name, value):
5743.2.2 by Vincent Ladeuil
Add tests for remove.
2257
        if name not in self.options:
5743.2.3 by Vincent Ladeuil
The option is either new or has an existing value.
2258
            # This is a new option
5743.3.6 by Vincent Ladeuil
Use a name less likely to be reused.
2259
            self.orig[name] = _NewlyCreatedOption
5743.2.3 by Vincent Ladeuil
The option is either new or has an existing value.
2260
        elif name not in self.orig:
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2261
            self.orig[name] = self.get(name, None)
2262
        self.options[name] = value
2263
2264
    def remove(self, name):
2265
        if name not in self.orig:
2266
            self.orig[name] = self.get(name, None)
2267
        del self.options[name]
2268
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
2269
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2270
class Store(object):
2271
    """Abstract interface to persistent storage for configuration options."""
2272
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2273
    readonly_section_class = Section
5743.4.22 by Vincent Ladeuil
Allow daughter classes to use different Section classes if/when needed.
2274
    mutable_section_class = MutableSection
5743.4.21 by Vincent Ladeuil
All stores should provide _load_from_string to reuse the existing tests.
2275
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2276
    def is_loaded(self):
2277
        """Returns True if the Store has been loaded.
2278
2279
        This is used to implement lazy loading and ensure the persistent
2280
        storage is queried only when needed.
2281
        """
2282
        raise NotImplementedError(self.is_loaded)
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2283
2284
    def load(self):
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2285
        """Loads the Store from persistent storage."""
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2286
        raise NotImplementedError(self.load)
2287
5743.4.21 by Vincent Ladeuil
All stores should provide _load_from_string to reuse the existing tests.
2288
    def _load_from_string(self, str_or_unicode):
2289
        """Create a store from a string in configobj syntax.
2290
2291
        :param str_or_unicode: A string representing the file content. This will
2292
            be encoded to suit store needs internally.
2293
2294
        This is for tests and should not be used in production unless a
2295
        convincing use case can be demonstrated :)
2296
        """
2297
        raise NotImplementedError(self._load_from_string)
2298
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
2299
    def unload(self):
2300
        """Unloads the Store.
2301
2302
        This should make is_loaded() return False. This is used when the caller
2303
        knows that the persistent storage has changed or may have change since
2304
        the last load.
2305
        """
2306
        raise NotImplementedError(self.unload)
2307
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
2308
    def save(self):
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2309
        """Saves the Store to persistent storage."""
5743.4.10 by Vincent Ladeuil
Fix copy/paste, bad.
2310
        raise NotImplementedError(self.save)
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
2311
5743.5.10 by Vincent Ladeuil
Parametrize the generic tests against the concrete stores.
2312
    def external_url(self):
2313
        raise NotImplementedError(self.external_url)
2314
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
2315
    def get_sections(self):
2316
        """Returns an ordered iterable of existing sections.
2317
2318
        :returns: An iterable of (name, dict).
2319
        """
2320
        raise NotImplementedError(self.get_sections)
2321
5743.4.2 by Vincent Ladeuil
Stores don't implement set_option, they just provide a mutable section.
2322
    def get_mutable_section(self, section_name=None):
2323
        """Returns the specified mutable section.
2324
2325
        :param section_name: The section identifier
2326
        """
2327
        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).
2328
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2329
    def __repr__(self):
2330
        # Mostly for debugging use
5743.5.17 by Vincent Ladeuil
Use external_url to identify stores.
2331
        return "<config.%s(%s)>" % (self.__class__.__name__,
5743.5.18 by Vincent Ladeuil
Fix typo.
2332
                                    self.external_url())
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2333
2334
2335
class IniFileStore(Store):
2336
    """A config Store using ConfigObj for storage.
2337
2338
    :ivar transport: The transport object where the config file is located.
2339
2340
    :ivar file_name: The config file basename in the transport directory.
2341
2342
    :ivar _config_obj: Private member to hold the ConfigObj instance used to
2343
        serialize/deserialize the config file.
2344
    """
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2345
2346
    def __init__(self, transport, file_name):
2347
        """A config Store using ConfigObj for storage.
2348
2349
        :param transport: The transport object where the config file is located.
2350
2351
        :param file_name: The config file basename in the transport directory.
2352
        """
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2353
        super(IniFileStore, self).__init__()
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2354
        self.transport = transport
2355
        self.file_name = file_name
5743.4.18 by Vincent Ladeuil
Replace class.from_string with self._load_from_string to all stores can use it.
2356
        self._config_obj = None
2357
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2358
    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.
2359
        return self._config_obj != None
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2360
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
2361
    def unload(self):
2362
        self._config_obj = None
2363
5743.4.19 by Vincent Ladeuil
Clarify that only Store.get_mutable_section() can accept an empty file.
2364
    def load(self):
2365
        """Load the store from the associated file."""
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2366
        if self.is_loaded():
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2367
            return
5743.4.19 by Vincent Ladeuil
Clarify that only Store.get_mutable_section() can accept an empty file.
2368
        content = self.transport.get_bytes(self.file_name)
5743.4.18 by Vincent Ladeuil
Replace class.from_string with self._load_from_string to all stores can use it.
2369
        self._load_from_string(content)
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.
2370
        for hook in ConfigHooks['load']:
5743.8.8 by Vincent Ladeuil
Puth the load hook in the right place.
2371
            hook(self)
5743.4.18 by Vincent Ladeuil
Replace class.from_string with self._load_from_string to all stores can use it.
2372
2373
    def _load_from_string(self, str_or_unicode):
2374
        """Create a config store from a string.
2375
2376
        :param str_or_unicode: A string representing the file content. This will
2377
            be utf-8 encoded internally.
2378
2379
        This is for tests and should not be used in production unless a
2380
        convincing use case can be demonstrated :)
2381
        """
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2382
        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.
2383
            raise AssertionError('Already loaded: %r' % (self._config_obj,))
2384
        co_input = StringIO(str_or_unicode.encode('utf-8'))
5743.4.3 by Vincent Ladeuil
Implement get_mutable_section.
2385
        try:
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2386
            # The config files are always stored utf8-encoded
2387
            self._config_obj = ConfigObj(co_input, encoding='utf-8')
2388
        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.
2389
            self._config_obj = None
5743.5.10 by Vincent Ladeuil
Parametrize the generic tests against the concrete stores.
2390
            raise errors.ParseConfigError(e.errors, self.external_url())
5743.2.7 by Vincent Ladeuil
Implement loading a config store from a string or a file.
2391
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.
2392
    def save(self):
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2393
        if not self.is_loaded():
5743.4.19 by Vincent Ladeuil
Clarify that only Store.get_mutable_section() can accept an empty file.
2394
            # Nothing to save
2395
            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.
2396
        out = StringIO()
2397
        self._config_obj.write(out)
2398
        self.transport.put_bytes(self.file_name, 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.
2399
        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).
2400
            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.
2401
5743.5.10 by Vincent Ladeuil
Parametrize the generic tests against the concrete stores.
2402
    def external_url(self):
2403
        # FIXME: external_url should really accepts an optional relpath
2404
        # parameter (bug #750169) :-/ -- vila 2011-04-04
2405
        # The following will do in the interim but maybe we don't want to
2406
        # expose a path here but rather a config ID and its associated
2407
        # object </hand wawe>.
5743.5.13 by Vincent Ladeuil
Merge config-abstract-store into config-concrete-stores resolving conflicts
2408
        return urlutils.join(self.transport.external_url(), self.file_name)
5743.5.10 by Vincent Ladeuil
Parametrize the generic tests against the concrete stores.
2409
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
2410
    def get_sections(self):
2411
        """Get the configobj section in the file order.
2412
2413
        :returns: An iterable of (name, dict).
2414
        """
2415
        # We need a loaded store
5743.6.14 by Vincent Ladeuil
Parametrize the Stack tests.
2416
        try:
2417
            self.load()
2418
        except errors.NoSuchFile:
2419
            # If the file doesn't exist, there is no sections
2420
            return
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
2421
        cobj = self._config_obj
2422
        if cobj.scalars:
5743.4.22 by Vincent Ladeuil
Allow daughter classes to use different Section classes if/when needed.
2423
            yield self.readonly_section_class(None, cobj)
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
2424
        for section_name in cobj.sections:
5743.4.22 by Vincent Ladeuil
Allow daughter classes to use different Section classes if/when needed.
2425
            yield self.readonly_section_class(section_name, cobj[section_name])
5743.2.10 by Vincent Ladeuil
Implement store.get_sections() as an iterator and provides the configobj implementation.
2426
5743.4.2 by Vincent Ladeuil
Stores don't implement set_option, they just provide a mutable section.
2427
    def get_mutable_section(self, section_name=None):
5743.2.11 by Vincent Ladeuil
Basic store.set implementation.
2428
        # We need a loaded store
5743.4.19 by Vincent Ladeuil
Clarify that only Store.get_mutable_section() can accept an empty file.
2429
        try:
2430
            self.load()
2431
        except errors.NoSuchFile:
2432
            # The file doesn't exist, let's pretend it was empty
2433
            self._load_from_string('')
5743.2.11 by Vincent Ladeuil
Basic store.set implementation.
2434
        if section_name is None:
2435
            section = self._config_obj
2436
        else:
2437
            section = self._config_obj.setdefault(section_name, {})
5743.4.22 by Vincent Ladeuil
Allow daughter classes to use different Section classes if/when needed.
2438
        return self.mutable_section_class(section_name, section)
5743.2.11 by Vincent Ladeuil
Basic store.set implementation.
2439
5743.2.1 by Vincent Ladeuil
Basic tests and implementations for read-only and mutable sections.
2440
5743.4.16 by Vincent Ladeuil
Some doc for the stores.
2441
# Note that LockableConfigObjStore inherits from ConfigObjStore because we need
2442
# unlockable stores for use with objects that can already ensure the locking
2443
# (think branches). If different stores (not based on ConfigObj) are created,
2444
# they may face the same issue.
2445
2446
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2447
class LockableIniFileStore(IniFileStore):
5743.4.9 by Vincent Ladeuil
Implement a LockableConfigObjStore to be able to mimick the actual behaviour.
2448
    """A ConfigObjStore using locks on save to ensure store integrity."""
2449
2450
    def __init__(self, transport, file_name, lock_dir_name=None):
2451
        """A config Store using ConfigObj for storage.
2452
2453
        :param transport: The transport object where the config file is located.
2454
2455
        :param file_name: The config file basename in the transport directory.
2456
        """
2457
        if lock_dir_name is None:
2458
            lock_dir_name = 'lock'
2459
        self.lock_dir_name = lock_dir_name
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2460
        super(LockableIniFileStore, self).__init__(transport, file_name)
5743.4.9 by Vincent Ladeuil
Implement a LockableConfigObjStore to be able to mimick the actual behaviour.
2461
        self._lock = lockdir.LockDir(self.transport, self.lock_dir_name)
2462
2463
    def lock_write(self, token=None):
2464
        """Takes a write lock in the directory containing the config file.
2465
2466
        If the directory doesn't exist it is created.
2467
        """
2468
        # FIXME: This doesn't check the ownership of the created directories as
2469
        # ensure_config_dir_exists does. It should if the transport is local
2470
        # -- vila 2011-04-06
2471
        self.transport.create_prefix()
2472
        return self._lock.lock_write(token)
2473
2474
    def unlock(self):
2475
        self._lock.unlock()
2476
2477
    def break_lock(self):
2478
        self._lock.break_lock()
2479
2480
    @needs_write_lock
2481
    def save(self):
5743.6.25 by Vincent Ladeuil
Last test rewritten.
2482
        # We need to be able to override the undecorated implementation
5743.6.32 by Vincent Ladeuil
Address poolie's review comments.
2483
        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.
2484
5743.6.32 by Vincent Ladeuil
Address poolie's review comments.
2485
    def save_without_locking(self):
5743.4.25 by Vincent Ladeuil
Address review comments by jelmer and poolie.
2486
        super(LockableIniFileStore, self).save()
5743.4.9 by Vincent Ladeuil
Implement a LockableConfigObjStore to be able to mimick the actual behaviour.
2487
2488
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
2489
# FIXME: global, bazaar, shouldn't that be 'user' instead or even
2490
# 'user_defaults' as opposed to 'user_overrides', 'system_defaults'
2491
# (/etc/bzr/bazaar.conf) and 'system_overrides' ? -- vila 2011-04-05
5743.5.15 by Vincent Ladeuil
Mention poolie's point about focusing tests.
2492
2493
# FIXME: Moreover, we shouldn't need classes for these stores either, factory
2494
# functions or a registry will make it easier and clearer for tests, focusing
2495
# on the relevant parts of the API that needs testing -- vila 20110503 (based
2496
# on a poolie's remark)
5743.5.13 by Vincent Ladeuil
Merge config-abstract-store into config-concrete-stores resolving conflicts
2497
class GlobalStore(LockableIniFileStore):
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
2498
2499
    def __init__(self, possible_transports=None):
2500
        t = transport.get_transport(config_dir(),
2501
                                    possible_transports=possible_transports)
2502
        super(GlobalStore, self).__init__(t, 'bazaar.conf')
2503
2504
5743.5.13 by Vincent Ladeuil
Merge config-abstract-store into config-concrete-stores resolving conflicts
2505
class LocationStore(LockableIniFileStore):
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
2506
2507
    def __init__(self, possible_transports=None):
2508
        t = transport.get_transport(config_dir(),
2509
                                    possible_transports=possible_transports)
5743.5.10 by Vincent Ladeuil
Parametrize the generic tests against the concrete stores.
2510
        super(LocationStore, self).__init__(t, 'locations.conf')
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
2511
2512
5743.9.1 by Vincent Ladeuil
Properly implement locking for BranchStore by delegating all the lock operations to the branch itself.
2513
class BranchStore(IniFileStore):
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
2514
2515
    def __init__(self, branch):
2516
        super(BranchStore, self).__init__(branch.control_transport,
2517
                                          'branch.conf')
5743.6.34 by Vincent Ladeuil
Forget weakref for branch <-> config.
2518
        self.branch = branch
5743.10.5 by Vincent Ladeuil
Give up.
2519
5743.9.1 by Vincent Ladeuil
Properly implement locking for BranchStore by delegating all the lock operations to the branch itself.
2520
    def lock_write(self, token=None):
5743.6.34 by Vincent Ladeuil
Forget weakref for branch <-> config.
2521
        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.
2522
2523
    def unlock(self):
5743.6.34 by Vincent Ladeuil
Forget weakref for branch <-> config.
2524
        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.
2525
2526
    @needs_write_lock
2527
    def save(self):
2528
        # 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.
2529
        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.
2530
5743.9.5 by Vincent Ladeuil
Fix test failure, forgot a call site when renaming _save to save_without_locking.
2531
    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.
2532
        super(BranchStore, self).save()
2533
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
2534
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
2535
class SectionMatcher(object):
2536
    """Select sections into a given Store.
2537
2538
    This intended to be used to postpone getting an iterable of sections from a
2539
    store.
2540
    """
2541
2542
    def __init__(self, store):
2543
        self.store = store
2544
2545
    def get_sections(self):
5743.2.29 by Vincent Ladeuil
Add doc for the section matchers.
2546
        # 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.
2547
        # sections.
2548
        sections = self.store.get_sections()
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
2549
        # Walk the revisions in the order provided
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
2550
        for s in sections:
2551
            if self.match(s):
2552
                yield s
2553
2554
    def match(self, secion):
2555
        raise NotImplementedError(self.match)
2556
2557
5743.2.37 by Vincent Ladeuil
Merge config-concrete-stores into config-section-matchers resolving conflicts
2558
class LocationSection(Section):
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
2559
2560
    def __init__(self, section, length, extra_path):
2561
        super(LocationSection, self).__init__(section.id, section.options)
2562
        self.length = length
2563
        self.extra_path = extra_path
2564
2565
    def get(self, name, default=None):
2566
        value = super(LocationSection, self).get(name, default)
2567
        if value is not None:
2568
            policy_name = self.get(name + ':policy', None)
2569
            policy = _policy_value.get(policy_name, POLICY_NONE)
2570
            if policy == POLICY_APPENDPATH:
2571
                value = urlutils.join(value, self.extra_path)
2572
        return value
2573
2574
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
2575
class LocationMatcher(SectionMatcher):
2576
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
2577
    def __init__(self, store, location):
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
2578
        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).
2579
        if location.startswith('file://'):
2580
            location = urlutils.local_path_from_url(location)
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
2581
        self.location = location
2582
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
2583
    def _get_matching_sections(self):
2584
        """Get all sections matching ``location``."""
2585
        # We slightly diverge from LocalConfig here by allowing the no-name
2586
        # section as the most generic one and the lower priority.
2587
        no_name_section = None
2588
        sections = []
2589
        # Filter out the no_name_section so _iter_for_location_by_parts can be
2590
        # used (it assumes all sections have a name).
2591
        for section in self.store.get_sections():
2592
            if section.id is None:
2593
                no_name_section = section
2594
            else:
2595
                sections.append(section)
2596
        # Unfortunately _iter_for_location_by_parts deals with section names so
2597
        # we have to resync.
5743.2.31 by Vincent Ladeuil
Both the length and the section id should be used to sort.
2598
        filtered_sections = _iter_for_location_by_parts(
5743.2.27 by Vincent Ladeuil
Merge the use of _filter_for_location_by_parts, uglier, but better for
2599
            [s.id for s in sections], self.location)
2600
        iter_sections = iter(sections)
2601
        matching_sections = []
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
2602
        if no_name_section is not None:
2603
            matching_sections.append(
2604
                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.
2605
        for section_id, extra_path, length in filtered_sections:
5743.2.27 by Vincent Ladeuil
Merge the use of _filter_for_location_by_parts, uglier, but better for
2606
            # a section id is unique for a given store so it's safe to iterate
2607
            # again
2608
            section = iter_sections.next()
2609
            if section_id == section.id:
2610
                matching_sections.append(
2611
                    LocationSection(section, length, extra_path))
5743.6.15 by Vincent Ladeuil
Don't pollute _iter_for_location_by_parts.
2612
        return matching_sections
2613
2614
    def get_sections(self):
2615
        # Override the default implementation as we want to change the order
2616
        matching_sections = self._get_matching_sections()
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
2617
        # 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.
2618
        sections = sorted(matching_sections,
2619
                          key=lambda section: (section.length, section.id),
5743.2.24 by Vincent Ladeuil
Complete location config helpers with basic tests.
2620
                          reverse=True)
2621
        # Sections mentioning 'ignore_parents' restrict the selection
2622
        for section in sections:
2623
            # FIXME: We really want to use as_bool below -- vila 2011-04-07
2624
            ignore = section.get('ignore_parents', None)
2625
            if ignore is not None:
2626
                ignore = ui.bool_from_string(ignore)
2627
            if ignore:
2628
                break
2629
            # Finally, we have a valid section
2630
            yield section
5743.2.22 by Vincent Ladeuil
Some minimal SectionMatcher implementation to setup the test infrastucture.
2631
5743.2.13 by Vincent Ladeuil
Trivial implementations for stores with smoke tests.
2632
5743.1.34 by Vincent Ladeuil
Merge config-section-matchers into config-stack resolving conflicts
2633
class Stack(object):
5743.1.1 by Vincent Ladeuil
Start implementing a config stack.
2634
    """A stack of configurations where an option can be defined"""
2635
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.
2636
    def __init__(self, sections_def, store=None, mutable_section_name=None):
5743.1.11 by Vincent Ladeuil
Properly use MutableSection for write operations.
2637
        """Creates a stack of sections with an optional store for changes.
2638
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.
2639
        :param sections_def: A list of Section or callables that returns an
2640
            iterable of Section. This defines the Sections for the Stack and
2641
            can be called repeatedly if needed.
5743.1.11 by Vincent Ladeuil
Properly use MutableSection for write operations.
2642
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.
2643
        :param store: The optional Store where modifications will be
2644
            recorded. If none is specified, no modifications can be done.
2645
2646
        :param mutable_section_name: The name of the MutableSection where
2647
            changes are recorded. This requires the ``store`` parameter to be
2648
            specified.
5743.1.11 by Vincent Ladeuil
Properly use MutableSection for write operations.
2649
        """
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.
2650
        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.
2651
        self.store = store
2652
        self.mutable_section_name = mutable_section_name
5743.1.1 by Vincent Ladeuil
Start implementing a config stack.
2653
2654
    def get(self, name):
5743.1.16 by Vincent Ladeuil
Allows empty sections and empty section callables.
2655
        """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.
2656
5743.1.16 by Vincent Ladeuil
Allows empty sections and empty section callables.
2657
        This is where we guarantee that sections coming from Store are loaded
2658
        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.
2659
        option exists or get its value, which in turn may require to discover
2660
        in which sections it can be defined. Both of these (section and option
2661
        existence) require loading the store (even partially).
2662
        """
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.
2663
        # FIXME: No caching of options nor sections yet -- vila 20110503
5743.12.6 by Vincent Ladeuil
Stack.get() provides the registered option default value.
2664
        value = None
5743.6.17 by Vincent Ladeuil
Clarify comment.
2665
        # Ensuring lazy loading is achieved by delaying section matching (which
2666
        # implies querying the persistent storage) until it can't be avoided
2667
        # anymore by using callables to describe (possibly empty) section
2668
        # lists.
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.
2669
        for section_or_callable in self.sections_def:
5743.1.12 by Vincent Ladeuil
Clarify ConfigStack.get() about lazy evaluation of sections.
2670
            # Each section can expand to multiple ones when a callable is used
2671
            if callable(section_or_callable):
2672
                sections = section_or_callable()
5743.1.9 by Vincent Ladeuil
Fix the issue by allowing delayed section acquisition.
2673
            else:
5743.1.12 by Vincent Ladeuil
Clarify ConfigStack.get() about lazy evaluation of sections.
2674
                sections = [section_or_callable]
2675
            for section in sections:
2676
                value = section.get(name)
2677
                if value is not None:
5743.12.6 by Vincent Ladeuil
Stack.get() provides the registered option default value.
2678
                    break
2679
            if value is not None:
2680
                break
2681
        if value is None:
2682
            # If the option is registered, it may provide a default value
5743.12.7 by Vincent Ladeuil
Test that providing a default value doesn't break for non-registered options.
2683
            try:
2684
                opt = option_registry.get(name)
2685
            except KeyError:
2686
                # Not registered
2687
                opt = None
2688
            if opt is not None:
2689
                value = opt.get_default()
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.
2690
        for hook in ConfigHooks['get']:
5743.8.6 by Vincent Ladeuil
Add hooks for config stacks.
2691
            hook(self, name, value)
5743.12.6 by Vincent Ladeuil
Stack.get() provides the registered option default value.
2692
        return value
5743.1.1 by Vincent Ladeuil
Start implementing a config stack.
2693
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.
2694
    def _get_mutable_section(self):
2695
        """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.
2696
5743.1.15 by Vincent Ladeuil
Test and implement ConfigStack.remove.
2697
        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.
2698
        this means we won't load the corresponding store before setting a value
2699
        or deleting an option. In practice the store will often be loaded but
5743.6.14 by Vincent Ladeuil
Parametrize the Stack tests.
2700
        this allows helps catching some programming errors.
5743.1.13 by Vincent Ladeuil
Better explain lazy loading and make sure the mutable section respect the design.
2701
        """
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.
2702
        section = self.store.get_mutable_section(self.mutable_section_name)
2703
        return section
2704
2705
    def set(self, name, value):
2706
        """Set a new value for the option."""
2707
        section = self._get_mutable_section()
5743.1.13 by Vincent Ladeuil
Better explain lazy loading and make sure the mutable section respect the design.
2708
        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.
2709
        for hook in ConfigHooks['set']:
5743.8.6 by Vincent Ladeuil
Add hooks for config stacks.
2710
            hook(self, name, value)
5743.1.7 by Vincent Ladeuil
Simple set implementation.
2711
5743.1.15 by Vincent Ladeuil
Test and implement ConfigStack.remove.
2712
    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.
2713
        """Remove an existing option."""
2714
        section = self._get_mutable_section()
5743.1.15 by Vincent Ladeuil
Test and implement ConfigStack.remove.
2715
        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.
2716
        for hook in ConfigHooks['remove']:
5743.8.6 by Vincent Ladeuil
Add hooks for config stacks.
2717
            hook(self, name)
5743.1.15 by Vincent Ladeuil
Test and implement ConfigStack.remove.
2718
5743.1.34 by Vincent Ladeuil
Merge config-section-matchers into config-stack resolving conflicts
2719
    def __repr__(self):
2720
        # Mostly for debugging use
2721
        return "<config.%s(%s)>" % (self.__class__.__name__, id(self))
2722
5743.1.1 by Vincent Ladeuil
Start implementing a config stack.
2723
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
2724
class _CompatibleStack(Stack):
5743.6.26 by Vincent Ladeuil
Clarify _CompatibleStack aims.
2725
    """Place holder for compatibility with previous design.
2726
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
2727
    This is intended to ease the transition from the Config-based design to the
5743.6.26 by Vincent Ladeuil
Clarify _CompatibleStack aims.
2728
    Stack-based design and should not be used nor relied upon by plugins.
2729
2730
    One assumption made here is that the daughter classes will all use Stores
2731
    derived from LockableIniFileStore).
5743.6.32 by Vincent Ladeuil
Address poolie's review comments.
2732
2733
    It implements set() by re-loading the store before applying the
2734
    modification and saving it.
2735
2736
    The long term plan being to implement a single write by store to save
2737
    all modifications, this class should not be used in the interim.
5743.6.26 by Vincent Ladeuil
Clarify _CompatibleStack aims.
2738
    """
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
2739
2740
    def set(self, name, value):
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
2741
        # Force a reload
2742
        self.store.unload()
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
2743
        super(_CompatibleStack, self).set(name, value)
2744
        # Force a write to persistent storage
2745
        self.store.save()
2746
2747
2748
class GlobalStack(_CompatibleStack):
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
2749
2750
    def __init__(self):
2751
        # Get a GlobalStore
2752
        gstore = GlobalStore()
5743.6.14 by Vincent Ladeuil
Parametrize the Stack tests.
2753
        super(GlobalStack, self).__init__([gstore.get_sections], gstore)
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
2754
2755
5743.6.23 by Vincent Ladeuil
More config concurrent updates tests.
2756
class LocationStack(_CompatibleStack):
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
2757
2758
    def __init__(self, location):
2759
        lstore = LocationStore()
2760
        matcher = LocationMatcher(lstore, location)
2761
        gstore = GlobalStore()
2762
        super(LocationStack, self).__init__(
5743.6.14 by Vincent Ladeuil
Parametrize the Stack tests.
2763
            [matcher.get_sections, gstore.get_sections], lstore)
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
2764
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
2765
class BranchStack(_CompatibleStack):
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
2766
2767
    def __init__(self, branch):
2768
        bstore = BranchStore(branch)
2769
        lstore = LocationStore()
2770
        matcher = LocationMatcher(lstore, branch.base)
2771
        gstore = GlobalStore()
2772
        super(BranchStack, self).__init__(
2773
            [matcher.get_sections, bstore.get_sections, gstore.get_sections],
5743.6.14 by Vincent Ladeuil
Parametrize the Stack tests.
2774
            bstore)
5743.10.2 by Vincent Ladeuil
Make sure RemoteBranch are supported as well, relying on the vfs API.
2775
        self.branch = branch
5743.6.1 by Vincent Ladeuil
Outline concrete stacks and basic smoke tests.
2776
2777
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2778
class cmd_config(commands.Command):
5447.4.19 by Vincent Ladeuil
Add some more documentation.
2779
    __doc__ = """Display, set or remove a configuration option.
2780
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2781
    Display the active value for a given option.
2782
2783
    If --all is specified, NAME is interpreted as a regular expression and all
2784
    matching options are displayed mentioning their scope. The active value
2785
    that bzr will take into account is the first one displayed for each option.
2786
2787
    If no NAME is given, --all .* is implied.
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2788
5447.4.19 by Vincent Ladeuil
Add some more documentation.
2789
    Setting a value is achieved by using name=value without spaces. The value
2790
    is set in the most relevant scope and can be checked by displaying the
2791
    option again.
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2792
    """
2793
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2794
    takes_args = ['name?']
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2795
2796
    takes_options = [
2797
        'directory',
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2798
        # FIXME: This should be a registry option so that plugins can register
2799
        # their own config files (or not) -- vila 20101002
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2800
        commands.Option('scope', help='Reduce the scope to the specified'
2801
                        ' configuration file',
2802
                        type=unicode),
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2803
        commands.Option('all',
2804
            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.
2805
            ),
5447.4.8 by Vincent Ladeuil
Make the test properly fail and provide a fake implementation for ``bzr config --remove opt_name``.
2806
        commands.Option('remove', help='Remove the option from'
2807
                        ' the configuration file'),
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2808
        ]
2809
5425.4.24 by Martin Pool
Mention 'configuration' help topic from 'bzr help config'
2810
    _see_also = ['configuration']
2811
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2812
    @commands.display_command
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2813
    def run(self, name=None, all=False, directory=None, scope=None,
2814
            remove=False):
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2815
        if directory is None:
2816
            directory = '.'
2817
        directory = urlutils.normalize_url(directory)
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2818
        if remove and all:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2819
            raise errors.BzrError(
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2820
                '--all and --remove are mutually exclusive.')
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2821
        elif remove:
2822
            # Delete the option in the given scope
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2823
            self._remove_config_option(name, directory, scope)
2824
        elif name is None:
2825
            # Defaults to all options
2826
            self._show_matching_options('.*', directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2827
        else:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2828
            try:
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2829
                name, value = name.split('=', 1)
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2830
            except ValueError:
2831
                # Display the option(s) value(s)
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2832
                if all:
2833
                    self._show_matching_options(name, directory, scope)
2834
                else:
2835
                    self._show_value(name, directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2836
            else:
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2837
                if all:
2838
                    raise errors.BzrError(
2839
                        'Only one option can be set.')
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2840
                # Set the option value
2841
                self._set_config_option(name, value, directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2842
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2843
    def _get_configs(self, directory, scope=None):
2844
        """Iterate the configurations specified by ``directory`` and ``scope``.
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2845
2846
        :param directory: Where the configurations are derived from.
2847
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2848
        :param scope: A specific config to start from.
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2849
        """
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2850
        if scope is not None:
2851
            if scope == 'bazaar':
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2852
                yield GlobalConfig()
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2853
            elif scope == 'locations':
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2854
                yield LocationConfig(directory)
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2855
            elif scope == 'branch':
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2856
                (_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
2857
                    directory)
2858
                yield br.get_config()
2859
        else:
2860
            try:
2861
                (_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
2862
                    directory)
2863
                yield br.get_config()
2864
            except errors.NotBranchError:
2865
                yield LocationConfig(directory)
2866
                yield GlobalConfig()
2867
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2868
    def _show_value(self, name, directory, scope):
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2869
        displayed = False
2870
        for c in self._get_configs(directory, scope):
2871
            if displayed:
2872
                break
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
2873
            for (oname, value, section, conf_id, parser) in c._get_options():
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2874
                if name == oname:
5533.1.3 by Vincent Ladeuil
Tweak comment as per poolie's suggestion.
2875
                    # Display only the first value and exit
5533.2.3 by Vincent Ladeuil
Merge 671050-config-policy into 672382-list-values 672382-list-values resolving conflicts
2876
5533.1.3 by Vincent Ladeuil
Tweak comment as per poolie's suggestion.
2877
                    # FIXME: We need to use get_user_option to take policies
2878
                    # into account and we need to make sure the option exists
5533.2.3 by Vincent Ladeuil
Merge 671050-config-policy into 672382-list-values 672382-list-values resolving conflicts
2879
                    # too (hence the two for loops), this needs a better API
2880
                    # -- vila 20101117
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
2881
                    value = c.get_user_option(name)
2882
                    # Quote the value appropriately
2883
                    value = parser._quote(value)
2884
                    self.outf.write('%s\n' % (value,))
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2885
                    displayed = True
2886
                    break
2887
        if not displayed:
2888
            raise errors.NoSuchConfigOption(name)
2889
2890
    def _show_matching_options(self, name, directory, scope):
2891
        name = re.compile(name)
2892
        # We want any error in the regexp to be raised *now* so we need to
2893
        # avoid the delay introduced by the lazy regexp.
2894
        name._compile_and_collapse()
2895
        cur_conf_id = None
5533.1.1 by Vincent Ladeuil
Fix ``bzr config`` to respect policies when displaying values and also display sections when appropriate.
2896
        cur_section = None
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2897
        for c in self._get_configs(directory, scope):
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
2898
            for (oname, value, section, conf_id, parser) in c._get_options():
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2899
                if name.search(oname):
2900
                    if cur_conf_id != conf_id:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2901
                        # Explain where the options are defined
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
2902
                        self.outf.write('%s:\n' % (conf_id,))
2903
                        cur_conf_id = conf_id
5533.1.1 by Vincent Ladeuil
Fix ``bzr config`` to respect policies when displaying values and also display sections when appropriate.
2904
                        cur_section = None
2905
                    if (section not in (None, 'DEFAULT')
2906
                        and cur_section != section):
2907
                        # Display the section if it's not the default (or only)
2908
                        # one.
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
2909
                        self.outf.write('  [%s]\n' % (section,))
5533.1.1 by Vincent Ladeuil
Fix ``bzr config`` to respect policies when displaying values and also display sections when appropriate.
2910
                        cur_section = section
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2911
                    self.outf.write('  %s = %s\n' % (oname, value))
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2912
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2913
    def _set_config_option(self, name, value, directory, scope):
2914
        for conf in self._get_configs(directory, scope):
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2915
            conf.set_user_option(name, value)
2916
            break
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2917
        else:
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2918
            raise errors.NoSuchConfig(scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2919
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2920
    def _remove_config_option(self, name, directory, scope):
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2921
        if name is None:
2922
            raise errors.BzrCommandError(
2923
                '--remove expects an option to remove.')
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2924
        removed = False
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2925
        for conf in self._get_configs(directory, scope):
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.
2926
            for (section_name, section, conf_id) in conf._get_sections():
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2927
                if scope is not None and conf_id != scope:
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2928
                    # Not the right configuration file
2929
                    continue
2930
                if name in section:
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
2931
                    if conf_id != conf.config_id():
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2932
                        conf = self._get_configs(directory, conf_id).next()
2933
                    # We use the first section in the first config where the
2934
                    # option is defined to remove it
2935
                    conf.remove_user_option(name, section_name)
2936
                    removed = True
2937
                    break
2938
            break
2939
        else:
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2940
            raise errors.NoSuchConfig(scope)
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2941
        if not removed:
2942
            raise errors.NoSuchConfigOption(name)
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
2943
2944
# Test registries
5743.6.29 by Vincent Ladeuil
For jam.
2945
#
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
2946
# We need adapters that can build a Store or a Stack in a test context. Test
2947
# classes, based on TestCaseWithTransport, can use the registry to parametrize
2948
# themselves. The builder will receive a test instance and should return a
5743.6.29 by Vincent Ladeuil
For jam.
2949
# 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
2950
# 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.
2951
# bzrlib.tests.test_config. Note that the builder can be called multiple times
2952
# for the same tests.
5743.6.27 by Vincent Ladeuil
Move the test registries to bzrlib.config so plugins will be able to use
2953
2954
# The registered object should be a callable receiving a test instance
2955
# parameter (inheriting from tests.TestCaseWithTransport) and returning a Store
2956
# object.
2957
test_store_builder_registry = registry.Registry()
2958
5743.10.1 by Vincent Ladeuil
Derefence the ref to use it.
2959
# 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
2960
# parameter (inheriting from tests.TestCaseWithTransport) and returning a Stack
2961
# object.
2962
test_stack_builder_registry = registry.Registry()