~bzr-pqm/bzr/bzr.dev

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