/brz/remove-bazaar

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