/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.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
372
        self._content = _content
4503.2.2 by Vincent Ladeuil
Get a bool or none from a config file.
373
        self._parser = None
374
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
375
    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
376
        if self._parser is not None:
377
            return self._parser
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
378
        if symbol_versioning.deprecated_passed(file):
379
            symbol_versioning.warn(
380
                '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.
381
                ' Use IniBasedConfig(_content=xxx) instead.',
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
382
                DeprecationWarning,
383
                stacklevel=2)
384
        if self._content is not None:
385
            co_input = self._content
386
        elif self.file_name is None:
387
            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
388
        else:
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
389
            co_input = self.file_name
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
390
        try:
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
391
            self._parser = ConfigObj(co_input, encoding='utf-8')
1474 by Robert Collins
Merge from Aaron Bentley.
392
        except configobj.ConfigObjError, e:
1185.12.51 by Aaron Bentley
Allowed second call of _get_parser() to not require a file
393
            raise errors.ParseConfigError(e.errors, e.config.filename)
1185.12.49 by Aaron Bentley
Switched to ConfigObj
394
        return self._parser
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
395
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
396
    def _get_matching_sections(self):
397
        """Return an ordered list of (section_name, extra_path) pairs.
398
399
        If the section contains inherited configuration, extra_path is
400
        a string containing the additional path components.
401
        """
402
        section = self._get_section()
403
        if section is not None:
404
            return [(section, '')]
405
        else:
406
            return []
407
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
408
    def _get_section(self):
409
        """Override this to define the section used by the config."""
410
        return "DEFAULT"
411
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
412
    def _get_option_policy(self, section, option_name):
413
        """Return the policy for the given (section, option_name) pair."""
414
        return POLICY_NONE
415
4603.1.10 by Aaron Bentley
Provide change editor via config.
416
    def _get_change_editor(self):
417
        return self.get_user_option('change_editor')
418
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
419
    def _get_signature_checking(self):
420
        """See Config._get_signature_checking."""
1474 by Robert Collins
Merge from Aaron Bentley.
421
        policy = self._get_user_option('check_signatures')
422
        if policy:
423
            return self._string_to_signature_policy(policy)
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
424
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
425
    def _get_signing_policy(self):
1773.4.3 by Martin Pool
[merge] bzr.dev
426
        """See Config._get_signing_policy"""
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
427
        policy = self._get_user_option('create_signatures')
428
        if policy:
429
            return self._string_to_signing_policy(policy)
430
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
431
    def _get_user_id(self):
432
        """Get the user id from the 'email' key in the current section."""
1474 by Robert Collins
Merge from Aaron Bentley.
433
        return self._get_user_option('email')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
434
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
435
    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.
436
        """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
437
        for (section, extra_path) in self._get_matching_sections():
438
            try:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
439
                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
440
            except KeyError:
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
441
                continue
442
            policy = self._get_option_policy(section, option_name)
443
            if policy == POLICY_NONE:
444
                return value
445
            elif policy == POLICY_NORECURSE:
446
                # norecurse items only apply to the exact path
447
                if extra_path:
448
                    continue
449
                else:
450
                    return value
451
            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
452
                if extra_path:
453
                    value = urlutils.join(value, extra_path)
454
                return value
2120.6.6 by James Henstridge
fix test_set_push_location test
455
            else:
456
                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
457
        else:
1993.3.1 by James Henstridge
first go at making location config lookup recursive
458
            return None
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
459
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
460
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
461
        """See Config.gpg_signing_command."""
1472 by Robert Collins
post commit hook, first pass implementation
462
        return self._get_user_option('gpg_signing_command')
1442.1.56 by Robert Collins
gpg_signing_command configuration item
463
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
464
    def _log_format(self):
465
        """See Config.log_format."""
466
        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
467
1472 by Robert Collins
post commit hook, first pass implementation
468
    def _post_commit(self):
469
        """See Config.post_commit."""
470
        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
471
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
472
    def _string_to_signature_policy(self, signature_string):
473
        """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
474
        if signature_string.lower() == 'check-available':
475
            return CHECK_IF_POSSIBLE
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
476
        if signature_string.lower() == 'ignore':
477
            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
478
        if signature_string.lower() == 'require':
479
            return CHECK_ALWAYS
1442.1.16 by Robert Collins
allow global overriding of signature policy to never check
480
        raise errors.BzrError("Invalid signatures policy '%s'"
481
                              % signature_string)
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
482
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
483
    def _string_to_signing_policy(self, signature_string):
484
        """Convert a string to a signing policy."""
485
        if signature_string.lower() == 'when-required':
486
            return SIGN_WHEN_REQUIRED
487
        if signature_string.lower() == 'never':
488
            return SIGN_NEVER
489
        if signature_string.lower() == 'always':
490
            return SIGN_ALWAYS
491
        raise errors.BzrError("Invalid signing policy '%s'"
492
                              % signature_string)
493
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
494
    def _get_alias(self, value):
495
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
496
            return self._get_parser().get_value("ALIASES",
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
497
                                                value)
498
        except KeyError:
499
            pass
500
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
501
    def _get_nickname(self):
502
        return self.get_user_option('nickname')
503
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
504
    def _write_config_file(self):
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
505
        if self.file_name is None:
506
            raise AssertionError('We cannot save, self.file_name is None')
507
        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
508
        self._get_parser().write(atomic_file)
509
        atomic_file.commit()
510
        atomic_file.close()
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
511
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
512
513
class GlobalConfig(IniBasedConfig):
514
    """The configuration that should be used for a specific location."""
515
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
516
    def __init__(self, _content=None):
517
        super(GlobalConfig, self).__init__(file_name=config_filename(),
518
                                           _content=_content)
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
519
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
520
    def get_editor(self):
1474 by Robert Collins
Merge from Aaron Bentley.
521
        return self._get_user_option('editor')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
522
1816.2.1 by Robey Pointer
add set_user_option to GlobalConfig, and make /etc/passwd username lookup try harder with encodings
523
    def set_user_option(self, option, value):
524
        """Save option and its value in the configuration."""
2900.3.2 by Tim Penhey
A working alias command.
525
        self._set_option(option, value, 'DEFAULT')
526
527
    def get_aliases(self):
528
        """Return the aliases section."""
529
        if 'ALIASES' in self._get_parser():
530
            return self._get_parser()['ALIASES']
531
        else:
532
            return {}
533
534
    def set_alias(self, alias_name, alias_command):
535
        """Save the alias in the configuration."""
536
        self._set_option(alias_name, alias_command, 'ALIASES')
537
538
    def unset_alias(self, alias_name):
539
        """Unset an existing alias."""
540
        aliases = self._get_parser().get('ALIASES')
2900.3.7 by Tim Penhey
Updates from Aaron's review.
541
        if not aliases or alias_name not in aliases:
542
            raise errors.NoSuchAlias(alias_name)
2900.3.2 by Tim Penhey
A working alias command.
543
        del aliases[alias_name]
2900.3.12 by Tim Penhey
Final review comments.
544
        self._write_config_file()
2900.3.2 by Tim Penhey
A working alias command.
545
546
    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
547
        # FIXME: RBC 20051029 This should refresh the parser and also take a
548
        # file lock on bazaar.conf.
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
549
        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
550
        ensure_config_dir_exists(conf_dir)
2900.3.7 by Tim Penhey
Updates from Aaron's review.
551
        self._get_parser().setdefault(section, {})[option] = value
2900.3.12 by Tim Penhey
Final review comments.
552
        self._write_config_file()
2900.3.2 by Tim Penhey
A working alias command.
553
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
554
555
class LocationConfig(IniBasedConfig):
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
556
    """A configuration object that gives the policy for a location."""
557
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
558
    def __init__(self, location, _content=None):
5345.1.2 by Vincent Ladeuil
Get rid of 'branches.conf' references.
559
        super(LocationConfig, self).__init__(
5345.1.4 by Vincent Ladeuil
Deprecate the ``file`` parameter of the ``config._get_parser()`` method.
560
            file_name=locations_config_filename(),
561
            _content=_content)
1878.1.1 by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653)
562
        # local file locations are looked up by local path, rather than
563
        # by file url. This is because the config file is a user
564
        # file, and we would rather not expose the user to file urls.
565
        if location.startswith('file://'):
566
            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
567
        self.location = location
568
1993.3.1 by James Henstridge
first go at making location config lookup recursive
569
    def _get_matching_sections(self):
570
        """Return an ordered list of section names matching this location."""
1185.12.49 by Aaron Bentley
Switched to ConfigObj
571
        sections = self._get_parser()
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
572
        location_names = self.location.split('/')
1442.1.18 by Robert Collins
permit per branch location overriding of signature checking policy
573
        if self.location.endswith('/'):
574
            del location_names[-1]
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
575
        matches=[]
1442.1.10 by Robert Collins
explicit over glob test passes
576
        for section in sections:
1878.1.1 by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653)
577
            # location is a local path if possible, so we need
578
            # to convert 'file://' urls to local paths if necessary.
579
            # This also avoids having file:///path be a more exact
580
            # match than '/path'.
581
            if section.startswith('file://'):
582
                section_path = urlutils.local_path_from_url(section)
583
            else:
584
                section_path = section
585
            section_names = section_path.split('/')
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
586
            if section.endswith('/'):
587
                del section_names[-1]
588
            names = zip(location_names, section_names)
589
            matched = True
590
            for name in names:
591
                if not fnmatch(name[0], name[1]):
592
                    matched = False
593
                    break
594
            if not matched:
595
                continue
596
            # so, for the common prefix they matched.
597
            # if section is longer, no match.
598
            if len(section_names) > len(location_names):
599
                continue
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
600
            matches.append((len(section_names), section,
601
                            '/'.join(location_names[len(section_names):])))
1442.1.12 by Robert Collins
LocationConfig section retrieval falls into my lap
602
        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
603
        sections = []
604
        for (length, section, extra_path) in matches:
605
            sections.append((section, extra_path))
606
            # should we stop looking for parent configs here?
1993.3.1 by James Henstridge
first go at making location config lookup recursive
607
            try:
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
608
                if self._get_parser()[section].as_bool('ignore_parents'):
609
                    break
1993.3.1 by James Henstridge
first go at making location config lookup recursive
610
            except KeyError:
611
                pass
1993.3.3 by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
612
        return sections
1442.1.9 by Robert Collins
exact section test passes
613
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
614
    def _get_option_policy(self, section, option_name):
615
        """Return the policy for the given (section, option_name) pair."""
616
        # check for the old 'recurse=False' flag
617
        try:
618
            recurse = self._get_parser()[section].as_bool('recurse')
619
        except KeyError:
620
            recurse = True
621
        if not recurse:
622
            return POLICY_NORECURSE
623
2120.6.10 by James Henstridge
Catch another deprecation warning, and more cleanup
624
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
625
        try:
626
            policy_name = self._get_parser()[section][policy_key]
627
        except KeyError:
628
            policy_name = None
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
629
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
630
        return _policy_value[policy_name]
2120.6.1 by James Henstridge
add support for norecurse and appendpath policies when reading configuration files
631
2120.6.4 by James Henstridge
add support for specifying policy when storing options
632
    def _set_option_policy(self, section, option_name, option_policy):
633
        """Set the policy for the given option name in the given section."""
634
        # The old recurse=False option affects all options in the
635
        # section.  To handle multiple policies in the section, we
636
        # need to convert it to a policy_norecurse key.
637
        try:
638
            recurse = self._get_parser()[section].as_bool('recurse')
639
        except KeyError:
640
            pass
641
        else:
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
642
            symbol_versioning.warn(
2120.6.11 by James Henstridge
s/0.13/0.14/ in deprecation warning
643
                'The recurse option is deprecated as of 0.14.  '
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
644
                'The section "%s" has been converted to use policies.'
645
                % section,
646
                DeprecationWarning)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
647
            del self._get_parser()[section]['recurse']
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
648
            if not recurse:
649
                for key in self._get_parser()[section].keys():
650
                    if not key.endswith(':policy'):
651
                        self._get_parser()[section][key +
652
                                                    ':policy'] = 'norecurse'
2120.6.4 by James Henstridge
add support for specifying policy when storing options
653
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
654
        policy_key = option_name + ':policy'
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
655
        policy_name = _policy_name[option_policy]
656
        if policy_name is not None:
657
            self._get_parser()[section][policy_key] = policy_name
658
        else:
659
            if policy_key in self._get_parser()[section]:
660
                del self._get_parser()[section][policy_key]
2120.6.4 by James Henstridge
add support for specifying policy when storing options
661
662
    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.
663
        """Save option and its value in the configuration."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
664
        if store not in [STORE_LOCATION,
2120.6.4 by James Henstridge
add support for specifying policy when storing options
665
                         STORE_LOCATION_NORECURSE,
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
666
                         STORE_LOCATION_APPENDPATH]:
667
            raise ValueError('bad storage policy %r for %r' %
668
                (store, option))
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
669
        # FIXME: RBC 20051029 This should refresh the parser and also take a
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
670
        # file lock on locations.conf.
5345.1.1 by Vincent Ladeuil
Deprecate the get_filename parameter in IniBasedConfig.
671
        conf_dir = os.path.dirname(self.file_name)
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
672
        ensure_config_dir_exists(conf_dir)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
673
        location = self.location
674
        if location.endswith('/'):
675
            location = location[:-1]
676
        if (not location in self._get_parser() and
677
            not location + '/' in self._get_parser()):
678
            self._get_parser()[location]={}
679
        elif location + '/' in self._get_parser():
680
            location = location + '/'
681
        self._get_parser()[location][option]=value
2120.6.4 by James Henstridge
add support for specifying policy when storing options
682
        # the allowed values of store match the config policies
683
        self._set_option_policy(location, option, store)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
684
        self._write_config_file()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
685
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
686
687
class BranchConfig(Config):
688
    """A configuration object giving the policy for a branch."""
689
5345.1.3 by Vincent Ladeuil
Make __init__ the first method in the BranchConfig class.
690
    def __init__(self, branch):
691
        super(BranchConfig, self).__init__()
692
        self._location_config = None
693
        self._branch_data_config = None
694
        self._global_config = None
695
        self.branch = branch
696
        self.option_sources = (self._get_location_config,
697
                               self._get_branch_data_config,
698
                               self._get_global_config)
699
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
700
    def _get_branch_data_config(self):
701
        if self._branch_data_config is None:
702
            self._branch_data_config = TreeConfig(self.branch)
703
        return self._branch_data_config
704
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
705
    def _get_location_config(self):
706
        if self._location_config is None:
707
            self._location_config = LocationConfig(self.branch.base)
708
        return self._location_config
709
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
710
    def _get_global_config(self):
711
        if self._global_config is None:
712
            self._global_config = GlobalConfig()
713
        return self._global_config
714
715
    def _get_best_value(self, option_name):
716
        """This returns a user option from local, tree or global config.
717
718
        They are tried in that order.  Use get_safe_value if trusted values
719
        are necessary.
720
        """
721
        for source in self.option_sources:
722
            value = getattr(source(), option_name)()
723
            if value is not None:
724
                return value
725
        return None
726
727
    def _get_safe_value(self, option_name):
728
        """This variant of get_best_value never returns untrusted values.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
729
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
730
        It does not return values from the branch data, because the branch may
731
        not be controlled by the user.
732
733
        We may wish to allow locations.conf to control whether branches are
734
        trusted in the future.
735
        """
736
        for source in (self._get_location_config, self._get_global_config):
737
            value = getattr(source(), option_name)()
738
            if value is not None:
739
                return value
740
        return None
741
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
742
    def _get_user_id(self):
743
        """Return the full user id for the branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
744
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
745
        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
746
        This is looked up in the email controlfile for the branch.
747
        """
748
        try:
3407.2.16 by Martin Pool
Remove RemoteBranch reliance on control_files._transport
749
            return (self.branch._transport.get_bytes("email")
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
750
                    .decode(osutils.get_user_encoding())
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
751
                    .rstrip("\r\n"))
752
        except errors.NoSuchFile, e:
753
            pass
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
754
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
755
        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
756
4603.1.10 by Aaron Bentley
Provide change editor via config.
757
    def _get_change_editor(self):
758
        return self._get_best_value('_get_change_editor')
759
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
760
    def _get_signature_checking(self):
761
        """See Config._get_signature_checking."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
762
        return self._get_best_value('_get_signature_checking')
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
763
1770.2.1 by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this
764
    def _get_signing_policy(self):
765
        """See Config._get_signing_policy."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
766
        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
767
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
768
    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.
769
        """See Config._get_user_option."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
770
        for source in self.option_sources:
1993.3.6 by James Henstridge
get rid of the recurse argument to get_user_option()
771
            value = source()._get_user_option(option_name)
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
772
            if value is not None:
773
                return value
774
        return None
775
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
776
    def set_user_option(self, name, value, store=STORE_BRANCH,
777
        warn_masked=False):
2120.6.4 by James Henstridge
add support for specifying policy when storing options
778
        if store == STORE_BRANCH:
1770.2.6 by Aaron Bentley
Ensure branch.conf works properly
779
            self._get_branch_data_config().set_option(value, name)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
780
        elif store == STORE_GLOBAL:
2120.6.7 by James Henstridge
Fix GlobalConfig.set_user_option() call
781
            self._get_global_config().set_user_option(name, value)
2120.6.4 by James Henstridge
add support for specifying policy when storing options
782
        else:
783
            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)
784
        if not warn_masked:
785
            return
786
        if store in (STORE_GLOBAL, STORE_BRANCH):
787
            mask_value = self._get_location_config().get_user_option(name)
788
            if mask_value is not None:
789
                trace.warning('Value "%s" is masked by "%s" from'
790
                              ' locations.conf', value, mask_value)
791
            else:
792
                if store == STORE_GLOBAL:
793
                    branch_config = self._get_branch_data_config()
794
                    mask_value = branch_config.get_user_option(name)
795
                    if mask_value is not None:
796
                        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
797
                                      ' branch.conf', value, mask_value)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
798
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
799
    def _gpg_signing_command(self):
1442.1.56 by Robert Collins
gpg_signing_command configuration item
800
        """See Config.gpg_signing_command."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
801
        return self._get_safe_value('_gpg_signing_command')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
802
1472 by Robert Collins
post commit hook, first pass implementation
803
    def _post_commit(self):
804
        """See Config.post_commit."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
805
        return self._get_safe_value('_post_commit')
1472 by Robert Collins
post commit hook, first pass implementation
806
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
807
    def _get_nickname(self):
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
808
        value = self._get_explicit_nickname()
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
809
        if value is not None:
810
            return value
2120.5.2 by Alexander Belchenko
(jam) Fix for bug #66857
811
        return urlutils.unescape(self.branch.base.split('/')[-2])
1770.2.7 by Aaron Bentley
Set/get nickname using BranchConfig
812
1824.1.1 by Robert Collins
Add BranchConfig.has_explicit_nickname call.
813
    def has_explicit_nickname(self):
814
        """Return true if a nickname has been explicitly assigned."""
815
        return self._get_explicit_nickname() is not None
816
817
    def _get_explicit_nickname(self):
818
        return self._get_best_value('_get_nickname')
819
1553.2.9 by Erik Bågfors
log_formatter => log_format for "named" formatters
820
    def _log_format(self):
821
        """See Config.log_format."""
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
822
        return self._get_best_value('_log_format')
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
823
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
824
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
825
def ensure_config_dir_exists(path=None):
826
    """Make sure a configuration directory exists.
827
    This makes sure that the directory exists.
828
    On windows, since configuration directories are 2 levels deep,
829
    it makes sure both the directory and the parent directory exists.
830
    """
831
    if path is None:
832
        path = config_dir()
833
    if not os.path.isdir(path):
834
        if sys.platform == 'win32':
835
            parent_dir = os.path.dirname(path)
836
            if not os.path.isdir(parent_dir):
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
837
                trace.mutter('creating config parent directory: %r', parent_dir)
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
838
            os.mkdir(parent_dir)
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
839
        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
840
        os.mkdir(path)
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
841
        osutils.copy_ownership_from_path(path)
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
842
1532 by Robert Collins
Merge in John Meinels integration branch.
843
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
844
def config_dir():
845
    """Return per-user configuration directory.
846
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
847
    By default this is ~/.bazaar/
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
848
1442.1.1 by Robert Collins
move config_dir into bzrlib.config
849
    TODO: Global option --config-dir to override this.
850
    """
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
851
    base = os.environ.get('BZR_HOME', None)
852
    if sys.platform == 'win32':
853
        if base is None:
2245.4.3 by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
854
            base = win32utils.get_appdata_location_unicode()
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
855
        if base is None:
856
            base = os.environ.get('HOME', None)
857
        if base is None:
2991.2.2 by Vincent Ladeuil
No tests worth adding after upgrading to configobj-4.4.0.
858
            raise errors.BzrError('You must have one of BZR_HOME, APPDATA,'
859
                                  ' or HOME set')
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
860
        return osutils.pathjoin(base, 'bazaar', '2.0')
1185.38.1 by John Arbash Meinel
Adding my win32 patch for moving the home directory.
861
    else:
862
        if base is None:
863
            base = os.path.expanduser("~")
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
864
        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 \
865
866
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
867
def config_filename():
868
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
869
    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.
870
871
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
872
def locations_config_filename():
873
    """Return per-user configuration ini file filename."""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
874
    return osutils.pathjoin(config_dir(), 'locations.conf')
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
875
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
876
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
877
def authentication_config_filename():
878
    """Return per-user authentication ini file filename."""
879
    return osutils.pathjoin(config_dir(), 'authentication.conf')
880
881
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
882
def user_ignore_config_filename():
883
    """Return the user default ignore filename"""
1996.3.31 by John Arbash Meinel
Make bzrlib.config use lazy importing
884
    return osutils.pathjoin(config_dir(), 'ignore')
1836.1.6 by John Arbash Meinel
Creating a helper function for getting the user ignore filename
885
886
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
887
def crash_dir():
888
    """Return the directory name to store crash files.
889
890
    This doesn't implicitly create it.
891
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
892
    On Windows it's in the config directory; elsewhere it's /var/crash
4634.128.18 by Martin Pool
Update apport crash tests
893
    which may be monitored by apport.  It can be overridden by
894
    $APPORT_CRASH_DIR.
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
895
    """
896
    if sys.platform == 'win32':
897
        return osutils.pathjoin(config_dir(), 'Crash')
898
    else:
4634.128.2 by Martin Pool
Write crash files into /var/crash where apport can see them.
899
        # XXX: hardcoded in apport_python_hook.py; therefore here too -- mbp
900
        # 2010-01-31
4634.128.18 by Martin Pool
Update apport crash tests
901
        return os.environ.get('APPORT_CRASH_DIR', '/var/crash')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
902
903
904
def xdg_cache_dir():
4584.3.23 by Martin Pool
Correction to xdg_cache_dir and add a simple test
905
    # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html
906
    # Possibly this should be different on Windows?
907
    e = os.environ.get('XDG_CACHE_DIR', None)
908
    if e:
909
        return e
910
    else:
911
        return os.path.expanduser('~/.cache')
4584.3.4 by Martin Pool
Add crash_dir and xdg_cache_dir functions
912
913
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
914
def parse_username(username):
915
    """Parse e-mail username and return a (name, address) tuple."""
916
    match = re.match(r'(.*?)\s*<?([\w+.-]+@[\w+.-]+)>?', username)
917
    if match is None:
918
        return (username, '')
919
    else:
920
        return (match.group(1), match.group(2))
921
922
1185.16.52 by Martin Pool
- add extract_email_address
923
def extract_email_address(e):
924
    """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.
925
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
926
    That is just the user@domain part, nothing else.
1185.16.52 by Martin Pool
- add extract_email_address
927
    This part is required to contain only ascii characters.
928
    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.
929
1185.16.52 by Martin Pool
- add extract_email_address
930
    >>> extract_email_address('Jane Tester <jane@test.com>')
931
    "jane@test.com"
932
    """
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
933
    name, email = parse_username(e)
934
    if not email:
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
935
        raise errors.NoEmailInUsername(e)
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
936
    return email
1185.35.11 by Aaron Bentley
Added support for branch nicks
937
1185.85.30 by John Arbash Meinel
Fixing 'bzr push' exposed that IniBasedConfig didn't handle unicode.
938
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
939
class TreeConfig(IniBasedConfig):
1185.35.11 by Aaron Bentley
Added support for branch nicks
940
    """Branch configuration data associated with its contents, not location"""
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
941
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
942
    # XXX: Really needs a better name, as this is not part of the tree! -- mbp 20080507
943
1185.35.11 by Aaron Bentley
Added support for branch nicks
944
    def __init__(self, branch):
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
945
        self._config = branch._get_config()
1185.35.11 by Aaron Bentley
Added support for branch nicks
946
        self.branch = branch
947
1770.2.5 by Aaron Bentley
Integrate branch.conf into BranchConfig
948
    def _get_parser(self, file=None):
949
        if file is not None:
950
            return IniBasedConfig._get_parser(file)
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
951
        return self._config._get_configobj()
1185.35.11 by Aaron Bentley
Added support for branch nicks
952
953
    def get_option(self, name, section=None, default=None):
954
        self.branch.lock_read()
955
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
956
            return self._config.get_option(name, section, default)
1185.35.11 by Aaron Bentley
Added support for branch nicks
957
        finally:
958
            self.branch.unlock()
959
960
    def set_option(self, value, name, section=None):
961
        """Set a per-branch configuration option"""
962
        self.branch.lock_write()
963
        try:
3242.1.2 by Aaron Bentley
Turn BzrDirConfig into TransportConfig, reduce code duplication
964
            self._config.set_option(value, name, section)
1185.35.11 by Aaron Bentley
Added support for branch nicks
965
        finally:
966
            self.branch.unlock()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
967
968
969
class AuthenticationConfig(object):
970
    """The authentication configuration file based on a ini file.
971
972
    Implements the authentication.conf file described in
973
    doc/developers/authentication-ring.txt.
974
    """
975
976
    def __init__(self, _file=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
977
        self._config = None # The ConfigObj
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
978
        if _file is None:
2900.2.24 by Vincent Ladeuil
Review feedback.
979
            self._filename = authentication_config_filename()
980
            self._input = self._filename = authentication_config_filename()
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
981
        else:
2900.2.24 by Vincent Ladeuil
Review feedback.
982
            # Tests can provide a string as _file
983
            self._filename = None
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
984
            self._input = _file
985
986
    def _get_config(self):
987
        if self._config is not None:
988
            return self._config
989
        try:
2900.2.22 by Vincent Ladeuil
Polishing.
990
            # FIXME: Should we validate something here ? Includes: empty
991
            # sections are useless, at least one of
992
            # user/password/password_encoding should be defined, etc.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
993
994
            # Note: the encoding below declares that the file itself is utf-8
995
            # encoded, but the values in the ConfigObj are always Unicode.
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
996
            self._config = ConfigObj(self._input, encoding='utf-8')
997
        except configobj.ConfigObjError, e:
998
            raise errors.ParseConfigError(e.errors, e.config.filename)
999
        return self._config
1000
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1001
    def _save(self):
1002
        """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.
1003
        conf_dir = os.path.dirname(self._filename)
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1004
        ensure_config_dir_exists(conf_dir)
4708.2.2 by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib
1005
        f = file(self._filename, 'wb')
1006
        try:
1007
            self._get_config().write(f)
1008
        finally:
1009
            f.close()
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1010
1011
    def _set_option(self, section_name, option_name, value):
1012
        """Set an authentication configuration option"""
1013
        conf = self._get_config()
1014
        section = conf.get(section_name)
1015
        if section is None:
1016
            conf[section] = {}
1017
            section = conf[section]
1018
        section[option_name] = value
1019
        self._save()
1020
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1021
    def get_credentials(self, scheme, host, port=None, user=None, path=None, 
1022
                        realm=None):
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1023
        """Returns the matching credentials from authentication.conf file.
1024
1025
        :param scheme: protocol
1026
1027
        :param host: the server address
1028
1029
        :param port: the associated port (optional)
1030
1031
        :param user: login (optional)
1032
1033
        :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
1034
        
1035
        :param realm: the http authentication realm (optional)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1036
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1037
        :return: A dict containing the matching credentials or None.
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1038
           This includes:
1039
           - name: the section name of the credentials in the
1040
             authentication.conf file,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1041
           - 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.
1042
           - scheme: the server protocol,
1043
           - host: the server address,
1044
           - port: the server port (can be None),
1045
           - path: the absolute server path (can be None),
1046
           - realm: the http specific authentication realm (can be None),
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1047
           - password: the decoded password, could be None if the credential
1048
             defines only the user
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1049
           - verify_certificates: https specific, True if the server
1050
             certificate should be verified, False otherwise.
1051
        """
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1052
        credentials = None
1053
        for auth_def_name, auth_def in self._get_config().items():
3418.2.1 by Vincent Ladeuil
Fix #217650 by catching declarations outside sections.
1054
            if type(auth_def) is not configobj.Section:
1055
                raise ValueError("%s defined outside a section" % auth_def_name)
1056
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1057
            a_scheme, a_host, a_user, a_path = map(
1058
                auth_def.get, ['scheme', 'host', 'user', 'path'])
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1059
2900.2.5 by Vincent Ladeuil
ake ftp aware of authentication config.
1060
            try:
1061
                a_port = auth_def.as_int('port')
1062
            except KeyError:
1063
                a_port = None
2900.2.22 by Vincent Ladeuil
Polishing.
1064
            except ValueError:
1065
                raise ValueError("'port' not numeric in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1066
            try:
1067
                a_verify_certificates = auth_def.as_bool('verify_certificates')
1068
            except KeyError:
1069
                a_verify_certificates = True
2900.2.22 by Vincent Ladeuil
Polishing.
1070
            except ValueError:
1071
                raise ValueError(
1072
                    "'verify_certificates' not boolean in %s" % auth_def_name)
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1073
1074
            # Attempt matching
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1075
            if a_scheme is not None and scheme != a_scheme:
1076
                continue
1077
            if a_host is not None:
1078
                if not (host == a_host
1079
                        or (a_host.startswith('.') and host.endswith(a_host))):
1080
                    continue
2900.2.4 by Vincent Ladeuil
Cosmetic changes.
1081
            if a_port is not None and port != a_port:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1082
                continue
1083
            if (a_path is not None and path is not None
1084
                and not path.startswith(a_path)):
1085
                continue
1086
            if (a_user is not None and user is not None
1087
                and a_user != user):
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1088
                # Never contradict the caller about the user to be used
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1089
                continue
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1090
            if a_user is None:
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1091
                # Can't find a user
1092
                continue
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1093
            # Prepare a credentials dictionary with additional keys
1094
            # for the credential providers
2900.2.24 by Vincent Ladeuil
Review feedback.
1095
            credentials = dict(name=auth_def_name,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1096
                               user=a_user,
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1097
                               scheme=a_scheme,
1098
                               host=host,
1099
                               port=port,
1100
                               path=path,
1101
                               realm=realm,
3418.4.2 by Vincent Ladeuil
Fix bug #199440 by taking into account that a section may not
1102
                               password=auth_def.get('password', None),
2900.2.24 by Vincent Ladeuil
Review feedback.
1103
                               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
1104
            # Decode the password in the credentials (or get one)
2900.2.22 by Vincent Ladeuil
Polishing.
1105
            self.decode_password(credentials,
1106
                                 auth_def.get('password_encoding', None))
2900.2.10 by Vincent Ladeuil
Add -Dauth handling.
1107
            if 'auth' in debug.debug_flags:
1108
                trace.mutter("Using authentication section: %r", auth_def_name)
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1109
            break
1110
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1111
        if credentials is None:
1112
            # No credentials were found in authentication.conf, try the fallback
1113
            # credentials stores.
1114
            credentials = credential_store_registry.get_fallback_credentials(
1115
                scheme, host, port, user, path, realm)
1116
2900.2.3 by Vincent Ladeuil
Credentials matching implementation.
1117
        return credentials
1118
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1119
    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
1120
                        port=None, path=None, verify_certificates=None,
1121
                        realm=None):
3777.3.1 by Aaron Bentley
Update docs
1122
        """Set authentication credentials for a host.
1123
1124
        Any existing credentials with matching scheme, host, port and path
1125
        will be deleted, regardless of name.
1126
1127
        :param name: An arbitrary name to describe this set of credentials.
1128
        :param host: Name of the host that accepts these credentials.
1129
        :param user: The username portion of these credentials.
1130
        :param scheme: The URL scheme (e.g. ssh, http) the credentials apply
1131
            to.
3777.3.2 by Aaron Bentley
Reverse order of scheme and password
1132
        :param password: Password portion of these credentials.
3777.3.1 by Aaron Bentley
Update docs
1133
        :param port: The IP port on the host that these credentials apply to.
1134
        :param path: A filesystem path on the host that these credentials
1135
            apply to.
1136
        :param verify_certificates: On https, verify server certificates if
1137
            True.
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1138
        :param realm: The http authentication realm (optional).
3777.3.1 by Aaron Bentley
Update docs
1139
        """
3777.1.8 by Aaron Bentley
Commit work-in-progress
1140
        values = {'host': host, 'user': user}
1141
        if password is not None:
1142
            values['password'] = password
1143
        if scheme is not None:
1144
            values['scheme'] = scheme
1145
        if port is not None:
1146
            values['port'] = '%d' % port
1147
        if path is not None:
1148
            values['path'] = path
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1149
        if verify_certificates is not None:
1150
            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
1151
        if realm is not None:
1152
            values['realm'] = realm
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1153
        config = self._get_config()
1154
        for_deletion = []
1155
        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
1156
            for key in ('scheme', 'host', 'port', 'path', 'realm'):
3777.1.11 by Aaron Bentley
Ensure changed-name updates clear old values
1157
                if existing_values.get(key) != values.get(key):
1158
                    break
1159
            else:
1160
                del config[section]
1161
        config.update({name: values})
3777.1.10 by Aaron Bentley
Ensure credentials are stored
1162
        self._save()
3777.1.8 by Aaron Bentley
Commit work-in-progress
1163
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1164
    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.
1165
                 prompt=None, ask=False, default=None):
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1166
        """Get a user from authentication file.
1167
1168
        :param scheme: protocol
1169
1170
        :param host: the server address
1171
1172
        :param port: the associated port (optional)
1173
1174
        :param realm: the realm sent by the server (optional)
1175
1176
        :param path: the absolute path on the server (optional)
1177
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1178
        :param ask: Ask the user if there is no explicitly configured username 
1179
                    (optional)
1180
4304.2.1 by Vincent Ladeuil
Fix bug #367726 by reverting some default user handling introduced
1181
        :param default: The username returned if none is defined (optional).
1182
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1183
        :return: The found user.
1184
        """
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1185
        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
1186
                                           path=path, realm=realm)
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1187
        if credentials is not None:
1188
            user = credentials['user']
1189
        else:
1190
            user = None
4222.3.2 by Jelmer Vernooij
Prompt for user names if they are not in the configuration.
1191
        if user is None:
4222.3.4 by Jelmer Vernooij
Default to getpass.getuser() in AuthenticationConfig.get_user(), but allow
1192
            if ask:
1193
                if prompt is None:
1194
                    # Create a default prompt suitable for most cases
1195
                    prompt = scheme.upper() + ' %(host)s username'
1196
                # Special handling for optional fields in the prompt
1197
                if port is not None:
1198
                    prompt_host = '%s:%d' % (host, port)
1199
                else:
1200
                    prompt_host = host
1201
                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.
1202
            else:
4222.3.10 by Jelmer Vernooij
Avoid using the default username in the case of SMTP.
1203
                user = default
2900.2.15 by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step).
1204
        return user
1205
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1206
    def get_password(self, scheme, host, user, port=None,
1207
                     realm=None, path=None, prompt=None):
1208
        """Get a password from authentication file or prompt the user for one.
1209
1210
        :param scheme: protocol
1211
1212
        :param host: the server address
1213
1214
        :param port: the associated port (optional)
1215
1216
        :param user: login
1217
1218
        :param realm: the realm sent by the server (optional)
1219
1220
        :param path: the absolute path on the server (optional)
1221
1222
        :return: The found password or the one entered by the user.
1223
        """
4081.1.1 by Jean-Francois Roy
A 'realm' optional argument was added to the get_credentials and set_credentials
1224
        credentials = self.get_credentials(scheme, host, port, user, path,
1225
                                           realm)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1226
        if credentials is not None:
1227
            password = credentials['password']
3420.1.3 by Vincent Ladeuil
John's review feedback.
1228
            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.
1229
                trace.warning('password ignored in section [%s],'
1230
                              ' use an ssh agent instead'
1231
                              % credentials['name'])
1232
                password = None
2900.2.16 by Vincent Ladeuil
Make hhtp proxy aware of AuthenticationConfig (for password).
1233
        else:
1234
            password = None
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1235
        # 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).
1236
        if password is None:
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1237
            if prompt is None:
3420.1.2 by Vincent Ladeuil
Fix bug #203186 by ignoring passwords for ssh and warning user.
1238
                # Create a default prompt suitable for most cases
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1239
                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
1240
            # Special handling for optional fields in the prompt
1241
            if port is not None:
1242
                prompt_host = '%s:%d' % (host, port)
1243
            else:
1244
                prompt_host = host
2900.2.19 by Vincent Ladeuil
Mention proxy and https in the password prompts, with tests.
1245
            password = ui.ui_factory.get_password(prompt,
1246
                                                  host=prompt_host, user=user)
2900.2.12 by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that
1247
        return password
1248
2900.2.22 by Vincent Ladeuil
Polishing.
1249
    def decode_password(self, credentials, encoding):
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1250
        try:
1251
            cs = credential_store_registry.get_credential_store(encoding)
1252
        except KeyError:
1253
            raise ValueError('%r is not a known password_encoding' % encoding)
1254
        credentials['password'] = cs.decode_password(credentials)
2900.2.22 by Vincent Ladeuil
Polishing.
1255
        return credentials
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1256
3242.3.17 by Aaron Bentley
Whitespace cleanup
1257
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1258
class CredentialStoreRegistry(registry.Registry):
1259
    """A class that registers credential stores.
1260
1261
    A credential store provides access to credentials via the password_encoding
1262
    field in authentication.conf sections.
1263
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1264
    Except for stores provided by bzr itself, most stores are expected to be
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1265
    provided by plugins that will therefore use
1266
    register_lazy(password_encoding, module_name, member_name, help=help,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1267
    fallback=fallback) to install themselves.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1268
1269
    A fallback credential store is one that is queried if no credentials can be
1270
    found via authentication.conf.
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1271
    """
1272
1273
    def get_credential_store(self, encoding=None):
1274
        cs = self.get(encoding)
1275
        if callable(cs):
1276
            cs = cs()
1277
        return cs
1278
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1279
    def is_fallback(self, name):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1280
        """Check if the named credentials store should be used as fallback."""
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1281
        return self.get_info(name)
1282
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1283
    def get_fallback_credentials(self, scheme, host, port=None, user=None,
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1284
                                 path=None, realm=None):
1285
        """Request credentials from all fallback credentials stores.
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1286
1287
        The first credentials store that can provide credentials wins.
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1288
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1289
        credentials = None
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1290
        for name in self.keys():
4283.1.2 by Jelmer Vernooij
Add tests, NEWS item.
1291
            if not self.is_fallback(name):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1292
                continue
1293
            cs = self.get_credential_store(name)
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1294
            credentials = cs.get_credentials(scheme, host, port, user,
1295
                                             path, realm)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1296
            if credentials is not None:
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1297
                # We found some credentials
1298
                break
1299
        return credentials
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1300
1301
    def register(self, key, obj, help=None, override_existing=False,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1302
                 fallback=False):
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1303
        """Register a new object to a name.
1304
1305
        :param key: This is the key to use to request the object later.
1306
        :param obj: The object to register.
1307
        :param help: Help text for this entry. This may be a string or
1308
                a callable. If it is a callable, it should take two
1309
                parameters (registry, key): this registry and the key that
1310
                the help was registered under.
1311
        :param override_existing: Raise KeyErorr if False and something has
1312
                already been registered for that key. If True, ignore if there
1313
                is an existing key (always register the new value).
1314
        :param fallback: Whether this credential store should be 
1315
                used as fallback.
1316
        """
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1317
        return super(CredentialStoreRegistry,
1318
                     self).register(key, obj, help, info=fallback,
1319
                                    override_existing=override_existing)
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1320
1321
    def register_lazy(self, key, module_name, member_name,
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1322
                      help=None, override_existing=False,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1323
                      fallback=False):
1324
        """Register a new credential store to be loaded on request.
1325
1326
        :param module_name: The python path to the module. Such as 'os.path'.
1327
        :param member_name: The member of the module to return.  If empty or
1328
                None, get() will return the module itself.
1329
        :param help: Help text for this entry. This may be a string or
1330
                a callable.
1331
        :param override_existing: If True, replace the existing object
1332
                with the new one. If False, if there is already something
1333
                registered with the same key, raise a KeyError
1334
        :param fallback: Whether this credential store should be 
1335
                used as fallback.
1336
        """
1337
        return super(CredentialStoreRegistry, self).register_lazy(
1338
            key, module_name, member_name, help,
1339
            info=fallback, override_existing=override_existing)
1340
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1341
1342
credential_store_registry = CredentialStoreRegistry()
1343
1344
1345
class CredentialStore(object):
1346
    """An abstract class to implement storage for credentials"""
1347
1348
    def decode_password(self, credentials):
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1349
        """Returns a clear text password for the provided credentials."""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1350
        raise NotImplementedError(self.decode_password)
1351
4283.2.1 by Vincent Ladeuil
Add a test and cleanup some PEP8 issues.
1352
    def get_credentials(self, scheme, host, port=None, user=None, path=None,
4283.1.1 by Jelmer Vernooij
Support fallback credential stores.
1353
                        realm=None):
1354
        """Return the matching credentials from this credential store.
1355
1356
        This method is only called on fallback credential stores.
1357
        """
1358
        raise NotImplementedError(self.get_credentials)
1359
1360
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1361
1362
class PlainTextCredentialStore(CredentialStore):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1363
    __doc__ = """Plain text credential store for the authentication.conf file"""
3757.3.1 by Vincent Ladeuil
Add credential stores plugging.
1364
1365
    def decode_password(self, credentials):
1366
        """See CredentialStore.decode_password."""
1367
        return credentials['password']
1368
1369
1370
credential_store_registry.register('plain', PlainTextCredentialStore,
1371
                                   help=PlainTextCredentialStore.__doc__)
1372
credential_store_registry.default_key = 'plain'
1373
1374
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1375
class BzrDirConfig(object):
1376
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1377
    def __init__(self, bzrdir):
1378
        self._bzrdir = bzrdir
1379
        self._config = bzrdir._get_config()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1380
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1381
    def set_default_stack_on(self, value):
1382
        """Set the default stacking location.
1383
1384
        It may be set to a location, or None.
1385
1386
        This policy affects all branches contained by this bzrdir, except for
1387
        those under repositories.
1388
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1389
        if self._config is None:
1390
            raise errors.BzrError("Cannot set configuration in %s" % self._bzrdir)
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1391
        if value is None:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1392
            self._config.set_option('', 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1393
        else:
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1394
            self._config.set_option(value, 'default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1395
1396
    def get_default_stack_on(self):
1397
        """Return the default stacking location.
1398
1399
        This will either be a location, or None.
1400
1401
        This policy affects all branches contained by this bzrdir, except for
1402
        those under repositories.
1403
        """
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1404
        if self._config is None:
1405
            return None
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1406
        value = self._config.get_option('default_stack_on')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
1407
        if value == '':
1408
            value = None
1409
        return value
1410
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1411
1412
class TransportConfig(object):
3242.1.5 by Aaron Bentley
Update per review comments
1413
    """A Config that reads/writes a config file on a Transport.
3242.1.4 by Aaron Bentley
Clean-up
1414
1415
    It is a low-level object that considers config data to be name/value pairs
1416
    that may be associated with a section.  Assigning meaning to the these
1417
    values is done at higher levels like TreeConfig.
1418
    """
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1419
1420
    def __init__(self, transport, filename):
1421
        self._transport = transport
1422
        self._filename = filename
1423
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1424
    def get_option(self, name, section=None, default=None):
1425
        """Return the value associated with a named option.
1426
1427
        :param name: The name of the value
1428
        :param section: The section the option is in (if any)
1429
        :param default: The value to return if the value is not set
1430
        :return: The value or default value
1431
        """
1432
        configobj = self._get_configobj()
1433
        if section is None:
1434
            section_obj = configobj
1435
        else:
1436
            try:
1437
                section_obj = configobj[section]
1438
            except KeyError:
1439
                return default
1440
        return section_obj.get(name, default)
1441
1442
    def set_option(self, value, name, section=None):
1443
        """Set the value associated with a named option.
1444
1445
        :param value: The value to set
1446
        :param name: The name of the value to set
1447
        :param section: The section the option is in (if any)
1448
        """
1449
        configobj = self._get_configobj()
1450
        if section is None:
1451
            configobj[name] = value
1452
        else:
1453
            configobj.setdefault(section, {})[name] = value
1454
        self._set_configobj(configobj)
1455
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1456
    def _get_config_file(self):
1457
        try:
4852.1.10 by John Arbash Meinel
Use a StringIO instead, otherwise we get failures with smart server requests.
1458
            return StringIO(self._transport.get_bytes(self._filename))
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1459
        except errors.NoSuchFile:
1460
            return StringIO()
1461
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1462
    def _get_configobj(self):
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
1463
        f = self._get_config_file()
1464
        try:
1465
            return ConfigObj(f, encoding='utf-8')
1466
        finally:
1467
            f.close()
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1468
1469
    def _set_configobj(self, configobj):
1470
        out_file = StringIO()
1471
        configobj.write(out_file)
1472
        out_file.seek(0)
1473
        self._transport.put_file(self._filename, out_file)