/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4988.10.3 by John Arbash Meinel
Merge bzr.dev 5007, resolve conflict, update NEWS
1
# Copyright (C) 2005-2010 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
66
import sys
1474 by Robert Collins
Merge from Aaron Bentley.
67
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
68
from bzrlib import commands
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
69
from bzrlib.decorators import needs_write_lock
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
70
from bzrlib.lazy_import import lazy_import
71
lazy_import(globals(), """
1474 by Robert Collins
Merge from Aaron Bentley.
72
import errno
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,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
85
    osutils,
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
86
    registry,
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
87
    symbol_versioning,
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
88
    trace,
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
89
    transport,
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
90
    ui,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
91
    urlutils,
2245.4.3 by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
92
    win32utils,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
93
    )
2991.2.4 by Vincent Ladeuil
Various fixes following local testing environment rebuild.
94
from bzrlib.util.configobj import configobj
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
95
""")
96
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
97
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
98
CHECK_IF_POSSIBLE=0
99
CHECK_ALWAYS=1
100
CHECK_NEVER=2
101
102
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
103
SIGN_WHEN_REQUIRED=0
104
SIGN_ALWAYS=1
105
SIGN_NEVER=2
106
107
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
108
POLICY_NONE = 0
109
POLICY_NORECURSE = 1
110
POLICY_APPENDPATH = 2
111
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
112
_policy_name = {
113
    POLICY_NONE: None,
114
    POLICY_NORECURSE: 'norecurse',
115
    POLICY_APPENDPATH: 'appendpath',
116
    }
117
_policy_value = {
118
    None: POLICY_NONE,
119
    'none': POLICY_NONE,
120
    'norecurse': POLICY_NORECURSE,
121
    'appendpath': POLICY_APPENDPATH,
122
    }
2120.6.4 by James Henstridge
add support for specifying policy when storing options
123
124
125
STORE_LOCATION = POLICY_NONE
126
STORE_LOCATION_NORECURSE = POLICY_NORECURSE
127
STORE_LOCATION_APPENDPATH = POLICY_APPENDPATH
128
STORE_BRANCH = 3
129
STORE_GLOBAL = 4
130
3224.5.10 by Andrew Bennetts
Replace some duplication with a different form of hackery.
131
_ConfigObj = None
132
def ConfigObj(*args, **kwargs):
133
    global _ConfigObj
134
    if _ConfigObj is None:
135
        class ConfigObj(configobj.ConfigObj):
136
137
            def get_bool(self, section, key):
138
                return self[section].as_bool(key)
139
140
            def get_value(self, section, name):
141
                # Try [] for the old DEFAULT section.
142
                if section == "DEFAULT":
143
                    try:
144
                        return self[name]
145
                    except KeyError:
146
                        pass
147
                return self[section][name]
148
        _ConfigObj = ConfigObj
149
    return _ConfigObj(*args, **kwargs)
1474 by Robert Collins
Merge from Aaron Bentley.
150
151
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
152
class Config(object):
153
    """A configuration policy - what username, editor, gpg needs etc."""
154
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
155
    def __init__(self):
156
        super(Config, self).__init__()
157
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
158
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
159
        """Returns a unique ID for the config."""
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
160
        raise NotImplementedError(self.config_id)
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
161
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
162
    def get_editor(self):
163
        """Get the users pop up editor."""
164
        raise NotImplementedError
165
4603.1.10 by Aaron Bentley
Provide change editor via config.
166
    def get_change_editor(self, old_tree, new_tree):
167
        from bzrlib import diff
168
        cmd = self._get_change_editor()
169
        if cmd is None:
170
            return None
171
        return diff.DiffFromTool.from_string(cmd, old_tree, new_tree,
172
                                             sys.stdout)
173
174
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
175
    def get_mail_client(self):
176
        """Get a mail client to use"""
177
        selected_client = self.get_user_option('mail_client')
3638.2.4 by Neil Martinsen-Burrell
Address JAMs review. Dont use register_lazy and dont lazy_import anything other than modules
178
        _registry = mail_client.mail_client_registry
2681.1.10 by Aaron Bentley
Clean up handling of unknown mail clients
179
        try:
3638.2.4 by Neil Martinsen-Burrell
Address JAMs review. Dont use register_lazy and dont lazy_import anything other than modules
180
            mail_client_class = _registry.get(selected_client)
2681.1.10 by Aaron Bentley
Clean up handling of unknown mail clients
181
        except KeyError:
182
            raise errors.UnknownMailClient(selected_client)
183
        return mail_client_class(self)
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
184
1442.1.15 by Robert Collins
make getting the signature checking policy a template method
185
    def _get_signature_checking(self):
186
        """Template method to override signature checking policy."""
187
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
188
    def _get_signing_policy(self):
189
        """Template method to override signature creation policy."""
190
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
191
    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.
192
        """Template method to provide a user option."""
193
        return None
194
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
195
    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.
196
        """Get a generic option - no special process, no default."""
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
197
        return self._get_user_option(option_name)
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
198
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
199
    def get_user_option_as_bool(self, option_name):
200
        """Get a generic option as a boolean - no special process, no default.
201
202
        :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.
203
            interpreted as a boolean. Returns True or False otherwise.
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
204
        """
205
        s = self._get_user_option(option_name)
4989.2.12 by Vincent Ladeuil
Display a warning if an option value is not boolean.
206
        if s is None:
207
            # The option doesn't exist
208
            return None
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
209
        val = ui.bool_from_string(s)
4989.2.12 by Vincent Ladeuil
Display a warning if an option value is not boolean.
210
        if val is None:
211
            # The value can't be interpreted as a boolean
212
            trace.warning('Value "%s" is not a boolean for "%s"',
213
                          s, option_name)
214
        return val
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
215
4840.2.4 by Vincent Ladeuil
Implement config.get_user_option_as_list.
216
    def get_user_option_as_list(self, option_name):
217
        """Get a generic option as a list - no special process, no default.
218
219
        :return None if the option doesn't exist. Returns the value as a list
220
            otherwise.
221
        """
222
        l = self._get_user_option(option_name)
223
        if isinstance(l, (str, unicode)):
224
            # A single value, most probably the user forgot the final ','
225
            l = [l]
226
        return l
227
1442.1.56 by Robert Collins
gpg_signing_command configuration item
228
    def gpg_signing_command(self):
229
        """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.
230
        result = self._gpg_signing_command()
231
        if result is None:
232
            result = "gpg"
233
        return result
234
235
    def _gpg_signing_command(self):
236
        """See gpg_signing_command()."""
237
        return None
1442.1.56 by Robert Collins
gpg_signing_command configuration item
238
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
239
    def log_format(self):
240
        """What log format should be used"""
241
        result = self._log_format()
1553.2.4 by Erik Bågfors
Support for setting the default log format at a configuration option
242
        if result is None:
243
            result = "long"
244
        return result
245
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
246
    def _log_format(self):
247
        """See log_format()."""
1553.2.4 by Erik Bågfors
Support for setting the default log format at a configuration option
248
        return None
249
1472 by Robert Collins
post commit hook, first pass implementation
250
    def post_commit(self):
251
        """An ordered list of python functions to call.
252
253
        Each function takes branch, rev_id as parameters.
254
        """
255
        return self._post_commit()
256
257
    def _post_commit(self):
258
        """See Config.post_commit."""
259
        return None
260
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
261
    def user_email(self):
262
        """Return just the email component of a username."""
1185.33.31 by Martin Pool
Make annotate cope better with revisions committed without a valid
263
        return extract_email_address(self.username())
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
264
265
    def username(self):
266
        """Return email-style username.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
267
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
268
        Something similar to 'Martin Pool <mbp@sourcefrog.net>'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
269
5187.2.1 by Parth Malwankar
removed comment about deprecated BZREMAIL.
270
        $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
271
        the concrete policy type is checked, and finally
1185.37.2 by Jamie Wilkinson
Fix a typo and grammar in Config.username() docstring.
272
        $EMAIL is examined.
5187.2.12 by Parth Malwankar
trivial clarification in docstring.
273
        If no username can be found, errors.NoWhoami exception is raised.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
274
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
275
        TODO: Check it's reasonably well-formed.
276
        """
1861.4.1 by Matthieu Moy
BZREMAIL renamed to BZR_EMAIL.
277
        v = os.environ.get('BZR_EMAIL')
278
        if v:
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
279
            return v.decode(osutils.get_user_encoding())
2900.3.1 by Tim Penhey
Removed some annoying trailing whitespace.
280
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
281
        v = self._get_user_id()
282
        if v:
283
            return v
2900.3.1 by Tim Penhey
Removed some annoying trailing whitespace.
284
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
285
        v = os.environ.get('EMAIL')
286
        if v:
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
287
            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
288
5187.2.6 by Parth Malwankar
lockdir no long mandates whoami but uses unicode version of getuser
289
        raise errors.NoWhoami()
5187.2.3 by Parth Malwankar
init and init-repo now fail before creating dir if username is not set.
290
291
    def ensure_username(self):
5187.2.11 by Parth Malwankar
documentation updates
292
        """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.
293
294
        This method relies on the username() function raising the error.
295
        """
296
        self.username()
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
297
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
298
    def signature_checking(self):
299
        """What is the current policy for signature checking?."""
1442.1.15 by Robert Collins
make getting the signature checking policy a template method
300
        policy = self._get_signature_checking()
301
        if policy is not None:
302
            return policy
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
303
        return CHECK_IF_POSSIBLE
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
304
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
305
    def signing_policy(self):
306
        """What is the current policy for signature checking?."""
307
        policy = self._get_signing_policy()
308
        if policy is not None:
309
            return policy
310
        return SIGN_WHEN_REQUIRED
311
1442.1.21 by Robert Collins
create signature_needed() call for commit to trigger creating signatures
312
    def signature_needed(self):
313
        """Is a signature needed when committing ?."""
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
314
        policy = self._get_signing_policy()
315
        if policy is None:
316
            policy = self._get_signature_checking()
317
            if policy is not None:
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
318
                trace.warning("Please use create_signatures,"
319
                              " not check_signatures to set signing policy.")
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
320
            if policy == CHECK_ALWAYS:
321
                return True
322
        elif policy == SIGN_ALWAYS:
1442.1.21 by Robert Collins
create signature_needed() call for commit to trigger creating signatures
323
            return True
324
        return False
325
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
326
    def get_alias(self, value):
327
        return self._get_alias(value)
328
329
    def _get_alias(self, value):
330
        pass
331
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
332
    def get_nickname(self):
333
        return self._get_nickname()
334
335
    def _get_nickname(self):
336
        return None
337
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
338
    def get_bzr_remote_path(self):
339
        try:
340
            return os.environ['BZR_REMOTE_PATH']
341
        except KeyError:
342
            path = self.get_user_option("bzr_remote_path")
343
            if path is None:
344
                path = 'bzr'
345
            return path
346
4840.2.6 by Vincent Ladeuil
Implement config.suppress_warning.
347
    def suppress_warning(self, warning):
348
        """Should the warning be suppressed or emitted.
349
350
        :param warning: The name of the warning being tested.
351
352
        :returns: True if the warning should be suppressed, False otherwise.
353
        """
354
        warnings = self.get_user_option_as_list('suppress_warnings')
355
        if warnings is None or warning not in warnings:
356
            return False
357
        else:
358
            return True
359
1442.1.15 by Robert Collins
make getting the signature checking policy a template method
360
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
361
class IniBasedConfig(Config):
362
    """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
363
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
364
    def __init__(self, get_filename=symbol_versioning.DEPRECATED_PARAMETER,
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
365
                 file_name=None):
5345.2.5 by Vincent Ladeuil
Add docstring.
366
        """Base class for configuration files using an ini-like syntax.
367
368
        :param file_name: The configuration file path.
369
        """
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
370
        super(IniBasedConfig, self).__init__()
5345.1.8 by Vincent Ladeuil
Make the test_listen_to_the_last_speaker pass and fix fallouts.
371
        self.file_name = file_name
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
372
        if symbol_versioning.deprecated_passed(get_filename):
373
            symbol_versioning.warn(
374
                'IniBasedConfig.__init__(get_filename) was deprecated in 2.3.'
375
                ' Use file_name instead.',
376
                DeprecationWarning,
377
                stacklevel=2)
5345.1.8 by Vincent Ladeuil
Make the test_listen_to_the_last_speaker pass and fix fallouts.
378
            if get_filename is not None:
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
379
                self.file_name = get_filename()
380
        else:
381
            self.file_name = file_name
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
382
        self._content = None
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
383
        self._parser = None
384
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
385
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
386
    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
387
        """Create a config object from a string.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
388
5345.2.9 by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string.
389
        :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.
390
            be utf-8 encoded.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
391
392
        :param file_name: The configuration file path.
393
394
        :param _save: Whether the file should be saved upon creation.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
395
        """
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
396
        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
397
        conf._create_from_string(str_or_unicode, save)
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
398
        return conf
399
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
400
    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
401
        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.
402
        # Some tests use in-memory configs, some other always need the config
403
        # file to exist on disk.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
404
        if save:
5345.1.16 by Vincent Ladeuil
Allows tests to save the config file at build time.
405
            self._write_config_file()
5345.5.12 by Vincent Ladeuil
Fix fallouts from replacing '_content' by 'from_bytes' for config files.
406
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
407
    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
408
        if self._parser is not None:
409
            return self._parser
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
410
        if symbol_versioning.deprecated_passed(file):
411
            symbol_versioning.warn(
412
                '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.
413
                ' Use IniBasedConfig(_content=xxx) instead.',
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
414
                DeprecationWarning,
415
                stacklevel=2)
416
        if self._content is not None:
417
            co_input = self._content
418
        elif self.file_name is None:
419
            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
420
        else:
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
421
            co_input = self.file_name
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
422
        try:
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
423
            self._parser = ConfigObj(co_input, encoding='utf-8')
1474 by Robert Collins
Merge from Aaron Bentley.
424
        except configobj.ConfigObjError, e:
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
425
            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.
426
        # 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.
427
        self._parser.filename = self.file_name
1185.12.49 by Aaron Bentley
Switched to ConfigObj
428
        return self._parser
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
429
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
430
    def reload(self):
431
        """Reload the config file from disk."""
432
        if self.file_name is None:
433
            raise AssertionError('We need a file name to reload the config')
434
        if self._parser is not None:
435
            self._parser.reload()
436
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
437
    def _get_matching_sections(self):
438
        """Return an ordered list of (section_name, extra_path) pairs.
439
440
        If the section contains inherited configuration, extra_path is
441
        a string containing the additional path components.
442
        """
443
        section = self._get_section()
444
        if section is not None:
445
            return [(section, '')]
446
        else:
447
            return []
448
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
449
    def _get_section(self):
450
        """Override this to define the section used by the config."""
451
        return "DEFAULT"
452
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.
453
    def _get_sections(self, name=None):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
454
        """Returns an iterator of the sections specified by ``name``.
455
456
        :param name: The section name. If None is supplied, the default
457
            configurations are yielded.
458
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
459
        :return: A tuple (name, section, config_id) for all sections that will
460
            be walked by user_get_option() in the 'right' order. The first one
461
            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.
462
        """
463
        parser = self._get_parser()
464
        if name is not None:
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
465
            yield (name, parser[name], self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
466
        else:
467
            # No section name has been given so we fallback to the configobj
468
            # 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.
469
            yield (None, parser, self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
470
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.
471
    def _get_options(self, sections=None):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
472
        """Return an ordered list of (name, value, section, config_id) tuples.
473
474
        All options are returned with their associated value and the section
475
        they appeared in. ``config_id`` is a unique identifier for the
476
        configuration file the option is defined in.
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
477
478
        :param sections: Default to ``_get_matching_sections`` if not
479
            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.
480
            which sections should be searched. This is a list of (name,
481
            configobj) tuples.
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
482
        """
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
483
        opts = []
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
484
        if sections is None:
485
            parser = self._get_parser()
486
            sections = []
487
            for (section_name, _) in self._get_matching_sections():
488
                try:
489
                    section = parser[section_name]
490
                except KeyError:
491
                    # This could happen for an empty file for which we define a
492
                    # DEFAULT section. FIXME: Force callers to provide sections
493
                    # instead ? -- vila 20100930
494
                    continue
495
                sections.append((section_name, section))
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
496
        config_id = self.config_id()
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
497
        for (section_name, section) in sections:
498
            for (name, value) in section.iteritems():
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
499
                yield (name, value, section_name, config_id)
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
500
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
501
    def _get_option_policy(self, section, option_name):
502
        """Return the policy for the given (section, option_name) pair."""
503
        return POLICY_NONE
504
4603.1.10 by Aaron Bentley
Provide change editor via config.
505
    def _get_change_editor(self):
506
        return self.get_user_option('change_editor')
507
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
508
    def _get_signature_checking(self):
509
        """See Config._get_signature_checking."""
1474 by Robert Collins
Merge from Aaron Bentley.
510
        policy = self._get_user_option('check_signatures')
511
        if policy:
512
            return self._string_to_signature_policy(policy)
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
513
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
514
    def _get_signing_policy(self):
1773.4.3 by Martin Pool
[merge] bzr.dev
515
        """See Config._get_signing_policy"""
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
516
        policy = self._get_user_option('create_signatures')
517
        if policy:
518
            return self._string_to_signing_policy(policy)
519
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
520
    def _get_user_id(self):
521
        """Get the user id from the 'email' key in the current section."""
1474 by Robert Collins
Merge from Aaron Bentley.
522
        return self._get_user_option('email')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
523
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
524
    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.
525
        """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
526
        for (section, extra_path) in self._get_matching_sections():
527
            try:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
528
                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
529
            except KeyError:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
530
                continue
531
            policy = self._get_option_policy(section, option_name)
532
            if policy == POLICY_NONE:
533
                return value
534
            elif policy == POLICY_NORECURSE:
535
                # norecurse items only apply to the exact path
536
                if extra_path:
537
                    continue
538
                else:
539
                    return value
540
            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
541
                if extra_path:
542
                    value = urlutils.join(value, extra_path)
543
                return value
2120.6.6 by James Henstridge
fix test_set_push_location test
544
            else:
545
                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
546
        else:
1993.3.1 by James Henstridge
first go at making location config lookup recursive
547
            return None
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
548
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
549
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
550
        """See Config.gpg_signing_command."""
1472 by Robert Collins
post commit hook, first pass implementation
551
        return self._get_user_option('gpg_signing_command')
1442.1.56 by Robert Collins
gpg_signing_command configuration item
552
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
553
    def _log_format(self):
554
        """See Config.log_format."""
555
        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
556
1472 by Robert Collins
post commit hook, first pass implementation
557
    def _post_commit(self):
558
        """See Config.post_commit."""
559
        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
560
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
561
    def _string_to_signature_policy(self, signature_string):
562
        """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
563
        if signature_string.lower() == 'check-available':
564
            return CHECK_IF_POSSIBLE
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
565
        if signature_string.lower() == 'ignore':
566
            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
567
        if signature_string.lower() == 'require':
568
            return CHECK_ALWAYS
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
569
        raise errors.BzrError("Invalid signatures policy '%s'"
570
                              % signature_string)
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
571
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
572
    def _string_to_signing_policy(self, signature_string):
573
        """Convert a string to a signing policy."""
574
        if signature_string.lower() == 'when-required':
575
            return SIGN_WHEN_REQUIRED
576
        if signature_string.lower() == 'never':
577
            return SIGN_NEVER
578
        if signature_string.lower() == 'always':
579
            return SIGN_ALWAYS
580
        raise errors.BzrError("Invalid signing policy '%s'"
581
                              % signature_string)
582
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
583
    def _get_alias(self, value):
584
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
585
            return self._get_parser().get_value("ALIASES",
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
586
                                                value)
587
        except KeyError:
588
            pass
589
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
590
    def _get_nickname(self):
591
        return self.get_user_option('nickname')
592
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
593
    def remove_user_option(self, option_name, section_name=None):
594
        """Remove a user option and save the configuration file.
595
596
        :param option_name: The option to be removed.
597
598
        :param section_name: The section the option is defined in, default to
599
            the default section.
600
        """
601
        self.reload()
602
        parser = self._get_parser()
603
        if section_name is None:
604
            section = parser
605
        else:
606
            section = parser[section_name]
607
        try:
608
            del section[option_name]
609
        except KeyError:
610
            raise errors.NoSuchConfigOption(option_name)
611
        self._write_config_file()
612
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
613
    def _write_config_file(self):
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
614
        if self.file_name is None:
615
            raise AssertionError('We cannot save, self.file_name is None')
5345.1.9 by Vincent Ladeuil
Refactor config dir check.
616
        conf_dir = os.path.dirname(self.file_name)
617
        ensure_config_dir_exists(conf_dir)
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
618
        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
619
        self._get_parser().write(atomic_file)
620
        atomic_file.commit()
621
        atomic_file.close()
5345.3.3 by Vincent Ladeuil
Merge bzr.dev into deprecate-get-filename resolving conflicts
622
        osutils.copy_ownership_from_path(self.file_name)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
623
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
624
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
625
class LockableConfig(IniBasedConfig):
626
    """A configuration needing explicit locking for access.
627
628
    If several processes try to write the config file, the accesses need to be
629
    serialized.
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
630
631
    Daughter classes should decorate all methods that update a config with the
632
    ``@needs_write_lock`` decorator (they call, directly or indirectly, the
633
    ``_write_config_file()`` method. These methods (typically ``set_option()``
634
    and variants must reload the config file from disk before calling
635
    ``_write_config_file()``), this can be achieved by calling the
636
    ``self.reload()`` method. Note that the lock scope should cover both the
637
    reading and the writing of the config file which is why the decorator can't
638
    be applied to ``_write_config_file()`` only.
639
640
    This should be enough to implement the following logic:
641
    - lock for exclusive write access,
642
    - reload the config file from disk,
643
    - set the new value
644
    - unlock
645
646
    This logic guarantees that a writer can update a value without erasing an
647
    update made by another writer.
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
648
    """
649
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
650
    lock_name = 'lock'
651
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
652
    def __init__(self, file_name):
653
        super(LockableConfig, self).__init__(file_name=file_name)
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
654
        self.dir = osutils.dirname(osutils.safe_unicode(self.file_name))
655
        self.transport = transport.get_transport(self.dir)
656
        self._lock = lockdir.LockDir(self.transport, 'lock')
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
657
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
658
    def _create_from_string(self, unicode_bytes, save):
659
        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.
660
        if save:
5345.1.24 by Vincent Ladeuil
Implement _save for LockableConfig too.
661
            # We need to handle the saving here (as opposed to IniBasedConfig)
662
            # to be able to lock
663
            self.lock_write()
664
            self._write_config_file()
665
            self.unlock()
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
666
667
    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.
668
        """Takes a write lock in the directory containing the config file.
669
670
        If the directory doesn't exist it is created.
671
        """
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
672
        ensure_config_dir_exists(self.dir)
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
673
        return self._lock.lock_write(token)
674
675
    def unlock(self):
676
        self._lock.unlock()
677
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
678
    def break_lock(self):
679
        self._lock.break_lock()
680
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
681
    @needs_write_lock
682
    def remove_user_option(self, option_name, section_name=None):
683
        super(LockableConfig, self).remove_user_option(option_name,
684
                                                       section_name)
685
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
686
    def _write_config_file(self):
687
        if self._lock is None or not self._lock.is_held:
688
            # NB: if the following exception is raised it probably means a
689
            # missing @needs_write_lock decorator on one of the callers.
690
            raise errors.ObjectNotLocked(self)
691
        super(LockableConfig, self)._write_config_file()
692
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
693
694
class GlobalConfig(LockableConfig):
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
695
    """The configuration that should be used for a specific location."""
696
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
697
    def __init__(self):
698
        super(GlobalConfig, self).__init__(file_name=config_filename())
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
699
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
700
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
701
        return 'bazaar'
702
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
703
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
704
    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
705
        """Create a config object from a string.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
706
5345.5.13 by Vincent Ladeuil
Merge simplify-test-config-building into lockable-config-files resolving conflicts
707
        :param str_or_unicode: A string representing the file content. This
708
            will be utf-8 encoded.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
709
710
        :param save: Whether the file should be saved upon creation.
711
        """
712
        conf = cls()
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
713
        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.
714
        return conf
5345.5.12 by Vincent Ladeuil
Fix fallouts from replacing '_content' by 'from_bytes' for config files.
715
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
716
    def get_editor(self):
1474 by Robert Collins
Merge from Aaron Bentley.
717
        return self._get_user_option('editor')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
718
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
719
    @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
720
    def set_user_option(self, option, value):
721
        """Save option and its value in the configuration."""
2900.3.2 by Tim Penhey
A working alias command.
722
        self._set_option(option, value, 'DEFAULT')
723
724
    def get_aliases(self):
725
        """Return the aliases section."""
726
        if 'ALIASES' in self._get_parser():
727
            return self._get_parser()['ALIASES']
728
        else:
729
            return {}
730
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
731
    @needs_write_lock
2900.3.2 by Tim Penhey
A working alias command.
732
    def set_alias(self, alias_name, alias_command):
733
        """Save the alias in the configuration."""
734
        self._set_option(alias_name, alias_command, 'ALIASES')
735
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
736
    @needs_write_lock
2900.3.2 by Tim Penhey
A working alias command.
737
    def unset_alias(self, alias_name):
738
        """Unset an existing alias."""
5345.5.10 by Vincent Ladeuil
Add a missing config.reload().
739
        self.reload()
2900.3.2 by Tim Penhey
A working alias command.
740
        aliases = self._get_parser().get('ALIASES')
2900.3.7 by Tim Penhey
Updates from Aaron's review.
741
        if not aliases or alias_name not in aliases:
742
            raise errors.NoSuchAlias(alias_name)
2900.3.2 by Tim Penhey
A working alias command.
743
        del aliases[alias_name]
2900.3.12 by Tim Penhey
Final review comments.
744
        self._write_config_file()
2900.3.2 by Tim Penhey
A working alias command.
745
746
    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.
747
        self.reload()
2900.3.7 by Tim Penhey
Updates from Aaron's review.
748
        self._get_parser().setdefault(section, {})[option] = value
2900.3.12 by Tim Penhey
Final review comments.
749
        self._write_config_file()
2900.3.2 by Tim Penhey
A working alias command.
750
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
751
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.
752
    def _get_sections(self, name=None):
753
        """See IniBasedConfig._get_sections()."""
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
754
        parser = self._get_parser()
755
        # We don't give access to options defined outside of any section, we
756
        # used the DEFAULT section by... default.
757
        if name in (None, 'DEFAULT'):
758
            # This could happen for an empty file where the DEFAULT section
759
            # doesn't exist yet. So we force DEFAULT when yielding
760
            name = 'DEFAULT'
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
761
            if 'DEFAULT' not in parser:
762
               parser['DEFAULT']= {}
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
763
        yield (name, parser[name], self.config_id())
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
764
765
    @needs_write_lock
766
    def remove_user_option(self, option_name, section_name=None):
767
        if section_name is None:
768
            # We need to force the default section.
769
            section_name = 'DEFAULT'
770
        # We need to avoid the LockableConfig implementation or we'll lock
771
        # twice
772
        super(LockableConfig, self).remove_user_option(option_name,
773
                                                       section_name)
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
774
775
5345.5.7 by Vincent Ladeuil
Make LocationConfig use a lock too.
776
class LocationConfig(LockableConfig):
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
777
    """A configuration object that gives the policy for a location."""
778
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
779
    def __init__(self, location):
5345.1.2 by Vincent Ladeuil
Get rid of 'branches.conf' references.
780
        super(LocationConfig, self).__init__(
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
781
            file_name=locations_config_filename())
1878.1.1 by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653)
782
        # local file locations are looked up by local path, rather than
783
        # by file url. This is because the config file is a user
784
        # file, and we would rather not expose the user to file urls.
785
        if location.startswith('file://'):
786
            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
787
        self.location = location
788
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
789
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
790
        return 'locations'
791
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
792
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
793
    def from_string(cls, str_or_unicode, location, save=False):
794
        """Create a config object from a string.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
795
5345.2.9 by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string.
796
        :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.
797
            be utf-8 encoded.
798
799
        :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.
800
801
        :param save: Whether the file should be saved upon creation.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
802
        """
803
        conf = cls(location)
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
804
        conf._create_from_string(str_or_unicode, save)
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
805
        return conf
806
1993.3.1 by James Henstridge
first go at making location config lookup recursive
807
    def _get_matching_sections(self):
808
        """Return an ordered list of section names matching this location."""
1185.12.49 by Aaron Bentley
Switched to ConfigObj
809
        sections = self._get_parser()
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
810
        location_names = self.location.split('/')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
811
        if self.location.endswith('/'):
812
            del location_names[-1]
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
813
        matches=[]
1442.1.10 by Robert Collins
explicit over glob test passes
814
        for section in sections:
1878.1.1 by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653)
815
            # location is a local path if possible, so we need
816
            # to convert 'file://' urls to local paths if necessary.
817
            # This also avoids having file:///path be a more exact
818
            # match than '/path'.
819
            if section.startswith('file://'):
820
                section_path = urlutils.local_path_from_url(section)
821
            else:
822
                section_path = section
823
            section_names = section_path.split('/')
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
824
            if section.endswith('/'):
825
                del section_names[-1]
826
            names = zip(location_names, section_names)
827
            matched = True
828
            for name in names:
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
829
                if not fnmatch.fnmatch(name[0], name[1]):
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
830
                    matched = False
831
                    break
832
            if not matched:
833
                continue
834
            # so, for the common prefix they matched.
835
            # if section is longer, no match.
836
            if len(section_names) > len(location_names):
837
                continue
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
838
            matches.append((len(section_names), section,
839
                            '/'.join(location_names[len(section_names):])))
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
840
        # put the longest (aka more specific) locations first
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
841
        matches.sort(reverse=True)
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
842
        sections = []
843
        for (length, section, extra_path) in matches:
844
            sections.append((section, extra_path))
845
            # should we stop looking for parent configs here?
1993.3.1 by James Henstridge
first go at making location config lookup recursive
846
            try:
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
847
                if self._get_parser()[section].as_bool('ignore_parents'):
848
                    break
1993.3.1 by James Henstridge
first go at making location config lookup recursive
849
            except KeyError:
850
                pass
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
851
        return sections
1442.1.9 by Robert Collins
exact section test passes
852
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.
853
    def _get_sections(self, name=None):
854
        """See IniBasedConfig._get_sections()."""
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
855
        # We ignore the name here as the only sections handled are named with
856
        # the location path and we don't expose embedded sections either.
857
        parser = self._get_parser()
858
        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.
859
            yield (name, parser[name], self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
860
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
861
    def _get_option_policy(self, section, option_name):
862
        """Return the policy for the given (section, option_name) pair."""
863
        # check for the old 'recurse=False' flag
864
        try:
865
            recurse = self._get_parser()[section].as_bool('recurse')
866
        except KeyError:
867
            recurse = True
868
        if not recurse:
869
            return POLICY_NORECURSE
870
2120.6.10 by James Henstridge
Catch another deprecation warning, and more cleanup
871
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
872
        try:
873
            policy_name = self._get_parser()[section][policy_key]
874
        except KeyError:
875
            policy_name = None
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
876
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
877
        return _policy_value[policy_name]
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
878
2120.6.4 by James Henstridge
add support for specifying policy when storing options
879
    def _set_option_policy(self, section, option_name, option_policy):
880
        """Set the policy for the given option name in the given section."""
881
        # The old recurse=False option affects all options in the
882
        # section.  To handle multiple policies in the section, we
883
        # need to convert it to a policy_norecurse key.
884
        try:
885
            recurse = self._get_parser()[section].as_bool('recurse')
886
        except KeyError:
887
            pass
888
        else:
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
889
            symbol_versioning.warn(
2120.6.11 by James Henstridge
s/0.13/0.14/ in deprecation warning
890
                'The recurse option is deprecated as of 0.14.  '
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
891
                'The section "%s" has been converted to use policies.'
892
                % section,
893
                DeprecationWarning)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
894
            del self._get_parser()[section]['recurse']
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
895
            if not recurse:
896
                for key in self._get_parser()[section].keys():
897
                    if not key.endswith(':policy'):
898
                        self._get_parser()[section][key +
899
                                                    ':policy'] = 'norecurse'
2120.6.4 by James Henstridge
add support for specifying policy when storing options
900
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
901
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
902
        policy_name = _policy_name[option_policy]
903
        if policy_name is not None:
904
            self._get_parser()[section][policy_key] = policy_name
905
        else:
906
            if policy_key in self._get_parser()[section]:
907
                del self._get_parser()[section][policy_key]
2120.6.4 by James Henstridge
add support for specifying policy when storing options
908
5345.5.7 by Vincent Ladeuil
Make LocationConfig use a lock too.
909
    @needs_write_lock
2120.6.4 by James Henstridge
add support for specifying policy when storing options
910
    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.
911
        """Save option and its value in the configuration."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
912
        if store not in [STORE_LOCATION,
2120.6.4 by James Henstridge
add support for specifying policy when storing options
913
                         STORE_LOCATION_NORECURSE,
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
914
                         STORE_LOCATION_APPENDPATH]:
915
            raise ValueError('bad storage policy %r for %r' %
916
                (store, option))
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
917
        self.reload()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
918
        location = self.location
919
        if location.endswith('/'):
920
            location = location[:-1]
5345.1.24 by Vincent Ladeuil
Implement _save for LockableConfig too.
921
        parser = self._get_parser()
5345.1.21 by Vincent Ladeuil
Slight rewrite to make the method more readable.
922
        if not location in parser and not location + '/' in parser:
923
            parser[location] = {}
924
        elif location + '/' in parser:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
925
            location = location + '/'
5345.1.21 by Vincent Ladeuil
Slight rewrite to make the method more readable.
926
        parser[location][option]=value
2120.6.4 by James Henstridge
add support for specifying policy when storing options
927
        # the allowed values of store match the config policies
928
        self._set_option_policy(location, option, store)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
929
        self._write_config_file()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
930
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
931
932
class BranchConfig(Config):
933
    """A configuration object giving the policy for a branch."""
934
5345.1.3 by Vincent Ladeuil
Make __init__ the first method in the BranchConfig class.
935
    def __init__(self, branch):
936
        super(BranchConfig, self).__init__()
937
        self._location_config = None
938
        self._branch_data_config = None
939
        self._global_config = None
940
        self.branch = branch
941
        self.option_sources = (self._get_location_config,
942
                               self._get_branch_data_config,
943
                               self._get_global_config)
944
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
945
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
946
        return 'branch'
947
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
948
    def _get_branch_data_config(self):
949
        if self._branch_data_config is None:
950
            self._branch_data_config = TreeConfig(self.branch)
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
951
            self._branch_data_config.config_id = self.config_id
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
952
        return self._branch_data_config
953
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
954
    def _get_location_config(self):
955
        if self._location_config is None:
956
            self._location_config = LocationConfig(self.branch.base)
957
        return self._location_config
958
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
959
    def _get_global_config(self):
960
        if self._global_config is None:
961
            self._global_config = GlobalConfig()
962
        return self._global_config
963
964
    def _get_best_value(self, option_name):
965
        """This returns a user option from local, tree or global config.
966
967
        They are tried in that order.  Use get_safe_value if trusted values
968
        are necessary.
969
        """
970
        for source in self.option_sources:
971
            value = getattr(source(), option_name)()
972
            if value is not None:
973
                return value
974
        return None
975
976
    def _get_safe_value(self, option_name):
977
        """This variant of get_best_value never returns untrusted values.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
978
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
979
        It does not return values from the branch data, because the branch may
980
        not be controlled by the user.
981
982
        We may wish to allow locations.conf to control whether branches are
983
        trusted in the future.
984
        """
985
        for source in (self._get_location_config, self._get_global_config):
986
            value = getattr(source(), option_name)()
987
            if value is not None:
988
                return value
989
        return None
990
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
991
    def _get_user_id(self):
992
        """Return the full user id for the branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
993
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
994
        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
995
        This is looked up in the email controlfile for the branch.
996
        """
997
        try:
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
998
            return (self.branch._transport.get_bytes("email")
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
999
                    .decode(osutils.get_user_encoding())
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1000
                    .rstrip("\r\n"))
1001
        except errors.NoSuchFile, e:
1002
            pass
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1003
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1004
        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
1005
4603.1.10 by Aaron Bentley
Provide change editor via config.
1006
    def _get_change_editor(self):
1007
        return self._get_best_value('_get_change_editor')
1008
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
1009
    def _get_signature_checking(self):
1010
        """See Config._get_signature_checking."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1011
        return self._get_best_value('_get_signature_checking')
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
1012
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
1013
    def _get_signing_policy(self):
1014
        """See Config._get_signing_policy."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1015
        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
1016
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
1017
    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.
1018
        """See Config._get_user_option."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1019
        for source in self.option_sources:
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
1020
            value = source()._get_user_option(option_name)
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1021
            if value is not None:
1022
                return value
1023
        return None
1024
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.
1025
    def _get_sections(self, name=None):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1026
        """See IniBasedConfig.get_sections()."""
1027
        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.
1028
            for section in source()._get_sections(name):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1029
                yield section
1030
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.
1031
    def _get_options(self, sections=None):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1032
        opts = []
1033
        # 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.
1034
        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.
1035
            yield option
1036
        # Then the branch options
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1037
        branch_config = self._get_branch_data_config()
1038
        if sections is None:
1039
            sections = [('DEFAULT', branch_config._get_parser())]
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1040
        # FIXME: We shouldn't have to duplicate the code in IniBasedConfig but
1041
        # 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.
1042
        config_id = self.config_id()
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1043
        for (section_name, section) in sections:
1044
            for (name, value) in section.iteritems():
1045
                yield (name, value, section_name, config_id)
1046
        # 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.
1047
        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.
1048
            yield option
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1049
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1050
    def set_user_option(self, name, value, store=STORE_BRANCH,
1051
        warn_masked=False):
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1052
        if store == STORE_BRANCH:
1770.2.6 by Aaron Bentley
Ensure branch.conf works properly
1053
            self._get_branch_data_config().set_option(value, name)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1054
        elif store == STORE_GLOBAL:
2120.6.7 by James Henstridge
Fix GlobalConfig.set_user_option() call
1055
            self._get_global_config().set_user_option(name, value)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1056
        else:
1057
            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)
1058
        if not warn_masked:
1059
            return
1060
        if store in (STORE_GLOBAL, STORE_BRANCH):
1061
            mask_value = self._get_location_config().get_user_option(name)
1062
            if mask_value is not None:
1063
                trace.warning('Value "%s" is masked by "%s" from'
1064
                              ' locations.conf', value, mask_value)
1065
            else:
1066
                if store == STORE_GLOBAL:
1067
                    branch_config = self._get_branch_data_config()
1068
                    mask_value = branch_config.get_user_option(name)
1069
                    if mask_value is not None:
1070
                        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
1071
                                      ' branch.conf', value, mask_value)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1072
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1073
    def remove_user_option(self, option_name, section_name=None):
1074
        self._get_branch_data_config().remove_option(option_name, section_name)
1075
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
1076
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
1077
        """See Config.gpg_signing_command."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1078
        return self._get_safe_value('_gpg_signing_command')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1079
1472 by Robert Collins
post commit hook, first pass implementation
1080
    def _post_commit(self):
1081
        """See Config.post_commit."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1082
        return self._get_safe_value('_post_commit')
1472 by Robert Collins
post commit hook, first pass implementation
1083
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1084
    def _get_nickname(self):
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
1085
        value = self._get_explicit_nickname()
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1086
        if value is not None:
1087
            return value
2120.5.2 by Alexander Belchenko
(jam) Fix for bug #66857
1088
        return urlutils.unescape(self.branch.base.split('/')[-2])
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1089
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
1090
    def has_explicit_nickname(self):
1091
        """Return true if a nickname has been explicitly assigned."""
1092
        return self._get_explicit_nickname() is not None
1093
1094
    def _get_explicit_nickname(self):
1095
        return self._get_best_value('_get_nickname')
1096
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
1097
    def _log_format(self):
1098
        """See Config.log_format."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1099
        return self._get_best_value('_log_format')
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1100
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
1101
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1102
def ensure_config_dir_exists(path=None):
1103
    """Make sure a configuration directory exists.
1104
    This makes sure that the directory exists.
1105
    On windows, since configuration directories are 2 levels deep,
1106
    it makes sure both the directory and the parent directory exists.
1107
    """
1108
    if path is None:
1109
        path = config_dir()
1110
    if not os.path.isdir(path):
1111
        if sys.platform == 'win32':
1112
            parent_dir = os.path.dirname(path)
1113
            if not os.path.isdir(parent_dir):
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1114
                trace.mutter('creating config parent directory: %r', parent_dir)
5485.2.1 by Martin
Add indent to correct ensure_config_dir_exists logic
1115
                os.mkdir(parent_dir)
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1116
        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
1117
        os.mkdir(path)
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
1118
        osutils.copy_ownership_from_path(path)
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1119
1532 by Robert Collins
Merge in John Meinels integration branch.
1120
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1121
def config_dir():
1122
    """Return per-user configuration directory.
1123
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1124
    By default this is ~/.bazaar/
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1125
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1126
    TODO: Global option --config-dir to override this.
1127
    """
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1128
    base = os.environ.get('BZR_HOME', None)
1129
    if sys.platform == 'win32':
1130
        if base is None:
2245.4.3 by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
1131
            base = win32utils.get_appdata_location_unicode()
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1132
        if base is None:
1133
            base = os.environ.get('HOME', None)
1134
        if base is None:
2991.2.2 by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0.
1135
            raise errors.BzrError('You must have one of BZR_HOME, APPDATA,'
1136
                                  ' or HOME set')
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1137
        return osutils.pathjoin(base, 'bazaar', '2.0')
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1138
    else:
1139
        if base is None:
1140
            base = os.path.expanduser("~")
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1141
        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 \
1142
1143
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1144
def config_filename():
1145
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1146
    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.
1147
1148
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
1149
def locations_config_filename():
1150
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1151
    return osutils.pathjoin(config_dir(), 'locations.conf')
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
1152
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1153
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1154
def authentication_config_filename():
1155
    """Return per-user authentication ini file filename."""
1156
    return osutils.pathjoin(config_dir(), 'authentication.conf')
1157
1158
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
1159
def user_ignore_config_filename():
1160
    """Return the user default ignore filename"""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1161
    return osutils.pathjoin(config_dir(), 'ignore')
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
1162
1163
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1164
def crash_dir():
1165
    """Return the directory name to store crash files.
1166
1167
    This doesn't implicitly create it.
1168
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
1169
    On Windows it's in the config directory; elsewhere it's /var/crash
4634.128.18 by Martin Pool
Update apport crash tests
1170
    which may be monitored by apport.  It can be overridden by
1171
    $APPORT_CRASH_DIR.
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1172
    """
1173
    if sys.platform == 'win32':
1174
        return osutils.pathjoin(config_dir(), 'Crash')
1175
    else:
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
1176
        # XXX: hardcoded in apport_python_hook.py; therefore here too -- mbp
1177
        # 2010-01-31
4634.128.18 by Martin Pool
Update apport crash tests
1178
        return os.environ.get('APPORT_CRASH_DIR', '/var/crash')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1179
1180
1181
def xdg_cache_dir():
4584.3.23 by Martin Pool
Correction to xdg_cache_dir and add a simple test
1182
    # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html
1183
    # Possibly this should be different on Windows?
1184
    e = os.environ.get('XDG_CACHE_DIR', None)
1185
    if e:
1186
        return e
1187
    else:
1188
        return os.path.expanduser('~/.cache')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1189
1190
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1191
def parse_username(username):
1192
    """Parse e-mail username and return a (name, address) tuple."""
1193
    match = re.match(r'(.*?)\s*<?([\w+.-]+@[\w+.-]+)>?', username)
1194
    if match is None:
1195
        return (username, '')
1196
    else:
1197
        return (match.group(1), match.group(2))
1198
1199
1185.16.52 by Martin Pool
- add extract_email_address
1200
def extract_email_address(e):
1201
    """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.
1202
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1203
    That is just the user@domain part, nothing else.
1185.16.52 by Martin Pool
- add extract_email_address
1204
    This part is required to contain only ascii characters.
1205
    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.
1206
1185.16.52 by Martin Pool
- add extract_email_address
1207
    >>> extract_email_address('Jane Tester <jane@test.com>')
1208
    "jane@test.com"
1209
    """
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1210
    name, email = parse_username(e)
1211
    if not email:
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
1212
        raise errors.NoEmailInUsername(e)
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1213
    return email
1185.35.11 by Aaron Bentley
Added support for branch nicks
1214
1185.85.30 by John Arbash Meinel
Fixing 'bzr push' exposed that IniBasedConfig didn't handle unicode.
1215
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1216
class TreeConfig(IniBasedConfig):
1185.35.11 by Aaron Bentley
Added support for branch nicks
1217
    """Branch configuration data associated with its contents, not location"""
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1218
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
1219
    # XXX: Really needs a better name, as this is not part of the tree! -- mbp 20080507
1220
1185.35.11 by Aaron Bentley
Added support for branch nicks
1221
    def __init__(self, branch):
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
1222
        self._config = branch._get_config()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1223
        self.branch = branch
1224
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1225
    def _get_parser(self, file=None):
1226
        if file is not None:
1227
            return IniBasedConfig._get_parser(file)
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1228
        return self._config._get_configobj()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1229
1230
    def get_option(self, name, section=None, default=None):
1231
        self.branch.lock_read()
1232
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1233
            return self._config.get_option(name, section, default)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1234
        finally:
1235
            self.branch.unlock()
1236
1237
    def set_option(self, value, name, section=None):
1238
        """Set a per-branch configuration option"""
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1239
        # FIXME: We shouldn't need to lock explicitly here but rather rely on
1240
        # higher levels providing the right lock -- vila 20101004
1185.35.11 by Aaron Bentley
Added support for branch nicks
1241
        self.branch.lock_write()
1242
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1243
            self._config.set_option(value, name, section)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1244
        finally:
1245
            self.branch.unlock()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1246
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1247
    def remove_option(self, option_name, section_name=None):
1248
        # FIXME: We shouldn't need to lock explicitly here but rather rely on
1249
        # higher levels providing the right lock -- vila 20101004
1250
        self.branch.lock_write()
1251
        try:
1252
            self._config.remove_option(option_name, section_name)
1253
        finally:
1254
            self.branch.unlock()
1255
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1256
1257
class AuthenticationConfig(object):
1258
    """The authentication configuration file based on a ini file.
1259
1260
    Implements the authentication.conf file described in
1261
    doc/developers/authentication-ring.txt.
1262
    """
1263
1264
    def __init__(self, _file=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1265
        self._config = None # The ConfigObj
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1266
        if _file is None:
2900.2.24 by Vincent Ladeuil
Review feedback.
1267
            self._filename = authentication_config_filename()
1268
            self._input = self._filename = authentication_config_filename()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1269
        else:
2900.2.24 by Vincent Ladeuil
Review feedback.
1270
            # Tests can provide a string as _file
1271
            self._filename = None
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1272
            self._input = _file
1273
1274
    def _get_config(self):
1275
        if self._config is not None:
1276
            return self._config
1277
        try:
2900.2.22 by Vincent Ladeuil
Polishing.
1278
            # FIXME: Should we validate something here ? Includes: empty
1279
            # sections are useless, at least one of
1280
            # user/password/password_encoding should be defined, etc.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1281
1282
            # Note: the encoding below declares that the file itself is utf-8
1283
            # encoded, but the values in the ConfigObj are always Unicode.
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1284
            self._config = ConfigObj(self._input, encoding='utf-8')
1285
        except configobj.ConfigObjError, e:
1286
            raise errors.ParseConfigError(e.errors, e.config.filename)
1287
        return self._config
1288
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1289
    def _save(self):
1290
        """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.
1291
        conf_dir = os.path.dirname(self._filename)
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1292
        ensure_config_dir_exists(conf_dir)
4708.2.2 by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib
1293
        f = file(self._filename, 'wb')
1294
        try:
1295
            self._get_config().write(f)
1296
        finally:
1297
            f.close()
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1298
1299
    def _set_option(self, section_name, option_name, value):
1300
        """Set an authentication configuration option"""
1301
        conf = self._get_config()
1302
        section = conf.get(section_name)
1303
        if section is None:
1304
            conf[section] = {}
1305
            section = conf[section]
1306
        section[option_name] = value
1307
        self._save()
1308
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1309
    def get_credentials(self, scheme, host, port=None, user=None, path=None, 
1310
                        realm=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1311
        """Returns the matching credentials from authentication.conf file.
1312
1313
        :param scheme: protocol
1314
1315
        :param host: the server address
1316
1317
        :param port: the associated port (optional)
1318
1319
        :param user: login (optional)
1320
1321
        :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
1322
        
1323
        :param realm: the http authentication realm (optional)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1324
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1325
        :return: A dict containing the matching credentials or None.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1326
           This includes:
1327
           - name: the section name of the credentials in the
1328
             authentication.conf file,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1329
           - 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.
1330
           - scheme: the server protocol,
1331
           - host: the server address,
1332
           - port: the server port (can be None),
1333
           - path: the absolute server path (can be None),
1334
           - realm: the http specific authentication realm (can be None),
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1335
           - password: the decoded password, could be None if the credential
1336
             defines only the user
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1337
           - verify_certificates: https specific, True if the server
1338
             certificate should be verified, False otherwise.
1339
        """
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1340
        credentials = None
1341
        for auth_def_name, auth_def in self._get_config().items():
3418.2.1 by Vincent Ladeuil
Fix #217650 by catching declarations outside sections.
1342
            if type(auth_def) is not configobj.Section:
1343
                raise ValueError("%s defined outside a section" % auth_def_name)
1344
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1345
            a_scheme, a_host, a_user, a_path = map(
1346
                auth_def.get, ['scheme', 'host', 'user', 'path'])
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1347
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1348
            try:
1349
                a_port = auth_def.as_int('port')
1350
            except KeyError:
1351
                a_port = None
2900.2.22 by Vincent Ladeuil
Polishing.
1352
            except ValueError:
1353
                raise ValueError("'port' not numeric in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1354
            try:
1355
                a_verify_certificates = auth_def.as_bool('verify_certificates')
1356
            except KeyError:
1357
                a_verify_certificates = True
2900.2.22 by Vincent Ladeuil
Polishing.
1358
            except ValueError:
1359
                raise ValueError(
1360
                    "'verify_certificates' not boolean in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1361
1362
            # Attempt matching
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1363
            if a_scheme is not None and scheme != a_scheme:
1364
                continue
1365
            if a_host is not None:
1366
                if not (host == a_host
1367
                        or (a_host.startswith('.') and host.endswith(a_host))):
1368
                    continue
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1369
            if a_port is not None and port != a_port:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1370
                continue
1371
            if (a_path is not None and path is not None
1372
                and not path.startswith(a_path)):
1373
                continue
1374
            if (a_user is not None and user is not None
1375
                and a_user != user):
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1376
                # Never contradict the caller about the user to be used
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1377
                continue
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1378
            if a_user is None:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1379
                # Can't find a user
1380
                continue
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1381
            # Prepare a credentials dictionary with additional keys
1382
            # for the credential providers
2900.2.24 by Vincent Ladeuil
Review feedback.
1383
            credentials = dict(name=auth_def_name,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1384
                               user=a_user,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1385
                               scheme=a_scheme,
1386
                               host=host,
1387
                               port=port,
1388
                               path=path,
1389
                               realm=realm,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1390
                               password=auth_def.get('password', None),
2900.2.24 by Vincent Ladeuil
Review feedback.
1391
                               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
1392
            # Decode the password in the credentials (or get one)
2900.2.22 by Vincent Ladeuil
Polishing.
1393
            self.decode_password(credentials,
1394
                                 auth_def.get('password_encoding', None))
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1395
            if 'auth' in debug.debug_flags:
1396
                trace.mutter("Using authentication section: %r", auth_def_name)
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1397
            break
1398
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1399
        if credentials is None:
1400
            # No credentials were found in authentication.conf, try the fallback
1401
            # credentials stores.
1402
            credentials = credential_store_registry.get_fallback_credentials(
1403
                scheme, host, port, user, path, realm)
1404
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1405
        return credentials
1406
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1407
    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
1408
                        port=None, path=None, verify_certificates=None,
1409
                        realm=None):
3777.3.1 by Aaron Bentley
Update docs
1410
        """Set authentication credentials for a host.
1411
1412
        Any existing credentials with matching scheme, host, port and path
1413
        will be deleted, regardless of name.
1414
1415
        :param name: An arbitrary name to describe this set of credentials.
1416
        :param host: Name of the host that accepts these credentials.
1417
        :param user: The username portion of these credentials.
1418
        :param scheme: The URL scheme (e.g. ssh, http) the credentials apply
1419
            to.
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1420
        :param password: Password portion of these credentials.
3777.3.1 by Aaron Bentley
Update docs
1421
        :param port: The IP port on the host that these credentials apply to.
1422
        :param path: A filesystem path on the host that these credentials
1423
            apply to.
1424
        :param verify_certificates: On https, verify server certificates if
1425
            True.
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1426
        :param realm: The http authentication realm (optional).
3777.3.1 by Aaron Bentley
Update docs
1427
        """
3777.1.8 by Aaron Bentley
Commit work-in-progress
1428
        values = {'host': host, 'user': user}
1429
        if password is not None:
1430
            values['password'] = password
1431
        if scheme is not None:
1432
            values['scheme'] = scheme
1433
        if port is not None:
1434
            values['port'] = '%d' % port
1435
        if path is not None:
1436
            values['path'] = path
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1437
        if verify_certificates is not None:
1438
            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
1439
        if realm is not None:
1440
            values['realm'] = realm
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1441
        config = self._get_config()
1442
        for_deletion = []
1443
        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
1444
            for key in ('scheme', 'host', 'port', 'path', 'realm'):
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1445
                if existing_values.get(key) != values.get(key):
1446
                    break
1447
            else:
1448
                del config[section]
1449
        config.update({name: values})
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1450
        self._save()
3777.1.8 by Aaron Bentley
Commit work-in-progress
1451
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1452
    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.
1453
                 prompt=None, ask=False, default=None):
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1454
        """Get a user from authentication file.
1455
1456
        :param scheme: protocol
1457
1458
        :param host: the server address
1459
1460
        :param port: the associated port (optional)
1461
1462
        :param realm: the realm sent by the server (optional)
1463
1464
        :param path: the absolute path on the server (optional)
1465
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1466
        :param ask: Ask the user if there is no explicitly configured username 
1467
                    (optional)
1468
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1469
        :param default: The username returned if none is defined (optional).
1470
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1471
        :return: The found user.
1472
        """
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1473
        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
1474
                                           path=path, realm=realm)
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1475
        if credentials is not None:
1476
            user = credentials['user']
1477
        else:
1478
            user = None
4222.3.2 by Jelmer Vernooij
Prompt for user names if they are not in the configuration.
1479
        if user is None:
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1480
            if ask:
1481
                if prompt is None:
1482
                    # Create a default prompt suitable for most cases
1483
                    prompt = scheme.upper() + ' %(host)s username'
1484
                # Special handling for optional fields in the prompt
1485
                if port is not None:
1486
                    prompt_host = '%s:%d' % (host, port)
1487
                else:
1488
                    prompt_host = host
1489
                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.
1490
            else:
4222.3.10 by Jelmer Vernooij
Avoid using the default username in the case of SMTP.
1491
                user = default
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1492
        return user
1493
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1494
    def get_password(self, scheme, host, user, port=None,
1495
                     realm=None, path=None, prompt=None):
1496
        """Get a password from authentication file or prompt the user for one.
1497
1498
        :param scheme: protocol
1499
1500
        :param host: the server address
1501
1502
        :param port: the associated port (optional)
1503
1504
        :param user: login
1505
1506
        :param realm: the realm sent by the server (optional)
1507
1508
        :param path: the absolute path on the server (optional)
1509
1510
        :return: The found password or the one entered by the user.
1511
        """
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1512
        credentials = self.get_credentials(scheme, host, port, user, path,
1513
                                           realm)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1514
        if credentials is not None:
1515
            password = credentials['password']
3420.1.3 by Vincent Ladeuil
John's review feedback.
1516
            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.
1517
                trace.warning('password ignored in section [%s],'
1518
                              ' use an ssh agent instead'
1519
                              % credentials['name'])
1520
                password = None
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1521
        else:
1522
            password = None
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1523
        # 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).
1524
        if password is None:
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1525
            if prompt is None:
3420.1.2 by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user.
1526
                # Create a default prompt suitable for most cases
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1527
                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
1528
            # Special handling for optional fields in the prompt
1529
            if port is not None:
1530
                prompt_host = '%s:%d' % (host, port)
1531
            else:
1532
                prompt_host = host
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1533
            password = ui.ui_factory.get_password(prompt,
1534
                                                  host=prompt_host, user=user)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1535
        return password
1536
2900.2.22 by Vincent Ladeuil
Polishing.
1537
    def decode_password(self, credentials, encoding):
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1538
        try:
1539
            cs = credential_store_registry.get_credential_store(encoding)
1540
        except KeyError:
1541
            raise ValueError('%r is not a known password_encoding' % encoding)
1542
        credentials['password'] = cs.decode_password(credentials)
2900.2.22 by Vincent Ladeuil
Polishing.
1543
        return credentials
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1544
3242.3.17 by Aaron Bentley
Whitespace cleanup
1545
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1546
class CredentialStoreRegistry(registry.Registry):
1547
    """A class that registers credential stores.
1548
1549
    A credential store provides access to credentials via the password_encoding
1550
    field in authentication.conf sections.
1551
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1552
    Except for stores provided by bzr itself, most stores are expected to be
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1553
    provided by plugins that will therefore use
1554
    register_lazy(password_encoding, module_name, member_name, help=help,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1555
    fallback=fallback) to install themselves.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1556
1557
    A fallback credential store is one that is queried if no credentials can be
1558
    found via authentication.conf.
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1559
    """
1560
1561
    def get_credential_store(self, encoding=None):
1562
        cs = self.get(encoding)
1563
        if callable(cs):
1564
            cs = cs()
1565
        return cs
1566
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1567
    def is_fallback(self, name):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1568
        """Check if the named credentials store should be used as fallback."""
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1569
        return self.get_info(name)
1570
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1571
    def get_fallback_credentials(self, scheme, host, port=None, user=None,
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1572
                                 path=None, realm=None):
1573
        """Request credentials from all fallback credentials stores.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1574
1575
        The first credentials store that can provide credentials wins.
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1576
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1577
        credentials = None
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1578
        for name in self.keys():
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1579
            if not self.is_fallback(name):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1580
                continue
1581
            cs = self.get_credential_store(name)
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1582
            credentials = cs.get_credentials(scheme, host, port, user,
1583
                                             path, realm)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1584
            if credentials is not None:
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1585
                # We found some credentials
1586
                break
1587
        return credentials
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1588
1589
    def register(self, key, obj, help=None, override_existing=False,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1590
                 fallback=False):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1591
        """Register a new object to a name.
1592
1593
        :param key: This is the key to use to request the object later.
1594
        :param obj: The object to register.
1595
        :param help: Help text for this entry. This may be a string or
1596
                a callable. If it is a callable, it should take two
1597
                parameters (registry, key): this registry and the key that
1598
                the help was registered under.
1599
        :param override_existing: Raise KeyErorr if False and something has
1600
                already been registered for that key. If True, ignore if there
1601
                is an existing key (always register the new value).
1602
        :param fallback: Whether this credential store should be 
1603
                used as fallback.
1604
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1605
        return super(CredentialStoreRegistry,
1606
                     self).register(key, obj, help, info=fallback,
1607
                                    override_existing=override_existing)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1608
1609
    def register_lazy(self, key, module_name, member_name,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1610
                      help=None, override_existing=False,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1611
                      fallback=False):
1612
        """Register a new credential store to be loaded on request.
1613
1614
        :param module_name: The python path to the module. Such as 'os.path'.
1615
        :param member_name: The member of the module to return.  If empty or
1616
                None, get() will return the module itself.
1617
        :param help: Help text for this entry. This may be a string or
1618
                a callable.
1619
        :param override_existing: If True, replace the existing object
1620
                with the new one. If False, if there is already something
1621
                registered with the same key, raise a KeyError
1622
        :param fallback: Whether this credential store should be 
1623
                used as fallback.
1624
        """
1625
        return super(CredentialStoreRegistry, self).register_lazy(
1626
            key, module_name, member_name, help,
1627
            info=fallback, override_existing=override_existing)
1628
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1629
1630
credential_store_registry = CredentialStoreRegistry()
1631
1632
1633
class CredentialStore(object):
1634
    """An abstract class to implement storage for credentials"""
1635
1636
    def decode_password(self, credentials):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1637
        """Returns a clear text password for the provided credentials."""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1638
        raise NotImplementedError(self.decode_password)
1639
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1640
    def get_credentials(self, scheme, host, port=None, user=None, path=None,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1641
                        realm=None):
1642
        """Return the matching credentials from this credential store.
1643
1644
        This method is only called on fallback credential stores.
1645
        """
1646
        raise NotImplementedError(self.get_credentials)
1647
1648
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1649
1650
class PlainTextCredentialStore(CredentialStore):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1651
    __doc__ = """Plain text credential store for the authentication.conf file"""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1652
1653
    def decode_password(self, credentials):
1654
        """See CredentialStore.decode_password."""
1655
        return credentials['password']
1656
1657
1658
credential_store_registry.register('plain', PlainTextCredentialStore,
1659
                                   help=PlainTextCredentialStore.__doc__)
1660
credential_store_registry.default_key = 'plain'
1661
1662
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1663
class BzrDirConfig(object):
1664
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1665
    def __init__(self, bzrdir):
1666
        self._bzrdir = bzrdir
1667
        self._config = bzrdir._get_config()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1668
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1669
    def set_default_stack_on(self, value):
1670
        """Set the default stacking location.
1671
1672
        It may be set to a location, or None.
1673
1674
        This policy affects all branches contained by this bzrdir, except for
1675
        those under repositories.
1676
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1677
        if self._config is None:
1678
            raise errors.BzrError("Cannot set configuration in %s" % self._bzrdir)
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1679
        if value is None:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1680
            self._config.set_option('', 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1681
        else:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1682
            self._config.set_option(value, 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1683
1684
    def get_default_stack_on(self):
1685
        """Return the default stacking location.
1686
1687
        This will either be a location, or None.
1688
1689
        This policy affects all branches contained by this bzrdir, except for
1690
        those under repositories.
1691
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1692
        if self._config is None:
1693
            return None
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1694
        value = self._config.get_option('default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1695
        if value == '':
1696
            value = None
1697
        return value
1698
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1699
1700
class TransportConfig(object):
3242.1.5 by Aaron Bentley
Update per review comments
1701
    """A Config that reads/writes a config file on a Transport.
3242.1.4 by Aaron Bentley
Clean-up
1702
1703
    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.
1704
    that may be associated with a section.  Assigning meaning to these values
1705
    is done at higher levels like TreeConfig.
3242.1.4 by Aaron Bentley
Clean-up
1706
    """
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1707
1708
    def __init__(self, transport, filename):
1709
        self._transport = transport
1710
        self._filename = filename
1711
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1712
    def get_option(self, name, section=None, default=None):
1713
        """Return the value associated with a named option.
1714
1715
        :param name: The name of the value
1716
        :param section: The section the option is in (if any)
1717
        :param default: The value to return if the value is not set
1718
        :return: The value or default value
1719
        """
1720
        configobj = self._get_configobj()
1721
        if section is None:
1722
            section_obj = configobj
1723
        else:
1724
            try:
1725
                section_obj = configobj[section]
1726
            except KeyError:
1727
                return default
1728
        return section_obj.get(name, default)
1729
1730
    def set_option(self, value, name, section=None):
1731
        """Set the value associated with a named option.
1732
1733
        :param value: The value to set
1734
        :param name: The name of the value to set
1735
        :param section: The section the option is in (if any)
1736
        """
1737
        configobj = self._get_configobj()
1738
        if section is None:
1739
            configobj[name] = value
1740
        else:
1741
            configobj.setdefault(section, {})[name] = value
1742
        self._set_configobj(configobj)
1743
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1744
    def remove_option(self, option_name, section_name=None):
1745
        configobj = self._get_configobj()
1746
        if section_name is None:
1747
            del configobj[option_name]
1748
        else:
1749
            del configobj[section_name][option_name]
1750
        self._set_configobj(configobj)
1751
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1752
    def _get_config_file(self):
1753
        try:
4852.1.10 by John Arbash Meinel
Use a StringIO instead, otherwise we get failures with smart server requests.
1754
            return StringIO(self._transport.get_bytes(self._filename))
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1755
        except errors.NoSuchFile:
1756
            return StringIO()
1757
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1758
    def _get_configobj(self):
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
1759
        f = self._get_config_file()
1760
        try:
1761
            return ConfigObj(f, encoding='utf-8')
1762
        finally:
1763
            f.close()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1764
1765
    def _set_configobj(self, configobj):
1766
        out_file = StringIO()
1767
        configobj.write(out_file)
1768
        out_file.seek(0)
1769
        self._transport.put_file(self._filename, out_file)
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
1770
1771
1772
class cmd_config(commands.Command):
5447.4.19 by Vincent Ladeuil
Add some more documentation.
1773
    __doc__ = """Display, set or remove a configuration option.
1774
1775
    Display the MATCHING configuration options mentioning their scope (the
1776
    configuration file they are defined in). The active value that bzr will
1777
    take into account is the first one displayed.
1778
1779
    Setting a value is achieved by using name=value without spaces. The value
1780
    is set in the most relevant scope and can be checked by displaying the
1781
    option again.
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
1782
    """
1783
1784
    aliases = ['conf']
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1785
    takes_args = ['matching?']
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
1786
1787
    takes_options = [
1788
        'directory',
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1789
        # FIXME: This should be a registry option so that plugins can register
1790
        # their own config files (or not) -- vila 20101002
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1791
        commands.Option('scope', help='Reduce the scope to the specified'
1792
                        ' configuration file',
1793
                        type=unicode),
5447.4.8 by Vincent Ladeuil
Make the test properly fail and provide a fake implementation for ``bzr config --remove opt_name``.
1794
        commands.Option('remove', help='Remove the option from'
1795
                        ' the configuration file'),
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
1796
        ]
1797
1798
    @commands.display_command
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1799
    def run(self, matching=None, directory=None, scope=None, remove=False):
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1800
        if directory is None:
1801
            directory = '.'
1802
        directory = urlutils.normalize_url(directory)
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1803
        if matching is None:
5447.4.8 by Vincent Ladeuil
Make the test properly fail and provide a fake implementation for ``bzr config --remove opt_name``.
1804
            self._show_config('*', directory)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1805
        else:
5447.4.8 by Vincent Ladeuil
Make the test properly fail and provide a fake implementation for ``bzr config --remove opt_name``.
1806
            if remove:
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1807
                self._remove_config_option(matching, directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1808
            else:
5447.4.8 by Vincent Ladeuil
Make the test properly fail and provide a fake implementation for ``bzr config --remove opt_name``.
1809
                pos = matching.find('=')
1810
                if pos == -1:
1811
                    self._show_config(matching, directory)
1812
                else:
1813
                    self._set_config_option(matching[:pos], matching[pos+1:],
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1814
                                            directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1815
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1816
    def _get_configs(self, directory, scope=None):
1817
        """Iterate the configurations specified by ``directory`` and ``scope``.
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1818
1819
        :param directory: Where the configurations are derived from.
1820
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1821
        :param scope: A specific config to start from.
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1822
        """
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1823
        if scope is not None:
1824
            if scope == 'bazaar':
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1825
                yield GlobalConfig()
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1826
            elif scope == 'locations':
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1827
                yield LocationConfig(directory)
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1828
            elif scope == 'branch':
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1829
                (_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
1830
                    directory)
1831
                yield br.get_config()
1832
        else:
1833
            try:
1834
                (_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
1835
                    directory)
1836
                yield br.get_config()
1837
            except errors.NotBranchError:
1838
                yield LocationConfig(directory)
1839
                yield GlobalConfig()
1840
5447.4.8 by Vincent Ladeuil
Make the test properly fail and provide a fake implementation for ``bzr config --remove opt_name``.
1841
    def _show_config(self, matching, directory):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1842
        # Turn the glob into a regexp
1843
        matching_re = re.compile(fnmatch.translate(matching))
1844
        cur_conf_id = None
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1845
        for c in self._get_configs(directory):
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.
1846
            for (name, value, section, conf_id) in c._get_options():
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1847
                if matching_re.search(name):
1848
                    if cur_conf_id != conf_id:
1849
                        self.outf.write('%s:\n' % (conf_id,))
1850
                        cur_conf_id = conf_id
1851
                    self.outf.write('  %s = %s\n' % (name, value))
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
1852
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1853
    def _set_config_option(self, name, value, directory, scope):
1854
        for conf in self._get_configs(directory, scope):
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1855
            conf.set_user_option(name, value)
1856
            break
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1857
        else:
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1858
            raise errors.NoSuchConfig(scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1859
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1860
    def _remove_config_option(self, name, directory, scope):
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1861
        removed = False
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1862
        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.
1863
            for (section_name, section, conf_id) in conf._get_sections():
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1864
                if scope is not None and conf_id != scope:
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1865
                    # Not the right configuration file
1866
                    continue
1867
                if name in section:
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1868
                    if conf_id != conf.config_id():
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1869
                        conf = self._get_configs(directory, conf_id).next()
1870
                    # We use the first section in the first config where the
1871
                    # option is defined to remove it
1872
                    conf.remove_user_option(name, section_name)
1873
                    removed = True
1874
                    break
1875
            break
1876
        else:
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1877
            raise errors.NoSuchConfig(scope)
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1878
        if not removed:
1879
            raise errors.NoSuchConfigOption(name)