/brz/remove-bazaar

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