~bzr-pqm/bzr/bzr.dev

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
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
68
from bzrlib.lazy_import import lazy_import
69
lazy_import(globals(), """
1474 by Robert Collins
Merge from Aaron Bentley.
70
import errno
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
71
from fnmatch import fnmatch
72
import re
2900.2.22 by Vincent Ladeuil
Polishing.
73
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.
74
75
import bzrlib
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
76
from bzrlib import (
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
77
    debug,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
78
    errors,
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
79
    mail_client,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
80
    osutils,
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
81
    registry,
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
82
    symbol_versioning,
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
83
    trace,
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
84
    ui,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
85
    urlutils,
2245.4.3 by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
86
    win32utils,
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
87
    )
2991.2.4 by Vincent Ladeuil
Various fixes following local testing environment rebuild.
88
from bzrlib.util.configobj import configobj
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
89
""")
90
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
91
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
92
CHECK_IF_POSSIBLE=0
93
CHECK_ALWAYS=1
94
CHECK_NEVER=2
95
96
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
97
SIGN_WHEN_REQUIRED=0
98
SIGN_ALWAYS=1
99
SIGN_NEVER=2
100
101
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
102
POLICY_NONE = 0
103
POLICY_NORECURSE = 1
104
POLICY_APPENDPATH = 2
105
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
106
_policy_name = {
107
    POLICY_NONE: None,
108
    POLICY_NORECURSE: 'norecurse',
109
    POLICY_APPENDPATH: 'appendpath',
110
    }
111
_policy_value = {
112
    None: POLICY_NONE,
113
    'none': POLICY_NONE,
114
    'norecurse': POLICY_NORECURSE,
115
    'appendpath': POLICY_APPENDPATH,
116
    }
2120.6.4 by James Henstridge
add support for specifying policy when storing options
117
118
119
STORE_LOCATION = POLICY_NONE
120
STORE_LOCATION_NORECURSE = POLICY_NORECURSE
121
STORE_LOCATION_APPENDPATH = POLICY_APPENDPATH
122
STORE_BRANCH = 3
123
STORE_GLOBAL = 4
124
3224.5.10 by Andrew Bennetts
Replace some duplication with a different form of hackery.
125
_ConfigObj = None
126
def ConfigObj(*args, **kwargs):
127
    global _ConfigObj
128
    if _ConfigObj is None:
129
        class ConfigObj(configobj.ConfigObj):
130
131
            def get_bool(self, section, key):
132
                return self[section].as_bool(key)
133
134
            def get_value(self, section, name):
135
                # Try [] for the old DEFAULT section.
136
                if section == "DEFAULT":
137
                    try:
138
                        return self[name]
139
                    except KeyError:
140
                        pass
141
                return self[section][name]
142
        _ConfigObj = ConfigObj
143
    return _ConfigObj(*args, **kwargs)
1474 by Robert Collins
Merge from Aaron Bentley.
144
145
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
146
class Config(object):
147
    """A configuration policy - what username, editor, gpg needs etc."""
148
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
149
    def __init__(self):
150
        super(Config, self).__init__()
151
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
152
    def get_editor(self):
153
        """Get the users pop up editor."""
154
        raise NotImplementedError
155
4603.1.10 by Aaron Bentley
Provide change editor via config.
156
    def get_change_editor(self, old_tree, new_tree):
157
        from bzrlib import diff
158
        cmd = self._get_change_editor()
159
        if cmd is None:
160
            return None
161
        return diff.DiffFromTool.from_string(cmd, old_tree, new_tree,
162
                                             sys.stdout)
163
164
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
165
    def get_mail_client(self):
166
        """Get a mail client to use"""
167
        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
168
        _registry = mail_client.mail_client_registry
2681.1.10 by Aaron Bentley
Clean up handling of unknown mail clients
169
        try:
3638.2.4 by Neil Martinsen-Burrell
Address JAMs review. Dont use register_lazy and dont lazy_import anything other than modules
170
            mail_client_class = _registry.get(selected_client)
2681.1.10 by Aaron Bentley
Clean up handling of unknown mail clients
171
        except KeyError:
172
            raise errors.UnknownMailClient(selected_client)
173
        return mail_client_class(self)
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
174
1442.1.15 by Robert Collins
make getting the signature checking policy a template method
175
    def _get_signature_checking(self):
176
        """Template method to override signature checking policy."""
177
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
178
    def _get_signing_policy(self):
179
        """Template method to override signature creation policy."""
180
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
181
    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.
182
        """Template method to provide a user option."""
183
        return None
184
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
185
    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.
186
        """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()
187
        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.
188
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
189
    def get_user_option_as_bool(self, option_name):
190
        """Get a generic option as a boolean - no special process, no default.
191
192
        :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.
193
            interpreted as a boolean. Returns True or False otherwise.
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
194
        """
195
        s = self._get_user_option(option_name)
4989.2.12 by Vincent Ladeuil
Display a warning if an option value is not boolean.
196
        if s is None:
197
            # The option doesn't exist
198
            return None
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
199
        val = ui.bool_from_string(s)
4989.2.12 by Vincent Ladeuil
Display a warning if an option value is not boolean.
200
        if val is None:
201
            # The value can't be interpreted as a boolean
202
            trace.warning('Value "%s" is not a boolean for "%s"',
203
                          s, option_name)
204
        return val
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
205
4840.2.4 by Vincent Ladeuil
Implement config.get_user_option_as_list.
206
    def get_user_option_as_list(self, option_name):
207
        """Get a generic option as a list - no special process, no default.
208
209
        :return None if the option doesn't exist. Returns the value as a list
210
            otherwise.
211
        """
212
        l = self._get_user_option(option_name)
213
        if isinstance(l, (str, unicode)):
214
            # A single value, most probably the user forgot the final ','
215
            l = [l]
216
        return l
217
1442.1.56 by Robert Collins
gpg_signing_command configuration item
218
    def gpg_signing_command(self):
219
        """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.
220
        result = self._gpg_signing_command()
221
        if result is None:
222
            result = "gpg"
223
        return result
224
225
    def _gpg_signing_command(self):
226
        """See gpg_signing_command()."""
227
        return None
1442.1.56 by Robert Collins
gpg_signing_command configuration item
228
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
229
    def log_format(self):
230
        """What log format should be used"""
231
        result = self._log_format()
1553.2.4 by Erik Bågfors
Support for setting the default log format at a configuration option
232
        if result is None:
233
            result = "long"
234
        return result
235
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
236
    def _log_format(self):
237
        """See log_format()."""
1553.2.4 by Erik Bågfors
Support for setting the default log format at a configuration option
238
        return None
239
1472 by Robert Collins
post commit hook, first pass implementation
240
    def post_commit(self):
241
        """An ordered list of python functions to call.
242
243
        Each function takes branch, rev_id as parameters.
244
        """
245
        return self._post_commit()
246
247
    def _post_commit(self):
248
        """See Config.post_commit."""
249
        return None
250
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
251
    def user_email(self):
252
        """Return just the email component of a username."""
1185.33.31 by Martin Pool
Make annotate cope better with revisions committed without a valid
253
        return extract_email_address(self.username())
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
254
255
    def username(self):
256
        """Return email-style username.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
257
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
258
        Something similar to 'Martin Pool <mbp@sourcefrog.net>'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
259
1861.4.1 by Matthieu Moy
BZREMAIL renamed to BZR_EMAIL.
260
        $BZR_EMAIL can be set to override this (as well as the
261
        deprecated $BZREMAIL), then
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
262
        the concrete policy type is checked, and finally
1185.37.2 by Jamie Wilkinson
Fix a typo and grammar in Config.username() docstring.
263
        $EMAIL is examined.
264
        If none is found, a reasonable default is (hopefully)
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
265
        created.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
266
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
267
        TODO: Check it's reasonably well-formed.
268
        """
1861.4.1 by Matthieu Moy
BZREMAIL renamed to BZR_EMAIL.
269
        v = os.environ.get('BZR_EMAIL')
270
        if v:
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
271
            return v.decode(osutils.get_user_encoding())
2900.3.1 by Tim Penhey
Removed some annoying trailing whitespace.
272
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
273
        v = self._get_user_id()
274
        if v:
275
            return v
2900.3.1 by Tim Penhey
Removed some annoying trailing whitespace.
276
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
277
        v = os.environ.get('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())
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
280
281
        name, email = _auto_user_id()
282
        if name:
283
            return '%s <%s>' % (name, email)
284
        else:
285
            return email
286
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
287
    def signature_checking(self):
288
        """What is the current policy for signature checking?."""
1442.1.15 by Robert Collins
make getting the signature checking policy a template method
289
        policy = self._get_signature_checking()
290
        if policy is not None:
291
            return policy
1442.1.14 by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE
292
        return CHECK_IF_POSSIBLE
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
293
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
294
    def signing_policy(self):
295
        """What is the current policy for signature checking?."""
296
        policy = self._get_signing_policy()
297
        if policy is not None:
298
            return policy
299
        return SIGN_WHEN_REQUIRED
300
1442.1.21 by Robert Collins
create signature_needed() call for commit to trigger creating signatures
301
    def signature_needed(self):
302
        """Is a signature needed when committing ?."""
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
303
        policy = self._get_signing_policy()
304
        if policy is None:
305
            policy = self._get_signature_checking()
306
            if policy is not None:
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
307
                trace.warning("Please use create_signatures,"
308
                              " not check_signatures to set signing policy.")
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
309
            if policy == CHECK_ALWAYS:
310
                return True
311
        elif policy == SIGN_ALWAYS:
1442.1.21 by Robert Collins
create signature_needed() call for commit to trigger creating signatures
312
            return True
313
        return False
314
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
315
    def get_alias(self, value):
316
        return self._get_alias(value)
317
318
    def _get_alias(self, value):
319
        pass
320
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
321
    def get_nickname(self):
322
        return self._get_nickname()
323
324
    def _get_nickname(self):
325
        return None
326
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
327
    def get_bzr_remote_path(self):
328
        try:
329
            return os.environ['BZR_REMOTE_PATH']
330
        except KeyError:
331
            path = self.get_user_option("bzr_remote_path")
332
            if path is None:
333
                path = 'bzr'
334
            return path
335
4840.2.6 by Vincent Ladeuil
Implement config.suppress_warning.
336
    def suppress_warning(self, warning):
337
        """Should the warning be suppressed or emitted.
338
339
        :param warning: The name of the warning being tested.
340
341
        :returns: True if the warning should be suppressed, False otherwise.
342
        """
343
        warnings = self.get_user_option_as_list('suppress_warnings')
344
        if warnings is None or warning not in warnings:
345
            return False
346
        else:
347
            return True
348
1442.1.15 by Robert Collins
make getting the signature checking policy a template method
349
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
350
class IniBasedConfig(Config):
351
    """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
352
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
353
    def __init__(self, get_filename):
354
        super(IniBasedConfig, self).__init__()
355
        self._get_filename = get_filename
356
        self._parser = None
357
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
358
    def _get_parser(self, file=None):
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
359
        if self._parser is not None:
360
            return self._parser
1185.12.49 by Aaron Bentley
Switched to ConfigObj
361
        if file is None:
362
            input = self._get_filename()
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
363
        else:
1185.12.49 by Aaron Bentley
Switched to ConfigObj
364
            input = file
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
365
        try:
4603.1.21 by Aaron Bentley
Restore ConfigObj interpolation.
366
            self._parser = ConfigObj(input, encoding='utf-8')
1474 by Robert Collins
Merge from Aaron Bentley.
367
        except configobj.ConfigObjError, e:
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
368
            raise errors.ParseConfigError(e.errors, e.config.filename)
1185.12.49 by Aaron Bentley
Switched to ConfigObj
369
        return self._parser
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
370
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
371
    def _get_matching_sections(self):
372
        """Return an ordered list of (section_name, extra_path) pairs.
373
374
        If the section contains inherited configuration, extra_path is
375
        a string containing the additional path components.
376
        """
377
        section = self._get_section()
378
        if section is not None:
379
            return [(section, '')]
380
        else:
381
            return []
382
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
383
    def _get_section(self):
384
        """Override this to define the section used by the config."""
385
        return "DEFAULT"
386
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
387
    def _get_option_policy(self, section, option_name):
388
        """Return the policy for the given (section, option_name) pair."""
389
        return POLICY_NONE
390
4603.1.10 by Aaron Bentley
Provide change editor via config.
391
    def _get_change_editor(self):
392
        return self.get_user_option('change_editor')
393
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
394
    def _get_signature_checking(self):
395
        """See Config._get_signature_checking."""
1474 by Robert Collins
Merge from Aaron Bentley.
396
        policy = self._get_user_option('check_signatures')
397
        if policy:
398
            return self._string_to_signature_policy(policy)
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
399
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
400
    def _get_signing_policy(self):
1773.4.3 by Martin Pool
[merge] bzr.dev
401
        """See Config._get_signing_policy"""
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
402
        policy = self._get_user_option('create_signatures')
403
        if policy:
404
            return self._string_to_signing_policy(policy)
405
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
406
    def _get_user_id(self):
407
        """Get the user id from the 'email' key in the current section."""
1474 by Robert Collins
Merge from Aaron Bentley.
408
        return self._get_user_option('email')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
409
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
410
    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.
411
        """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
412
        for (section, extra_path) in self._get_matching_sections():
413
            try:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
414
                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
415
            except KeyError:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
416
                continue
417
            policy = self._get_option_policy(section, option_name)
418
            if policy == POLICY_NONE:
419
                return value
420
            elif policy == POLICY_NORECURSE:
421
                # norecurse items only apply to the exact path
422
                if extra_path:
423
                    continue
424
                else:
425
                    return value
426
            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
427
                if extra_path:
428
                    value = urlutils.join(value, extra_path)
429
                return value
2120.6.6 by James Henstridge
fix test_set_push_location test
430
            else:
431
                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
432
        else:
1993.3.1 by James Henstridge
first go at making location config lookup recursive
433
            return None
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
434
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
435
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
436
        """See Config.gpg_signing_command."""
1472 by Robert Collins
post commit hook, first pass implementation
437
        return self._get_user_option('gpg_signing_command')
1442.1.56 by Robert Collins
gpg_signing_command configuration item
438
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
439
    def _log_format(self):
440
        """See Config.log_format."""
441
        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
442
1472 by Robert Collins
post commit hook, first pass implementation
443
    def _post_commit(self):
444
        """See Config.post_commit."""
445
        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
446
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
447
    def _string_to_signature_policy(self, signature_string):
448
        """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
449
        if signature_string.lower() == 'check-available':
450
            return CHECK_IF_POSSIBLE
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
451
        if signature_string.lower() == 'ignore':
452
            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
453
        if signature_string.lower() == 'require':
454
            return CHECK_ALWAYS
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
455
        raise errors.BzrError("Invalid signatures policy '%s'"
456
                              % signature_string)
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
457
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
458
    def _string_to_signing_policy(self, signature_string):
459
        """Convert a string to a signing policy."""
460
        if signature_string.lower() == 'when-required':
461
            return SIGN_WHEN_REQUIRED
462
        if signature_string.lower() == 'never':
463
            return SIGN_NEVER
464
        if signature_string.lower() == 'always':
465
            return SIGN_ALWAYS
466
        raise errors.BzrError("Invalid signing policy '%s'"
467
                              % signature_string)
468
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
469
    def _get_alias(self, value):
470
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
471
            return self._get_parser().get_value("ALIASES",
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
472
                                                value)
473
        except KeyError:
474
            pass
475
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
476
    def _get_nickname(self):
477
        return self.get_user_option('nickname')
478
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
479
480
class GlobalConfig(IniBasedConfig):
481
    """The configuration that should be used for a specific location."""
482
483
    def get_editor(self):
1474 by Robert Collins
Merge from Aaron Bentley.
484
        return self._get_user_option('editor')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
485
486
    def __init__(self):
487
        super(GlobalConfig, self).__init__(config_filename)
488
1816.2.1 by Robey Pointer
add set_user_option to GlobalConfig, and make /etc/passwd username lookup try harder with encodings
489
    def set_user_option(self, option, value):
490
        """Save option and its value in the configuration."""
2900.3.2 by Tim Penhey
A working alias command.
491
        self._set_option(option, value, 'DEFAULT')
492
493
    def get_aliases(self):
494
        """Return the aliases section."""
495
        if 'ALIASES' in self._get_parser():
496
            return self._get_parser()['ALIASES']
497
        else:
498
            return {}
499
500
    def set_alias(self, alias_name, alias_command):
501
        """Save the alias in the configuration."""
502
        self._set_option(alias_name, alias_command, 'ALIASES')
503
504
    def unset_alias(self, alias_name):
505
        """Unset an existing alias."""
506
        aliases = self._get_parser().get('ALIASES')
2900.3.7 by Tim Penhey
Updates from Aaron's review.
507
        if not aliases or alias_name not in aliases:
508
            raise errors.NoSuchAlias(alias_name)
2900.3.2 by Tim Penhey
A working alias command.
509
        del aliases[alias_name]
2900.3.12 by Tim Penhey
Final review comments.
510
        self._write_config_file()
2900.3.2 by Tim Penhey
A working alias command.
511
512
    def _set_option(self, option, value, section):
1816.2.1 by Robey Pointer
add set_user_option to GlobalConfig, and make /etc/passwd username lookup try harder with encodings
513
        # FIXME: RBC 20051029 This should refresh the parser and also take a
514
        # file lock on bazaar.conf.
515
        conf_dir = os.path.dirname(self._get_filename())
516
        ensure_config_dir_exists(conf_dir)
2900.3.7 by Tim Penhey
Updates from Aaron's review.
517
        self._get_parser().setdefault(section, {})[option] = value
2900.3.12 by Tim Penhey
Final review comments.
518
        self._write_config_file()
2900.3.2 by Tim Penhey
A working alias command.
519
2900.3.12 by Tim Penhey
Final review comments.
520
    def _write_config_file(self):
4634.143.1 by Parth Malwankar
default .bazaar, .bzr.log and .bazaar/bazaar.conf retain
521
        path = self._get_filename()
5116.2.3 by Parth Malwankar
updated log file creation to avoid race based on implementation by Martin [gz]
522
        f = open(path, 'wb')
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
523
        osutils.copy_ownership_from_path(path)
1816.2.1 by Robey Pointer
add set_user_option to GlobalConfig, and make /etc/passwd username lookup try harder with encodings
524
        self._get_parser().write(f)
525
        f.close()
526
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
527
528
class LocationConfig(IniBasedConfig):
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
529
    """A configuration object that gives the policy for a location."""
530
531
    def __init__(self, location):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
532
        name_generator = locations_config_filename
2900.3.1 by Tim Penhey
Removed some annoying trailing whitespace.
533
        if (not os.path.exists(name_generator()) and
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
534
                os.path.exists(branches_config_filename())):
1830.2.1 by John Arbash Meinel
Make it clearer what config file needs to be renamed.
535
            if sys.platform == 'win32':
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
536
                trace.warning('Please rename %s to %s'
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
537
                              % (branches_config_filename(),
538
                                 locations_config_filename()))
1830.2.1 by John Arbash Meinel
Make it clearer what config file needs to be renamed.
539
            else:
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
540
                trace.warning('Please rename ~/.bazaar/branches.conf'
541
                              ' to ~/.bazaar/locations.conf')
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
542
            name_generator = branches_config_filename
543
        super(LocationConfig, self).__init__(name_generator)
1878.1.1 by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653)
544
        # local file locations are looked up by local path, rather than
545
        # by file url. This is because the config file is a user
546
        # file, and we would rather not expose the user to file urls.
547
        if location.startswith('file://'):
548
            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
549
        self.location = location
550
1993.3.1 by James Henstridge
first go at making location config lookup recursive
551
    def _get_matching_sections(self):
552
        """Return an ordered list of section names matching this location."""
1185.12.49 by Aaron Bentley
Switched to ConfigObj
553
        sections = self._get_parser()
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
554
        location_names = self.location.split('/')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
555
        if self.location.endswith('/'):
556
            del location_names[-1]
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
557
        matches=[]
1442.1.10 by Robert Collins
explicit over glob test passes
558
        for section in sections:
1878.1.1 by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653)
559
            # location is a local path if possible, so we need
560
            # to convert 'file://' urls to local paths if necessary.
561
            # This also avoids having file:///path be a more exact
562
            # match than '/path'.
563
            if section.startswith('file://'):
564
                section_path = urlutils.local_path_from_url(section)
565
            else:
566
                section_path = section
567
            section_names = section_path.split('/')
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
568
            if section.endswith('/'):
569
                del section_names[-1]
570
            names = zip(location_names, section_names)
571
            matched = True
572
            for name in names:
573
                if not fnmatch(name[0], name[1]):
574
                    matched = False
575
                    break
576
            if not matched:
577
                continue
578
            # so, for the common prefix they matched.
579
            # if section is longer, no match.
580
            if len(section_names) > len(location_names):
581
                continue
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
582
            matches.append((len(section_names), section,
583
                            '/'.join(location_names[len(section_names):])))
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
584
        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
585
        sections = []
586
        for (length, section, extra_path) in matches:
587
            sections.append((section, extra_path))
588
            # should we stop looking for parent configs here?
1993.3.1 by James Henstridge
first go at making location config lookup recursive
589
            try:
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
590
                if self._get_parser()[section].as_bool('ignore_parents'):
591
                    break
1993.3.1 by James Henstridge
first go at making location config lookup recursive
592
            except KeyError:
593
                pass
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
594
        return sections
1442.1.9 by Robert Collins
exact section test passes
595
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
596
    def _get_option_policy(self, section, option_name):
597
        """Return the policy for the given (section, option_name) pair."""
598
        # check for the old 'recurse=False' flag
599
        try:
600
            recurse = self._get_parser()[section].as_bool('recurse')
601
        except KeyError:
602
            recurse = True
603
        if not recurse:
604
            return POLICY_NORECURSE
605
2120.6.10 by James Henstridge
Catch another deprecation warning, and more cleanup
606
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
607
        try:
608
            policy_name = self._get_parser()[section][policy_key]
609
        except KeyError:
610
            policy_name = None
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
611
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
612
        return _policy_value[policy_name]
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
613
2120.6.4 by James Henstridge
add support for specifying policy when storing options
614
    def _set_option_policy(self, section, option_name, option_policy):
615
        """Set the policy for the given option name in the given section."""
616
        # The old recurse=False option affects all options in the
617
        # section.  To handle multiple policies in the section, we
618
        # need to convert it to a policy_norecurse key.
619
        try:
620
            recurse = self._get_parser()[section].as_bool('recurse')
621
        except KeyError:
622
            pass
623
        else:
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
624
            symbol_versioning.warn(
2120.6.11 by James Henstridge
s/0.13/0.14/ in deprecation warning
625
                'The recurse option is deprecated as of 0.14.  '
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
626
                'The section "%s" has been converted to use policies.'
627
                % section,
628
                DeprecationWarning)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
629
            del self._get_parser()[section]['recurse']
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
630
            if not recurse:
631
                for key in self._get_parser()[section].keys():
632
                    if not key.endswith(':policy'):
633
                        self._get_parser()[section][key +
634
                                                    ':policy'] = 'norecurse'
2120.6.4 by James Henstridge
add support for specifying policy when storing options
635
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
636
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
637
        policy_name = _policy_name[option_policy]
638
        if policy_name is not None:
639
            self._get_parser()[section][policy_key] = policy_name
640
        else:
641
            if policy_key in self._get_parser()[section]:
642
                del self._get_parser()[section][policy_key]
2120.6.4 by James Henstridge
add support for specifying policy when storing options
643
644
    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.
645
        """Save option and its value in the configuration."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
646
        if store not in [STORE_LOCATION,
2120.6.4 by James Henstridge
add support for specifying policy when storing options
647
                         STORE_LOCATION_NORECURSE,
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
648
                         STORE_LOCATION_APPENDPATH]:
649
            raise ValueError('bad storage policy %r for %r' %
650
                (store, option))
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
651
        # FIXME: RBC 20051029 This should refresh the parser and also take a
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
652
        # file lock on locations.conf.
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
653
        conf_dir = os.path.dirname(self._get_filename())
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
654
        ensure_config_dir_exists(conf_dir)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
655
        location = self.location
656
        if location.endswith('/'):
657
            location = location[:-1]
658
        if (not location in self._get_parser() and
659
            not location + '/' in self._get_parser()):
660
            self._get_parser()[location]={}
661
        elif location + '/' in self._get_parser():
662
            location = location + '/'
663
        self._get_parser()[location][option]=value
2120.6.4 by James Henstridge
add support for specifying policy when storing options
664
        # the allowed values of store match the config policies
665
        self._set_option_policy(location, option, store)
1551.2.49 by abentley
Made ConfigObj output binary-identical files on win32 and *nix
666
        self._get_parser().write(file(self._get_filename(), 'wb'))
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
667
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
668
669
class BranchConfig(Config):
670
    """A configuration object giving the policy for a branch."""
671
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
672
    def _get_branch_data_config(self):
673
        if self._branch_data_config is None:
674
            self._branch_data_config = TreeConfig(self.branch)
675
        return self._branch_data_config
676
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
677
    def _get_location_config(self):
678
        if self._location_config is None:
679
            self._location_config = LocationConfig(self.branch.base)
680
        return self._location_config
681
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
682
    def _get_global_config(self):
683
        if self._global_config is None:
684
            self._global_config = GlobalConfig()
685
        return self._global_config
686
687
    def _get_best_value(self, option_name):
688
        """This returns a user option from local, tree or global config.
689
690
        They are tried in that order.  Use get_safe_value if trusted values
691
        are necessary.
692
        """
693
        for source in self.option_sources:
694
            value = getattr(source(), option_name)()
695
            if value is not None:
696
                return value
697
        return None
698
699
    def _get_safe_value(self, option_name):
700
        """This variant of get_best_value never returns untrusted values.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
701
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
702
        It does not return values from the branch data, because the branch may
703
        not be controlled by the user.
704
705
        We may wish to allow locations.conf to control whether branches are
706
        trusted in the future.
707
        """
708
        for source in (self._get_location_config, self._get_global_config):
709
            value = getattr(source(), option_name)()
710
            if value is not None:
711
                return value
712
        return None
713
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
714
    def _get_user_id(self):
715
        """Return the full user id for the branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
716
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
717
        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
718
        This is looked up in the email controlfile for the branch.
719
        """
720
        try:
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
721
            return (self.branch._transport.get_bytes("email")
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
722
                    .decode(osutils.get_user_encoding())
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
723
                    .rstrip("\r\n"))
724
        except errors.NoSuchFile, e:
725
            pass
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
726
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
727
        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
728
4603.1.10 by Aaron Bentley
Provide change editor via config.
729
    def _get_change_editor(self):
730
        return self._get_best_value('_get_change_editor')
731
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
732
    def _get_signature_checking(self):
733
        """See Config._get_signature_checking."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
734
        return self._get_best_value('_get_signature_checking')
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
735
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
736
    def _get_signing_policy(self):
737
        """See Config._get_signing_policy."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
738
        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
739
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
740
    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.
741
        """See Config._get_user_option."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
742
        for source in self.option_sources:
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
743
            value = source()._get_user_option(option_name)
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
744
            if value is not None:
745
                return value
746
        return None
747
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
748
    def set_user_option(self, name, value, store=STORE_BRANCH,
749
        warn_masked=False):
2120.6.4 by James Henstridge
add support for specifying policy when storing options
750
        if store == STORE_BRANCH:
1770.2.6 by Aaron Bentley
Ensure branch.conf works properly
751
            self._get_branch_data_config().set_option(value, name)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
752
        elif store == STORE_GLOBAL:
2120.6.7 by James Henstridge
Fix GlobalConfig.set_user_option() call
753
            self._get_global_config().set_user_option(name, value)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
754
        else:
755
            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)
756
        if not warn_masked:
757
            return
758
        if store in (STORE_GLOBAL, STORE_BRANCH):
759
            mask_value = self._get_location_config().get_user_option(name)
760
            if mask_value is not None:
761
                trace.warning('Value "%s" is masked by "%s" from'
762
                              ' locations.conf', value, mask_value)
763
            else:
764
                if store == STORE_GLOBAL:
765
                    branch_config = self._get_branch_data_config()
766
                    mask_value = branch_config.get_user_option(name)
767
                    if mask_value is not None:
768
                        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
769
                                      ' branch.conf', value, mask_value)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
770
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
771
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
772
        """See Config.gpg_signing_command."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
773
        return self._get_safe_value('_gpg_signing_command')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
774
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
775
    def __init__(self, branch):
776
        super(BranchConfig, self).__init__()
777
        self._location_config = None
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
778
        self._branch_data_config = None
779
        self._global_config = None
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
780
        self.branch = branch
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
781
        self.option_sources = (self._get_location_config,
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
782
                               self._get_branch_data_config,
783
                               self._get_global_config)
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
784
1472 by Robert Collins
post commit hook, first pass implementation
785
    def _post_commit(self):
786
        """See Config.post_commit."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
787
        return self._get_safe_value('_post_commit')
1472 by Robert Collins
post commit hook, first pass implementation
788
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
789
    def _get_nickname(self):
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
790
        value = self._get_explicit_nickname()
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
791
        if value is not None:
792
            return value
2120.5.2 by Alexander Belchenko
(jam) Fix for bug #66857
793
        return urlutils.unescape(self.branch.base.split('/')[-2])
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
794
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
795
    def has_explicit_nickname(self):
796
        """Return true if a nickname has been explicitly assigned."""
797
        return self._get_explicit_nickname() is not None
798
799
    def _get_explicit_nickname(self):
800
        return self._get_best_value('_get_nickname')
801
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
802
    def _log_format(self):
803
        """See Config.log_format."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
804
        return self._get_best_value('_log_format')
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
805
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
806
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
807
def ensure_config_dir_exists(path=None):
808
    """Make sure a configuration directory exists.
809
    This makes sure that the directory exists.
810
    On windows, since configuration directories are 2 levels deep,
811
    it makes sure both the directory and the parent directory exists.
812
    """
813
    if path is None:
814
        path = config_dir()
815
    if not os.path.isdir(path):
816
        if sys.platform == 'win32':
817
            parent_dir = os.path.dirname(path)
818
            if not os.path.isdir(parent_dir):
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
819
                trace.mutter('creating config parent directory: %r', parent_dir)
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
820
            os.mkdir(parent_dir)
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
821
        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
822
        os.mkdir(path)
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
823
        osutils.copy_ownership_from_path(path)
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
824
1532 by Robert Collins
Merge in John Meinels integration branch.
825
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
826
def config_dir():
827
    """Return per-user configuration directory.
828
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
829
    By default this is ~/.bazaar/
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
830
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
831
    TODO: Global option --config-dir to override this.
832
    """
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
833
    base = os.environ.get('BZR_HOME', None)
834
    if sys.platform == 'win32':
835
        if base is None:
2245.4.3 by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
836
            base = win32utils.get_appdata_location_unicode()
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
837
        if base is None:
838
            base = os.environ.get('HOME', None)
839
        if base is None:
2991.2.2 by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0.
840
            raise errors.BzrError('You must have one of BZR_HOME, APPDATA,'
841
                                  ' or HOME set')
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
842
        return osutils.pathjoin(base, 'bazaar', '2.0')
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
843
    else:
844
        # cygwin, linux, and darwin all have a $HOME directory
845
        if base is None:
846
            base = os.path.expanduser("~")
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
847
        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 \
848
849
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
850
def config_filename():
851
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
852
    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.
853
854
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
855
def branches_config_filename():
856
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
857
    return osutils.pathjoin(config_dir(), 'branches.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.
858
1830.2.1 by John Arbash Meinel
Make it clearer what config file needs to be renamed.
859
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
860
def locations_config_filename():
861
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
862
    return osutils.pathjoin(config_dir(), 'locations.conf')
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
863
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
864
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
865
def authentication_config_filename():
866
    """Return per-user authentication ini file filename."""
867
    return osutils.pathjoin(config_dir(), 'authentication.conf')
868
869
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
870
def user_ignore_config_filename():
871
    """Return the user default ignore filename"""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
872
    return osutils.pathjoin(config_dir(), 'ignore')
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
873
874
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
875
def crash_dir():
876
    """Return the directory name to store crash files.
877
878
    This doesn't implicitly create it.
879
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
880
    On Windows it's in the config directory; elsewhere it's /var/crash
4634.128.18 by Martin Pool
Update apport crash tests
881
    which may be monitored by apport.  It can be overridden by
882
    $APPORT_CRASH_DIR.
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
883
    """
884
    if sys.platform == 'win32':
885
        return osutils.pathjoin(config_dir(), 'Crash')
886
    else:
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
887
        # XXX: hardcoded in apport_python_hook.py; therefore here too -- mbp
888
        # 2010-01-31
4634.128.18 by Martin Pool
Update apport crash tests
889
        return os.environ.get('APPORT_CRASH_DIR', '/var/crash')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
890
891
892
def xdg_cache_dir():
4584.3.23 by Martin Pool
Correction to xdg_cache_dir and add a simple test
893
    # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html
894
    # Possibly this should be different on Windows?
895
    e = os.environ.get('XDG_CACHE_DIR', None)
896
    if e:
897
        return e
898
    else:
899
        return os.path.expanduser('~/.cache')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
900
901
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
902
def _auto_user_id():
903
    """Calculate automatic user identification.
904
905
    Returns (realname, email).
906
907
    Only used when none is set in the environment or the id file.
908
909
    This previously used the FQDN as the default domain, but that can
910
    be very slow on machines where DNS is broken.  So now we simply
911
    use the hostname.
912
    """
913
    import socket
914
2245.4.3 by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
915
    if sys.platform == 'win32':
916
        name = win32utils.get_user_name_unicode()
917
        if name is None:
918
            raise errors.BzrError("Cannot autodetect user name.\n"
919
                                  "Please, set your name with command like:\n"
920
                                  'bzr whoami "Your Name <name@domain.com>"')
921
        host = win32utils.get_host_name_unicode()
922
        if host is None:
923
            host = socket.gethostname()
924
        return name, (name + '@' + host)
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
925
926
    try:
927
        import pwd
928
        uid = os.getuid()
3849.1.1 by Andrew Bennetts
Catch exceptions from pwd and raise a better error
929
        try:
930
            w = pwd.getpwuid(uid)
931
        except KeyError:
932
            raise errors.BzrCommandError('Unable to determine your name.  '
933
                'Please use "bzr whoami" to set it.')
1553.4.5 by Michael Ellerman
Produce an intelligible error if the user's /etc/passwd is not encoded in
934
1816.2.1 by Robey Pointer
add set_user_option to GlobalConfig, and make /etc/passwd username lookup try harder with encodings
935
        # we try utf-8 first, because on many variants (like Linux),
936
        # /etc/passwd "should" be in utf-8, and because it's unlikely to give
937
        # false positives.  (many users will have their user encoding set to
938
        # latin-1, which cannot raise UnicodeError.)
939
        try:
940
            gecos = w.pw_gecos.decode('utf-8')
941
            encoding = 'utf-8'
942
        except UnicodeError:
943
            try:
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
944
                encoding = osutils.get_user_encoding()
945
                gecos = w.pw_gecos.decode(encoding)
1816.2.1 by Robey Pointer
add set_user_option to GlobalConfig, and make /etc/passwd username lookup try harder with encodings
946
            except UnicodeError:
947
                raise errors.BzrCommandError('Unable to determine your name.  '
948
                   'Use "bzr whoami" to set it.')
949
        try:
950
            username = w.pw_name.decode(encoding)
951
        except UnicodeError:
952
            raise errors.BzrCommandError('Unable to determine your name.  '
953
                'Use "bzr whoami" to set it.')
1553.4.5 by Michael Ellerman
Produce an intelligible error if the user's /etc/passwd is not encoded in
954
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
955
        comma = gecos.find(',')
956
        if comma == -1:
957
            realname = gecos
958
        else:
959
            realname = gecos[:comma]
960
        if not realname:
961
            realname = username
962
963
    except ImportError:
964
        import getpass
1553.4.5 by Michael Ellerman
Produce an intelligible error if the user's /etc/passwd is not encoded in
965
        try:
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
966
            user_encoding = osutils.get_user_encoding()
967
            realname = username = getpass.getuser().decode(user_encoding)
1553.4.5 by Michael Ellerman
Produce an intelligible error if the user's /etc/passwd is not encoded in
968
        except UnicodeDecodeError:
969
            raise errors.BzrError("Can't decode username as %s." % \
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
970
                    user_encoding)
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
971
972
    return realname, (username + '@' + socket.gethostname())
973
974
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
975
def parse_username(username):
976
    """Parse e-mail username and return a (name, address) tuple."""
977
    match = re.match(r'(.*?)\s*<?([\w+.-]+@[\w+.-]+)>?', username)
978
    if match is None:
979
        return (username, '')
980
    else:
981
        return (match.group(1), match.group(2))
982
983
1185.16.52 by Martin Pool
- add extract_email_address
984
def extract_email_address(e):
985
    """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.
986
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
987
    That is just the user@domain part, nothing else.
1185.16.52 by Martin Pool
- add extract_email_address
988
    This part is required to contain only ascii characters.
989
    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.
990
1185.16.52 by Martin Pool
- add extract_email_address
991
    >>> extract_email_address('Jane Tester <jane@test.com>')
992
    "jane@test.com"
993
    """
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
994
    name, email = parse_username(e)
995
    if not email:
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
996
        raise errors.NoEmailInUsername(e)
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
997
    return email
1185.35.11 by Aaron Bentley
Added support for branch nicks
998
1185.85.30 by John Arbash Meinel
Fixing 'bzr push' exposed that IniBasedConfig didn't handle unicode.
999
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1000
class TreeConfig(IniBasedConfig):
1185.35.11 by Aaron Bentley
Added support for branch nicks
1001
    """Branch configuration data associated with its contents, not location"""
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1002
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
1003
    # XXX: Really needs a better name, as this is not part of the tree! -- mbp 20080507
1004
1185.35.11 by Aaron Bentley
Added support for branch nicks
1005
    def __init__(self, branch):
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
1006
        self._config = branch._get_config()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1007
        self.branch = branch
1008
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
1009
    def _get_parser(self, file=None):
1010
        if file is not None:
1011
            return IniBasedConfig._get_parser(file)
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1012
        return self._config._get_configobj()
1185.35.11 by Aaron Bentley
Added support for branch nicks
1013
1014
    def get_option(self, name, section=None, default=None):
1015
        self.branch.lock_read()
1016
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1017
            return self._config.get_option(name, section, default)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1018
        finally:
1019
            self.branch.unlock()
1020
1021
    def set_option(self, value, name, section=None):
1022
        """Set a per-branch configuration option"""
1023
        self.branch.lock_write()
1024
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
1025
            self._config.set_option(value, name, section)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1026
        finally:
1027
            self.branch.unlock()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1028
1029
1030
class AuthenticationConfig(object):
1031
    """The authentication configuration file based on a ini file.
1032
1033
    Implements the authentication.conf file described in
1034
    doc/developers/authentication-ring.txt.
1035
    """
1036
1037
    def __init__(self, _file=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1038
        self._config = None # The ConfigObj
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1039
        if _file is None:
2900.2.24 by Vincent Ladeuil
Review feedback.
1040
            self._filename = authentication_config_filename()
1041
            self._input = self._filename = authentication_config_filename()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1042
        else:
2900.2.24 by Vincent Ladeuil
Review feedback.
1043
            # Tests can provide a string as _file
1044
            self._filename = None
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1045
            self._input = _file
1046
1047
    def _get_config(self):
1048
        if self._config is not None:
1049
            return self._config
1050
        try:
2900.2.22 by Vincent Ladeuil
Polishing.
1051
            # FIXME: Should we validate something here ? Includes: empty
1052
            # sections are useless, at least one of
1053
            # user/password/password_encoding should be defined, etc.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1054
1055
            # Note: the encoding below declares that the file itself is utf-8
1056
            # encoded, but the values in the ConfigObj are always Unicode.
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1057
            self._config = ConfigObj(self._input, encoding='utf-8')
1058
        except configobj.ConfigObjError, e:
1059
            raise errors.ParseConfigError(e.errors, e.config.filename)
1060
        return self._config
1061
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1062
    def _save(self):
1063
        """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.
1064
        conf_dir = os.path.dirname(self._filename)
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1065
        ensure_config_dir_exists(conf_dir)
2900.2.26 by Vincent Ladeuil
Fix forgotten reference to _get_filename and duplicated code.
1066
        self._get_config().write(file(self._filename, 'wb'))
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1067
1068
    def _set_option(self, section_name, option_name, value):
1069
        """Set an authentication configuration option"""
1070
        conf = self._get_config()
1071
        section = conf.get(section_name)
1072
        if section is None:
1073
            conf[section] = {}
1074
            section = conf[section]
1075
        section[option_name] = value
1076
        self._save()
1077
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1078
    def get_credentials(self, scheme, host, port=None, user=None, path=None, 
1079
                        realm=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1080
        """Returns the matching credentials from authentication.conf file.
1081
1082
        :param scheme: protocol
1083
1084
        :param host: the server address
1085
1086
        :param port: the associated port (optional)
1087
1088
        :param user: login (optional)
1089
1090
        :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
1091
        
1092
        :param realm: the http authentication realm (optional)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1093
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1094
        :return: A dict containing the matching credentials or None.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1095
           This includes:
1096
           - name: the section name of the credentials in the
1097
             authentication.conf file,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1098
           - 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.
1099
           - scheme: the server protocol,
1100
           - host: the server address,
1101
           - port: the server port (can be None),
1102
           - path: the absolute server path (can be None),
1103
           - realm: the http specific authentication realm (can be None),
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1104
           - password: the decoded password, could be None if the credential
1105
             defines only the user
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1106
           - verify_certificates: https specific, True if the server
1107
             certificate should be verified, False otherwise.
1108
        """
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1109
        credentials = None
1110
        for auth_def_name, auth_def in self._get_config().items():
3418.2.1 by Vincent Ladeuil
Fix #217650 by catching declarations outside sections.
1111
            if type(auth_def) is not configobj.Section:
1112
                raise ValueError("%s defined outside a section" % auth_def_name)
1113
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1114
            a_scheme, a_host, a_user, a_path = map(
1115
                auth_def.get, ['scheme', 'host', 'user', 'path'])
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1116
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1117
            try:
1118
                a_port = auth_def.as_int('port')
1119
            except KeyError:
1120
                a_port = None
2900.2.22 by Vincent Ladeuil
Polishing.
1121
            except ValueError:
1122
                raise ValueError("'port' not numeric in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1123
            try:
1124
                a_verify_certificates = auth_def.as_bool('verify_certificates')
1125
            except KeyError:
1126
                a_verify_certificates = True
2900.2.22 by Vincent Ladeuil
Polishing.
1127
            except ValueError:
1128
                raise ValueError(
1129
                    "'verify_certificates' not boolean in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1130
1131
            # Attempt matching
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1132
            if a_scheme is not None and scheme != a_scheme:
1133
                continue
1134
            if a_host is not None:
1135
                if not (host == a_host
1136
                        or (a_host.startswith('.') and host.endswith(a_host))):
1137
                    continue
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1138
            if a_port is not None and port != a_port:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1139
                continue
1140
            if (a_path is not None and path is not None
1141
                and not path.startswith(a_path)):
1142
                continue
1143
            if (a_user is not None and user is not None
1144
                and a_user != user):
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1145
                # Never contradict the caller about the user to be used
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1146
                continue
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1147
            if a_user is None:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1148
                # Can't find a user
1149
                continue
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1150
            # Prepare a credentials dictionary with additional keys
1151
            # for the credential providers
2900.2.24 by Vincent Ladeuil
Review feedback.
1152
            credentials = dict(name=auth_def_name,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1153
                               user=a_user,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1154
                               scheme=a_scheme,
1155
                               host=host,
1156
                               port=port,
1157
                               path=path,
1158
                               realm=realm,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1159
                               password=auth_def.get('password', None),
2900.2.24 by Vincent Ladeuil
Review feedback.
1160
                               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
1161
            # Decode the password in the credentials (or get one)
2900.2.22 by Vincent Ladeuil
Polishing.
1162
            self.decode_password(credentials,
1163
                                 auth_def.get('password_encoding', None))
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1164
            if 'auth' in debug.debug_flags:
1165
                trace.mutter("Using authentication section: %r", auth_def_name)
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1166
            break
1167
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1168
        if credentials is None:
1169
            # No credentials were found in authentication.conf, try the fallback
1170
            # credentials stores.
1171
            credentials = credential_store_registry.get_fallback_credentials(
1172
                scheme, host, port, user, path, realm)
1173
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1174
        return credentials
1175
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1176
    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
1177
                        port=None, path=None, verify_certificates=None,
1178
                        realm=None):
3777.3.1 by Aaron Bentley
Update docs
1179
        """Set authentication credentials for a host.
1180
1181
        Any existing credentials with matching scheme, host, port and path
1182
        will be deleted, regardless of name.
1183
1184
        :param name: An arbitrary name to describe this set of credentials.
1185
        :param host: Name of the host that accepts these credentials.
1186
        :param user: The username portion of these credentials.
1187
        :param scheme: The URL scheme (e.g. ssh, http) the credentials apply
1188
            to.
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1189
        :param password: Password portion of these credentials.
3777.3.1 by Aaron Bentley
Update docs
1190
        :param port: The IP port on the host that these credentials apply to.
1191
        :param path: A filesystem path on the host that these credentials
1192
            apply to.
1193
        :param verify_certificates: On https, verify server certificates if
1194
            True.
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1195
        :param realm: The http authentication realm (optional).
3777.3.1 by Aaron Bentley
Update docs
1196
        """
3777.1.8 by Aaron Bentley
Commit work-in-progress
1197
        values = {'host': host, 'user': user}
1198
        if password is not None:
1199
            values['password'] = password
1200
        if scheme is not None:
1201
            values['scheme'] = scheme
1202
        if port is not None:
1203
            values['port'] = '%d' % port
1204
        if path is not None:
1205
            values['path'] = path
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1206
        if verify_certificates is not None:
1207
            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
1208
        if realm is not None:
1209
            values['realm'] = realm
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1210
        config = self._get_config()
1211
        for_deletion = []
1212
        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
1213
            for key in ('scheme', 'host', 'port', 'path', 'realm'):
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1214
                if existing_values.get(key) != values.get(key):
1215
                    break
1216
            else:
1217
                del config[section]
1218
        config.update({name: values})
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1219
        self._save()
3777.1.8 by Aaron Bentley
Commit work-in-progress
1220
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1221
    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.
1222
                 prompt=None, ask=False, default=None):
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1223
        """Get a user from authentication file.
1224
1225
        :param scheme: protocol
1226
1227
        :param host: the server address
1228
1229
        :param port: the associated port (optional)
1230
1231
        :param realm: the realm sent by the server (optional)
1232
1233
        :param path: the absolute path on the server (optional)
1234
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1235
        :param ask: Ask the user if there is no explicitly configured username 
1236
                    (optional)
1237
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1238
        :param default: The username returned if none is defined (optional).
1239
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1240
        :return: The found user.
1241
        """
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1242
        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
1243
                                           path=path, realm=realm)
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1244
        if credentials is not None:
1245
            user = credentials['user']
1246
        else:
1247
            user = None
4222.3.2 by Jelmer Vernooij
Prompt for user names if they are not in the configuration.
1248
        if user is None:
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1249
            if ask:
1250
                if prompt is None:
1251
                    # Create a default prompt suitable for most cases
1252
                    prompt = scheme.upper() + ' %(host)s username'
1253
                # Special handling for optional fields in the prompt
1254
                if port is not None:
1255
                    prompt_host = '%s:%d' % (host, port)
1256
                else:
1257
                    prompt_host = host
1258
                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.
1259
            else:
4222.3.10 by Jelmer Vernooij
Avoid using the default username in the case of SMTP.
1260
                user = default
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1261
        return user
1262
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1263
    def get_password(self, scheme, host, user, port=None,
1264
                     realm=None, path=None, prompt=None):
1265
        """Get a password from authentication file or prompt the user for one.
1266
1267
        :param scheme: protocol
1268
1269
        :param host: the server address
1270
1271
        :param port: the associated port (optional)
1272
1273
        :param user: login
1274
1275
        :param realm: the realm sent by the server (optional)
1276
1277
        :param path: the absolute path on the server (optional)
1278
1279
        :return: The found password or the one entered by the user.
1280
        """
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1281
        credentials = self.get_credentials(scheme, host, port, user, path,
1282
                                           realm)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1283
        if credentials is not None:
1284
            password = credentials['password']
3420.1.3 by Vincent Ladeuil
John's review feedback.
1285
            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.
1286
                trace.warning('password ignored in section [%s],'
1287
                              ' use an ssh agent instead'
1288
                              % credentials['name'])
1289
                password = None
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1290
        else:
1291
            password = None
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1292
        # 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).
1293
        if password is None:
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1294
            if prompt is None:
3420.1.2 by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user.
1295
                # Create a default prompt suitable for most cases
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1296
                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
1297
            # Special handling for optional fields in the prompt
1298
            if port is not None:
1299
                prompt_host = '%s:%d' % (host, port)
1300
            else:
1301
                prompt_host = host
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1302
            password = ui.ui_factory.get_password(prompt,
1303
                                                  host=prompt_host, user=user)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1304
        return password
1305
2900.2.22 by Vincent Ladeuil
Polishing.
1306
    def decode_password(self, credentials, encoding):
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1307
        try:
1308
            cs = credential_store_registry.get_credential_store(encoding)
1309
        except KeyError:
1310
            raise ValueError('%r is not a known password_encoding' % encoding)
1311
        credentials['password'] = cs.decode_password(credentials)
2900.2.22 by Vincent Ladeuil
Polishing.
1312
        return credentials
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1313
3242.3.17 by Aaron Bentley
Whitespace cleanup
1314
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1315
class CredentialStoreRegistry(registry.Registry):
1316
    """A class that registers credential stores.
1317
1318
    A credential store provides access to credentials via the password_encoding
1319
    field in authentication.conf sections.
1320
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1321
    Except for stores provided by bzr itself, most stores are expected to be
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1322
    provided by plugins that will therefore use
1323
    register_lazy(password_encoding, module_name, member_name, help=help,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1324
    fallback=fallback) to install themselves.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1325
1326
    A fallback credential store is one that is queried if no credentials can be
1327
    found via authentication.conf.
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1328
    """
1329
1330
    def get_credential_store(self, encoding=None):
1331
        cs = self.get(encoding)
1332
        if callable(cs):
1333
            cs = cs()
1334
        return cs
1335
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1336
    def is_fallback(self, name):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1337
        """Check if the named credentials store should be used as fallback."""
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1338
        return self.get_info(name)
1339
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1340
    def get_fallback_credentials(self, scheme, host, port=None, user=None,
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1341
                                 path=None, realm=None):
1342
        """Request credentials from all fallback credentials stores.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1343
1344
        The first credentials store that can provide credentials wins.
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1345
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1346
        credentials = None
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1347
        for name in self.keys():
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1348
            if not self.is_fallback(name):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1349
                continue
1350
            cs = self.get_credential_store(name)
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1351
            credentials = cs.get_credentials(scheme, host, port, user,
1352
                                             path, realm)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1353
            if credentials is not None:
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1354
                # We found some credentials
1355
                break
1356
        return credentials
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1357
1358
    def register(self, key, obj, help=None, override_existing=False,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1359
                 fallback=False):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1360
        """Register a new object to a name.
1361
1362
        :param key: This is the key to use to request the object later.
1363
        :param obj: The object to register.
1364
        :param help: Help text for this entry. This may be a string or
1365
                a callable. If it is a callable, it should take two
1366
                parameters (registry, key): this registry and the key that
1367
                the help was registered under.
1368
        :param override_existing: Raise KeyErorr if False and something has
1369
                already been registered for that key. If True, ignore if there
1370
                is an existing key (always register the new value).
1371
        :param fallback: Whether this credential store should be 
1372
                used as fallback.
1373
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1374
        return super(CredentialStoreRegistry,
1375
                     self).register(key, obj, help, info=fallback,
1376
                                    override_existing=override_existing)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1377
1378
    def register_lazy(self, key, module_name, member_name,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1379
                      help=None, override_existing=False,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1380
                      fallback=False):
1381
        """Register a new credential store to be loaded on request.
1382
1383
        :param module_name: The python path to the module. Such as 'os.path'.
1384
        :param member_name: The member of the module to return.  If empty or
1385
                None, get() will return the module itself.
1386
        :param help: Help text for this entry. This may be a string or
1387
                a callable.
1388
        :param override_existing: If True, replace the existing object
1389
                with the new one. If False, if there is already something
1390
                registered with the same key, raise a KeyError
1391
        :param fallback: Whether this credential store should be 
1392
                used as fallback.
1393
        """
1394
        return super(CredentialStoreRegistry, self).register_lazy(
1395
            key, module_name, member_name, help,
1396
            info=fallback, override_existing=override_existing)
1397
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1398
1399
credential_store_registry = CredentialStoreRegistry()
1400
1401
1402
class CredentialStore(object):
1403
    """An abstract class to implement storage for credentials"""
1404
1405
    def decode_password(self, credentials):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1406
        """Returns a clear text password for the provided credentials."""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1407
        raise NotImplementedError(self.decode_password)
1408
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1409
    def get_credentials(self, scheme, host, port=None, user=None, path=None,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1410
                        realm=None):
1411
        """Return the matching credentials from this credential store.
1412
1413
        This method is only called on fallback credential stores.
1414
        """
1415
        raise NotImplementedError(self.get_credentials)
1416
1417
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1418
1419
class PlainTextCredentialStore(CredentialStore):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1420
    __doc__ = """Plain text credential store for the authentication.conf file"""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1421
1422
    def decode_password(self, credentials):
1423
        """See CredentialStore.decode_password."""
1424
        return credentials['password']
1425
1426
1427
credential_store_registry.register('plain', PlainTextCredentialStore,
1428
                                   help=PlainTextCredentialStore.__doc__)
1429
credential_store_registry.default_key = 'plain'
1430
1431
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1432
class BzrDirConfig(object):
1433
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1434
    def __init__(self, bzrdir):
1435
        self._bzrdir = bzrdir
1436
        self._config = bzrdir._get_config()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1437
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1438
    def set_default_stack_on(self, value):
1439
        """Set the default stacking location.
1440
1441
        It may be set to a location, or None.
1442
1443
        This policy affects all branches contained by this bzrdir, except for
1444
        those under repositories.
1445
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1446
        if self._config is None:
1447
            raise errors.BzrError("Cannot set configuration in %s" % self._bzrdir)
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1448
        if value is None:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1449
            self._config.set_option('', 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1450
        else:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1451
            self._config.set_option(value, 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1452
1453
    def get_default_stack_on(self):
1454
        """Return the default stacking location.
1455
1456
        This will either be a location, or None.
1457
1458
        This policy affects all branches contained by this bzrdir, except for
1459
        those under repositories.
1460
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1461
        if self._config is None:
1462
            return None
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1463
        value = self._config.get_option('default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1464
        if value == '':
1465
            value = None
1466
        return value
1467
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1468
1469
class TransportConfig(object):
3242.1.5 by Aaron Bentley
Update per review comments
1470
    """A Config that reads/writes a config file on a Transport.
3242.1.4 by Aaron Bentley
Clean-up
1471
1472
    It is a low-level object that considers config data to be name/value pairs
1473
    that may be associated with a section.  Assigning meaning to the these
1474
    values is done at higher levels like TreeConfig.
1475
    """
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1476
1477
    def __init__(self, transport, filename):
1478
        self._transport = transport
1479
        self._filename = filename
1480
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1481
    def get_option(self, name, section=None, default=None):
1482
        """Return the value associated with a named option.
1483
1484
        :param name: The name of the value
1485
        :param section: The section the option is in (if any)
1486
        :param default: The value to return if the value is not set
1487
        :return: The value or default value
1488
        """
1489
        configobj = self._get_configobj()
1490
        if section is None:
1491
            section_obj = configobj
1492
        else:
1493
            try:
1494
                section_obj = configobj[section]
1495
            except KeyError:
1496
                return default
1497
        return section_obj.get(name, default)
1498
1499
    def set_option(self, value, name, section=None):
1500
        """Set the value associated with a named option.
1501
1502
        :param value: The value to set
1503
        :param name: The name of the value to set
1504
        :param section: The section the option is in (if any)
1505
        """
1506
        configobj = self._get_configobj()
1507
        if section is None:
1508
            configobj[name] = value
1509
        else:
1510
            configobj.setdefault(section, {})[name] = value
1511
        self._set_configobj(configobj)
1512
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1513
    def _get_config_file(self):
1514
        try:
4852.1.10 by John Arbash Meinel
Use a StringIO instead, otherwise we get failures with smart server requests.
1515
            return StringIO(self._transport.get_bytes(self._filename))
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1516
        except errors.NoSuchFile:
1517
            return StringIO()
1518
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1519
    def _get_configobj(self):
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1520
        return ConfigObj(self._get_config_file(), encoding='utf-8')
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1521
1522
    def _set_configobj(self, configobj):
1523
        out_file = StringIO()
1524
        configobj.write(out_file)
1525
        out_file.seek(0)
1526
        self._transport.put_file(self._filename, out_file)