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