/brz/remove-bazaar

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