/brz/remove-bazaar

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