/brz/remove-bazaar

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