/brz/remove-bazaar

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