/brz/remove-bazaar

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