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