~bzr-pqm/bzr/bzr.dev

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