bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
1442.1.1
by Robert Collins
 move config_dir into bzrlib.config  | 
1  | 
# Copyright (C) 2005 by Canonical Ltd
 | 
2  | 
#   Authors: Robert Collins <robert.collins@canonical.com>
 | 
|
3  | 
#
 | 
|
4  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
5  | 
# it under the terms of the GNU General Public License as published by
 | 
|
6  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
7  | 
# (at your option) any later version.
 | 
|
8  | 
#
 | 
|
9  | 
# This program is distributed in the hope that it will be useful,
 | 
|
10  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
11  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
12  | 
# GNU General Public License for more details.
 | 
|
13  | 
#
 | 
|
14  | 
# You should have received a copy of the GNU General Public License
 | 
|
15  | 
# along with this program; if not, write to the Free Software
 | 
|
16  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
17  | 
||
| 
1442.1.20
by Robert Collins
 add some documentation on options  | 
18  | 
"""Configuration that affects the behaviour of Bazaar.
 | 
19  | 
||
20  | 
Currently this configuration resides in ~/.bazaar/bazaar.conf
 | 
|
21  | 
and ~/.bazaar/branches.conf, which is written to by bzr.
 | 
|
22  | 
||
| 
1461
by Robert Collins
 Typo in config.py (Thanks Fabbione)  | 
23  | 
In bazaar.conf the following options may be set:
 | 
| 
1442.1.20
by Robert Collins
 add some documentation on options  | 
24  | 
[DEFAULT]
 | 
25  | 
editor=name-of-program
 | 
|
26  | 
email=Your Name <your@email.address>
 | 
|
27  | 
check_signatures=require|ignore|check-available(default)
 | 
|
28  | 
create_signatures=always|never|when-required(default)
 | 
|
| 
1442.1.56
by Robert Collins
 gpg_signing_command configuration item  | 
29  | 
gpg_signing_command=name-of-program
 | 
| 
1442.1.20
by Robert Collins
 add some documentation on options  | 
30  | 
|
31  | 
in branches.conf, you specify the url of a branch and options for it.
 | 
|
32  | 
Wildcards may be used - * and ? as normal in shell completion. Options
 | 
|
33  | 
set in both bazaar.conf and branches.conf are overriden by the branches.conf
 | 
|
34  | 
setting.
 | 
|
35  | 
[/home/robertc/source]
 | 
|
36  | 
recurse=False|True(default)
 | 
|
37  | 
email= as above
 | 
|
38  | 
check_signatures= as abive 
 | 
|
39  | 
create_signatures= as above.
 | 
|
40  | 
||
41  | 
explanation of options
 | 
|
42  | 
----------------------
 | 
|
43  | 
editor - this option sets the pop up editor to use during commits.
 | 
|
44  | 
email - this option sets the user id bzr will use when committing.
 | 
|
45  | 
check_signatures - this option controls whether bzr will require good gpg
 | 
|
46  | 
                   signatures, ignore them, or check them if they are 
 | 
|
47  | 
                   present.
 | 
|
48  | 
create_signatures - this option controls whether bzr will always create 
 | 
|
49  | 
                    gpg signatures, never create them, or create them if the
 | 
|
50  | 
                    branch is configured to require them.
 | 
|
| 
1442.1.21
by Robert Collins
 create signature_needed() call for commit to trigger creating signatures  | 
51  | 
                    NB: This option is planned, but not implemented yet.
 | 
| 
1442.1.20
by Robert Collins
 add some documentation on options  | 
52  | 
"""
 | 
| 
1442.1.1
by Robert Collins
 move config_dir into bzrlib.config  | 
53  | 
|
| 
1474
by Robert Collins
 Merge from Aaron Bentley.  | 
54  | 
|
55  | 
import errno  | 
|
| 
1442.1.1
by Robert Collins
 move config_dir into bzrlib.config  | 
56  | 
import os  | 
| 
1442.1.12
by Robert Collins
 LocationConfig section retrieval falls into my lap  | 
57  | 
from fnmatch import fnmatch  | 
| 
1442.1.2
by Robert Collins
 create a config module - there is enough config logic to make this worthwhile, and start testing config processing.  | 
58  | 
import re  | 
59  | 
||
60  | 
import bzrlib  | 
|
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
61  | 
import bzrlib.errors as errors  | 
| 
1474
by Robert Collins
 Merge from Aaron Bentley.  | 
62  | 
import bzrlib.util.configobj.configobj as configobj  | 
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
63  | 
|
64  | 
||
| 
1442.1.14
by Robert Collins
 Create a default signature checking policy of CHECK_IF_POSSIBLE  | 
65  | 
CHECK_IF_POSSIBLE=0  | 
66  | 
CHECK_ALWAYS=1  | 
|
67  | 
CHECK_NEVER=2  | 
|
68  | 
||
69  | 
||
| 
1474
by Robert Collins
 Merge from Aaron Bentley.  | 
70  | 
class ConfigObj(configobj.ConfigObj):  | 
71  | 
||
72  | 
def get_bool(self, section, key):  | 
|
73  | 
val = self[section][key].lower()  | 
|
74  | 
if val in ('1', 'yes', 'true', 'on'):  | 
|
75  | 
return True  | 
|
76  | 
elif val in ('0', 'no', 'false', 'off'):  | 
|
77  | 
return False  | 
|
78  | 
else:  | 
|
79  | 
raise ValueError("Value %r is not boolean" % val)  | 
|
80  | 
||
81  | 
def get_value(self, section, name):  | 
|
82  | 
        # Try [] for the old DEFAULT section.
 | 
|
83  | 
if section == "DEFAULT":  | 
|
84  | 
try:  | 
|
85  | 
return self[name]  | 
|
86  | 
except KeyError:  | 
|
87  | 
                pass
 | 
|
88  | 
return self[section][name]  | 
|
89  | 
||
90  | 
||
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
91  | 
class Config(object):  | 
92  | 
"""A configuration policy - what username, editor, gpg needs etc."""  | 
|
93  | 
||
94  | 
def get_editor(self):  | 
|
95  | 
"""Get the users pop up editor."""  | 
|
96  | 
raise NotImplementedError  | 
|
97  | 
||
| 
1442.1.15
by Robert Collins
 make getting the signature checking policy a template method  | 
98  | 
def _get_signature_checking(self):  | 
99  | 
"""Template method to override signature checking policy."""  | 
|
100  | 
||
| 
1442.1.69
by Robert Collins
 config.Config has a 'get_user_option' call that accepts an option name.  | 
101  | 
def _get_user_option(self, option_name):  | 
102  | 
"""Template method to provide a user option."""  | 
|
103  | 
return None  | 
|
104  | 
||
105  | 
def get_user_option(self, option_name):  | 
|
106  | 
"""Get a generic option - no special process, no default."""  | 
|
107  | 
return self._get_user_option(option_name)  | 
|
108  | 
||
| 
1442.1.56
by Robert Collins
 gpg_signing_command configuration item  | 
109  | 
def gpg_signing_command(self):  | 
110  | 
"""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.  | 
111  | 
result = self._gpg_signing_command()  | 
112  | 
if result is None:  | 
|
113  | 
result = "gpg"  | 
|
114  | 
return result  | 
|
115  | 
||
116  | 
def _gpg_signing_command(self):  | 
|
117  | 
"""See gpg_signing_command()."""  | 
|
118  | 
return None  | 
|
| 
1442.1.56
by Robert Collins
 gpg_signing_command configuration item  | 
119  | 
|
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
120  | 
def __init__(self):  | 
121  | 
super(Config, self).__init__()  | 
|
122  | 
||
| 
1472
by Robert Collins
 post commit hook, first pass implementation  | 
123  | 
def post_commit(self):  | 
124  | 
"""An ordered list of python functions to call.  | 
|
125  | 
||
126  | 
        Each function takes branch, rev_id as parameters.
 | 
|
127  | 
        """
 | 
|
128  | 
return self._post_commit()  | 
|
129  | 
||
130  | 
def _post_commit(self):  | 
|
131  | 
"""See Config.post_commit."""  | 
|
132  | 
return None  | 
|
133  | 
||
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
134  | 
def user_email(self):  | 
135  | 
"""Return just the email component of a username."""  | 
|
136  | 
e = self.username()  | 
|
137  | 
m = re.search(r'[\w+.-]+@[\w+.-]+', e)  | 
|
138  | 
if not m:  | 
|
139  | 
raise BzrError("%r doesn't seem to contain "  | 
|
140  | 
"a reasonable email address" % e)  | 
|
141  | 
return m.group(0)  | 
|
142  | 
||
143  | 
def username(self):  | 
|
144  | 
"""Return email-style username.  | 
|
145  | 
    
 | 
|
146  | 
        Something similar to 'Martin Pool <mbp@sourcefrog.net>'
 | 
|
147  | 
        
 | 
|
148  | 
        $BZREMAIL can be set to override this, then
 | 
|
149  | 
        the concrete policy type is checked, and finally
 | 
|
150  | 
        $EMAIL is examinged.
 | 
|
151  | 
        but if none is found, a reasonable default is (hopefully)
 | 
|
152  | 
        created.
 | 
|
153  | 
    
 | 
|
154  | 
        TODO: Check it's reasonably well-formed.
 | 
|
155  | 
        """
 | 
|
156  | 
v = os.environ.get('BZREMAIL')  | 
|
157  | 
if v:  | 
|
158  | 
return v.decode(bzrlib.user_encoding)  | 
|
159  | 
||
160  | 
v = self._get_user_id()  | 
|
161  | 
if v:  | 
|
162  | 
return v  | 
|
163  | 
||
164  | 
v = os.environ.get('EMAIL')  | 
|
165  | 
if v:  | 
|
166  | 
return v.decode(bzrlib.user_encoding)  | 
|
167  | 
||
168  | 
name, email = _auto_user_id()  | 
|
169  | 
if name:  | 
|
170  | 
return '%s <%s>' % (name, email)  | 
|
171  | 
else:  | 
|
172  | 
return email  | 
|
173  | 
||
| 
1442.1.14
by Robert Collins
 Create a default signature checking policy of CHECK_IF_POSSIBLE  | 
174  | 
def signature_checking(self):  | 
175  | 
"""What is the current policy for signature checking?."""  | 
|
| 
1442.1.15
by Robert Collins
 make getting the signature checking policy a template method  | 
176  | 
policy = self._get_signature_checking()  | 
177  | 
if policy is not None:  | 
|
178  | 
return policy  | 
|
| 
1442.1.14
by Robert Collins
 Create a default signature checking policy of CHECK_IF_POSSIBLE  | 
179  | 
return CHECK_IF_POSSIBLE  | 
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
180  | 
|
| 
1442.1.21
by Robert Collins
 create signature_needed() call for commit to trigger creating signatures  | 
181  | 
def signature_needed(self):  | 
182  | 
"""Is a signature needed when committing ?."""  | 
|
183  | 
policy = self._get_signature_checking()  | 
|
184  | 
if policy == CHECK_ALWAYS:  | 
|
185  | 
return True  | 
|
186  | 
return False  | 
|
187  | 
||
| 
1442.1.15
by Robert Collins
 make getting the signature checking policy a template method  | 
188  | 
|
| 
1442.1.18
by Robert Collins
 permit per branch location overriding of signature checking policy  | 
189  | 
class IniBasedConfig(Config):  | 
190  | 
"""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  | 
191  | 
|
| 
1442.1.18
by Robert Collins
 permit per branch location overriding of signature checking policy  | 
192  | 
def _get_parser(self, file=None):  | 
| 
1185.12.51
by Aaron Bentley
 Allowed second call of _get_parser() to not require a file  | 
193  | 
if self._parser is not None:  | 
194  | 
return self._parser  | 
|
| 
1185.12.49
by Aaron Bentley
 Switched to ConfigObj  | 
195  | 
if file is None:  | 
196  | 
input = self._get_filename()  | 
|
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
197  | 
else:  | 
| 
1185.12.49
by Aaron Bentley
 Switched to ConfigObj  | 
198  | 
input = file  | 
| 
1185.12.51
by Aaron Bentley
 Allowed second call of _get_parser() to not require a file  | 
199  | 
try:  | 
200  | 
self._parser = ConfigObj(input)  | 
|
| 
1474
by Robert Collins
 Merge from Aaron Bentley.  | 
201  | 
except configobj.ConfigObjError, e:  | 
| 
1185.12.51
by Aaron Bentley
 Allowed second call of _get_parser() to not require a file  | 
202  | 
raise errors.ParseConfigError(e.errors, e.config.filename)  | 
| 
1185.12.49
by Aaron Bentley
 Switched to ConfigObj  | 
203  | 
return self._parser  | 
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
204  | 
|
| 
1442.1.18
by Robert Collins
 permit per branch location overriding of signature checking policy  | 
205  | 
def _get_section(self):  | 
206  | 
"""Override this to define the section used by the config."""  | 
|
207  | 
return "DEFAULT"  | 
|
208  | 
||
| 
1442.1.16
by Robert Collins
 allow global overriding of signature policy to never check  | 
209  | 
def _get_signature_checking(self):  | 
210  | 
"""See Config._get_signature_checking."""  | 
|
| 
1474
by Robert Collins
 Merge from Aaron Bentley.  | 
211  | 
policy = self._get_user_option('check_signatures')  | 
212  | 
if policy:  | 
|
213  | 
return self._string_to_signature_policy(policy)  | 
|
| 
1442.1.18
by Robert Collins
 permit per branch location overriding of signature checking policy  | 
214  | 
|
215  | 
def _get_user_id(self):  | 
|
216  | 
"""Get the user id from the 'email' key in the current section."""  | 
|
| 
1474
by Robert Collins
 Merge from Aaron Bentley.  | 
217  | 
return self._get_user_option('email')  | 
| 
1442.1.18
by Robert Collins
 permit per branch location overriding of signature checking policy  | 
218  | 
|
| 
1442.1.69
by Robert Collins
 config.Config has a 'get_user_option' call that accepts an option name.  | 
219  | 
def _get_user_option(self, option_name):  | 
220  | 
"""See Config._get_user_option."""  | 
|
| 
1185.12.53
by Aaron Bentley
 Merged more from Robert  | 
221  | 
try:  | 
| 
1474
by Robert Collins
 Merge from Aaron Bentley.  | 
222  | 
return self._get_parser().get_value(self._get_section(),  | 
223  | 
option_name)  | 
|
| 
1185.12.53
by Aaron Bentley
 Merged more from Robert  | 
224  | 
except KeyError:  | 
225  | 
            pass
 | 
|
| 
1442.1.69
by Robert Collins
 config.Config has a 'get_user_option' call that accepts an option name.  | 
226  | 
|
| 
1442.1.59
by Robert Collins
 Add re-sign command to generate a digital signature on a single revision.  | 
227  | 
def _gpg_signing_command(self):  | 
| 
1442.1.56
by Robert Collins
 gpg_signing_command configuration item  | 
228  | 
"""See Config.gpg_signing_command."""  | 
| 
1472
by Robert Collins
 post commit hook, first pass implementation  | 
229  | 
return self._get_user_option('gpg_signing_command')  | 
| 
1442.1.56
by Robert Collins
 gpg_signing_command configuration item  | 
230  | 
|
| 
1442.1.18
by Robert Collins
 permit per branch location overriding of signature checking policy  | 
231  | 
def __init__(self, get_filename):  | 
232  | 
super(IniBasedConfig, self).__init__()  | 
|
233  | 
self._get_filename = get_filename  | 
|
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
234  | 
self._parser = None  | 
| 
1472
by Robert Collins
 post commit hook, first pass implementation  | 
235  | 
|
236  | 
def _post_commit(self):  | 
|
237  | 
"""See Config.post_commit."""  | 
|
238  | 
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  | 
239  | 
|
| 
1442.1.16
by Robert Collins
 allow global overriding of signature policy to never check  | 
240  | 
def _string_to_signature_policy(self, signature_string):  | 
241  | 
"""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  | 
242  | 
if signature_string.lower() == 'check-available':  | 
243  | 
return CHECK_IF_POSSIBLE  | 
|
| 
1442.1.16
by Robert Collins
 allow global overriding of signature policy to never check  | 
244  | 
if signature_string.lower() == 'ignore':  | 
245  | 
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  | 
246  | 
if signature_string.lower() == 'require':  | 
247  | 
return CHECK_ALWAYS  | 
|
| 
1442.1.16
by Robert Collins
 allow global overriding of signature policy to never check  | 
248  | 
raise errors.BzrError("Invalid signatures policy '%s'"  | 
249  | 
% signature_string)  | 
|
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
250  | 
|
| 
1442.1.18
by Robert Collins
 permit per branch location overriding of signature checking policy  | 
251  | 
|
252  | 
class GlobalConfig(IniBasedConfig):  | 
|
253  | 
"""The configuration that should be used for a specific location."""  | 
|
254  | 
||
255  | 
def get_editor(self):  | 
|
| 
1474
by Robert Collins
 Merge from Aaron Bentley.  | 
256  | 
return self._get_user_option('editor')  | 
| 
1442.1.18
by Robert Collins
 permit per branch location overriding of signature checking policy  | 
257  | 
|
258  | 
def __init__(self):  | 
|
259  | 
super(GlobalConfig, self).__init__(config_filename)  | 
|
260  | 
||
261  | 
||
262  | 
class LocationConfig(IniBasedConfig):  | 
|
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
263  | 
"""A configuration object that gives the policy for a location."""  | 
264  | 
||
265  | 
def __init__(self, location):  | 
|
| 
1442.1.18
by Robert Collins
 permit per branch location overriding of signature checking policy  | 
266  | 
super(LocationConfig, self).__init__(branches_config_filename)  | 
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
267  | 
self._global_config = None  | 
268  | 
self.location = location  | 
|
269  | 
||
270  | 
def _get_global_config(self):  | 
|
271  | 
if self._global_config is None:  | 
|
272  | 
self._global_config = GlobalConfig()  | 
|
273  | 
return self._global_config  | 
|
274  | 
||
| 
1442.1.9
by Robert Collins
 exact section test passes  | 
275  | 
def _get_section(self):  | 
276  | 
"""Get the section we should look in for config items.  | 
|
277  | 
||
278  | 
        Returns None if none exists. 
 | 
|
279  | 
        TODO: perhaps return a NullSection that thunks through to the 
 | 
|
280  | 
              global config.
 | 
|
281  | 
        """
 | 
|
| 
1185.12.49
by Aaron Bentley
 Switched to ConfigObj  | 
282  | 
sections = self._get_parser()  | 
| 
1442.1.12
by Robert Collins
 LocationConfig section retrieval falls into my lap  | 
283  | 
location_names = self.location.split('/')  | 
| 
1442.1.18
by Robert Collins
 permit per branch location overriding of signature checking policy  | 
284  | 
if self.location.endswith('/'):  | 
285  | 
del location_names[-1]  | 
|
| 
1442.1.12
by Robert Collins
 LocationConfig section retrieval falls into my lap  | 
286  | 
matches=[]  | 
| 
1442.1.10
by Robert Collins
 explicit over glob test passes  | 
287  | 
for section in sections:  | 
| 
1442.1.12
by Robert Collins
 LocationConfig section retrieval falls into my lap  | 
288  | 
section_names = section.split('/')  | 
289  | 
if section.endswith('/'):  | 
|
290  | 
del section_names[-1]  | 
|
291  | 
names = zip(location_names, section_names)  | 
|
292  | 
matched = True  | 
|
293  | 
for name in names:  | 
|
294  | 
if not fnmatch(name[0], name[1]):  | 
|
295  | 
matched = False  | 
|
296  | 
                    break
 | 
|
297  | 
if not matched:  | 
|
298  | 
                continue
 | 
|
299  | 
            # so, for the common prefix they matched.
 | 
|
300  | 
            # if section is longer, no match.
 | 
|
301  | 
if len(section_names) > len(location_names):  | 
|
302  | 
                continue
 | 
|
303  | 
            # if path is longer, and recurse is not true, no match
 | 
|
304  | 
if len(section_names) < len(location_names):  | 
|
| 
1185.12.49
by Aaron Bentley
 Switched to ConfigObj  | 
305  | 
try:  | 
| 
1474
by Robert Collins
 Merge from Aaron Bentley.  | 
306  | 
if not self._get_parser().get_bool(section, 'recurse'):  | 
| 
1185.12.49
by Aaron Bentley
 Switched to ConfigObj  | 
307  | 
                        continue
 | 
308  | 
except KeyError:  | 
|
309  | 
                    pass
 | 
|
| 
1442.1.12
by Robert Collins
 LocationConfig section retrieval falls into my lap  | 
310  | 
matches.append((len(section_names), section))  | 
311  | 
if not len(matches):  | 
|
312  | 
return None  | 
|
313  | 
matches.sort(reverse=True)  | 
|
314  | 
return matches[0][1]  | 
|
| 
1442.1.9
by Robert Collins
 exact section test passes  | 
315  | 
|
| 
1442.1.59
by Robert Collins
 Add re-sign command to generate a digital signature on a single revision.  | 
316  | 
def _gpg_signing_command(self):  | 
| 
1442.1.56
by Robert Collins
 gpg_signing_command configuration item  | 
317  | 
"""See Config.gpg_signing_command."""  | 
| 
1442.1.59
by Robert Collins
 Add re-sign command to generate a digital signature on a single revision.  | 
318  | 
command = super(LocationConfig, self)._gpg_signing_command()  | 
| 
1442.1.56
by Robert Collins
 gpg_signing_command configuration item  | 
319  | 
if command is not None:  | 
320  | 
return command  | 
|
| 
1442.1.59
by Robert Collins
 Add re-sign command to generate a digital signature on a single revision.  | 
321  | 
return self._get_global_config()._gpg_signing_command()  | 
| 
1442.1.56
by Robert Collins
 gpg_signing_command configuration item  | 
322  | 
|
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
323  | 
def _get_user_id(self):  | 
| 
1442.1.18
by Robert Collins
 permit per branch location overriding of signature checking policy  | 
324  | 
user_id = super(LocationConfig, self)._get_user_id()  | 
325  | 
if user_id is not None:  | 
|
326  | 
return user_id  | 
|
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
327  | 
return self._get_global_config()._get_user_id()  | 
328  | 
||
| 
1442.1.69
by Robert Collins
 config.Config has a 'get_user_option' call that accepts an option name.  | 
329  | 
def _get_user_option(self, option_name):  | 
330  | 
"""See Config._get_user_option."""  | 
|
331  | 
option_value = super(LocationConfig,  | 
|
332  | 
self)._get_user_option(option_name)  | 
|
333  | 
if option_value is not None:  | 
|
334  | 
return option_value  | 
|
335  | 
return self._get_global_config()._get_user_option(option_name)  | 
|
336  | 
||
| 
1442.1.18
by Robert Collins
 permit per branch location overriding of signature checking policy  | 
337  | 
def _get_signature_checking(self):  | 
338  | 
"""See Config._get_signature_checking."""  | 
|
339  | 
check = super(LocationConfig, self)._get_signature_checking()  | 
|
340  | 
if check is not None:  | 
|
341  | 
return check  | 
|
342  | 
return self._get_global_config()._get_signature_checking()  | 
|
343  | 
||
| 
1472
by Robert Collins
 post commit hook, first pass implementation  | 
344  | 
def _post_commit(self):  | 
345  | 
"""See Config.post_commit."""  | 
|
346  | 
hook = self._get_user_option('post_commit')  | 
|
347  | 
if hook is not None:  | 
|
348  | 
return hook  | 
|
349  | 
return self._get_global_config()._post_commit()  | 
|
350  | 
||
| 
1490
by Robert Collins
 Implement a 'bzr push' command, with saved locations; update diff to return 1.  | 
351  | 
def set_user_option(self, option, value):  | 
352  | 
"""Save option and its value in the configuration."""  | 
|
353  | 
        # FIXME: RBC 20051029 This should refresh the parser and also take a
 | 
|
354  | 
        # file lock on branches.conf.
 | 
|
355  | 
if not os.path.isdir(os.path.dirname(self._get_filename())):  | 
|
356  | 
os.mkdir(os.path.dirname(self._get_filename()))  | 
|
357  | 
location = self.location  | 
|
358  | 
if location.endswith('/'):  | 
|
359  | 
location = location[:-1]  | 
|
360  | 
if (not location in self._get_parser() and  | 
|
361  | 
not location + '/' in self._get_parser()):  | 
|
362  | 
self._get_parser()[location]={}  | 
|
363  | 
elif location + '/' in self._get_parser():  | 
|
364  | 
location = location + '/'  | 
|
365  | 
self._get_parser()[location][option]=value  | 
|
366  | 
self._get_parser().write()  | 
|
367  | 
||
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
368  | 
|
369  | 
class BranchConfig(Config):  | 
|
370  | 
"""A configuration object giving the policy for a branch."""  | 
|
371  | 
||
372  | 
def _get_location_config(self):  | 
|
373  | 
if self._location_config is None:  | 
|
374  | 
self._location_config = LocationConfig(self.branch.base)  | 
|
375  | 
return self._location_config  | 
|
376  | 
||
377  | 
def _get_user_id(self):  | 
|
378  | 
"""Return the full user id for the branch.  | 
|
379  | 
    
 | 
|
380  | 
        e.g. "John Hacker <jhacker@foo.org>"
 | 
|
381  | 
        This is looked up in the email controlfile for the branch.
 | 
|
382  | 
        """
 | 
|
383  | 
try:  | 
|
384  | 
return (self.branch.controlfile("email", "r")  | 
|
385  | 
.read()  | 
|
386  | 
.decode(bzrlib.user_encoding)  | 
|
387  | 
.rstrip("\r\n"))  | 
|
388  | 
except errors.NoSuchFile, e:  | 
|
389  | 
            pass
 | 
|
390  | 
||
391  | 
return self._get_location_config()._get_user_id()  | 
|
392  | 
||
| 
1442.1.19
by Robert Collins
 BranchConfigs inherit signature_checking policy from their LocationConfig.  | 
393  | 
def _get_signature_checking(self):  | 
394  | 
"""See Config._get_signature_checking."""  | 
|
395  | 
return self._get_location_config()._get_signature_checking()  | 
|
396  | 
||
| 
1442.1.69
by Robert Collins
 config.Config has a 'get_user_option' call that accepts an option name.  | 
397  | 
def _get_user_option(self, option_name):  | 
398  | 
"""See Config._get_user_option."""  | 
|
399  | 
return self._get_location_config()._get_user_option(option_name)  | 
|
400  | 
||
| 
1442.1.59
by Robert Collins
 Add re-sign command to generate a digital signature on a single revision.  | 
401  | 
def _gpg_signing_command(self):  | 
| 
1442.1.56
by Robert Collins
 gpg_signing_command configuration item  | 
402  | 
"""See Config.gpg_signing_command."""  | 
| 
1442.1.59
by Robert Collins
 Add re-sign command to generate a digital signature on a single revision.  | 
403  | 
return self._get_location_config()._gpg_signing_command()  | 
| 
1442.1.56
by Robert Collins
 gpg_signing_command configuration item  | 
404  | 
|
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
405  | 
def __init__(self, branch):  | 
406  | 
super(BranchConfig, self).__init__()  | 
|
407  | 
self._location_config = None  | 
|
408  | 
self.branch = branch  | 
|
| 
1442.1.2
by Robert Collins
 create a config module - there is enough config logic to make this worthwhile, and start testing config processing.  | 
409  | 
|
| 
1472
by Robert Collins
 post commit hook, first pass implementation  | 
410  | 
def _post_commit(self):  | 
411  | 
"""See Config.post_commit."""  | 
|
412  | 
return self._get_location_config()._post_commit()  | 
|
413  | 
||
| 
1442.1.1
by Robert Collins
 move config_dir into bzrlib.config  | 
414  | 
|
415  | 
def config_dir():  | 
|
416  | 
"""Return per-user configuration directory.  | 
|
417  | 
||
| 
1442.1.2
by Robert Collins
 create a config module - there is enough config logic to make this worthwhile, and start testing config processing.  | 
418  | 
    By default this is ~/.bazaar/
 | 
| 
1442.1.1
by Robert Collins
 move config_dir into bzrlib.config  | 
419  | 
    
 | 
420  | 
    TODO: Global option --config-dir to override this.
 | 
|
421  | 
    """
 | 
|
| 
1442.1.2
by Robert Collins
 create a config module - there is enough config logic to make this worthwhile, and start testing config processing.  | 
422  | 
return os.path.join(os.path.expanduser("~"), ".bazaar")  | 
423  | 
||
424  | 
||
425  | 
def config_filename():  | 
|
426  | 
"""Return per-user configuration ini file filename."""  | 
|
427  | 
return os.path.join(config_dir(), 'bazaar.conf')  | 
|
428  | 
||
429  | 
||
| 
1442.1.6
by Robert Collins
 first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs  | 
430  | 
def branches_config_filename():  | 
431  | 
"""Return per-user configuration ini file filename."""  | 
|
432  | 
return os.path.join(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.  | 
433  | 
|
434  | 
||
435  | 
def _auto_user_id():  | 
|
436  | 
"""Calculate automatic user identification.  | 
|
437  | 
||
438  | 
    Returns (realname, email).
 | 
|
439  | 
||
440  | 
    Only used when none is set in the environment or the id file.
 | 
|
441  | 
||
442  | 
    This previously used the FQDN as the default domain, but that can
 | 
|
443  | 
    be very slow on machines where DNS is broken.  So now we simply
 | 
|
444  | 
    use the hostname.
 | 
|
445  | 
    """
 | 
|
446  | 
import socket  | 
|
447  | 
||
448  | 
    # XXX: Any good way to get real user name on win32?
 | 
|
449  | 
||
450  | 
try:  | 
|
451  | 
import pwd  | 
|
452  | 
uid = os.getuid()  | 
|
453  | 
w = pwd.getpwuid(uid)  | 
|
454  | 
gecos = w.pw_gecos.decode(bzrlib.user_encoding)  | 
|
455  | 
username = w.pw_name.decode(bzrlib.user_encoding)  | 
|
456  | 
comma = gecos.find(',')  | 
|
457  | 
if comma == -1:  | 
|
458  | 
realname = gecos  | 
|
459  | 
else:  | 
|
460  | 
realname = gecos[:comma]  | 
|
461  | 
if not realname:  | 
|
462  | 
realname = username  | 
|
463  | 
||
464  | 
except ImportError:  | 
|
465  | 
import getpass  | 
|
466  | 
realname = username = getpass.getuser().decode(bzrlib.user_encoding)  | 
|
467  | 
||
468  | 
return realname, (username + '@' + socket.gethostname())  | 
|
469  | 
||
470  | 
||
| 
1185.16.52
by Martin Pool
 - add extract_email_address  | 
471  | 
def extract_email_address(e):  | 
472  | 
"""Return just the address part of an email string.  | 
|
473  | 
    
 | 
|
474  | 
    That is just the user@domain part, nothing else. 
 | 
|
475  | 
    This part is required to contain only ascii characters.
 | 
|
476  | 
    If it can't be extracted, raises an error.
 | 
|
477  | 
    
 | 
|
478  | 
    >>> extract_email_address('Jane Tester <jane@test.com>')
 | 
|
479  | 
    "jane@test.com"
 | 
|
480  | 
    """
 | 
|
481  | 
m = re.search(r'[\w+.-]+@[\w+.-]+', e)  | 
|
482  | 
if not m:  | 
|
483  | 
raise BzrError("%r doesn't seem to contain "  | 
|
484  | 
"a reasonable email address" % e)  | 
|
485  | 
return m.group(0)  |