/brz/remove-bazaar

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