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