/brz/remove-bazaar

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