~bzr-pqm/bzr/bzr.dev

5598.2.1 by John Arbash Meinel
Decode windows env vars using mbcs rather than assuming the 8-bit string is ok.
1
# Copyright (C) 2005-2011 Canonical Ltd
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
2
#   Authors: Robert Collins <robert.collins@canonical.com>
2323.6.2 by Martin Pool
Move responsibility for suggesting upgrades to ui object
3
#            and others
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
4
#
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
9
#
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
# GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
17
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
18
1442.1.20 by Robert Collins
add some documentation on options
19
"""Configuration that affects the behaviour of Bazaar.
20
21
Currently this configuration resides in ~/.bazaar/bazaar.conf
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
22
and ~/.bazaar/locations.conf, which is written to by bzr.
1442.1.20 by Robert Collins
add some documentation on options
23
1461 by Robert Collins
Typo in config.py (Thanks Fabbione)
24
In bazaar.conf the following options may be set:
1442.1.20 by Robert Collins
add some documentation on options
25
[DEFAULT]
26
editor=name-of-program
27
email=Your Name <your@email.address>
28
check_signatures=require|ignore|check-available(default)
29
create_signatures=always|never|when-required(default)
1442.1.56 by Robert Collins
gpg_signing_command configuration item
30
gpg_signing_command=name-of-program
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
31
log_format=name-of-format
1442.1.20 by Robert Collins
add some documentation on options
32
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
33
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
34
Wildcards may be used - * and ? as normal in shell completion. Options
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
35
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
36
setting.
37
[/home/robertc/source]
38
recurse=False|True(default)
39
email= as above
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
40
check_signatures= as above
1442.1.20 by Robert Collins
add some documentation on options
41
create_signatures= as above.
42
43
explanation of options
44
----------------------
45
editor - this option sets the pop up editor to use during commits.
46
email - this option sets the user id bzr will use when committing.
47
check_signatures - this option controls whether bzr will require good gpg
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
48
                   signatures, ignore them, or check them if they are
1442.1.20 by Robert Collins
add some documentation on options
49
                   present.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
50
create_signatures - this option controls whether bzr will always create
1442.1.20 by Robert Collins
add some documentation on options
51
                    gpg signatures, never create them, or create them if the
52
                    branch is configured to require them.
1887.2.1 by Adeodato Simó
Fix some typos and grammar issues.
53
log_format - this option sets the default log format.  Possible values are
54
             long, short, line, or a plugin can register new formats.
1553.6.2 by Erik Bågfors
documentation and NEWS
55
56
In bazaar.conf you can also define aliases in the ALIASES sections, example
57
58
[ALIASES]
59
lastlog=log --line -r-10..-1
60
ll=log --line -r-10..-1
61
h=help
62
up=pull
1442.1.20 by Robert Collins
add some documentation on options
63
"""
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
64
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
65
import os
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
66
import string
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
67
import sys
1474 by Robert Collins
Merge from Aaron Bentley.
68
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
69
from bzrlib import commands
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
70
from bzrlib.decorators import needs_write_lock
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
71
from bzrlib.lazy_import import lazy_import
72
lazy_import(globals(), """
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
73
import fnmatch
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
74
import re
2900.2.22 by Vincent Ladeuil
Polishing.
75
from cStringIO import StringIO
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
76
77
import bzrlib
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
78
from bzrlib import (
4797.59.2 by Vincent Ladeuil
Use AtomicFile and avoid all unicode/encoding issues around transport (thanks jam).
79
    atomicfile,
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
80
    bzrdir,
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
81
    debug,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
82
    errors,
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
83
    lockdir,
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
84
    mail_client,
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
85
    mergetools,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
86
    osutils,
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
87
    registry,
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
88
    symbol_versioning,
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
89
    trace,
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
90
    transport,
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
91
    ui,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
92
    urlutils,
2245.4.3 by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
93
    win32utils,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
94
    )
2991.2.4 by Vincent Ladeuil
Various fixes following local testing environment rebuild.
95
from bzrlib.util.configobj import configobj
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
96
""")
97
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
98
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
99
CHECK_IF_POSSIBLE=0
100
CHECK_ALWAYS=1
101
CHECK_NEVER=2
102
103
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
104
SIGN_WHEN_REQUIRED=0
105
SIGN_ALWAYS=1
106
SIGN_NEVER=2
107
108
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
109
POLICY_NONE = 0
110
POLICY_NORECURSE = 1
111
POLICY_APPENDPATH = 2
112
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
113
_policy_name = {
114
    POLICY_NONE: None,
115
    POLICY_NORECURSE: 'norecurse',
116
    POLICY_APPENDPATH: 'appendpath',
117
    }
118
_policy_value = {
119
    None: POLICY_NONE,
120
    'none': POLICY_NONE,
121
    'norecurse': POLICY_NORECURSE,
122
    'appendpath': POLICY_APPENDPATH,
123
    }
2120.6.4 by James Henstridge
add support for specifying policy when storing options
124
125
126
STORE_LOCATION = POLICY_NONE
127
STORE_LOCATION_NORECURSE = POLICY_NORECURSE
128
STORE_LOCATION_APPENDPATH = POLICY_APPENDPATH
129
STORE_BRANCH = 3
130
STORE_GLOBAL = 4
131
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
132
133
class ConfigObj(configobj.ConfigObj):
134
135
    def __init__(self, infile=None, **kwargs):
136
        # We define our own interpolation mechanism calling it option expansion
137
        super(ConfigObj, self).__init__(infile=infile,
138
                                        interpolation=False,
139
                                        **kwargs)
140
141
142
    def get_bool(self, section, key):
143
        return self[section].as_bool(key)
144
145
    def get_value(self, section, name):
146
        # Try [] for the old DEFAULT section.
147
        if section == "DEFAULT":
148
            try:
149
                return self[name]
150
            except KeyError:
151
                pass
152
        return self[section][name]
153
154
155
# FIXME: Until we can guarantee that each config file is loaded once and and
156
# only once for a given bzrlib session, we don't want to re-read the file every
157
# time we query for an option so we cache the value (bad ! watch out for tests
158
# needing to restore the proper value).This shouldn't be part of 2.4.0 final,
159
# yell at mgz^W vila and the RM if this is still present at that time
160
# -- vila 20110219
161
_expand_default_value = None
162
def _get_expand_default_value():
163
    global _expand_default_value
164
    if _expand_default_value is not None:
165
        return _expand_default_value
166
    conf = GlobalConfig()
167
    # Note that we must not use None for the expand value below or we'll run
168
    # into infinite recursion. Using False really would be quite silly ;)
169
    expand = conf.get_user_option_as_bool('bzr.config.expand', expand=True)
170
    if expand is None:
171
        # This is an opt-in feature, you *really* need to clearly say you want
172
        # to activate it !
173
        expand = False
174
    _expand_default_value = expand
175
    return expand
5549.1.31 by Vincent Ladeuil
Implement a default value for config option expansion (what ? No tests ?).
176
5549.1.19 by Vincent Ladeuil
Push down interpolation at the config level (make tests slightly less
177
178
class Config(object):
179
    """A configuration policy - what username, editor, gpg needs etc."""
180
181
    def __init__(self):
182
        super(Config, self).__init__()
183
184
    def config_id(self):
185
        """Returns a unique ID for the config."""
186
        raise NotImplementedError(self.config_id)
187
188
    def get_editor(self):
189
        """Get the users pop up editor."""
190
        raise NotImplementedError
191
192
    def get_change_editor(self, old_tree, new_tree):
193
        from bzrlib import diff
194
        cmd = self._get_change_editor()
195
        if cmd is None:
196
            return None
197
        return diff.DiffFromTool.from_string(cmd, old_tree, new_tree,
198
                                             sys.stdout)
199
200
201
    def get_mail_client(self):
202
        """Get a mail client to use"""
203
        selected_client = self.get_user_option('mail_client')
204
        _registry = mail_client.mail_client_registry
205
        try:
206
            mail_client_class = _registry.get(selected_client)
207
        except KeyError:
208
            raise errors.UnknownMailClient(selected_client)
209
        return mail_client_class(self)
210
211
    def _get_signature_checking(self):
212
        """Template method to override signature checking policy."""
213
214
    def _get_signing_policy(self):
215
        """Template method to override signature creation policy."""
216
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
217
    option_ref_re = None
218
219
    def expand_options(self, string, env=None):
220
        """Expand option references in the string in the configuration context.
221
222
        :param string: The string containing option to expand.
223
224
        :param env: An option dict defining additional configuration options or
225
            overriding existing ones.
226
227
        :returns: The expanded string.
228
        """
229
        return self._expand_options_in_string(string, env)
230
231
    def _expand_options_in_list(self, slist, env=None, _ref_stack=None):
232
        """Expand options in  a list of strings in the configuration context.
233
234
        :param slist: A list of strings.
235
236
        :param env: An option dict defining additional configuration options or
237
            overriding existing ones.
238
239
        :param _ref_stack: Private list containing the options being
240
            expanded to detect loops.
241
242
        :returns: The flatten list of expanded strings.
243
        """
244
        # expand options in each value separately flattening lists
245
        result = []
246
        for s in slist:
247
            value = self._expand_options_in_string(s, env, _ref_stack)
248
            if isinstance(value, list):
249
                result.extend(value)
250
            else:
251
                result.append(value)
252
        return result
253
254
    def _expand_options_in_string(self, string, env=None, _ref_stack=None):
255
        """Expand options in the string in the configuration context.
256
257
        :param string: The string to be expanded.
258
259
        :param env: An option dict defining additional configuration options or
260
            overriding existing ones.
261
262
        :param _ref_stack: Private list containing the options being
263
            expanded to detect loops.
264
265
        :returns: The expanded string.
266
        """
267
        if string is None:
268
            # Not much to expand there
269
            return None
270
        if _ref_stack is None:
271
            # What references are currently resolved (to detect loops)
272
            _ref_stack = []
273
        if self.option_ref_re is None:
274
            # We want to match the most embedded reference first (i.e. for
275
            # '{{foo}}' we will get '{foo}',
276
            # for '{bar{baz}}' we will get '{baz}'
277
            self.option_ref_re = re.compile('({[^{}]+})')
278
        result = string
279
        # We need to iterate until no more refs appear ({{foo}} will need two
280
        # iterations for example).
281
        while True:
5745.1.1 by Vincent Ladeuil
Remove debug code
282
            raw_chunks = self.option_ref_re.split(result)
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
283
            if len(raw_chunks) == 1:
284
                # Shorcut the trivial case: no refs
285
                return result
286
            chunks = []
287
            list_value = False
288
            # Split will isolate refs so that every other chunk is a ref
289
            chunk_is_ref = False
290
            for chunk in raw_chunks:
291
                if not chunk_is_ref:
292
                    if chunk:
293
                        # Keep only non-empty strings (or we get bogus empty
294
                        # slots when a list value is involved).
295
                        chunks.append(chunk)
296
                    chunk_is_ref = True
297
                else:
298
                    name = chunk[1:-1]
299
                    if name in _ref_stack:
300
                        raise errors.OptionExpansionLoop(string, _ref_stack)
301
                    _ref_stack.append(name)
302
                    value = self._expand_option(name, env, _ref_stack)
303
                    if value is None:
304
                        raise errors.ExpandingUnknownOption(name, string)
305
                    if isinstance(value, list):
306
                        list_value = True
307
                        chunks.extend(value)
308
                    else:
309
                        chunks.append(value)
310
                    _ref_stack.pop()
311
                    chunk_is_ref = False
312
            if list_value:
313
                # Once a list appears as the result of an expansion, all
314
                # callers will get a list result. This allows a consistent
315
                # behavior even when some options in the expansion chain
316
                # defined as strings (no comma in their value) but their
317
                # expanded value is a list.
318
                return self._expand_options_in_list(chunks, env, _ref_stack)
319
            else:
320
                result = ''.join(chunks)
321
        return result
322
323
    def _expand_option(self, name, env, _ref_stack):
324
        if env is not None and name in env:
325
            # Special case, values provided in env takes precedence over
326
            # anything else
327
            value = env[name]
328
        else:
329
            # FIXME: This is a limited implementation, what we really need is a
330
            # way to query the bzr config for the value of an option,
331
            # respecting the scope rules (That is, once we implement fallback
332
            # configs, getting the option value should restart from the top
333
            # config, not the current one) -- vila 20101222
334
            value = self.get_user_option(name, expand=False)
335
            if isinstance(value, list):
336
                value = self._expand_options_in_list(value, env, _ref_stack)
337
            else:
338
                value = self._expand_options_in_string(value, env, _ref_stack)
339
        return value
340
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
341
    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.
342
        """Template method to provide a user option."""
343
        return None
344
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
345
    def get_user_option(self, option_name, expand=None):
346
        """Get a generic option - no special process, no default.
347
348
        :param option_name: The queried option.
349
350
        :param expand: Whether options references should be expanded.
351
352
        :returns: The value of the option.
353
        """
354
        if expand is None:
355
            expand = _get_expand_default_value()
356
        value = self._get_user_option(option_name)
357
        if expand:
358
            if isinstance(value, list):
359
                value = self._expand_options_in_list(value)
360
            elif isinstance(value, dict):
361
                trace.warning('Cannot expand "%s":'
362
                              ' Dicts do not support option expansion'
363
                              % (option_name,))
364
            else:
365
                value = self._expand_options_in_string(value)
366
        return value
367
368
    def get_user_option_as_bool(self, option_name, expand=None):
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
369
        """Get a generic option as a boolean - no special process, no default.
370
371
        :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.
372
            interpreted as a boolean. Returns True or False otherwise.
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
373
        """
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
374
        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.
375
        if s is None:
376
            # The option doesn't exist
377
            return None
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
378
        val = ui.bool_from_string(s)
4989.2.12 by Vincent Ladeuil
Display a warning if an option value is not boolean.
379
        if val is None:
380
            # The value can't be interpreted as a boolean
381
            trace.warning('Value "%s" is not a boolean for "%s"',
382
                          s, option_name)
383
        return val
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
384
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
385
    def get_user_option_as_list(self, option_name, expand=None):
4840.2.4 by Vincent Ladeuil
Implement config.get_user_option_as_list.
386
        """Get a generic option as a list - no special process, no default.
387
388
        :return None if the option doesn't exist. Returns the value as a list
389
            otherwise.
390
        """
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
391
        l = self.get_user_option(option_name, expand=expand)
4840.2.4 by Vincent Ladeuil
Implement config.get_user_option_as_list.
392
        if isinstance(l, (str, unicode)):
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
393
            # A single value, most probably the user forgot (or didn't care to
394
            # add) the final ','
4840.2.4 by Vincent Ladeuil
Implement config.get_user_option_as_list.
395
            l = [l]
396
        return l
397
1442.1.56 by Robert Collins
gpg_signing_command configuration item
398
    def gpg_signing_command(self):
399
        """What program should be used to sign signatures?"""
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
400
        result = self._gpg_signing_command()
401
        if result is None:
402
            result = "gpg"
403
        return result
404
405
    def _gpg_signing_command(self):
406
        """See gpg_signing_command()."""
407
        return None
1442.1.56 by Robert Collins
gpg_signing_command configuration item
408
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
409
    def log_format(self):
410
        """What log format should be used"""
411
        result = self._log_format()
1553.2.4 by Erik Bågfors
Support for setting the default log format at a configuration option
412
        if result is None:
413
            result = "long"
414
        return result
415
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
416
    def _log_format(self):
417
        """See log_format()."""
1553.2.4 by Erik Bågfors
Support for setting the default log format at a configuration option
418
        return None
419
1472 by Robert Collins
post commit hook, first pass implementation
420
    def post_commit(self):
421
        """An ordered list of python functions to call.
422
423
        Each function takes branch, rev_id as parameters.
424
        """
425
        return self._post_commit()
426
427
    def _post_commit(self):
428
        """See Config.post_commit."""
429
        return None
430
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
431
    def user_email(self):
432
        """Return just the email component of a username."""
1185.33.31 by Martin Pool
Make annotate cope better with revisions committed without a valid
433
        return extract_email_address(self.username())
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
434
435
    def username(self):
436
        """Return email-style username.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
437
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
438
        Something similar to 'Martin Pool <mbp@sourcefrog.net>'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
439
5187.2.1 by Parth Malwankar
removed comment about deprecated BZREMAIL.
440
        $BZR_EMAIL can be set to override this, then
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
441
        the concrete policy type is checked, and finally
1185.37.2 by Jamie Wilkinson
Fix a typo and grammar in Config.username() docstring.
442
        $EMAIL is examined.
5187.2.12 by Parth Malwankar
trivial clarification in docstring.
443
        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
444
        """
1861.4.1 by Matthieu Moy
BZREMAIL renamed to BZR_EMAIL.
445
        v = os.environ.get('BZR_EMAIL')
446
        if v:
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
447
            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
448
        v = self._get_user_id()
449
        if v:
450
            return v
451
        v = os.environ.get('EMAIL')
452
        if v:
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
453
            return v.decode(osutils.get_user_encoding())
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
454
        name, email = _auto_user_id()
455
        if name and email:
456
            return '%s <%s>' % (name, email)
457
        elif email:
458
            return email
5187.2.6 by Parth Malwankar
lockdir no long mandates whoami but uses unicode version of getuser
459
        raise errors.NoWhoami()
5187.2.3 by Parth Malwankar
init and init-repo now fail before creating dir if username is not set.
460
461
    def ensure_username(self):
5187.2.11 by Parth Malwankar
documentation updates
462
        """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.
463
464
        This method relies on the username() function raising the error.
465
        """
466
        self.username()
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
467
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
468
    def signature_checking(self):
469
        """What is the current policy for signature checking?."""
1442.1.15 by Robert Collins
make getting the signature checking policy a template method
470
        policy = self._get_signature_checking()
471
        if policy is not None:
472
            return policy
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
473
        return CHECK_IF_POSSIBLE
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
474
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
475
    def signing_policy(self):
476
        """What is the current policy for signature checking?."""
477
        policy = self._get_signing_policy()
478
        if policy is not None:
479
            return policy
480
        return SIGN_WHEN_REQUIRED
481
1442.1.21 by Robert Collins
create signature_needed() call for commit to trigger creating signatures
482
    def signature_needed(self):
483
        """Is a signature needed when committing ?."""
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
484
        policy = self._get_signing_policy()
485
        if policy is None:
486
            policy = self._get_signature_checking()
487
            if policy is not None:
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
488
                trace.warning("Please use create_signatures,"
489
                              " not check_signatures to set signing policy.")
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
490
            if policy == CHECK_ALWAYS:
491
                return True
492
        elif policy == SIGN_ALWAYS:
1442.1.21 by Robert Collins
create signature_needed() call for commit to trigger creating signatures
493
            return True
494
        return False
495
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
496
    def get_alias(self, value):
497
        return self._get_alias(value)
498
499
    def _get_alias(self, value):
500
        pass
501
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
502
    def get_nickname(self):
503
        return self._get_nickname()
504
505
    def _get_nickname(self):
506
        return None
507
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
508
    def get_bzr_remote_path(self):
509
        try:
510
            return os.environ['BZR_REMOTE_PATH']
511
        except KeyError:
512
            path = self.get_user_option("bzr_remote_path")
513
            if path is None:
514
                path = 'bzr'
515
            return path
516
4840.2.6 by Vincent Ladeuil
Implement config.suppress_warning.
517
    def suppress_warning(self, warning):
518
        """Should the warning be suppressed or emitted.
519
520
        :param warning: The name of the warning being tested.
521
522
        :returns: True if the warning should be suppressed, False otherwise.
523
        """
524
        warnings = self.get_user_option_as_list('suppress_warnings')
525
        if warnings is None or warning not in warnings:
526
            return False
527
        else:
528
            return True
529
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
530
    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.
531
        tools = {}
5321.1.99 by Gordon Tyler
Fixes for changes to Config._get_options().
532
        for (oname, value, section, conf_id, parser) in self._get_options():
5321.2.3 by Vincent Ladeuil
Prefix mergetools option names with 'bzr.'.
533
            if oname.startswith('bzr.mergetool.'):
5321.1.108 by Gordon Tyler
Changed known merge tools into a default set of merge tools that are always defined but can be overridden by user-defined merge tools.
534
                tool_name = oname[len('bzr.mergetool.'):]
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
535
                tools[tool_name] = value
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
536
        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.
537
        return tools
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
538
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.
539
    def find_merge_tool(self, name):
5321.1.111 by Gordon Tyler
Remove predefined merge tools from list returned by get_merge_tools.
540
        # We fake a defaults mechanism here by checking if the given name can 
541
        # be found in the known_merge_tools if it's not found in the config.
542
        # This should be done through the proposed config defaults mechanism
543
        # when it becomes available in the future.
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
544
        command_line = (self.get_user_option('bzr.mergetool.%s' % name,
545
                                             expand=False)
546
                        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.
547
        return command_line
5321.1.88 by Gordon Tyler
Moved mergetools config functions into bzrlib.config.Config.
548
1442.1.15 by Robert Collins
make getting the signature checking policy a template method
549
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
550
class IniBasedConfig(Config):
551
    """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
552
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
553
    def __init__(self, get_filename=symbol_versioning.DEPRECATED_PARAMETER,
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
554
                 file_name=None):
5345.2.5 by Vincent Ladeuil
Add docstring.
555
        """Base class for configuration files using an ini-like syntax.
556
557
        :param file_name: The configuration file path.
558
        """
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
559
        super(IniBasedConfig, self).__init__()
5345.1.8 by Vincent Ladeuil
Make the test_listen_to_the_last_speaker pass and fix fallouts.
560
        self.file_name = file_name
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
561
        if symbol_versioning.deprecated_passed(get_filename):
562
            symbol_versioning.warn(
563
                'IniBasedConfig.__init__(get_filename) was deprecated in 2.3.'
564
                ' Use file_name instead.',
565
                DeprecationWarning,
566
                stacklevel=2)
5345.1.8 by Vincent Ladeuil
Make the test_listen_to_the_last_speaker pass and fix fallouts.
567
            if get_filename is not None:
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
568
                self.file_name = get_filename()
569
        else:
570
            self.file_name = file_name
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
571
        self._content = None
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
572
        self._parser = None
573
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
574
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
575
    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
576
        """Create a config object from a string.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
577
5345.2.9 by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string.
578
        :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.
579
            be utf-8 encoded.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
580
581
        :param file_name: The configuration file path.
582
583
        :param _save: Whether the file should be saved upon creation.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
584
        """
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
585
        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
586
        conf._create_from_string(str_or_unicode, save)
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
587
        return conf
588
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
589
    def _create_from_string(self, str_or_unicode, save):
5345.5.13 by Vincent Ladeuil
Merge simplify-test-config-building into lockable-config-files resolving conflicts
590
        self._content = StringIO(str_or_unicode.encode('utf-8'))
5345.1.16 by Vincent Ladeuil
Allows tests to save the config file at build time.
591
        # Some tests use in-memory configs, some other always need the config
592
        # file to exist on disk.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
593
        if save:
5345.1.16 by Vincent Ladeuil
Allows tests to save the config file at build time.
594
            self._write_config_file()
5345.5.12 by Vincent Ladeuil
Fix fallouts from replacing '_content' by 'from_bytes' for config files.
595
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
596
    def _get_parser(self, file=symbol_versioning.DEPRECATED_PARAMETER):
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
597
        if self._parser is not None:
598
            return self._parser
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
599
        if symbol_versioning.deprecated_passed(file):
600
            symbol_versioning.warn(
601
                'IniBasedConfig._get_parser(file=xxx) was deprecated in 2.3.'
5345.1.5 by Vincent Ladeuil
Fix fallouts by slightly editing the tests. More refactoring avoided to keep the review light.
602
                ' Use IniBasedConfig(_content=xxx) instead.',
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
603
                DeprecationWarning,
604
                stacklevel=2)
605
        if self._content is not None:
606
            co_input = self._content
607
        elif self.file_name is None:
608
            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
609
        else:
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
610
            co_input = self.file_name
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
611
        try:
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
612
            self._parser = ConfigObj(co_input, encoding='utf-8')
1474 by Robert Collins
Merge from Aaron Bentley.
613
        except configobj.ConfigObjError, e:
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
614
            raise errors.ParseConfigError(e.errors, e.config.filename)
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
615
        # 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.
616
        self._parser.filename = self.file_name
1185.12.49 by Aaron Bentley
Switched to ConfigObj
617
        return self._parser
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
618
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
619
    def reload(self):
620
        """Reload the config file from disk."""
621
        if self.file_name is None:
622
            raise AssertionError('We need a file name to reload the config')
623
        if self._parser is not None:
624
            self._parser.reload()
625
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
626
    def _get_matching_sections(self):
627
        """Return an ordered list of (section_name, extra_path) pairs.
628
629
        If the section contains inherited configuration, extra_path is
630
        a string containing the additional path components.
631
        """
632
        section = self._get_section()
633
        if section is not None:
634
            return [(section, '')]
635
        else:
636
            return []
637
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
638
    def _get_section(self):
639
        """Override this to define the section used by the config."""
640
        return "DEFAULT"
641
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.
642
    def _get_sections(self, name=None):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
643
        """Returns an iterator of the sections specified by ``name``.
644
645
        :param name: The section name. If None is supplied, the default
646
            configurations are yielded.
647
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
648
        :return: A tuple (name, section, config_id) for all sections that will
649
            be walked by user_get_option() in the 'right' order. The first one
650
            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.
651
        """
652
        parser = self._get_parser()
653
        if name is not None:
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
654
            yield (name, parser[name], self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
655
        else:
656
            # No section name has been given so we fallback to the configobj
657
            # 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.
658
            yield (None, parser, self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
659
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.
660
    def _get_options(self, sections=None):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
661
        """Return an ordered list of (name, value, section, config_id) tuples.
662
663
        All options are returned with their associated value and the section
664
        they appeared in. ``config_id`` is a unique identifier for the
665
        configuration file the option is defined in.
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
666
667
        :param sections: Default to ``_get_matching_sections`` if not
668
            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.
669
            which sections should be searched. This is a list of (name,
670
            configobj) tuples.
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
671
        """
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
672
        opts = []
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
673
        if sections is None:
674
            parser = self._get_parser()
675
            sections = []
676
            for (section_name, _) in self._get_matching_sections():
677
                try:
678
                    section = parser[section_name]
679
                except KeyError:
680
                    # This could happen for an empty file for which we define a
681
                    # DEFAULT section. FIXME: Force callers to provide sections
682
                    # instead ? -- vila 20100930
683
                    continue
684
                sections.append((section_name, section))
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
685
        config_id = self.config_id()
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
686
        for (section_name, section) in sections:
687
            for (name, value) in section.iteritems():
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
688
                yield (name, parser._quote(value), section_name,
689
                       config_id, parser)
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
690
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
691
    def _get_option_policy(self, section, option_name):
692
        """Return the policy for the given (section, option_name) pair."""
693
        return POLICY_NONE
694
4603.1.10 by Aaron Bentley
Provide change editor via config.
695
    def _get_change_editor(self):
696
        return self.get_user_option('change_editor')
697
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
698
    def _get_signature_checking(self):
699
        """See Config._get_signature_checking."""
1474 by Robert Collins
Merge from Aaron Bentley.
700
        policy = self._get_user_option('check_signatures')
701
        if policy:
702
            return self._string_to_signature_policy(policy)
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
703
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
704
    def _get_signing_policy(self):
1773.4.3 by Martin Pool
[merge] bzr.dev
705
        """See Config._get_signing_policy"""
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
706
        policy = self._get_user_option('create_signatures')
707
        if policy:
708
            return self._string_to_signing_policy(policy)
709
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
710
    def _get_user_id(self):
711
        """Get the user id from the 'email' key in the current section."""
1474 by Robert Collins
Merge from Aaron Bentley.
712
        return self._get_user_option('email')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
713
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
714
    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.
715
        """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
716
        for (section, extra_path) in self._get_matching_sections():
717
            try:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
718
                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
719
            except KeyError:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
720
                continue
721
            policy = self._get_option_policy(section, option_name)
722
            if policy == POLICY_NONE:
723
                return value
724
            elif policy == POLICY_NORECURSE:
725
                # norecurse items only apply to the exact path
726
                if extra_path:
727
                    continue
728
                else:
729
                    return value
730
            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
731
                if extra_path:
732
                    value = urlutils.join(value, extra_path)
733
                return value
2120.6.6 by James Henstridge
fix test_set_push_location test
734
            else:
735
                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
736
        else:
1993.3.1 by James Henstridge
first go at making location config lookup recursive
737
            return None
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
738
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
739
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
740
        """See Config.gpg_signing_command."""
1472 by Robert Collins
post commit hook, first pass implementation
741
        return self._get_user_option('gpg_signing_command')
1442.1.56 by Robert Collins
gpg_signing_command configuration item
742
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
743
    def _log_format(self):
744
        """See Config.log_format."""
745
        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
746
1472 by Robert Collins
post commit hook, first pass implementation
747
    def _post_commit(self):
748
        """See Config.post_commit."""
749
        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
750
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
751
    def _string_to_signature_policy(self, signature_string):
752
        """Convert a string to a signing policy."""
1442.1.17 by Robert Collins
allow global overriding of signature policy to force checking, or (pointless but allowed) to set auto checking
753
        if signature_string.lower() == 'check-available':
754
            return CHECK_IF_POSSIBLE
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
755
        if signature_string.lower() == 'ignore':
756
            return CHECK_NEVER
1442.1.17 by Robert Collins
allow global overriding of signature policy to force checking, or (pointless but allowed) to set auto checking
757
        if signature_string.lower() == 'require':
758
            return CHECK_ALWAYS
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
759
        raise errors.BzrError("Invalid signatures policy '%s'"
760
                              % signature_string)
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
761
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
762
    def _string_to_signing_policy(self, signature_string):
763
        """Convert a string to a signing policy."""
764
        if signature_string.lower() == 'when-required':
765
            return SIGN_WHEN_REQUIRED
766
        if signature_string.lower() == 'never':
767
            return SIGN_NEVER
768
        if signature_string.lower() == 'always':
769
            return SIGN_ALWAYS
770
        raise errors.BzrError("Invalid signing policy '%s'"
771
                              % signature_string)
772
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
773
    def _get_alias(self, value):
774
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
775
            return self._get_parser().get_value("ALIASES",
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
776
                                                value)
777
        except KeyError:
778
            pass
779
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
780
    def _get_nickname(self):
781
        return self.get_user_option('nickname')
782
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
783
    def remove_user_option(self, option_name, section_name=None):
784
        """Remove a user option and save the configuration file.
785
786
        :param option_name: The option to be removed.
787
788
        :param section_name: The section the option is defined in, default to
789
            the default section.
790
        """
791
        self.reload()
792
        parser = self._get_parser()
793
        if section_name is None:
794
            section = parser
795
        else:
796
            section = parser[section_name]
797
        try:
798
            del section[option_name]
799
        except KeyError:
800
            raise errors.NoSuchConfigOption(option_name)
801
        self._write_config_file()
802
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
803
    def _write_config_file(self):
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
804
        if self.file_name is None:
805
            raise AssertionError('We cannot save, self.file_name is None')
5345.1.9 by Vincent Ladeuil
Refactor config dir check.
806
        conf_dir = os.path.dirname(self.file_name)
807
        ensure_config_dir_exists(conf_dir)
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
808
        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
809
        self._get_parser().write(atomic_file)
810
        atomic_file.commit()
811
        atomic_file.close()
5345.3.3 by Vincent Ladeuil
Merge bzr.dev into deprecate-get-filename resolving conflicts
812
        osutils.copy_ownership_from_path(self.file_name)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
813
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
814
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
815
class LockableConfig(IniBasedConfig):
816
    """A configuration needing explicit locking for access.
817
818
    If several processes try to write the config file, the accesses need to be
819
    serialized.
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
820
821
    Daughter classes should decorate all methods that update a config with the
822
    ``@needs_write_lock`` decorator (they call, directly or indirectly, the
823
    ``_write_config_file()`` method. These methods (typically ``set_option()``
824
    and variants must reload the config file from disk before calling
825
    ``_write_config_file()``), this can be achieved by calling the
826
    ``self.reload()`` method. Note that the lock scope should cover both the
827
    reading and the writing of the config file which is why the decorator can't
828
    be applied to ``_write_config_file()`` only.
829
830
    This should be enough to implement the following logic:
831
    - lock for exclusive write access,
832
    - reload the config file from disk,
833
    - set the new value
834
    - unlock
835
836
    This logic guarantees that a writer can update a value without erasing an
837
    update made by another writer.
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
838
    """
839
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
840
    lock_name = 'lock'
841
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
842
    def __init__(self, file_name):
843
        super(LockableConfig, self).__init__(file_name=file_name)
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
844
        self.dir = osutils.dirname(osutils.safe_unicode(self.file_name))
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
845
        # FIXME: It doesn't matter that we don't provide possible_transports
846
        # below since this is currently used only for local config files ;
847
        # local transports are not shared. But if/when we start using
848
        # LockableConfig for other kind of transports, we will need to reuse
849
        # whatever connection is already established -- vila 20100929
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
850
        self.transport = transport.get_transport(self.dir)
851
        self._lock = lockdir.LockDir(self.transport, 'lock')
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
852
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
853
    def _create_from_string(self, unicode_bytes, save):
854
        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.
855
        if save:
5345.1.24 by Vincent Ladeuil
Implement _save for LockableConfig too.
856
            # We need to handle the saving here (as opposed to IniBasedConfig)
857
            # to be able to lock
858
            self.lock_write()
859
            self._write_config_file()
860
            self.unlock()
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
861
862
    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.
863
        """Takes a write lock in the directory containing the config file.
864
865
        If the directory doesn't exist it is created.
866
        """
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
867
        ensure_config_dir_exists(self.dir)
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
868
        return self._lock.lock_write(token)
869
870
    def unlock(self):
871
        self._lock.unlock()
872
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
873
    def break_lock(self):
874
        self._lock.break_lock()
875
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
876
    @needs_write_lock
877
    def remove_user_option(self, option_name, section_name=None):
878
        super(LockableConfig, self).remove_user_option(option_name,
879
                                                       section_name)
880
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
881
    def _write_config_file(self):
882
        if self._lock is None or not self._lock.is_held:
883
            # NB: if the following exception is raised it probably means a
884
            # missing @needs_write_lock decorator on one of the callers.
885
            raise errors.ObjectNotLocked(self)
886
        super(LockableConfig, self)._write_config_file()
887
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
888
889
class GlobalConfig(LockableConfig):
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
890
    """The configuration that should be used for a specific location."""
891
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
892
    def __init__(self):
893
        super(GlobalConfig, self).__init__(file_name=config_filename())
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
894
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
895
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
896
        return 'bazaar'
897
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
898
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
899
    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
900
        """Create a config object from a string.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
901
5345.5.13 by Vincent Ladeuil
Merge simplify-test-config-building into lockable-config-files resolving conflicts
902
        :param str_or_unicode: A string representing the file content. This
903
            will be utf-8 encoded.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
904
905
        :param save: Whether the file should be saved upon creation.
906
        """
907
        conf = cls()
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
908
        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.
909
        return conf
5345.5.12 by Vincent Ladeuil
Fix fallouts from replacing '_content' by 'from_bytes' for config files.
910
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
911
    def get_editor(self):
1474 by Robert Collins
Merge from Aaron Bentley.
912
        return self._get_user_option('editor')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
913
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
914
    @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
915
    def set_user_option(self, option, value):
916
        """Save option and its value in the configuration."""
2900.3.2 by Tim Penhey
A working alias command.
917
        self._set_option(option, value, 'DEFAULT')
918
919
    def get_aliases(self):
920
        """Return the aliases section."""
921
        if 'ALIASES' in self._get_parser():
922
            return self._get_parser()['ALIASES']
923
        else:
924
            return {}
925
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
926
    @needs_write_lock
2900.3.2 by Tim Penhey
A working alias command.
927
    def set_alias(self, alias_name, alias_command):
928
        """Save the alias in the configuration."""
929
        self._set_option(alias_name, alias_command, 'ALIASES')
930
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
931
    @needs_write_lock
2900.3.2 by Tim Penhey
A working alias command.
932
    def unset_alias(self, alias_name):
933
        """Unset an existing alias."""
5345.5.10 by Vincent Ladeuil
Add a missing config.reload().
934
        self.reload()
2900.3.2 by Tim Penhey
A working alias command.
935
        aliases = self._get_parser().get('ALIASES')
2900.3.7 by Tim Penhey
Updates from Aaron's review.
936
        if not aliases or alias_name not in aliases:
937
            raise errors.NoSuchAlias(alias_name)
2900.3.2 by Tim Penhey
A working alias command.
938
        del aliases[alias_name]
2900.3.12 by Tim Penhey
Final review comments.
939
        self._write_config_file()
2900.3.2 by Tim Penhey
A working alias command.
940
941
    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.
942
        self.reload()
2900.3.7 by Tim Penhey
Updates from Aaron's review.
943
        self._get_parser().setdefault(section, {})[option] = value
2900.3.12 by Tim Penhey
Final review comments.
944
        self._write_config_file()
2900.3.2 by Tim Penhey
A working alias command.
945
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
946
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.
947
    def _get_sections(self, name=None):
948
        """See IniBasedConfig._get_sections()."""
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
949
        parser = self._get_parser()
950
        # We don't give access to options defined outside of any section, we
951
        # used the DEFAULT section by... default.
952
        if name in (None, 'DEFAULT'):
953
            # This could happen for an empty file where the DEFAULT section
954
            # doesn't exist yet. So we force DEFAULT when yielding
955
            name = 'DEFAULT'
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
956
            if 'DEFAULT' not in parser:
957
               parser['DEFAULT']= {}
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
958
        yield (name, parser[name], self.config_id())
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
959
960
    @needs_write_lock
961
    def remove_user_option(self, option_name, section_name=None):
962
        if section_name is None:
963
            # We need to force the default section.
964
            section_name = 'DEFAULT'
965
        # We need to avoid the LockableConfig implementation or we'll lock
966
        # twice
967
        super(LockableConfig, self).remove_user_option(option_name,
968
                                                       section_name)
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
969
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
970
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.
971
    """Keep only the sessions matching the specified location.
972
973
    :param sections: An iterable of section names.
974
975
    :param location: An url or a local path to match against.
976
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
977
    :returns: An iterator of (section, extra_path, nb_parts) where nb is the
978
        number of path components in the section name, section is the section
979
        name and extra_path is the difference between location and the section
980
        name.
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.
981
    """
5764.1.2 by Vincent Ladeuil
This put a common processing into the loop to avoid bad inputs. The
982
    location_parts = location.rstrip('/').split('/')
983
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.
984
    for section in sections:
985
        # location is a local path if possible, so we need
986
        # to convert 'file://' urls to local paths if necessary.
987
988
        # FIXME: I don't think the above comment is still up to date,
989
        # LocationConfig is always instantiated with an url -- vila 2011-04-07
990
991
        # This also avoids having file:///path be a more exact
992
        # match than '/path'.
993
994
        # FIXME: Not sure about the above either, but since the path components
995
        # are compared in sync, adding two empty components (//) is likely to
996
        # trick the comparison and also trick the check on the number of
997
        # components, so we *should* take only the relevant part of the url. On
998
        # the other hand, this means 'file://' urls *can't* be used in sections
999
        # so more work is probably needed -- vila 2011-04-07
1000
1001
        if section.startswith('file://'):
1002
            section_path = urlutils.local_path_from_url(section)
1003
        else:
1004
            section_path = section
1005
        section_parts = section_path.rstrip('/').split('/')
1006
1007
        matched = True
1008
        if len(section_parts) > len(location_parts):
1009
            # More path components in the section, they can't match
1010
            matched = False
1011
        else:
1012
            # Rely on zip truncating in length to the length of the shortest
1013
            # argument sequence.
1014
            names = zip(location_parts, section_parts)
1015
            for name in names:
1016
                if not fnmatch.fnmatch(name[0], name[1]):
1017
                    matched = False
1018
                    break
1019
        if not matched:
1020
            continue
5764.1.1 by Vincent Ladeuil
Extract _match_section_by_parts from LocationConfig._get_matching_sections and more comments to explain the behavior.
1021
        # 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.
1022
        extra_path = '/'.join(location_parts[len(section_parts):])
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
1023
        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.
1024
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1025
5345.5.7 by Vincent Ladeuil
Make LocationConfig use a lock too.
1026
class LocationConfig(LockableConfig):
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1027
    """A configuration object that gives the policy for a location."""
1028
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1029
    def __init__(self, location):
5345.1.2 by Vincent Ladeuil
Get rid of 'branches.conf' references.
1030
        super(LocationConfig, self).__init__(
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1031
            file_name=locations_config_filename())
1878.1.1 by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653)
1032
        # local file locations are looked up by local path, rather than
1033
        # by file url. This is because the config file is a user
1034
        # file, and we would rather not expose the user to file urls.
1035
        if location.startswith('file://'):
1036
            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
1037
        self.location = location
1038
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1039
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1040
        return 'locations'
1041
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1042
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
1043
    def from_string(cls, str_or_unicode, location, save=False):
1044
        """Create a config object from a string.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1045
5345.2.9 by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string.
1046
        :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.
1047
            be utf-8 encoded.
1048
1049
        :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.
1050
1051
        :param save: Whether the file should be saved upon creation.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1052
        """
1053
        conf = cls(location)
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
1054
        conf._create_from_string(str_or_unicode, save)
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
1055
        return conf
1056
1993.3.1 by James Henstridge
first go at making location config lookup recursive
1057
    def _get_matching_sections(self):
1058
        """Return an ordered list of section names matching this location."""
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
1059
        matches = list(_iter_for_location_by_parts(self._get_parser(),
1060
                                                   self.location))
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1061
        # put the longest (aka more specific) locations first
5764.1.4 by Vincent Ladeuil
Using iterators is even clearer.
1062
        matches.sort(
1063
            key=lambda (section, extra_path, length): (length, section),
1064
            reverse=True)
1065
        for (section, extra_path, length) in matches:
1066
            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
1067
            # should we stop looking for parent configs here?
1993.3.1 by James Henstridge
first go at making location config lookup recursive
1068
            try:
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
1069
                if self._get_parser()[section].as_bool('ignore_parents'):
1070
                    break
1993.3.1 by James Henstridge
first go at making location config lookup recursive
1071
            except KeyError:
1072
                pass
1442.1.9 by Robert Collins
exact section test passes
1073
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.
1074
    def _get_sections(self, name=None):
1075
        """See IniBasedConfig._get_sections()."""
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1076
        # We ignore the name here as the only sections handled are named with
1077
        # the location path and we don't expose embedded sections either.
1078
        parser = self._get_parser()
1079
        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.
1080
            yield (name, parser[name], self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1081
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
1082
    def _get_option_policy(self, section, option_name):
1083
        """Return the policy for the given (section, option_name) pair."""
1084
        # check for the old 'recurse=False' flag
1085
        try:
1086
            recurse = self._get_parser()[section].as_bool('recurse')
1087
        except KeyError:
1088
            recurse = True
1089
        if not recurse:
1090
            return POLICY_NORECURSE
1091
2120.6.10 by James Henstridge
Catch another deprecation warning, and more cleanup
1092
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
1093
        try:
1094
            policy_name = self._get_parser()[section][policy_key]
1095
        except KeyError:
1096
            policy_name = None
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
1097
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
1098
        return _policy_value[policy_name]
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
1099
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1100
    def _set_option_policy(self, section, option_name, option_policy):
1101
        """Set the policy for the given option name in the given section."""
1102
        # The old recurse=False option affects all options in the
1103
        # section.  To handle multiple policies in the section, we
1104
        # need to convert it to a policy_norecurse key.
1105
        try:
1106
            recurse = self._get_parser()[section].as_bool('recurse')
1107
        except KeyError:
1108
            pass
1109
        else:
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1110
            symbol_versioning.warn(
2120.6.11 by James Henstridge
s/0.13/0.14/ in deprecation warning
1111
                'The recurse option is deprecated as of 0.14.  '
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1112
                'The section "%s" has been converted to use policies.'
1113
                % section,
1114
                DeprecationWarning)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1115
            del self._get_parser()[section]['recurse']
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1116
            if not recurse:
1117
                for key in self._get_parser()[section].keys():
1118
                    if not key.endswith(':policy'):
1119
                        self._get_parser()[section][key +
1120
                                                    ':policy'] = 'norecurse'
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1121
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1122
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
1123
        policy_name = _policy_name[option_policy]
1124
        if policy_name is not None:
1125
            self._get_parser()[section][policy_key] = policy_name
1126
        else:
1127
            if policy_key in self._get_parser()[section]:
1128
                del self._get_parser()[section][policy_key]
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1129
5345.5.7 by Vincent Ladeuil
Make LocationConfig use a lock too.
1130
    @needs_write_lock
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1131
    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.
1132
        """Save option and its value in the configuration."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1133
        if store not in [STORE_LOCATION,
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1134
                         STORE_LOCATION_NORECURSE,
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1135
                         STORE_LOCATION_APPENDPATH]:
1136
            raise ValueError('bad storage policy %r for %r' %
1137
                (store, option))
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
1138
        self.reload()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1139
        location = self.location
1140
        if location.endswith('/'):
1141
            location = location[:-1]
5345.1.24 by Vincent Ladeuil
Implement _save for LockableConfig too.
1142
        parser = self._get_parser()
5345.1.21 by Vincent Ladeuil
Slight rewrite to make the method more readable.
1143
        if not location in parser and not location + '/' in parser:
1144
            parser[location] = {}
1145
        elif location + '/' in parser:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1146
            location = location + '/'
5345.1.21 by Vincent Ladeuil
Slight rewrite to make the method more readable.
1147
        parser[location][option]=value
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1148
        # the allowed values of store match the config policies
1149
        self._set_option_policy(location, option, store)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
1150
        self._write_config_file()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1151
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1152
1153
class BranchConfig(Config):
1154
    """A configuration object giving the policy for a branch."""
1155
5345.1.3 by Vincent Ladeuil
Make __init__ the first method in the BranchConfig class.
1156
    def __init__(self, branch):
1157
        super(BranchConfig, self).__init__()
1158
        self._location_config = None
1159
        self._branch_data_config = None
1160
        self._global_config = None
1161
        self.branch = branch
1162
        self.option_sources = (self._get_location_config,
1163
                               self._get_branch_data_config,
1164
                               self._get_global_config)
1165
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1166
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1167
        return 'branch'
1168
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1169
    def _get_branch_data_config(self):
1170
        if self._branch_data_config is None:
1171
            self._branch_data_config = TreeConfig(self.branch)
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1172
            self._branch_data_config.config_id = self.config_id
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1173
        return self._branch_data_config
1174
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1175
    def _get_location_config(self):
1176
        if self._location_config is None:
1177
            self._location_config = LocationConfig(self.branch.base)
1178
        return self._location_config
1179
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1180
    def _get_global_config(self):
1181
        if self._global_config is None:
1182
            self._global_config = GlobalConfig()
1183
        return self._global_config
1184
1185
    def _get_best_value(self, option_name):
1186
        """This returns a user option from local, tree or global config.
1187
1188
        They are tried in that order.  Use get_safe_value if trusted values
1189
        are necessary.
1190
        """
1191
        for source in self.option_sources:
1192
            value = getattr(source(), option_name)()
1193
            if value is not None:
1194
                return value
1195
        return None
1196
1197
    def _get_safe_value(self, option_name):
1198
        """This variant of get_best_value never returns untrusted values.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1199
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1200
        It does not return values from the branch data, because the branch may
1201
        not be controlled by the user.
1202
1203
        We may wish to allow locations.conf to control whether branches are
1204
        trusted in the future.
1205
        """
1206
        for source in (self._get_location_config, self._get_global_config):
1207
            value = getattr(source(), option_name)()
1208
            if value is not None:
1209
                return value
1210
        return None
1211
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1212
    def _get_user_id(self):
1213
        """Return the full user id for the branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1214
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
1215
        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
1216
        This is looked up in the email controlfile for the branch.
1217
        """
1218
        try:
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
1219
            return (self.branch._transport.get_bytes("email")
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
1220
                    .decode(osutils.get_user_encoding())
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1221
                    .rstrip("\r\n"))
1222
        except errors.NoSuchFile, e:
1223
            pass
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1224
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1225
        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
1226
4603.1.10 by Aaron Bentley
Provide change editor via config.
1227
    def _get_change_editor(self):
1228
        return self._get_best_value('_get_change_editor')
1229
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
1230
    def _get_signature_checking(self):
1231
        """See Config._get_signature_checking."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1232
        return self._get_best_value('_get_signature_checking')
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
1233
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
1234
    def _get_signing_policy(self):
1235
        """See Config._get_signing_policy."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1236
        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
1237
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
1238
    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.
1239
        """See Config._get_user_option."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1240
        for source in self.option_sources:
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
1241
            value = source()._get_user_option(option_name)
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1242
            if value is not None:
1243
                return value
1244
        return None
1245
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.
1246
    def _get_sections(self, name=None):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1247
        """See IniBasedConfig.get_sections()."""
1248
        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.
1249
            for section in source()._get_sections(name):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1250
                yield section
1251
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.
1252
    def _get_options(self, sections=None):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1253
        opts = []
1254
        # 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.
1255
        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.
1256
            yield option
1257
        # Then the branch options
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1258
        branch_config = self._get_branch_data_config()
1259
        if sections is None:
1260
            sections = [('DEFAULT', branch_config._get_parser())]
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1261
        # FIXME: We shouldn't have to duplicate the code in IniBasedConfig but
1262
        # 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.
1263
        config_id = self.config_id()
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1264
        for (section_name, section) in sections:
1265
            for (name, value) in section.iteritems():
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
1266
                yield (name, value, section_name,
1267
                       config_id, branch_config._get_parser())
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1268
        # 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.
1269
        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.
1270
            yield option
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1271
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1272
    def set_user_option(self, name, value, store=STORE_BRANCH,
1273
        warn_masked=False):
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1274
        if store == STORE_BRANCH:
1770.2.6 by Aaron Bentley
Ensure branch.conf works properly
1275
            self._get_branch_data_config().set_option(value, name)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1276
        elif store == STORE_GLOBAL:
2120.6.7 by James Henstridge
Fix GlobalConfig.set_user_option() call
1277
            self._get_global_config().set_user_option(name, value)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1278
        else:
1279
            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)
1280
        if not warn_masked:
1281
            return
1282
        if store in (STORE_GLOBAL, STORE_BRANCH):
1283
            mask_value = self._get_location_config().get_user_option(name)
1284
            if mask_value is not None:
1285
                trace.warning('Value "%s" is masked by "%s" from'
1286
                              ' locations.conf', value, mask_value)
1287
            else:
1288
                if store == STORE_GLOBAL:
1289
                    branch_config = self._get_branch_data_config()
1290
                    mask_value = branch_config.get_user_option(name)
1291
                    if mask_value is not None:
1292
                        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
1293
                                      ' branch.conf', value, mask_value)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1294
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1295
    def remove_user_option(self, option_name, section_name=None):
1296
        self._get_branch_data_config().remove_option(option_name, section_name)
1297
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
1298
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
1299
        """See Config.gpg_signing_command."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1300
        return self._get_safe_value('_gpg_signing_command')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1301
1472 by Robert Collins
post commit hook, first pass implementation
1302
    def _post_commit(self):
1303
        """See Config.post_commit."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1304
        return self._get_safe_value('_post_commit')
1472 by Robert Collins
post commit hook, first pass implementation
1305
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1306
    def _get_nickname(self):
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
1307
        value = self._get_explicit_nickname()
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1308
        if value is not None:
1309
            return value
2120.5.2 by Alexander Belchenko
(jam) Fix for bug #66857
1310
        return urlutils.unescape(self.branch.base.split('/')[-2])
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1311
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
1312
    def has_explicit_nickname(self):
1313
        """Return true if a nickname has been explicitly assigned."""
1314
        return self._get_explicit_nickname() is not None
1315
1316
    def _get_explicit_nickname(self):
1317
        return self._get_best_value('_get_nickname')
1318
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
1319
    def _log_format(self):
1320
        """See Config.log_format."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1321
        return self._get_best_value('_log_format')
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1322
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
1323
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1324
def ensure_config_dir_exists(path=None):
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1325
    """Make sure a configuration directory exists.
1326
    This makes sure that the directory exists.
1327
    On windows, since configuration directories are 2 levels deep,
1328
    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
1329
    """
1330
    if path is None:
1331
        path = config_dir()
1332
    if not os.path.isdir(path):
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1333
        if sys.platform == 'win32':
1334
            parent_dir = os.path.dirname(path)
1335
            if not os.path.isdir(parent_dir):
1336
                trace.mutter('creating config parent directory: %r', parent_dir)
1337
                os.mkdir(parent_dir)
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1338
        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
1339
        os.mkdir(path)
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
1340
        osutils.copy_ownership_from_path(path)
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1341
1532 by Robert Collins
Merge in John Meinels integration branch.
1342
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1343
def config_dir():
1344
    """Return per-user configuration directory.
1345
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1346
    By default this is %APPDATA%/bazaar/2.0 on Windows, ~/.bazaar on Mac OS X
5519.4.3 by Neil Martinsen-Burrell
be permissive about using $XDG_CONFIG_HOME/bazaar, but dont complain
1347
    and Linux.  On Linux, if there is a $XDG_CONFIG_HOME/bazaar directory,
1348
    that will be used instead.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1349
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1350
    TODO: Global option --config-dir to override this.
1351
    """
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1352
    base = os.environ.get('BZR_HOME', None)
1353
    if sys.platform == 'win32':
5598.2.2 by John Arbash Meinel
Change the comment slightly
1354
        # environ variables on Windows are in user encoding/mbcs. So decode
1355
        # before using one
5598.2.1 by John Arbash Meinel
Decode windows env vars using mbcs rather than assuming the 8-bit string is ok.
1356
        if base is not None:
1357
            base = base.decode('mbcs')
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1358
        if base is None:
2245.4.3 by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
1359
            base = win32utils.get_appdata_location_unicode()
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1360
        if base is None:
1361
            base = os.environ.get('HOME', None)
5598.2.1 by John Arbash Meinel
Decode windows env vars using mbcs rather than assuming the 8-bit string is ok.
1362
            if base is not None:
1363
                base = base.decode('mbcs')
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1364
        if base is None:
2991.2.2 by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0.
1365
            raise errors.BzrError('You must have one of BZR_HOME, APPDATA,'
1366
                                  ' or HOME set')
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1367
        return osutils.pathjoin(base, 'bazaar', '2.0')
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1368
    elif sys.platform == 'darwin':
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1369
        if base is None:
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1370
            # this takes into account $HOME
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1371
            base = os.path.expanduser("~")
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1372
        return osutils.pathjoin(base, '.bazaar')
1373
    else:
1374
        if base is None:
5519.4.3 by Neil Martinsen-Burrell
be permissive about using $XDG_CONFIG_HOME/bazaar, but dont complain
1375
1376
            xdg_dir = os.environ.get('XDG_CONFIG_HOME', None)
1377
            if xdg_dir is None:
1378
                xdg_dir = osutils.pathjoin(os.path.expanduser("~"), ".config")
1379
            xdg_dir = osutils.pathjoin(xdg_dir, 'bazaar')
1380
            if osutils.isdir(xdg_dir):
1381
                trace.mutter(
1382
                    "Using configuration in XDG directory %s." % xdg_dir)
1383
                return xdg_dir
1384
1385
            base = os.path.expanduser("~")
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1386
        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 \
1387
1388
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1389
def config_filename():
1390
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1391
    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.
1392
1393
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
1394
def locations_config_filename():
1395
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1396
    return osutils.pathjoin(config_dir(), 'locations.conf')
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
1397
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1398
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1399
def authentication_config_filename():
1400
    """Return per-user authentication ini file filename."""
1401
    return osutils.pathjoin(config_dir(), 'authentication.conf')
1402
1403
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
1404
def user_ignore_config_filename():
1405
    """Return the user default ignore filename"""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1406
    return osutils.pathjoin(config_dir(), 'ignore')
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
1407
1408
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1409
def crash_dir():
1410
    """Return the directory name to store crash files.
1411
1412
    This doesn't implicitly create it.
1413
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
1414
    On Windows it's in the config directory; elsewhere it's /var/crash
4634.128.18 by Martin Pool
Update apport crash tests
1415
    which may be monitored by apport.  It can be overridden by
1416
    $APPORT_CRASH_DIR.
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1417
    """
1418
    if sys.platform == 'win32':
1419
        return osutils.pathjoin(config_dir(), 'Crash')
1420
    else:
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
1421
        # XXX: hardcoded in apport_python_hook.py; therefore here too -- mbp
1422
        # 2010-01-31
4634.128.18 by Martin Pool
Update apport crash tests
1423
        return os.environ.get('APPORT_CRASH_DIR', '/var/crash')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1424
1425
1426
def xdg_cache_dir():
4584.3.23 by Martin Pool
Correction to xdg_cache_dir and add a simple test
1427
    # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html
1428
    # Possibly this should be different on Windows?
1429
    e = os.environ.get('XDG_CACHE_DIR', None)
1430
    if e:
1431
        return e
1432
    else:
1433
        return os.path.expanduser('~/.cache')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1434
1435
5050.72.1 by Martin Pool
Set email address from /etc/mailname if possible
1436
def _get_default_mail_domain():
1437
    """If possible, return the assumed default email domain.
1438
1439
    :returns: string mail domain, or None.
1440
    """
1441
    if sys.platform == 'win32':
1442
        # No implementation yet; patches welcome
1443
        return None
1444
    try:
1445
        f = open('/etc/mailname')
1446
    except (IOError, OSError), e:
1447
        return None
1448
    try:
1449
        domain = f.read().strip()
1450
        return domain
1451
    finally:
1452
        f.close()
1453
1454
1455
def _auto_user_id():
1456
    """Calculate automatic user identification.
1457
1458
    :returns: (realname, email), either of which may be None if they can't be
1459
    determined.
1460
1461
    Only used when none is set in the environment or the id file.
1462
1463
    This only returns an email address if we can be fairly sure the 
1464
    address is reasonable, ie if /etc/mailname is set on unix.
1465
1466
    This doesn't use the FQDN as the default domain because that may be 
1467
    slow, and it doesn't use the hostname alone because that's not normally 
1468
    a reasonable address.
1469
    """
1470
    if sys.platform == 'win32':
1471
        # No implementation to reliably determine Windows default mail
1472
        # address; please add one.
1473
        return None, None
1474
1475
    default_mail_domain = _get_default_mail_domain()
1476
    if not default_mail_domain:
1477
        return None, None
1478
1479
    import pwd
1480
    uid = os.getuid()
1481
    try:
1482
        w = pwd.getpwuid(uid)
1483
    except KeyError:
1484
        mutter('no passwd entry for uid %d?' % uid)
1485
        return None, None
1486
1487
    # we try utf-8 first, because on many variants (like Linux),
1488
    # /etc/passwd "should" be in utf-8, and because it's unlikely to give
1489
    # false positives.  (many users will have their user encoding set to
1490
    # latin-1, which cannot raise UnicodeError.)
1491
    try:
1492
        gecos = w.pw_gecos.decode('utf-8')
1493
        encoding = 'utf-8'
1494
    except UnicodeError:
1495
        try:
1496
            encoding = osutils.get_user_encoding()
1497
            gecos = w.pw_gecos.decode(encoding)
1498
        except UnicodeError, e:
1499
            mutter("cannot decode passwd entry %s" % w)
1500
            return None, None
1501
    try:
1502
        username = w.pw_name.decode(encoding)
1503
    except UnicodeError, e:
1504
        mutter("cannot decode passwd entry %s" % w)
1505
        return None, None
1506
1507
    comma = gecos.find(',')
1508
    if comma == -1:
1509
        realname = gecos
1510
    else:
1511
        realname = gecos[:comma]
1512
1513
    return realname, (username + '@' + default_mail_domain)
1514
1515
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1516
def parse_username(username):
1517
    """Parse e-mail username and return a (name, address) tuple."""
1518
    match = re.match(r'(.*?)\s*<?([\w+.-]+@[\w+.-]+)>?', username)
1519
    if match is None:
1520
        return (username, '')
1521
    else:
1522
        return (match.group(1), match.group(2))
1523
1524
1185.16.52 by Martin Pool
- add extract_email_address
1525
def extract_email_address(e):
1526
    """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.
1527
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1528
    That is just the user@domain part, nothing else.
1185.16.52 by Martin Pool
- add extract_email_address
1529
    This part is required to contain only ascii characters.
1530
    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.
1531
1185.16.52 by Martin Pool
- add extract_email_address
1532
    >>> extract_email_address('Jane Tester <jane@test.com>')
1533
    "jane@test.com"
1534
    """
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1535
    name, email = parse_username(e)
1536
    if not email:
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
1537
        raise errors.NoEmailInUsername(e)
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1538
    return email
1185.35.11 by Aaron Bentley
Added support for branch nicks
1539
1185.85.30 by John Arbash Meinel
Fixing 'bzr push' exposed that IniBasedConfig didn't handle unicode.
1540
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1541
class TreeConfig(IniBasedConfig):
1185.35.11 by Aaron Bentley
Added support for branch nicks
1542
    """Branch configuration data associated with its contents, not location"""
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1543
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
1544
    # XXX: Really needs a better name, as this is not part of the tree! -- mbp 20080507
1545
1185.35.11 by Aaron Bentley
Added support for branch nicks
1546
    def __init__(self, branch):
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
1547
        self._config = branch._get_config()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1548
        self.branch = branch
1549
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1550
    def _get_parser(self, file=None):
1551
        if file is not None:
1552
            return IniBasedConfig._get_parser(file)
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1553
        return self._config._get_configobj()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1554
1555
    def get_option(self, name, section=None, default=None):
1556
        self.branch.lock_read()
1557
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1558
            return self._config.get_option(name, section, default)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1559
        finally:
1560
            self.branch.unlock()
1561
1562
    def set_option(self, value, name, section=None):
1563
        """Set a per-branch configuration option"""
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1564
        # FIXME: We shouldn't need to lock explicitly here but rather rely on
1565
        # higher levels providing the right lock -- vila 20101004
1185.35.11 by Aaron Bentley
Added support for branch nicks
1566
        self.branch.lock_write()
1567
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1568
            self._config.set_option(value, name, section)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1569
        finally:
1570
            self.branch.unlock()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1571
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1572
    def remove_option(self, option_name, section_name=None):
1573
        # FIXME: We shouldn't need to lock explicitly here but rather rely on
1574
        # higher levels providing the right lock -- vila 20101004
1575
        self.branch.lock_write()
1576
        try:
1577
            self._config.remove_option(option_name, section_name)
1578
        finally:
1579
            self.branch.unlock()
1580
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1581
1582
class AuthenticationConfig(object):
1583
    """The authentication configuration file based on a ini file.
1584
1585
    Implements the authentication.conf file described in
1586
    doc/developers/authentication-ring.txt.
1587
    """
1588
1589
    def __init__(self, _file=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1590
        self._config = None # The ConfigObj
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1591
        if _file is None:
2900.2.24 by Vincent Ladeuil
Review feedback.
1592
            self._filename = authentication_config_filename()
1593
            self._input = self._filename = authentication_config_filename()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1594
        else:
2900.2.24 by Vincent Ladeuil
Review feedback.
1595
            # Tests can provide a string as _file
1596
            self._filename = None
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1597
            self._input = _file
1598
1599
    def _get_config(self):
1600
        if self._config is not None:
1601
            return self._config
1602
        try:
2900.2.22 by Vincent Ladeuil
Polishing.
1603
            # FIXME: Should we validate something here ? Includes: empty
1604
            # sections are useless, at least one of
1605
            # user/password/password_encoding should be defined, etc.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1606
1607
            # Note: the encoding below declares that the file itself is utf-8
1608
            # encoded, but the values in the ConfigObj are always Unicode.
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1609
            self._config = ConfigObj(self._input, encoding='utf-8')
1610
        except configobj.ConfigObjError, e:
1611
            raise errors.ParseConfigError(e.errors, e.config.filename)
1612
        return self._config
1613
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1614
    def _save(self):
1615
        """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.
1616
        conf_dir = os.path.dirname(self._filename)
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1617
        ensure_config_dir_exists(conf_dir)
4708.2.2 by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib
1618
        f = file(self._filename, 'wb')
1619
        try:
1620
            self._get_config().write(f)
1621
        finally:
1622
            f.close()
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1623
1624
    def _set_option(self, section_name, option_name, value):
1625
        """Set an authentication configuration option"""
1626
        conf = self._get_config()
1627
        section = conf.get(section_name)
1628
        if section is None:
1629
            conf[section] = {}
1630
            section = conf[section]
1631
        section[option_name] = value
1632
        self._save()
1633
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1634
    def get_credentials(self, scheme, host, port=None, user=None, path=None, 
1635
                        realm=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1636
        """Returns the matching credentials from authentication.conf file.
1637
1638
        :param scheme: protocol
1639
1640
        :param host: the server address
1641
1642
        :param port: the associated port (optional)
1643
1644
        :param user: login (optional)
1645
1646
        :param path: the absolute path on the server (optional)
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1647
        
1648
        :param realm: the http authentication realm (optional)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1649
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1650
        :return: A dict containing the matching credentials or None.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1651
           This includes:
1652
           - name: the section name of the credentials in the
1653
             authentication.conf file,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1654
           - 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.
1655
           - scheme: the server protocol,
1656
           - host: the server address,
1657
           - port: the server port (can be None),
1658
           - path: the absolute server path (can be None),
1659
           - realm: the http specific authentication realm (can be None),
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1660
           - password: the decoded password, could be None if the credential
1661
             defines only the user
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1662
           - verify_certificates: https specific, True if the server
1663
             certificate should be verified, False otherwise.
1664
        """
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1665
        credentials = None
1666
        for auth_def_name, auth_def in self._get_config().items():
3418.2.1 by Vincent Ladeuil
Fix #217650 by catching declarations outside sections.
1667
            if type(auth_def) is not configobj.Section:
1668
                raise ValueError("%s defined outside a section" % auth_def_name)
1669
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1670
            a_scheme, a_host, a_user, a_path = map(
1671
                auth_def.get, ['scheme', 'host', 'user', 'path'])
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1672
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1673
            try:
1674
                a_port = auth_def.as_int('port')
1675
            except KeyError:
1676
                a_port = None
2900.2.22 by Vincent Ladeuil
Polishing.
1677
            except ValueError:
1678
                raise ValueError("'port' not numeric in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1679
            try:
1680
                a_verify_certificates = auth_def.as_bool('verify_certificates')
1681
            except KeyError:
1682
                a_verify_certificates = True
2900.2.22 by Vincent Ladeuil
Polishing.
1683
            except ValueError:
1684
                raise ValueError(
1685
                    "'verify_certificates' not boolean in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1686
1687
            # Attempt matching
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1688
            if a_scheme is not None and scheme != a_scheme:
1689
                continue
1690
            if a_host is not None:
1691
                if not (host == a_host
1692
                        or (a_host.startswith('.') and host.endswith(a_host))):
1693
                    continue
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1694
            if a_port is not None and port != a_port:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1695
                continue
1696
            if (a_path is not None and path is not None
1697
                and not path.startswith(a_path)):
1698
                continue
1699
            if (a_user is not None and user is not None
1700
                and a_user != user):
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1701
                # Never contradict the caller about the user to be used
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1702
                continue
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1703
            if a_user is None:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1704
                # Can't find a user
1705
                continue
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1706
            # Prepare a credentials dictionary with additional keys
1707
            # for the credential providers
2900.2.24 by Vincent Ladeuil
Review feedback.
1708
            credentials = dict(name=auth_def_name,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1709
                               user=a_user,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1710
                               scheme=a_scheme,
1711
                               host=host,
1712
                               port=port,
1713
                               path=path,
1714
                               realm=realm,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1715
                               password=auth_def.get('password', None),
2900.2.24 by Vincent Ladeuil
Review feedback.
1716
                               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
1717
            # Decode the password in the credentials (or get one)
2900.2.22 by Vincent Ladeuil
Polishing.
1718
            self.decode_password(credentials,
1719
                                 auth_def.get('password_encoding', None))
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1720
            if 'auth' in debug.debug_flags:
1721
                trace.mutter("Using authentication section: %r", auth_def_name)
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1722
            break
1723
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1724
        if credentials is None:
1725
            # No credentials were found in authentication.conf, try the fallback
1726
            # credentials stores.
1727
            credentials = credential_store_registry.get_fallback_credentials(
1728
                scheme, host, port, user, path, realm)
1729
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1730
        return credentials
1731
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1732
    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
1733
                        port=None, path=None, verify_certificates=None,
1734
                        realm=None):
3777.3.1 by Aaron Bentley
Update docs
1735
        """Set authentication credentials for a host.
1736
1737
        Any existing credentials with matching scheme, host, port and path
1738
        will be deleted, regardless of name.
1739
1740
        :param name: An arbitrary name to describe this set of credentials.
1741
        :param host: Name of the host that accepts these credentials.
1742
        :param user: The username portion of these credentials.
1743
        :param scheme: The URL scheme (e.g. ssh, http) the credentials apply
1744
            to.
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1745
        :param password: Password portion of these credentials.
3777.3.1 by Aaron Bentley
Update docs
1746
        :param port: The IP port on the host that these credentials apply to.
1747
        :param path: A filesystem path on the host that these credentials
1748
            apply to.
1749
        :param verify_certificates: On https, verify server certificates if
1750
            True.
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1751
        :param realm: The http authentication realm (optional).
3777.3.1 by Aaron Bentley
Update docs
1752
        """
3777.1.8 by Aaron Bentley
Commit work-in-progress
1753
        values = {'host': host, 'user': user}
1754
        if password is not None:
1755
            values['password'] = password
1756
        if scheme is not None:
1757
            values['scheme'] = scheme
1758
        if port is not None:
1759
            values['port'] = '%d' % port
1760
        if path is not None:
1761
            values['path'] = path
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1762
        if verify_certificates is not None:
1763
            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
1764
        if realm is not None:
1765
            values['realm'] = realm
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1766
        config = self._get_config()
1767
        for_deletion = []
1768
        for section, existing_values in config.items():
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1769
            for key in ('scheme', 'host', 'port', 'path', 'realm'):
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1770
                if existing_values.get(key) != values.get(key):
1771
                    break
1772
            else:
1773
                del config[section]
1774
        config.update({name: values})
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1775
        self._save()
3777.1.8 by Aaron Bentley
Commit work-in-progress
1776
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1777
    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.
1778
                 prompt=None, ask=False, default=None):
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1779
        """Get a user from authentication file.
1780
1781
        :param scheme: protocol
1782
1783
        :param host: the server address
1784
1785
        :param port: the associated port (optional)
1786
1787
        :param realm: the realm sent by the server (optional)
1788
1789
        :param path: the absolute path on the server (optional)
1790
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1791
        :param ask: Ask the user if there is no explicitly configured username 
1792
                    (optional)
1793
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1794
        :param default: The username returned if none is defined (optional).
1795
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1796
        :return: The found user.
1797
        """
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1798
        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
1799
                                           path=path, realm=realm)
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1800
        if credentials is not None:
1801
            user = credentials['user']
1802
        else:
1803
            user = None
4222.3.2 by Jelmer Vernooij
Prompt for user names if they are not in the configuration.
1804
        if user is None:
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1805
            if ask:
1806
                if prompt is None:
1807
                    # Create a default prompt suitable for most cases
1808
                    prompt = scheme.upper() + ' %(host)s username'
1809
                # Special handling for optional fields in the prompt
1810
                if port is not None:
1811
                    prompt_host = '%s:%d' % (host, port)
1812
                else:
1813
                    prompt_host = host
1814
                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.
1815
            else:
4222.3.10 by Jelmer Vernooij
Avoid using the default username in the case of SMTP.
1816
                user = default
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1817
        return user
1818
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1819
    def get_password(self, scheme, host, user, port=None,
1820
                     realm=None, path=None, prompt=None):
1821
        """Get a password from authentication file or prompt the user for one.
1822
1823
        :param scheme: protocol
1824
1825
        :param host: the server address
1826
1827
        :param port: the associated port (optional)
1828
1829
        :param user: login
1830
1831
        :param realm: the realm sent by the server (optional)
1832
1833
        :param path: the absolute path on the server (optional)
1834
1835
        :return: The found password or the one entered by the user.
1836
        """
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1837
        credentials = self.get_credentials(scheme, host, port, user, path,
1838
                                           realm)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1839
        if credentials is not None:
1840
            password = credentials['password']
3420.1.3 by Vincent Ladeuil
John's review feedback.
1841
            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.
1842
                trace.warning('password ignored in section [%s],'
1843
                              ' use an ssh agent instead'
1844
                              % credentials['name'])
1845
                password = None
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1846
        else:
1847
            password = None
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1848
        # 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).
1849
        if password is None:
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1850
            if prompt is None:
3420.1.2 by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user.
1851
                # Create a default prompt suitable for most cases
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1852
                prompt = '%s' % scheme.upper() + ' %(user)s@%(host)s password'
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1853
            # Special handling for optional fields in the prompt
1854
            if port is not None:
1855
                prompt_host = '%s:%d' % (host, port)
1856
            else:
1857
                prompt_host = host
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1858
            password = ui.ui_factory.get_password(prompt,
1859
                                                  host=prompt_host, user=user)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1860
        return password
1861
2900.2.22 by Vincent Ladeuil
Polishing.
1862
    def decode_password(self, credentials, encoding):
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1863
        try:
1864
            cs = credential_store_registry.get_credential_store(encoding)
1865
        except KeyError:
1866
            raise ValueError('%r is not a known password_encoding' % encoding)
1867
        credentials['password'] = cs.decode_password(credentials)
2900.2.22 by Vincent Ladeuil
Polishing.
1868
        return credentials
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1869
3242.3.17 by Aaron Bentley
Whitespace cleanup
1870
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1871
class CredentialStoreRegistry(registry.Registry):
1872
    """A class that registers credential stores.
1873
1874
    A credential store provides access to credentials via the password_encoding
1875
    field in authentication.conf sections.
1876
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1877
    Except for stores provided by bzr itself, most stores are expected to be
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1878
    provided by plugins that will therefore use
1879
    register_lazy(password_encoding, module_name, member_name, help=help,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1880
    fallback=fallback) to install themselves.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1881
1882
    A fallback credential store is one that is queried if no credentials can be
1883
    found via authentication.conf.
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1884
    """
1885
1886
    def get_credential_store(self, encoding=None):
1887
        cs = self.get(encoding)
1888
        if callable(cs):
1889
            cs = cs()
1890
        return cs
1891
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1892
    def is_fallback(self, name):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1893
        """Check if the named credentials store should be used as fallback."""
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1894
        return self.get_info(name)
1895
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1896
    def get_fallback_credentials(self, scheme, host, port=None, user=None,
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1897
                                 path=None, realm=None):
1898
        """Request credentials from all fallback credentials stores.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1899
1900
        The first credentials store that can provide credentials wins.
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1901
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1902
        credentials = None
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1903
        for name in self.keys():
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1904
            if not self.is_fallback(name):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1905
                continue
1906
            cs = self.get_credential_store(name)
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1907
            credentials = cs.get_credentials(scheme, host, port, user,
1908
                                             path, realm)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1909
            if credentials is not None:
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1910
                # We found some credentials
1911
                break
1912
        return credentials
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1913
1914
    def register(self, key, obj, help=None, override_existing=False,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1915
                 fallback=False):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1916
        """Register a new object to a name.
1917
1918
        :param key: This is the key to use to request the object later.
1919
        :param obj: The object to register.
1920
        :param help: Help text for this entry. This may be a string or
1921
                a callable. If it is a callable, it should take two
1922
                parameters (registry, key): this registry and the key that
1923
                the help was registered under.
1924
        :param override_existing: Raise KeyErorr if False and something has
1925
                already been registered for that key. If True, ignore if there
1926
                is an existing key (always register the new value).
1927
        :param fallback: Whether this credential store should be 
1928
                used as fallback.
1929
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1930
        return super(CredentialStoreRegistry,
1931
                     self).register(key, obj, help, info=fallback,
1932
                                    override_existing=override_existing)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1933
1934
    def register_lazy(self, key, module_name, member_name,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1935
                      help=None, override_existing=False,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1936
                      fallback=False):
1937
        """Register a new credential store to be loaded on request.
1938
1939
        :param module_name: The python path to the module. Such as 'os.path'.
1940
        :param member_name: The member of the module to return.  If empty or
1941
                None, get() will return the module itself.
1942
        :param help: Help text for this entry. This may be a string or
1943
                a callable.
1944
        :param override_existing: If True, replace the existing object
1945
                with the new one. If False, if there is already something
1946
                registered with the same key, raise a KeyError
1947
        :param fallback: Whether this credential store should be 
1948
                used as fallback.
1949
        """
1950
        return super(CredentialStoreRegistry, self).register_lazy(
1951
            key, module_name, member_name, help,
1952
            info=fallback, override_existing=override_existing)
1953
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1954
1955
credential_store_registry = CredentialStoreRegistry()
1956
1957
1958
class CredentialStore(object):
1959
    """An abstract class to implement storage for credentials"""
1960
1961
    def decode_password(self, credentials):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1962
        """Returns a clear text password for the provided credentials."""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1963
        raise NotImplementedError(self.decode_password)
1964
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1965
    def get_credentials(self, scheme, host, port=None, user=None, path=None,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1966
                        realm=None):
1967
        """Return the matching credentials from this credential store.
1968
1969
        This method is only called on fallback credential stores.
1970
        """
1971
        raise NotImplementedError(self.get_credentials)
1972
1973
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1974
1975
class PlainTextCredentialStore(CredentialStore):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1976
    __doc__ = """Plain text credential store for the authentication.conf file"""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1977
1978
    def decode_password(self, credentials):
1979
        """See CredentialStore.decode_password."""
1980
        return credentials['password']
1981
1982
1983
credential_store_registry.register('plain', PlainTextCredentialStore,
1984
                                   help=PlainTextCredentialStore.__doc__)
1985
credential_store_registry.default_key = 'plain'
1986
1987
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1988
class BzrDirConfig(object):
1989
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1990
    def __init__(self, bzrdir):
1991
        self._bzrdir = bzrdir
1992
        self._config = bzrdir._get_config()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1993
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1994
    def set_default_stack_on(self, value):
1995
        """Set the default stacking location.
1996
1997
        It may be set to a location, or None.
1998
1999
        This policy affects all branches contained by this bzrdir, except for
2000
        those under repositories.
2001
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2002
        if self._config is None:
2003
            raise errors.BzrError("Cannot set configuration in %s" % self._bzrdir)
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2004
        if value is None:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2005
            self._config.set_option('', 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2006
        else:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2007
            self._config.set_option(value, 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2008
2009
    def get_default_stack_on(self):
2010
        """Return the default stacking location.
2011
2012
        This will either be a location, or None.
2013
2014
        This policy affects all branches contained by this bzrdir, except for
2015
        those under repositories.
2016
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
2017
        if self._config is None:
2018
            return None
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2019
        value = self._config.get_option('default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
2020
        if value == '':
2021
            value = None
2022
        return value
2023
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2024
2025
class TransportConfig(object):
3242.1.5 by Aaron Bentley
Update per review comments
2026
    """A Config that reads/writes a config file on a Transport.
3242.1.4 by Aaron Bentley
Clean-up
2027
2028
    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.
2029
    that may be associated with a section.  Assigning meaning to these values
2030
    is done at higher levels like TreeConfig.
3242.1.4 by Aaron Bentley
Clean-up
2031
    """
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
2032
2033
    def __init__(self, transport, filename):
2034
        self._transport = transport
2035
        self._filename = filename
2036
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2037
    def get_option(self, name, section=None, default=None):
2038
        """Return the value associated with a named option.
2039
2040
        :param name: The name of the value
2041
        :param section: The section the option is in (if any)
2042
        :param default: The value to return if the value is not set
2043
        :return: The value or default value
2044
        """
2045
        configobj = self._get_configobj()
2046
        if section is None:
2047
            section_obj = configobj
2048
        else:
2049
            try:
2050
                section_obj = configobj[section]
2051
            except KeyError:
2052
                return default
2053
        return section_obj.get(name, default)
2054
2055
    def set_option(self, value, name, section=None):
2056
        """Set the value associated with a named option.
2057
2058
        :param value: The value to set
2059
        :param name: The name of the value to set
2060
        :param section: The section the option is in (if any)
2061
        """
2062
        configobj = self._get_configobj()
2063
        if section is None:
2064
            configobj[name] = value
2065
        else:
2066
            configobj.setdefault(section, {})[name] = value
2067
        self._set_configobj(configobj)
2068
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2069
    def remove_option(self, option_name, section_name=None):
2070
        configobj = self._get_configobj()
2071
        if section_name is None:
2072
            del configobj[option_name]
2073
        else:
2074
            del configobj[section_name][option_name]
2075
        self._set_configobj(configobj)
2076
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
2077
    def _get_config_file(self):
2078
        try:
4852.1.10 by John Arbash Meinel
Use a StringIO instead, otherwise we get failures with smart server requests.
2079
            return StringIO(self._transport.get_bytes(self._filename))
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
2080
        except errors.NoSuchFile:
2081
            return StringIO()
2082
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2083
    def _get_configobj(self):
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
2084
        f = self._get_config_file()
2085
        try:
2086
            return ConfigObj(f, encoding='utf-8')
2087
        finally:
2088
            f.close()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
2089
2090
    def _set_configobj(self, configobj):
2091
        out_file = StringIO()
2092
        configobj.write(out_file)
2093
        out_file.seek(0)
2094
        self._transport.put_file(self._filename, out_file)
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2095
2096
2097
class cmd_config(commands.Command):
5447.4.19 by Vincent Ladeuil
Add some more documentation.
2098
    __doc__ = """Display, set or remove a configuration option.
2099
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2100
    Display the active value for a given option.
2101
2102
    If --all is specified, NAME is interpreted as a regular expression and all
2103
    matching options are displayed mentioning their scope. The active value
2104
    that bzr will take into account is the first one displayed for each option.
2105
2106
    If no NAME is given, --all .* is implied.
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2107
5447.4.19 by Vincent Ladeuil
Add some more documentation.
2108
    Setting a value is achieved by using name=value without spaces. The value
2109
    is set in the most relevant scope and can be checked by displaying the
2110
    option again.
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2111
    """
2112
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2113
    takes_args = ['name?']
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2114
2115
    takes_options = [
2116
        'directory',
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2117
        # FIXME: This should be a registry option so that plugins can register
2118
        # their own config files (or not) -- vila 20101002
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2119
        commands.Option('scope', help='Reduce the scope to the specified'
2120
                        ' configuration file',
2121
                        type=unicode),
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2122
        commands.Option('all',
2123
            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.
2124
            ),
5447.4.8 by Vincent Ladeuil
Make the test properly fail and provide a fake implementation for ``bzr config --remove opt_name``.
2125
        commands.Option('remove', help='Remove the option from'
2126
                        ' the configuration file'),
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2127
        ]
2128
2129
    @commands.display_command
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2130
    def run(self, name=None, all=False, directory=None, scope=None,
2131
            remove=False):
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2132
        if directory is None:
2133
            directory = '.'
2134
        directory = urlutils.normalize_url(directory)
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2135
        if remove and all:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2136
            raise errors.BzrError(
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2137
                '--all and --remove are mutually exclusive.')
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2138
        elif remove:
2139
            # Delete the option in the given scope
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2140
            self._remove_config_option(name, directory, scope)
2141
        elif name is None:
2142
            # Defaults to all options
2143
            self._show_matching_options('.*', directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2144
        else:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2145
            try:
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2146
                name, value = name.split('=', 1)
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2147
            except ValueError:
2148
                # Display the option(s) value(s)
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2149
                if all:
2150
                    self._show_matching_options(name, directory, scope)
2151
                else:
2152
                    self._show_value(name, directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2153
            else:
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2154
                if all:
2155
                    raise errors.BzrError(
2156
                        'Only one option can be set.')
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2157
                # Set the option value
2158
                self._set_config_option(name, value, directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2159
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2160
    def _get_configs(self, directory, scope=None):
2161
        """Iterate the configurations specified by ``directory`` and ``scope``.
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2162
2163
        :param directory: Where the configurations are derived from.
2164
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2165
        :param scope: A specific config to start from.
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2166
        """
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2167
        if scope is not None:
2168
            if scope == 'bazaar':
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2169
                yield GlobalConfig()
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2170
            elif scope == 'locations':
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2171
                yield LocationConfig(directory)
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2172
            elif scope == 'branch':
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2173
                (_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
2174
                    directory)
2175
                yield br.get_config()
2176
        else:
2177
            try:
2178
                (_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
2179
                    directory)
2180
                yield br.get_config()
2181
            except errors.NotBranchError:
2182
                yield LocationConfig(directory)
2183
                yield GlobalConfig()
2184
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2185
    def _show_value(self, name, directory, scope):
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2186
        displayed = False
2187
        for c in self._get_configs(directory, scope):
2188
            if displayed:
2189
                break
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
2190
            for (oname, value, section, conf_id, parser) in c._get_options():
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2191
                if name == oname:
5533.1.3 by Vincent Ladeuil
Tweak comment as per poolie's suggestion.
2192
                    # Display only the first value and exit
5533.2.3 by Vincent Ladeuil
Merge 671050-config-policy into 672382-list-values 672382-list-values resolving conflicts
2193
5533.1.3 by Vincent Ladeuil
Tweak comment as per poolie's suggestion.
2194
                    # FIXME: We need to use get_user_option to take policies
2195
                    # into account and we need to make sure the option exists
5533.2.3 by Vincent Ladeuil
Merge 671050-config-policy into 672382-list-values 672382-list-values resolving conflicts
2196
                    # too (hence the two for loops), this needs a better API
2197
                    # -- vila 20101117
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
2198
                    value = c.get_user_option(name)
2199
                    # Quote the value appropriately
2200
                    value = parser._quote(value)
2201
                    self.outf.write('%s\n' % (value,))
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2202
                    displayed = True
2203
                    break
2204
        if not displayed:
2205
            raise errors.NoSuchConfigOption(name)
2206
2207
    def _show_matching_options(self, name, directory, scope):
2208
        name = re.compile(name)
2209
        # We want any error in the regexp to be raised *now* so we need to
2210
        # avoid the delay introduced by the lazy regexp.
2211
        name._compile_and_collapse()
2212
        cur_conf_id = None
5533.1.1 by Vincent Ladeuil
Fix ``bzr config`` to respect policies when displaying values and also display sections when appropriate.
2213
        cur_section = None
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2214
        for c in self._get_configs(directory, scope):
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
2215
            for (oname, value, section, conf_id, parser) in c._get_options():
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2216
                if name.search(oname):
2217
                    if cur_conf_id != conf_id:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2218
                        # Explain where the options are defined
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
2219
                        self.outf.write('%s:\n' % (conf_id,))
2220
                        cur_conf_id = conf_id
5533.1.1 by Vincent Ladeuil
Fix ``bzr config`` to respect policies when displaying values and also display sections when appropriate.
2221
                        cur_section = None
2222
                    if (section not in (None, 'DEFAULT')
2223
                        and cur_section != section):
2224
                        # Display the section if it's not the default (or only)
2225
                        # one.
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
2226
                        self.outf.write('  [%s]\n' % (section,))
5533.1.1 by Vincent Ladeuil
Fix ``bzr config`` to respect policies when displaying values and also display sections when appropriate.
2227
                        cur_section = section
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
2228
                    self.outf.write('  %s = %s\n' % (oname, value))
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
2229
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2230
    def _set_config_option(self, name, value, directory, scope):
2231
        for conf in self._get_configs(directory, scope):
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2232
            conf.set_user_option(name, value)
2233
            break
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2234
        else:
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2235
            raise errors.NoSuchConfig(scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
2236
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2237
    def _remove_config_option(self, name, directory, scope):
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
2238
        if name is None:
2239
            raise errors.BzrCommandError(
2240
                '--remove expects an option to remove.')
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
2241
        removed = False
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2242
        for conf in self._get_configs(directory, scope):
5447.4.12 by Vincent Ladeuil
Turn get_options() and get_sections() into private methods because section handling is too messy and needs to be discussed and settled.
2243
            for (section_name, section, conf_id) in conf._get_sections():
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2244
                if scope is not None and conf_id != scope:
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2245
                    # Not the right configuration file
2246
                    continue
2247
                if name in section:
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
2248
                    if conf_id != conf.config_id():
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2249
                        conf = self._get_configs(directory, conf_id).next()
2250
                    # We use the first section in the first config where the
2251
                    # option is defined to remove it
2252
                    conf.remove_user_option(name, section_name)
2253
                    removed = True
2254
                    break
2255
            break
2256
        else:
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
2257
            raise errors.NoSuchConfig(scope)
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
2258
        if not removed:
2259
            raise errors.NoSuchConfigOption(name)