/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():
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
499
                yield (name, parser._quote(value), section_name,
500
                       config_id, parser)
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
501
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
502
    def _get_option_policy(self, section, option_name):
503
        """Return the policy for the given (section, option_name) pair."""
504
        return POLICY_NONE
505
4603.1.10 by Aaron Bentley
Provide change editor via config.
506
    def _get_change_editor(self):
507
        return self.get_user_option('change_editor')
508
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
509
    def _get_signature_checking(self):
510
        """See Config._get_signature_checking."""
1474 by Robert Collins
Merge from Aaron Bentley.
511
        policy = self._get_user_option('check_signatures')
512
        if policy:
513
            return self._string_to_signature_policy(policy)
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
514
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
515
    def _get_signing_policy(self):
1773.4.3 by Martin Pool
[merge] bzr.dev
516
        """See Config._get_signing_policy"""
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
517
        policy = self._get_user_option('create_signatures')
518
        if policy:
519
            return self._string_to_signing_policy(policy)
520
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
521
    def _get_user_id(self):
522
        """Get the user id from the 'email' key in the current section."""
1474 by Robert Collins
Merge from Aaron Bentley.
523
        return self._get_user_option('email')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
524
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
525
    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.
526
        """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
527
        for (section, extra_path) in self._get_matching_sections():
528
            try:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
529
                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
530
            except KeyError:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
531
                continue
532
            policy = self._get_option_policy(section, option_name)
533
            if policy == POLICY_NONE:
534
                return value
535
            elif policy == POLICY_NORECURSE:
536
                # norecurse items only apply to the exact path
537
                if extra_path:
538
                    continue
539
                else:
540
                    return value
541
            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
542
                if extra_path:
543
                    value = urlutils.join(value, extra_path)
544
                return value
2120.6.6 by James Henstridge
fix test_set_push_location test
545
            else:
546
                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
547
        else:
1993.3.1 by James Henstridge
first go at making location config lookup recursive
548
            return None
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
549
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
550
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
551
        """See Config.gpg_signing_command."""
1472 by Robert Collins
post commit hook, first pass implementation
552
        return self._get_user_option('gpg_signing_command')
1442.1.56 by Robert Collins
gpg_signing_command configuration item
553
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
554
    def _log_format(self):
555
        """See Config.log_format."""
556
        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
557
1472 by Robert Collins
post commit hook, first pass implementation
558
    def _post_commit(self):
559
        """See Config.post_commit."""
560
        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
561
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
562
    def _string_to_signature_policy(self, signature_string):
563
        """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
564
        if signature_string.lower() == 'check-available':
565
            return CHECK_IF_POSSIBLE
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
566
        if signature_string.lower() == 'ignore':
567
            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
568
        if signature_string.lower() == 'require':
569
            return CHECK_ALWAYS
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
570
        raise errors.BzrError("Invalid signatures policy '%s'"
571
                              % signature_string)
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
572
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
573
    def _string_to_signing_policy(self, signature_string):
574
        """Convert a string to a signing policy."""
575
        if signature_string.lower() == 'when-required':
576
            return SIGN_WHEN_REQUIRED
577
        if signature_string.lower() == 'never':
578
            return SIGN_NEVER
579
        if signature_string.lower() == 'always':
580
            return SIGN_ALWAYS
581
        raise errors.BzrError("Invalid signing policy '%s'"
582
                              % signature_string)
583
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
584
    def _get_alias(self, value):
585
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
586
            return self._get_parser().get_value("ALIASES",
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
587
                                                value)
588
        except KeyError:
589
            pass
590
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
591
    def _get_nickname(self):
592
        return self.get_user_option('nickname')
593
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
594
    def remove_user_option(self, option_name, section_name=None):
595
        """Remove a user option and save the configuration file.
596
597
        :param option_name: The option to be removed.
598
599
        :param section_name: The section the option is defined in, default to
600
            the default section.
601
        """
602
        self.reload()
603
        parser = self._get_parser()
604
        if section_name is None:
605
            section = parser
606
        else:
607
            section = parser[section_name]
608
        try:
609
            del section[option_name]
610
        except KeyError:
611
            raise errors.NoSuchConfigOption(option_name)
612
        self._write_config_file()
613
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
614
    def _write_config_file(self):
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
615
        if self.file_name is None:
616
            raise AssertionError('We cannot save, self.file_name is None')
5345.1.9 by Vincent Ladeuil
Refactor config dir check.
617
        conf_dir = os.path.dirname(self.file_name)
618
        ensure_config_dir_exists(conf_dir)
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
619
        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
620
        self._get_parser().write(atomic_file)
621
        atomic_file.commit()
622
        atomic_file.close()
5345.3.3 by Vincent Ladeuil
Merge bzr.dev into deprecate-get-filename resolving conflicts
623
        osutils.copy_ownership_from_path(self.file_name)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
624
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
625
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
626
class LockableConfig(IniBasedConfig):
627
    """A configuration needing explicit locking for access.
628
629
    If several processes try to write the config file, the accesses need to be
630
    serialized.
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
631
632
    Daughter classes should decorate all methods that update a config with the
633
    ``@needs_write_lock`` decorator (they call, directly or indirectly, the
634
    ``_write_config_file()`` method. These methods (typically ``set_option()``
635
    and variants must reload the config file from disk before calling
636
    ``_write_config_file()``), this can be achieved by calling the
637
    ``self.reload()`` method. Note that the lock scope should cover both the
638
    reading and the writing of the config file which is why the decorator can't
639
    be applied to ``_write_config_file()`` only.
640
641
    This should be enough to implement the following logic:
642
    - lock for exclusive write access,
643
    - reload the config file from disk,
644
    - set the new value
645
    - unlock
646
647
    This logic guarantees that a writer can update a value without erasing an
648
    update made by another writer.
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
649
    """
650
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
651
    lock_name = 'lock'
652
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
653
    def __init__(self, file_name):
654
        super(LockableConfig, self).__init__(file_name=file_name)
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
655
        self.dir = osutils.dirname(osutils.safe_unicode(self.file_name))
656
        self.transport = transport.get_transport(self.dir)
657
        self._lock = lockdir.LockDir(self.transport, 'lock')
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
658
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
659
    def _create_from_string(self, unicode_bytes, save):
660
        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.
661
        if save:
5345.1.24 by Vincent Ladeuil
Implement _save for LockableConfig too.
662
            # We need to handle the saving here (as opposed to IniBasedConfig)
663
            # to be able to lock
664
            self.lock_write()
665
            self._write_config_file()
666
            self.unlock()
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
667
668
    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.
669
        """Takes a write lock in the directory containing the config file.
670
671
        If the directory doesn't exist it is created.
672
        """
5345.5.5 by Vincent Ladeuil
Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
673
        ensure_config_dir_exists(self.dir)
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
674
        return self._lock.lock_write(token)
675
676
    def unlock(self):
677
        self._lock.unlock()
678
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
679
    def break_lock(self):
680
        self._lock.break_lock()
681
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
682
    @needs_write_lock
683
    def remove_user_option(self, option_name, section_name=None):
684
        super(LockableConfig, self).remove_user_option(option_name,
685
                                                       section_name)
686
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
687
    def _write_config_file(self):
688
        if self._lock is None or not self._lock.is_held:
689
            # NB: if the following exception is raised it probably means a
690
            # missing @needs_write_lock decorator on one of the callers.
691
            raise errors.ObjectNotLocked(self)
692
        super(LockableConfig, self)._write_config_file()
693
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
694
695
class GlobalConfig(LockableConfig):
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
696
    """The configuration that should be used for a specific location."""
697
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
698
    def __init__(self):
699
        super(GlobalConfig, self).__init__(file_name=config_filename())
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
700
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
701
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
702
        return 'bazaar'
703
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
704
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
705
    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
706
        """Create a config object from a string.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
707
5345.5.13 by Vincent Ladeuil
Merge simplify-test-config-building into lockable-config-files resolving conflicts
708
        :param str_or_unicode: A string representing the file content. This
709
            will be utf-8 encoded.
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
710
711
        :param save: Whether the file should be saved upon creation.
712
        """
713
        conf = cls()
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
714
        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.
715
        return conf
5345.5.12 by Vincent Ladeuil
Fix fallouts from replacing '_content' by 'from_bytes' for config files.
716
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
717
    def get_editor(self):
1474 by Robert Collins
Merge from Aaron Bentley.
718
        return self._get_user_option('editor')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
719
5345.5.4 by Vincent Ladeuil
Start implementing config files locking.
720
    @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
721
    def set_user_option(self, option, value):
722
        """Save option and its value in the configuration."""
2900.3.2 by Tim Penhey
A working alias command.
723
        self._set_option(option, value, 'DEFAULT')
724
725
    def get_aliases(self):
726
        """Return the aliases section."""
727
        if 'ALIASES' in self._get_parser():
728
            return self._get_parser()['ALIASES']
729
        else:
730
            return {}
731
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
732
    @needs_write_lock
2900.3.2 by Tim Penhey
A working alias command.
733
    def set_alias(self, alias_name, alias_command):
734
        """Save the alias in the configuration."""
735
        self._set_option(alias_name, alias_command, 'ALIASES')
736
5345.5.8 by Vincent Ladeuil
More doc and ensure that the config is locked when _write_config_file is called.
737
    @needs_write_lock
2900.3.2 by Tim Penhey
A working alias command.
738
    def unset_alias(self, alias_name):
739
        """Unset an existing alias."""
5345.5.10 by Vincent Ladeuil
Add a missing config.reload().
740
        self.reload()
2900.3.2 by Tim Penhey
A working alias command.
741
        aliases = self._get_parser().get('ALIASES')
2900.3.7 by Tim Penhey
Updates from Aaron's review.
742
        if not aliases or alias_name not in aliases:
743
            raise errors.NoSuchAlias(alias_name)
2900.3.2 by Tim Penhey
A working alias command.
744
        del aliases[alias_name]
2900.3.12 by Tim Penhey
Final review comments.
745
        self._write_config_file()
2900.3.2 by Tim Penhey
A working alias command.
746
747
    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.
748
        self.reload()
2900.3.7 by Tim Penhey
Updates from Aaron's review.
749
        self._get_parser().setdefault(section, {})[option] = value
2900.3.12 by Tim Penhey
Final review comments.
750
        self._write_config_file()
2900.3.2 by Tim Penhey
A working alias command.
751
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
752
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.
753
    def _get_sections(self, name=None):
754
        """See IniBasedConfig._get_sections()."""
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
755
        parser = self._get_parser()
756
        # We don't give access to options defined outside of any section, we
757
        # used the DEFAULT section by... default.
758
        if name in (None, 'DEFAULT'):
759
            # This could happen for an empty file where the DEFAULT section
760
            # doesn't exist yet. So we force DEFAULT when yielding
761
            name = 'DEFAULT'
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
762
            if 'DEFAULT' not in parser:
763
               parser['DEFAULT']= {}
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
764
        yield (name, parser[name], self.config_id())
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
765
766
    @needs_write_lock
767
    def remove_user_option(self, option_name, section_name=None):
768
        if section_name is None:
769
            # We need to force the default section.
770
            section_name = 'DEFAULT'
771
        # We need to avoid the LockableConfig implementation or we'll lock
772
        # twice
773
        super(LockableConfig, self).remove_user_option(option_name,
774
                                                       section_name)
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
775
776
5345.5.7 by Vincent Ladeuil
Make LocationConfig use a lock too.
777
class LocationConfig(LockableConfig):
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
778
    """A configuration object that gives the policy for a location."""
779
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
780
    def __init__(self, location):
5345.1.2 by Vincent Ladeuil
Get rid of 'branches.conf' references.
781
        super(LocationConfig, self).__init__(
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
782
            file_name=locations_config_filename())
1878.1.1 by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653)
783
        # local file locations are looked up by local path, rather than
784
        # by file url. This is because the config file is a user
785
        # file, and we would rather not expose the user to file urls.
786
        if location.startswith('file://'):
787
            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
788
        self.location = location
789
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
790
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
791
        return 'locations'
792
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
793
    @classmethod
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
794
    def from_string(cls, str_or_unicode, location, save=False):
795
        """Create a config object from a string.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
796
5345.2.9 by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string.
797
        :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.
798
            be utf-8 encoded.
799
800
        :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.
801
802
        :param save: Whether the file should be saved upon creation.
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
803
        """
804
        conf = cls(location)
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
805
        conf._create_from_string(str_or_unicode, save)
5345.2.8 by Vincent Ladeuil
Introduce a 'from_bytes' constructor for config objects.
806
        return conf
807
1993.3.1 by James Henstridge
first go at making location config lookup recursive
808
    def _get_matching_sections(self):
809
        """Return an ordered list of section names matching this location."""
1185.12.49 by Aaron Bentley
Switched to ConfigObj
810
        sections = self._get_parser()
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
811
        location_names = self.location.split('/')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
812
        if self.location.endswith('/'):
813
            del location_names[-1]
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
814
        matches=[]
1442.1.10 by Robert Collins
explicit over glob test passes
815
        for section in sections:
1878.1.1 by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653)
816
            # location is a local path if possible, so we need
817
            # to convert 'file://' urls to local paths if necessary.
818
            # This also avoids having file:///path be a more exact
819
            # match than '/path'.
820
            if section.startswith('file://'):
821
                section_path = urlutils.local_path_from_url(section)
822
            else:
823
                section_path = section
824
            section_names = section_path.split('/')
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
825
            if section.endswith('/'):
826
                del section_names[-1]
827
            names = zip(location_names, section_names)
828
            matched = True
829
            for name in names:
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
830
                if not fnmatch.fnmatch(name[0], name[1]):
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
831
                    matched = False
832
                    break
833
            if not matched:
834
                continue
835
            # so, for the common prefix they matched.
836
            # if section is longer, no match.
837
            if len(section_names) > len(location_names):
838
                continue
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
839
            matches.append((len(section_names), section,
840
                            '/'.join(location_names[len(section_names):])))
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
841
        # put the longest (aka more specific) locations first
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
842
        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
843
        sections = []
844
        for (length, section, extra_path) in matches:
845
            sections.append((section, extra_path))
846
            # should we stop looking for parent configs here?
1993.3.1 by James Henstridge
first go at making location config lookup recursive
847
            try:
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
848
                if self._get_parser()[section].as_bool('ignore_parents'):
849
                    break
1993.3.1 by James Henstridge
first go at making location config lookup recursive
850
            except KeyError:
851
                pass
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
852
        return sections
1442.1.9 by Robert Collins
exact section test passes
853
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.
854
    def _get_sections(self, name=None):
855
        """See IniBasedConfig._get_sections()."""
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
856
        # We ignore the name here as the only sections handled are named with
857
        # the location path and we don't expose embedded sections either.
858
        parser = self._get_parser()
859
        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.
860
            yield (name, parser[name], self.config_id())
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
861
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
862
    def _get_option_policy(self, section, option_name):
863
        """Return the policy for the given (section, option_name) pair."""
864
        # check for the old 'recurse=False' flag
865
        try:
866
            recurse = self._get_parser()[section].as_bool('recurse')
867
        except KeyError:
868
            recurse = True
869
        if not recurse:
870
            return POLICY_NORECURSE
871
2120.6.10 by James Henstridge
Catch another deprecation warning, and more cleanup
872
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
873
        try:
874
            policy_name = self._get_parser()[section][policy_key]
875
        except KeyError:
876
            policy_name = None
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
877
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
878
        return _policy_value[policy_name]
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
879
2120.6.4 by James Henstridge
add support for specifying policy when storing options
880
    def _set_option_policy(self, section, option_name, option_policy):
881
        """Set the policy for the given option name in the given section."""
882
        # The old recurse=False option affects all options in the
883
        # section.  To handle multiple policies in the section, we
884
        # need to convert it to a policy_norecurse key.
885
        try:
886
            recurse = self._get_parser()[section].as_bool('recurse')
887
        except KeyError:
888
            pass
889
        else:
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
890
            symbol_versioning.warn(
2120.6.11 by James Henstridge
s/0.13/0.14/ in deprecation warning
891
                'The recurse option is deprecated as of 0.14.  '
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
892
                'The section "%s" has been converted to use policies.'
893
                % section,
894
                DeprecationWarning)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
895
            del self._get_parser()[section]['recurse']
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
896
            if not recurse:
897
                for key in self._get_parser()[section].keys():
898
                    if not key.endswith(':policy'):
899
                        self._get_parser()[section][key +
900
                                                    ':policy'] = 'norecurse'
2120.6.4 by James Henstridge
add support for specifying policy when storing options
901
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
902
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
903
        policy_name = _policy_name[option_policy]
904
        if policy_name is not None:
905
            self._get_parser()[section][policy_key] = policy_name
906
        else:
907
            if policy_key in self._get_parser()[section]:
908
                del self._get_parser()[section][policy_key]
2120.6.4 by James Henstridge
add support for specifying policy when storing options
909
5345.5.7 by Vincent Ladeuil
Make LocationConfig use a lock too.
910
    @needs_write_lock
2120.6.4 by James Henstridge
add support for specifying policy when storing options
911
    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.
912
        """Save option and its value in the configuration."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
913
        if store not in [STORE_LOCATION,
2120.6.4 by James Henstridge
add support for specifying policy when storing options
914
                         STORE_LOCATION_NORECURSE,
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
915
                         STORE_LOCATION_APPENDPATH]:
916
            raise ValueError('bad storage policy %r for %r' %
917
                (store, option))
5345.5.1 by Vincent Ladeuil
Implement config.reload and make sure we have a file name when using it.
918
        self.reload()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
919
        location = self.location
920
        if location.endswith('/'):
921
            location = location[:-1]
5345.1.24 by Vincent Ladeuil
Implement _save for LockableConfig too.
922
        parser = self._get_parser()
5345.1.21 by Vincent Ladeuil
Slight rewrite to make the method more readable.
923
        if not location in parser and not location + '/' in parser:
924
            parser[location] = {}
925
        elif location + '/' in parser:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
926
            location = location + '/'
5345.1.21 by Vincent Ladeuil
Slight rewrite to make the method more readable.
927
        parser[location][option]=value
2120.6.4 by James Henstridge
add support for specifying policy when storing options
928
        # the allowed values of store match the config policies
929
        self._set_option_policy(location, option, store)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
930
        self._write_config_file()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
931
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
932
933
class BranchConfig(Config):
934
    """A configuration object giving the policy for a branch."""
935
5345.1.3 by Vincent Ladeuil
Make __init__ the first method in the BranchConfig class.
936
    def __init__(self, branch):
937
        super(BranchConfig, self).__init__()
938
        self._location_config = None
939
        self._branch_data_config = None
940
        self._global_config = None
941
        self.branch = branch
942
        self.option_sources = (self._get_location_config,
943
                               self._get_branch_data_config,
944
                               self._get_global_config)
945
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
946
    def config_id(self):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
947
        return 'branch'
948
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
949
    def _get_branch_data_config(self):
950
        if self._branch_data_config is None:
951
            self._branch_data_config = TreeConfig(self.branch)
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
952
            self._branch_data_config.config_id = self.config_id
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
953
        return self._branch_data_config
954
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
955
    def _get_location_config(self):
956
        if self._location_config is None:
957
            self._location_config = LocationConfig(self.branch.base)
958
        return self._location_config
959
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
960
    def _get_global_config(self):
961
        if self._global_config is None:
962
            self._global_config = GlobalConfig()
963
        return self._global_config
964
965
    def _get_best_value(self, option_name):
966
        """This returns a user option from local, tree or global config.
967
968
        They are tried in that order.  Use get_safe_value if trusted values
969
        are necessary.
970
        """
971
        for source in self.option_sources:
972
            value = getattr(source(), option_name)()
973
            if value is not None:
974
                return value
975
        return None
976
977
    def _get_safe_value(self, option_name):
978
        """This variant of get_best_value never returns untrusted values.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
979
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
980
        It does not return values from the branch data, because the branch may
981
        not be controlled by the user.
982
983
        We may wish to allow locations.conf to control whether branches are
984
        trusted in the future.
985
        """
986
        for source in (self._get_location_config, self._get_global_config):
987
            value = getattr(source(), option_name)()
988
            if value is not None:
989
                return value
990
        return None
991
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
992
    def _get_user_id(self):
993
        """Return the full user id for the branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
994
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
995
        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
996
        This is looked up in the email controlfile for the branch.
997
        """
998
        try:
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
999
            return (self.branch._transport.get_bytes("email")
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
1000
                    .decode(osutils.get_user_encoding())
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1001
                    .rstrip("\r\n"))
1002
        except errors.NoSuchFile, e:
1003
            pass
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1004
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1005
        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
1006
4603.1.10 by Aaron Bentley
Provide change editor via config.
1007
    def _get_change_editor(self):
1008
        return self._get_best_value('_get_change_editor')
1009
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
1010
    def _get_signature_checking(self):
1011
        """See Config._get_signature_checking."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1012
        return self._get_best_value('_get_signature_checking')
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
1013
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
1014
    def _get_signing_policy(self):
1015
        """See Config._get_signing_policy."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1016
        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
1017
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
1018
    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.
1019
        """See Config._get_user_option."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1020
        for source in self.option_sources:
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
1021
            value = source()._get_user_option(option_name)
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1022
            if value is not None:
1023
                return value
1024
        return None
1025
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.
1026
    def _get_sections(self, name=None):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1027
        """See IniBasedConfig.get_sections()."""
1028
        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.
1029
            for section in source()._get_sections(name):
5447.4.4 by Vincent Ladeuil
Implement config.get_sections() to clarify how sections can be used.
1030
                yield section
1031
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.
1032
    def _get_options(self, sections=None):
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1033
        opts = []
1034
        # 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.
1035
        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.
1036
            yield option
1037
        # Then the branch options
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1038
        branch_config = self._get_branch_data_config()
1039
        if sections is None:
1040
            sections = [('DEFAULT', branch_config._get_parser())]
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1041
        # FIXME: We shouldn't have to duplicate the code in IniBasedConfig but
1042
        # 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.
1043
        config_id = self.config_id()
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1044
        for (section_name, section) in sections:
1045
            for (name, value) in section.iteritems():
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
1046
                yield (name, value, section_name,
1047
                       config_id, branch_config._get_parser())
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1048
        # 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.
1049
        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.
1050
            yield option
5447.4.1 by Vincent Ladeuil
Implement config.get_options_matching_regexp.
1051
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1052
    def set_user_option(self, name, value, store=STORE_BRANCH,
1053
        warn_masked=False):
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1054
        if store == STORE_BRANCH:
1770.2.6 by Aaron Bentley
Ensure branch.conf works properly
1055
            self._get_branch_data_config().set_option(value, name)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1056
        elif store == STORE_GLOBAL:
2120.6.7 by James Henstridge
Fix GlobalConfig.set_user_option() call
1057
            self._get_global_config().set_user_option(name, value)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1058
        else:
1059
            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)
1060
        if not warn_masked:
1061
            return
1062
        if store in (STORE_GLOBAL, STORE_BRANCH):
1063
            mask_value = self._get_location_config().get_user_option(name)
1064
            if mask_value is not None:
1065
                trace.warning('Value "%s" is masked by "%s" from'
1066
                              ' locations.conf', value, mask_value)
1067
            else:
1068
                if store == STORE_GLOBAL:
1069
                    branch_config = self._get_branch_data_config()
1070
                    mask_value = branch_config.get_user_option(name)
1071
                    if mask_value is not None:
1072
                        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
1073
                                      ' branch.conf', value, mask_value)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1074
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1075
    def remove_user_option(self, option_name, section_name=None):
1076
        self._get_branch_data_config().remove_option(option_name, section_name)
1077
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
1078
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
1079
        """See Config.gpg_signing_command."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1080
        return self._get_safe_value('_gpg_signing_command')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1081
1472 by Robert Collins
post commit hook, first pass implementation
1082
    def _post_commit(self):
1083
        """See Config.post_commit."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1084
        return self._get_safe_value('_post_commit')
1472 by Robert Collins
post commit hook, first pass implementation
1085
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1086
    def _get_nickname(self):
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
1087
        value = self._get_explicit_nickname()
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1088
        if value is not None:
1089
            return value
2120.5.2 by Alexander Belchenko
(jam) Fix for bug #66857
1090
        return urlutils.unescape(self.branch.base.split('/')[-2])
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
1091
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
1092
    def has_explicit_nickname(self):
1093
        """Return true if a nickname has been explicitly assigned."""
1094
        return self._get_explicit_nickname() is not None
1095
1096
    def _get_explicit_nickname(self):
1097
        return self._get_best_value('_get_nickname')
1098
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
1099
    def _log_format(self):
1100
        """See Config.log_format."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1101
        return self._get_best_value('_log_format')
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1102
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
1103
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1104
def ensure_config_dir_exists(path=None):
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1105
    """Make sure a configuration directory exists.
1106
    This makes sure that the directory exists.
1107
    On windows, since configuration directories are 2 levels deep,
1108
    it makes sure both the directory and the parent directory exists.
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1109
    """
1110
    if path is None:
1111
        path = config_dir()
1112
    if not os.path.isdir(path):
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1113
        if sys.platform == 'win32':
1114
            parent_dir = os.path.dirname(path)
1115
            if not os.path.isdir(parent_dir):
1116
                trace.mutter('creating config parent directory: %r', parent_dir)
1117
                os.mkdir(parent_dir)
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1118
        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
1119
        os.mkdir(path)
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
1120
        osutils.copy_ownership_from_path(path)
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
1121
1532 by Robert Collins
Merge in John Meinels integration branch.
1122
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1123
def config_dir():
1124
    """Return per-user configuration directory.
1125
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1126
    By default this is %APPDATA%/bazaar/2.0 on Windows, ~/.bazaar on Mac OS X
5519.4.3 by Neil Martinsen-Burrell
be permissive about using $XDG_CONFIG_HOME/bazaar, but dont complain
1127
    and Linux.  On Linux, if there is a $XDG_CONFIG_HOME/bazaar directory,
1128
    that will be used instead.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1129
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
1130
    TODO: Global option --config-dir to override this.
1131
    """
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1132
    base = os.environ.get('BZR_HOME', None)
1133
    if sys.platform == 'win32':
1134
        if base is None:
2245.4.3 by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
1135
            base = win32utils.get_appdata_location_unicode()
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1136
        if base is None:
1137
            base = os.environ.get('HOME', None)
1138
        if base is None:
2991.2.2 by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0.
1139
            raise errors.BzrError('You must have one of BZR_HOME, APPDATA,'
1140
                                  ' or HOME set')
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1141
        return osutils.pathjoin(base, 'bazaar', '2.0')
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1142
    elif sys.platform == 'darwin':
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1143
        if base is None:
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1144
            # this takes into account $HOME
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
1145
            base = os.path.expanduser("~")
5519.4.1 by Neil Martinsen-Burrell
spec and first implementation, next tests
1146
        return osutils.pathjoin(base, '.bazaar')
1147
    else:
1148
        if base is None:
5519.4.3 by Neil Martinsen-Burrell
be permissive about using $XDG_CONFIG_HOME/bazaar, but dont complain
1149
1150
            xdg_dir = os.environ.get('XDG_CONFIG_HOME', None)
1151
            if xdg_dir is None:
1152
                xdg_dir = osutils.pathjoin(os.path.expanduser("~"), ".config")
1153
            xdg_dir = osutils.pathjoin(xdg_dir, 'bazaar')
1154
            if osutils.isdir(xdg_dir):
1155
                trace.mutter(
1156
                    "Using configuration in XDG directory %s." % xdg_dir)
1157
                return xdg_dir
1158
1159
            base = os.path.expanduser("~")
5519.4.4 by Neil Martinsen-Burrell
restore ensure_config_dir since XDG_CONFIG_HOME is optional
1160
        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 \
1161
1162
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1163
def config_filename():
1164
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1165
    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.
1166
1167
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
1168
def locations_config_filename():
1169
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1170
    return osutils.pathjoin(config_dir(), 'locations.conf')
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
1171
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1172
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1173
def authentication_config_filename():
1174
    """Return per-user authentication ini file filename."""
1175
    return osutils.pathjoin(config_dir(), 'authentication.conf')
1176
1177
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
1178
def user_ignore_config_filename():
1179
    """Return the user default ignore filename"""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
1180
    return osutils.pathjoin(config_dir(), 'ignore')
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
1181
1182
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1183
def crash_dir():
1184
    """Return the directory name to store crash files.
1185
1186
    This doesn't implicitly create it.
1187
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
1188
    On Windows it's in the config directory; elsewhere it's /var/crash
4634.128.18 by Martin Pool
Update apport crash tests
1189
    which may be monitored by apport.  It can be overridden by
1190
    $APPORT_CRASH_DIR.
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1191
    """
1192
    if sys.platform == 'win32':
1193
        return osutils.pathjoin(config_dir(), 'Crash')
1194
    else:
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
1195
        # XXX: hardcoded in apport_python_hook.py; therefore here too -- mbp
1196
        # 2010-01-31
4634.128.18 by Martin Pool
Update apport crash tests
1197
        return os.environ.get('APPORT_CRASH_DIR', '/var/crash')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1198
1199
1200
def xdg_cache_dir():
4584.3.23 by Martin Pool
Correction to xdg_cache_dir and add a simple test
1201
    # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html
1202
    # Possibly this should be different on Windows?
1203
    e = os.environ.get('XDG_CACHE_DIR', None)
1204
    if e:
1205
        return e
1206
    else:
1207
        return os.path.expanduser('~/.cache')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
1208
1209
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1210
def parse_username(username):
1211
    """Parse e-mail username and return a (name, address) tuple."""
1212
    match = re.match(r'(.*?)\s*<?([\w+.-]+@[\w+.-]+)>?', username)
1213
    if match is None:
1214
        return (username, '')
1215
    else:
1216
        return (match.group(1), match.group(2))
1217
1218
1185.16.52 by Martin Pool
- add extract_email_address
1219
def extract_email_address(e):
1220
    """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.
1221
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1222
    That is just the user@domain part, nothing else.
1185.16.52 by Martin Pool
- add extract_email_address
1223
    This part is required to contain only ascii characters.
1224
    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.
1225
1185.16.52 by Martin Pool
- add extract_email_address
1226
    >>> extract_email_address('Jane Tester <jane@test.com>')
1227
    "jane@test.com"
1228
    """
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1229
    name, email = parse_username(e)
1230
    if not email:
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
1231
        raise errors.NoEmailInUsername(e)
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1232
    return email
1185.35.11 by Aaron Bentley
Added support for branch nicks
1233
1185.85.30 by John Arbash Meinel
Fixing 'bzr push' exposed that IniBasedConfig didn't handle unicode.
1234
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1235
class TreeConfig(IniBasedConfig):
1185.35.11 by Aaron Bentley
Added support for branch nicks
1236
    """Branch configuration data associated with its contents, not location"""
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1237
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
1238
    # XXX: Really needs a better name, as this is not part of the tree! -- mbp 20080507
1239
1185.35.11 by Aaron Bentley
Added support for branch nicks
1240
    def __init__(self, branch):
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
1241
        self._config = branch._get_config()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1242
        self.branch = branch
1243
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1244
    def _get_parser(self, file=None):
1245
        if file is not None:
1246
            return IniBasedConfig._get_parser(file)
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1247
        return self._config._get_configobj()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1248
1249
    def get_option(self, name, section=None, default=None):
1250
        self.branch.lock_read()
1251
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1252
            return self._config.get_option(name, section, default)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1253
        finally:
1254
            self.branch.unlock()
1255
1256
    def set_option(self, value, name, section=None):
1257
        """Set a per-branch configuration option"""
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1258
        # FIXME: We shouldn't need to lock explicitly here but rather rely on
1259
        # higher levels providing the right lock -- vila 20101004
1185.35.11 by Aaron Bentley
Added support for branch nicks
1260
        self.branch.lock_write()
1261
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1262
            self._config.set_option(value, name, section)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1263
        finally:
1264
            self.branch.unlock()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1265
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1266
    def remove_option(self, option_name, section_name=None):
1267
        # FIXME: We shouldn't need to lock explicitly here but rather rely on
1268
        # higher levels providing the right lock -- vila 20101004
1269
        self.branch.lock_write()
1270
        try:
1271
            self._config.remove_option(option_name, section_name)
1272
        finally:
1273
            self.branch.unlock()
1274
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1275
1276
class AuthenticationConfig(object):
1277
    """The authentication configuration file based on a ini file.
1278
1279
    Implements the authentication.conf file described in
1280
    doc/developers/authentication-ring.txt.
1281
    """
1282
1283
    def __init__(self, _file=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1284
        self._config = None # The ConfigObj
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1285
        if _file is None:
2900.2.24 by Vincent Ladeuil
Review feedback.
1286
            self._filename = authentication_config_filename()
1287
            self._input = self._filename = authentication_config_filename()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1288
        else:
2900.2.24 by Vincent Ladeuil
Review feedback.
1289
            # Tests can provide a string as _file
1290
            self._filename = None
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1291
            self._input = _file
1292
1293
    def _get_config(self):
1294
        if self._config is not None:
1295
            return self._config
1296
        try:
2900.2.22 by Vincent Ladeuil
Polishing.
1297
            # FIXME: Should we validate something here ? Includes: empty
1298
            # sections are useless, at least one of
1299
            # user/password/password_encoding should be defined, etc.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1300
1301
            # Note: the encoding below declares that the file itself is utf-8
1302
            # encoded, but the values in the ConfigObj are always Unicode.
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1303
            self._config = ConfigObj(self._input, encoding='utf-8')
1304
        except configobj.ConfigObjError, e:
1305
            raise errors.ParseConfigError(e.errors, e.config.filename)
1306
        return self._config
1307
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1308
    def _save(self):
1309
        """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.
1310
        conf_dir = os.path.dirname(self._filename)
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1311
        ensure_config_dir_exists(conf_dir)
4708.2.2 by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib
1312
        f = file(self._filename, 'wb')
1313
        try:
1314
            self._get_config().write(f)
1315
        finally:
1316
            f.close()
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1317
1318
    def _set_option(self, section_name, option_name, value):
1319
        """Set an authentication configuration option"""
1320
        conf = self._get_config()
1321
        section = conf.get(section_name)
1322
        if section is None:
1323
            conf[section] = {}
1324
            section = conf[section]
1325
        section[option_name] = value
1326
        self._save()
1327
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1328
    def get_credentials(self, scheme, host, port=None, user=None, path=None, 
1329
                        realm=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1330
        """Returns the matching credentials from authentication.conf file.
1331
1332
        :param scheme: protocol
1333
1334
        :param host: the server address
1335
1336
        :param port: the associated port (optional)
1337
1338
        :param user: login (optional)
1339
1340
        :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
1341
        
1342
        :param realm: the http authentication realm (optional)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1343
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1344
        :return: A dict containing the matching credentials or None.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1345
           This includes:
1346
           - name: the section name of the credentials in the
1347
             authentication.conf file,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1348
           - 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.
1349
           - scheme: the server protocol,
1350
           - host: the server address,
1351
           - port: the server port (can be None),
1352
           - path: the absolute server path (can be None),
1353
           - realm: the http specific authentication realm (can be None),
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1354
           - password: the decoded password, could be None if the credential
1355
             defines only the user
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1356
           - verify_certificates: https specific, True if the server
1357
             certificate should be verified, False otherwise.
1358
        """
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1359
        credentials = None
1360
        for auth_def_name, auth_def in self._get_config().items():
3418.2.1 by Vincent Ladeuil
Fix #217650 by catching declarations outside sections.
1361
            if type(auth_def) is not configobj.Section:
1362
                raise ValueError("%s defined outside a section" % auth_def_name)
1363
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1364
            a_scheme, a_host, a_user, a_path = map(
1365
                auth_def.get, ['scheme', 'host', 'user', 'path'])
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1366
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1367
            try:
1368
                a_port = auth_def.as_int('port')
1369
            except KeyError:
1370
                a_port = None
2900.2.22 by Vincent Ladeuil
Polishing.
1371
            except ValueError:
1372
                raise ValueError("'port' not numeric in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1373
            try:
1374
                a_verify_certificates = auth_def.as_bool('verify_certificates')
1375
            except KeyError:
1376
                a_verify_certificates = True
2900.2.22 by Vincent Ladeuil
Polishing.
1377
            except ValueError:
1378
                raise ValueError(
1379
                    "'verify_certificates' not boolean in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1380
1381
            # Attempt matching
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1382
            if a_scheme is not None and scheme != a_scheme:
1383
                continue
1384
            if a_host is not None:
1385
                if not (host == a_host
1386
                        or (a_host.startswith('.') and host.endswith(a_host))):
1387
                    continue
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1388
            if a_port is not None and port != a_port:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1389
                continue
1390
            if (a_path is not None and path is not None
1391
                and not path.startswith(a_path)):
1392
                continue
1393
            if (a_user is not None and user is not None
1394
                and a_user != user):
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1395
                # Never contradict the caller about the user to be used
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1396
                continue
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1397
            if a_user is None:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1398
                # Can't find a user
1399
                continue
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1400
            # Prepare a credentials dictionary with additional keys
1401
            # for the credential providers
2900.2.24 by Vincent Ladeuil
Review feedback.
1402
            credentials = dict(name=auth_def_name,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1403
                               user=a_user,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1404
                               scheme=a_scheme,
1405
                               host=host,
1406
                               port=port,
1407
                               path=path,
1408
                               realm=realm,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1409
                               password=auth_def.get('password', None),
2900.2.24 by Vincent Ladeuil
Review feedback.
1410
                               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
1411
            # Decode the password in the credentials (or get one)
2900.2.22 by Vincent Ladeuil
Polishing.
1412
            self.decode_password(credentials,
1413
                                 auth_def.get('password_encoding', None))
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1414
            if 'auth' in debug.debug_flags:
1415
                trace.mutter("Using authentication section: %r", auth_def_name)
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1416
            break
1417
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1418
        if credentials is None:
1419
            # No credentials were found in authentication.conf, try the fallback
1420
            # credentials stores.
1421
            credentials = credential_store_registry.get_fallback_credentials(
1422
                scheme, host, port, user, path, realm)
1423
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1424
        return credentials
1425
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1426
    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
1427
                        port=None, path=None, verify_certificates=None,
1428
                        realm=None):
3777.3.1 by Aaron Bentley
Update docs
1429
        """Set authentication credentials for a host.
1430
1431
        Any existing credentials with matching scheme, host, port and path
1432
        will be deleted, regardless of name.
1433
1434
        :param name: An arbitrary name to describe this set of credentials.
1435
        :param host: Name of the host that accepts these credentials.
1436
        :param user: The username portion of these credentials.
1437
        :param scheme: The URL scheme (e.g. ssh, http) the credentials apply
1438
            to.
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1439
        :param password: Password portion of these credentials.
3777.3.1 by Aaron Bentley
Update docs
1440
        :param port: The IP port on the host that these credentials apply to.
1441
        :param path: A filesystem path on the host that these credentials
1442
            apply to.
1443
        :param verify_certificates: On https, verify server certificates if
1444
            True.
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1445
        :param realm: The http authentication realm (optional).
3777.3.1 by Aaron Bentley
Update docs
1446
        """
3777.1.8 by Aaron Bentley
Commit work-in-progress
1447
        values = {'host': host, 'user': user}
1448
        if password is not None:
1449
            values['password'] = password
1450
        if scheme is not None:
1451
            values['scheme'] = scheme
1452
        if port is not None:
1453
            values['port'] = '%d' % port
1454
        if path is not None:
1455
            values['path'] = path
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1456
        if verify_certificates is not None:
1457
            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
1458
        if realm is not None:
1459
            values['realm'] = realm
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1460
        config = self._get_config()
1461
        for_deletion = []
1462
        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
1463
            for key in ('scheme', 'host', 'port', 'path', 'realm'):
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1464
                if existing_values.get(key) != values.get(key):
1465
                    break
1466
            else:
1467
                del config[section]
1468
        config.update({name: values})
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1469
        self._save()
3777.1.8 by Aaron Bentley
Commit work-in-progress
1470
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1471
    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.
1472
                 prompt=None, ask=False, default=None):
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1473
        """Get a user from authentication file.
1474
1475
        :param scheme: protocol
1476
1477
        :param host: the server address
1478
1479
        :param port: the associated port (optional)
1480
1481
        :param realm: the realm sent by the server (optional)
1482
1483
        :param path: the absolute path on the server (optional)
1484
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1485
        :param ask: Ask the user if there is no explicitly configured username 
1486
                    (optional)
1487
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1488
        :param default: The username returned if none is defined (optional).
1489
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1490
        :return: The found user.
1491
        """
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1492
        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
1493
                                           path=path, realm=realm)
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1494
        if credentials is not None:
1495
            user = credentials['user']
1496
        else:
1497
            user = None
4222.3.2 by Jelmer Vernooij
Prompt for user names if they are not in the configuration.
1498
        if user is None:
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1499
            if ask:
1500
                if prompt is None:
1501
                    # Create a default prompt suitable for most cases
1502
                    prompt = scheme.upper() + ' %(host)s username'
1503
                # Special handling for optional fields in the prompt
1504
                if port is not None:
1505
                    prompt_host = '%s:%d' % (host, port)
1506
                else:
1507
                    prompt_host = host
1508
                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.
1509
            else:
4222.3.10 by Jelmer Vernooij
Avoid using the default username in the case of SMTP.
1510
                user = default
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1511
        return user
1512
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1513
    def get_password(self, scheme, host, user, port=None,
1514
                     realm=None, path=None, prompt=None):
1515
        """Get a password from authentication file or prompt the user for one.
1516
1517
        :param scheme: protocol
1518
1519
        :param host: the server address
1520
1521
        :param port: the associated port (optional)
1522
1523
        :param user: login
1524
1525
        :param realm: the realm sent by the server (optional)
1526
1527
        :param path: the absolute path on the server (optional)
1528
1529
        :return: The found password or the one entered by the user.
1530
        """
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1531
        credentials = self.get_credentials(scheme, host, port, user, path,
1532
                                           realm)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1533
        if credentials is not None:
1534
            password = credentials['password']
3420.1.3 by Vincent Ladeuil
John's review feedback.
1535
            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.
1536
                trace.warning('password ignored in section [%s],'
1537
                              ' use an ssh agent instead'
1538
                              % credentials['name'])
1539
                password = None
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1540
        else:
1541
            password = None
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1542
        # 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).
1543
        if password is None:
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1544
            if prompt is None:
3420.1.2 by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user.
1545
                # Create a default prompt suitable for most cases
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1546
                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
1547
            # Special handling for optional fields in the prompt
1548
            if port is not None:
1549
                prompt_host = '%s:%d' % (host, port)
1550
            else:
1551
                prompt_host = host
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1552
            password = ui.ui_factory.get_password(prompt,
1553
                                                  host=prompt_host, user=user)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1554
        return password
1555
2900.2.22 by Vincent Ladeuil
Polishing.
1556
    def decode_password(self, credentials, encoding):
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1557
        try:
1558
            cs = credential_store_registry.get_credential_store(encoding)
1559
        except KeyError:
1560
            raise ValueError('%r is not a known password_encoding' % encoding)
1561
        credentials['password'] = cs.decode_password(credentials)
2900.2.22 by Vincent Ladeuil
Polishing.
1562
        return credentials
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1563
3242.3.17 by Aaron Bentley
Whitespace cleanup
1564
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1565
class CredentialStoreRegistry(registry.Registry):
1566
    """A class that registers credential stores.
1567
1568
    A credential store provides access to credentials via the password_encoding
1569
    field in authentication.conf sections.
1570
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1571
    Except for stores provided by bzr itself, most stores are expected to be
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1572
    provided by plugins that will therefore use
1573
    register_lazy(password_encoding, module_name, member_name, help=help,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1574
    fallback=fallback) to install themselves.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1575
1576
    A fallback credential store is one that is queried if no credentials can be
1577
    found via authentication.conf.
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1578
    """
1579
1580
    def get_credential_store(self, encoding=None):
1581
        cs = self.get(encoding)
1582
        if callable(cs):
1583
            cs = cs()
1584
        return cs
1585
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1586
    def is_fallback(self, name):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1587
        """Check if the named credentials store should be used as fallback."""
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1588
        return self.get_info(name)
1589
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1590
    def get_fallback_credentials(self, scheme, host, port=None, user=None,
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1591
                                 path=None, realm=None):
1592
        """Request credentials from all fallback credentials stores.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1593
1594
        The first credentials store that can provide credentials wins.
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1595
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1596
        credentials = None
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1597
        for name in self.keys():
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1598
            if not self.is_fallback(name):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1599
                continue
1600
            cs = self.get_credential_store(name)
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1601
            credentials = cs.get_credentials(scheme, host, port, user,
1602
                                             path, realm)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1603
            if credentials is not None:
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1604
                # We found some credentials
1605
                break
1606
        return credentials
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1607
1608
    def register(self, key, obj, help=None, override_existing=False,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1609
                 fallback=False):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1610
        """Register a new object to a name.
1611
1612
        :param key: This is the key to use to request the object later.
1613
        :param obj: The object to register.
1614
        :param help: Help text for this entry. This may be a string or
1615
                a callable. If it is a callable, it should take two
1616
                parameters (registry, key): this registry and the key that
1617
                the help was registered under.
1618
        :param override_existing: Raise KeyErorr if False and something has
1619
                already been registered for that key. If True, ignore if there
1620
                is an existing key (always register the new value).
1621
        :param fallback: Whether this credential store should be 
1622
                used as fallback.
1623
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1624
        return super(CredentialStoreRegistry,
1625
                     self).register(key, obj, help, info=fallback,
1626
                                    override_existing=override_existing)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1627
1628
    def register_lazy(self, key, module_name, member_name,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1629
                      help=None, override_existing=False,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1630
                      fallback=False):
1631
        """Register a new credential store to be loaded on request.
1632
1633
        :param module_name: The python path to the module. Such as 'os.path'.
1634
        :param member_name: The member of the module to return.  If empty or
1635
                None, get() will return the module itself.
1636
        :param help: Help text for this entry. This may be a string or
1637
                a callable.
1638
        :param override_existing: If True, replace the existing object
1639
                with the new one. If False, if there is already something
1640
                registered with the same key, raise a KeyError
1641
        :param fallback: Whether this credential store should be 
1642
                used as fallback.
1643
        """
1644
        return super(CredentialStoreRegistry, self).register_lazy(
1645
            key, module_name, member_name, help,
1646
            info=fallback, override_existing=override_existing)
1647
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1648
1649
credential_store_registry = CredentialStoreRegistry()
1650
1651
1652
class CredentialStore(object):
1653
    """An abstract class to implement storage for credentials"""
1654
1655
    def decode_password(self, credentials):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1656
        """Returns a clear text password for the provided credentials."""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1657
        raise NotImplementedError(self.decode_password)
1658
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1659
    def get_credentials(self, scheme, host, port=None, user=None, path=None,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1660
                        realm=None):
1661
        """Return the matching credentials from this credential store.
1662
1663
        This method is only called on fallback credential stores.
1664
        """
1665
        raise NotImplementedError(self.get_credentials)
1666
1667
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1668
1669
class PlainTextCredentialStore(CredentialStore):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1670
    __doc__ = """Plain text credential store for the authentication.conf file"""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1671
1672
    def decode_password(self, credentials):
1673
        """See CredentialStore.decode_password."""
1674
        return credentials['password']
1675
1676
1677
credential_store_registry.register('plain', PlainTextCredentialStore,
1678
                                   help=PlainTextCredentialStore.__doc__)
1679
credential_store_registry.default_key = 'plain'
1680
1681
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1682
class BzrDirConfig(object):
1683
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1684
    def __init__(self, bzrdir):
1685
        self._bzrdir = bzrdir
1686
        self._config = bzrdir._get_config()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1687
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1688
    def set_default_stack_on(self, value):
1689
        """Set the default stacking location.
1690
1691
        It may be set to a location, or None.
1692
1693
        This policy affects all branches contained by this bzrdir, except for
1694
        those under repositories.
1695
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1696
        if self._config is None:
1697
            raise errors.BzrError("Cannot set configuration in %s" % self._bzrdir)
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1698
        if value is None:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1699
            self._config.set_option('', 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1700
        else:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1701
            self._config.set_option(value, 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1702
1703
    def get_default_stack_on(self):
1704
        """Return the default stacking location.
1705
1706
        This will either be a location, or None.
1707
1708
        This policy affects all branches contained by this bzrdir, except for
1709
        those under repositories.
1710
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1711
        if self._config is None:
1712
            return None
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1713
        value = self._config.get_option('default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1714
        if value == '':
1715
            value = None
1716
        return value
1717
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1718
1719
class TransportConfig(object):
3242.1.5 by Aaron Bentley
Update per review comments
1720
    """A Config that reads/writes a config file on a Transport.
3242.1.4 by Aaron Bentley
Clean-up
1721
1722
    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.
1723
    that may be associated with a section.  Assigning meaning to these values
1724
    is done at higher levels like TreeConfig.
3242.1.4 by Aaron Bentley
Clean-up
1725
    """
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1726
1727
    def __init__(self, transport, filename):
1728
        self._transport = transport
1729
        self._filename = filename
1730
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1731
    def get_option(self, name, section=None, default=None):
1732
        """Return the value associated with a named option.
1733
1734
        :param name: The name of the value
1735
        :param section: The section the option is in (if any)
1736
        :param default: The value to return if the value is not set
1737
        :return: The value or default value
1738
        """
1739
        configobj = self._get_configobj()
1740
        if section is None:
1741
            section_obj = configobj
1742
        else:
1743
            try:
1744
                section_obj = configobj[section]
1745
            except KeyError:
1746
                return default
1747
        return section_obj.get(name, default)
1748
1749
    def set_option(self, value, name, section=None):
1750
        """Set the value associated with a named option.
1751
1752
        :param value: The value to set
1753
        :param name: The name of the value to set
1754
        :param section: The section the option is in (if any)
1755
        """
1756
        configobj = self._get_configobj()
1757
        if section is None:
1758
            configobj[name] = value
1759
        else:
1760
            configobj.setdefault(section, {})[name] = value
1761
        self._set_configobj(configobj)
1762
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1763
    def remove_option(self, option_name, section_name=None):
1764
        configobj = self._get_configobj()
1765
        if section_name is None:
1766
            del configobj[option_name]
1767
        else:
1768
            del configobj[section_name][option_name]
1769
        self._set_configobj(configobj)
1770
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1771
    def _get_config_file(self):
1772
        try:
4852.1.10 by John Arbash Meinel
Use a StringIO instead, otherwise we get failures with smart server requests.
1773
            return StringIO(self._transport.get_bytes(self._filename))
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1774
        except errors.NoSuchFile:
1775
            return StringIO()
1776
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1777
    def _get_configobj(self):
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
1778
        f = self._get_config_file()
1779
        try:
1780
            return ConfigObj(f, encoding='utf-8')
1781
        finally:
1782
            f.close()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1783
1784
    def _set_configobj(self, configobj):
1785
        out_file = StringIO()
1786
        configobj.write(out_file)
1787
        out_file.seek(0)
1788
        self._transport.put_file(self._filename, out_file)
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
1789
1790
1791
class cmd_config(commands.Command):
5447.4.19 by Vincent Ladeuil
Add some more documentation.
1792
    __doc__ = """Display, set or remove a configuration option.
1793
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1794
    Display the active value for a given option.
1795
1796
    If --all is specified, NAME is interpreted as a regular expression and all
1797
    matching options are displayed mentioning their scope. The active value
1798
    that bzr will take into account is the first one displayed for each option.
1799
1800
    If no NAME is given, --all .* is implied.
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
1801
5447.4.19 by Vincent Ladeuil
Add some more documentation.
1802
    Setting a value is achieved by using name=value without spaces. The value
1803
    is set in the most relevant scope and can be checked by displaying the
1804
    option again.
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
1805
    """
1806
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1807
    takes_args = ['name?']
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
1808
1809
    takes_options = [
1810
        'directory',
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1811
        # FIXME: This should be a registry option so that plugins can register
1812
        # their own config files (or not) -- vila 20101002
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1813
        commands.Option('scope', help='Reduce the scope to the specified'
1814
                        ' configuration file',
1815
                        type=unicode),
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1816
        commands.Option('all',
1817
            help='Display all the defined values for the matching options.',
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
1818
            ),
5447.4.8 by Vincent Ladeuil
Make the test properly fail and provide a fake implementation for ``bzr config --remove opt_name``.
1819
        commands.Option('remove', help='Remove the option from'
1820
                        ' the configuration file'),
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
1821
        ]
1822
1823
    @commands.display_command
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1824
    def run(self, name=None, all=False, directory=None, scope=None,
1825
            remove=False):
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1826
        if directory is None:
1827
            directory = '.'
1828
        directory = urlutils.normalize_url(directory)
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1829
        if remove and all:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
1830
            raise errors.BzrError(
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1831
                '--all and --remove are mutually exclusive.')
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
1832
        elif remove:
1833
            # Delete the option in the given scope
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1834
            self._remove_config_option(name, directory, scope)
1835
        elif name is None:
1836
            # Defaults to all options
1837
            self._show_matching_options('.*', directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1838
        else:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
1839
            try:
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1840
                name, value = name.split('=', 1)
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
1841
            except ValueError:
1842
                # Display the option(s) value(s)
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1843
                if all:
1844
                    self._show_matching_options(name, directory, scope)
1845
                else:
1846
                    self._show_value(name, directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1847
            else:
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1848
                if all:
1849
                    raise errors.BzrError(
1850
                        'Only one option can be set.')
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
1851
                # Set the option value
1852
                self._set_config_option(name, value, directory, scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1853
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1854
    def _get_configs(self, directory, scope=None):
1855
        """Iterate the configurations specified by ``directory`` and ``scope``.
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1856
1857
        :param directory: Where the configurations are derived from.
1858
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1859
        :param scope: A specific config to start from.
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1860
        """
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1861
        if scope is not None:
1862
            if scope == 'bazaar':
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1863
                yield GlobalConfig()
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1864
            elif scope == 'locations':
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1865
                yield LocationConfig(directory)
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1866
            elif scope == 'branch':
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1867
                (_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
1868
                    directory)
1869
                yield br.get_config()
1870
        else:
1871
            try:
1872
                (_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
1873
                    directory)
1874
                yield br.get_config()
1875
            except errors.NotBranchError:
1876
                yield LocationConfig(directory)
1877
                yield GlobalConfig()
1878
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1879
    def _show_value(self, name, directory, scope):
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
1880
        displayed = False
1881
        for c in self._get_configs(directory, scope):
1882
            if displayed:
1883
                break
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
1884
            for (oname, value, section, conf_id, parser) in c._get_options():
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1885
                if name == oname:
5533.1.3 by Vincent Ladeuil
Tweak comment as per poolie's suggestion.
1886
                    # Display only the first value and exit
5533.2.3 by Vincent Ladeuil
Merge 671050-config-policy into 672382-list-values 672382-list-values resolving conflicts
1887
5533.1.3 by Vincent Ladeuil
Tweak comment as per poolie's suggestion.
1888
                    # FIXME: We need to use get_user_option to take policies
1889
                    # into account and we need to make sure the option exists
5533.2.3 by Vincent Ladeuil
Merge 671050-config-policy into 672382-list-values 672382-list-values resolving conflicts
1890
                    # too (hence the two for loops), this needs a better API
1891
                    # -- vila 20101117
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
1892
                    value = c.get_user_option(name)
1893
                    # Quote the value appropriately
1894
                    value = parser._quote(value)
1895
                    self.outf.write('%s\n' % (value,))
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1896
                    displayed = True
1897
                    break
1898
        if not displayed:
1899
            raise errors.NoSuchConfigOption(name)
1900
1901
    def _show_matching_options(self, name, directory, scope):
1902
        name = re.compile(name)
1903
        # We want any error in the regexp to be raised *now* so we need to
1904
        # avoid the delay introduced by the lazy regexp.
1905
        name._compile_and_collapse()
1906
        cur_conf_id = None
5533.1.1 by Vincent Ladeuil
Fix ``bzr config`` to respect policies when displaying values and also display sections when appropriate.
1907
        cur_section = None
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1908
        for c in self._get_configs(directory, scope):
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
1909
            for (oname, value, section, conf_id, parser) in c._get_options():
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1910
                if name.search(oname):
1911
                    if cur_conf_id != conf_id:
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
1912
                        # Explain where the options are defined
5447.4.3 by Vincent Ladeuil
Simplify code and design by only defining get_options() where relevant.
1913
                        self.outf.write('%s:\n' % (conf_id,))
1914
                        cur_conf_id = conf_id
5533.1.1 by Vincent Ladeuil
Fix ``bzr config`` to respect policies when displaying values and also display sections when appropriate.
1915
                        cur_section = None
1916
                    if (section not in (None, 'DEFAULT')
1917
                        and cur_section != section):
1918
                        # Display the section if it's not the default (or only)
1919
                        # one.
5533.2.1 by Vincent Ladeuil
``bzr config`` properly displays list values
1920
                        self.outf.write('  [%s]\n' % (section,))
5533.1.1 by Vincent Ladeuil
Fix ``bzr config`` to respect policies when displaying values and also display sections when appropriate.
1921
                        cur_section = section
5506.2.3 by Vincent Ladeuil
Take review comments into account and drive-by fix bug #670251
1922
                    self.outf.write('  %s = %s\n' % (oname, value))
5447.4.2 by Vincent Ladeuil
Implement the 'brz config' command. Read-only.
1923
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1924
    def _set_config_option(self, name, value, directory, scope):
1925
        for conf in self._get_configs(directory, scope):
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1926
            conf.set_user_option(name, value)
1927
            break
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1928
        else:
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1929
            raise errors.NoSuchConfig(scope)
5447.4.5 by Vincent Ladeuil
Implement ``bzr config option=value``.
1930
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1931
    def _remove_config_option(self, name, directory, scope):
5506.2.1 by Vincent Ladeuil
Implements ``bzr config --active option`` displaying only the value.
1932
        if name is None:
1933
            raise errors.BzrCommandError(
1934
                '--remove expects an option to remove.')
5447.4.9 by Vincent Ladeuil
Refactor under tests umbrella.
1935
        removed = False
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1936
        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.
1937
            for (section_name, section, conf_id) in conf._get_sections():
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1938
                if scope is not None and conf_id != scope:
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1939
                    # Not the right configuration file
1940
                    continue
1941
                if name in section:
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
1942
                    if conf_id != conf.config_id():
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1943
                        conf = self._get_configs(directory, conf_id).next()
1944
                    # We use the first section in the first config where the
1945
                    # option is defined to remove it
1946
                    conf.remove_user_option(name, section_name)
1947
                    removed = True
1948
                    break
1949
            break
1950
        else:
5447.4.17 by Vincent Ladeuil
Rename config --force to config --scope.
1951
            raise errors.NoSuchConfig(scope)
5447.4.11 by Vincent Ladeuil
Implement ``bzr config --remove <option>``.
1952
        if not removed:
1953
            raise errors.NoSuchConfigOption(name)