/brz/remove-bazaar

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