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