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
|
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
21 |
and ~/.bazaar/locations.conf, which is written to by bzr.
|
1442.1.20
by Robert Collins
add some documentation on options |
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
|
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
30 |
log_format=name-of-format
|
1442.1.20
by Robert Collins
add some documentation on options |
31 |
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
32 |
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 |
33 |
Wildcards may be used - * and ? as normal in shell completion. Options
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
34 |
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 |
35 |
setting.
|
36 |
[/home/robertc/source]
|
|
37 |
recurse=False|True(default)
|
|
38 |
email= as above
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
39 |
check_signatures= as above
|
1442.1.20
by Robert Collins
add some documentation on options |
40 |
create_signatures= as above.
|
41 |
||
42 |
explanation of options
|
|
43 |
----------------------
|
|
44 |
editor - this option sets the pop up editor to use during commits.
|
|
45 |
email - this option sets the user id bzr will use when committing.
|
|
46 |
check_signatures - this option controls whether bzr will require good gpg
|
|
47 |
signatures, ignore them, or check them if they are
|
|
48 |
present.
|
|
49 |
create_signatures - this option controls whether bzr will always create
|
|
50 |
gpg signatures, never create them, or create them if the
|
|
51 |
branch is configured to require them.
|
|
1553.2.4
by Erik Bågfors
Support for setting the default log format at a configuration option |
52 |
log_format - This options set the default log format. Options are long,
|
53 |
short, line, or a plugin can register new formats
|
|
1553.6.2
by Erik Bågfors
documentation and NEWS |
54 |
|
55 |
In bazaar.conf you can also define aliases in the ALIASES sections, example
|
|
56 |
||
57 |
[ALIASES]
|
|
58 |
lastlog=log --line -r-10..-1
|
|
59 |
ll=log --line -r-10..-1
|
|
60 |
h=help
|
|
61 |
up=pull
|
|
1442.1.20
by Robert Collins
add some documentation on options |
62 |
"""
|
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
63 |
|
1474
by Robert Collins
Merge from Aaron Bentley. |
64 |
|
65 |
import errno |
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
66 |
from fnmatch import fnmatch |
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
67 |
import os |
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
68 |
import re |
1185.38.1
by John Arbash Meinel
Adding my win32 patch for moving the home directory. |
69 |
import sys |
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
70 |
from StringIO 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. |
71 |
|
72 |
import bzrlib |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
73 |
import bzrlib.errors as errors |
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 \ |
74 |
from bzrlib.osutils import pathjoin |
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
75 |
from bzrlib.trace import mutter, warning |
1474
by Robert Collins
Merge from Aaron Bentley. |
76 |
import bzrlib.util.configobj.configobj as configobj |
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
77 |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
78 |
|
1442.1.14
by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE |
79 |
CHECK_IF_POSSIBLE=0 |
80 |
CHECK_ALWAYS=1 |
|
81 |
CHECK_NEVER=2 |
|
82 |
||
83 |
||
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
84 |
SIGN_WHEN_REQUIRED=0 |
85 |
SIGN_ALWAYS=1 |
|
86 |
SIGN_NEVER=2 |
|
87 |
||
88 |
||
1474
by Robert Collins
Merge from Aaron Bentley. |
89 |
class ConfigObj(configobj.ConfigObj): |
90 |
||
91 |
def get_bool(self, section, key): |
|
1556.2.2
by Aaron Bentley
Fixed get_bool |
92 |
return self[section].as_bool(key) |
1474
by Robert Collins
Merge from Aaron Bentley. |
93 |
|
94 |
def get_value(self, section, name): |
|
95 |
# Try [] for the old DEFAULT section.
|
|
96 |
if section == "DEFAULT": |
|
97 |
try: |
|
98 |
return self[name] |
|
99 |
except KeyError: |
|
100 |
pass
|
|
101 |
return self[section][name] |
|
102 |
||
103 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
104 |
class Config(object): |
105 |
"""A configuration policy - what username, editor, gpg needs etc."""
|
|
106 |
||
107 |
def get_editor(self): |
|
108 |
"""Get the users pop up editor."""
|
|
109 |
raise NotImplementedError |
|
110 |
||
1442.1.15
by Robert Collins
make getting the signature checking policy a template method |
111 |
def _get_signature_checking(self): |
112 |
"""Template method to override signature checking policy."""
|
|
113 |
||
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
114 |
def _get_signing_policy(self): |
115 |
"""Template method to override signature creation policy."""
|
|
116 |
||
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
117 |
def _get_user_option(self, option_name): |
118 |
"""Template method to provide a user option."""
|
|
119 |
return None |
|
120 |
||
121 |
def get_user_option(self, option_name): |
|
122 |
"""Get a generic option - no special process, no default."""
|
|
123 |
return self._get_user_option(option_name) |
|
124 |
||
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
125 |
def gpg_signing_command(self): |
126 |
"""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. |
127 |
result = self._gpg_signing_command() |
128 |
if result is None: |
|
129 |
result = "gpg" |
|
130 |
return result |
|
131 |
||
132 |
def _gpg_signing_command(self): |
|
133 |
"""See gpg_signing_command()."""
|
|
134 |
return None |
|
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
135 |
|
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
136 |
def log_format(self): |
137 |
"""What log format should be used"""
|
|
138 |
result = self._log_format() |
|
1553.2.4
by Erik Bågfors
Support for setting the default log format at a configuration option |
139 |
if result is None: |
140 |
result = "long" |
|
141 |
return result |
|
142 |
||
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
143 |
def _log_format(self): |
144 |
"""See log_format()."""
|
|
1553.2.4
by Erik Bågfors
Support for setting the default log format at a configuration option |
145 |
return None |
146 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
147 |
def __init__(self): |
148 |
super(Config, self).__init__() |
|
149 |
||
1472
by Robert Collins
post commit hook, first pass implementation |
150 |
def post_commit(self): |
151 |
"""An ordered list of python functions to call.
|
|
152 |
||
153 |
Each function takes branch, rev_id as parameters.
|
|
154 |
"""
|
|
155 |
return self._post_commit() |
|
156 |
||
157 |
def _post_commit(self): |
|
158 |
"""See Config.post_commit."""
|
|
159 |
return None |
|
160 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
161 |
def user_email(self): |
162 |
"""Return just the email component of a username."""
|
|
1185.33.31
by Martin Pool
Make annotate cope better with revisions committed without a valid |
163 |
return extract_email_address(self.username()) |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
164 |
|
165 |
def username(self): |
|
166 |
"""Return email-style username.
|
|
167 |
|
|
168 |
Something similar to 'Martin Pool <mbp@sourcefrog.net>'
|
|
169 |
|
|
170 |
$BZREMAIL can be set to override this, then
|
|
171 |
the concrete policy type is checked, and finally
|
|
1185.37.2
by Jamie Wilkinson
Fix a typo and grammar in Config.username() docstring. |
172 |
$EMAIL is examined.
|
173 |
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 |
174 |
created.
|
175 |
|
|
176 |
TODO: Check it's reasonably well-formed.
|
|
177 |
"""
|
|
178 |
v = os.environ.get('BZREMAIL') |
|
179 |
if v: |
|
180 |
return v.decode(bzrlib.user_encoding) |
|
181 |
||
182 |
v = self._get_user_id() |
|
183 |
if v: |
|
184 |
return v |
|
185 |
||
186 |
v = os.environ.get('EMAIL') |
|
187 |
if v: |
|
188 |
return v.decode(bzrlib.user_encoding) |
|
189 |
||
190 |
name, email = _auto_user_id() |
|
191 |
if name: |
|
192 |
return '%s <%s>' % (name, email) |
|
193 |
else: |
|
194 |
return email |
|
195 |
||
1442.1.14
by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE |
196 |
def signature_checking(self): |
197 |
"""What is the current policy for signature checking?."""
|
|
1442.1.15
by Robert Collins
make getting the signature checking policy a template method |
198 |
policy = self._get_signature_checking() |
199 |
if policy is not None: |
|
200 |
return policy |
|
1442.1.14
by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE |
201 |
return CHECK_IF_POSSIBLE |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
202 |
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
203 |
def signing_policy(self): |
204 |
"""What is the current policy for signature checking?."""
|
|
205 |
policy = self._get_signing_policy() |
|
206 |
if policy is not None: |
|
207 |
return policy |
|
208 |
return SIGN_WHEN_REQUIRED |
|
209 |
||
1442.1.21
by Robert Collins
create signature_needed() call for commit to trigger creating signatures |
210 |
def signature_needed(self): |
211 |
"""Is a signature needed when committing ?."""
|
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
212 |
policy = self._get_signing_policy() |
213 |
if policy is None: |
|
214 |
policy = self._get_signature_checking() |
|
215 |
if policy is not None: |
|
216 |
warning("Please use create_signatures, not check_signatures " |
|
217 |
"to set signing policy.") |
|
218 |
if policy == CHECK_ALWAYS: |
|
219 |
return True |
|
220 |
elif policy == SIGN_ALWAYS: |
|
1442.1.21
by Robert Collins
create signature_needed() call for commit to trigger creating signatures |
221 |
return True |
222 |
return False |
|
223 |
||
1553.6.12
by Erik Bågfors
remove AliasConfig, based on input from abentley |
224 |
def get_alias(self, value): |
225 |
return self._get_alias(value) |
|
226 |
||
227 |
def _get_alias(self, value): |
|
228 |
pass
|
|
229 |
||
1770.2.7
by Aaron Bentley
Set/get nickname using BranchConfig |
230 |
def get_nickname(self): |
231 |
return self._get_nickname() |
|
232 |
||
233 |
def _get_nickname(self): |
|
234 |
return None |
|
235 |
||
1442.1.15
by Robert Collins
make getting the signature checking policy a template method |
236 |
|
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
237 |
class IniBasedConfig(Config): |
238 |
"""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 |
239 |
|
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
240 |
def _get_parser(self, file=None): |
1185.12.51
by Aaron Bentley
Allowed second call of _get_parser() to not require a file |
241 |
if self._parser is not None: |
242 |
return self._parser |
|
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
243 |
if file is None: |
244 |
input = self._get_filename() |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
245 |
else: |
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
246 |
input = file |
1185.12.51
by Aaron Bentley
Allowed second call of _get_parser() to not require a file |
247 |
try: |
1551.2.20
by Aaron Bentley
Treated config files as utf-8 |
248 |
self._parser = ConfigObj(input, encoding='utf-8') |
1474
by Robert Collins
Merge from Aaron Bentley. |
249 |
except configobj.ConfigObjError, e: |
1185.12.51
by Aaron Bentley
Allowed second call of _get_parser() to not require a file |
250 |
raise errors.ParseConfigError(e.errors, e.config.filename) |
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
251 |
return self._parser |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
252 |
|
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
253 |
def _get_section(self): |
254 |
"""Override this to define the section used by the config."""
|
|
255 |
return "DEFAULT" |
|
256 |
||
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
257 |
def _get_signature_checking(self): |
258 |
"""See Config._get_signature_checking."""
|
|
1474
by Robert Collins
Merge from Aaron Bentley. |
259 |
policy = self._get_user_option('check_signatures') |
260 |
if policy: |
|
261 |
return self._string_to_signature_policy(policy) |
|
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
262 |
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
263 |
def _get_signing_policy(self): |
1773.4.3
by Martin Pool
[merge] bzr.dev |
264 |
"""See Config._get_signing_policy"""
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
265 |
policy = self._get_user_option('create_signatures') |
266 |
if policy: |
|
267 |
return self._string_to_signing_policy(policy) |
|
268 |
||
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
269 |
def _get_user_id(self): |
270 |
"""Get the user id from the 'email' key in the current section."""
|
|
1474
by Robert Collins
Merge from Aaron Bentley. |
271 |
return self._get_user_option('email') |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
272 |
|
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
273 |
def _get_user_option(self, option_name): |
274 |
"""See Config._get_user_option."""
|
|
1185.12.53
by Aaron Bentley
Merged more from Robert |
275 |
try: |
1474
by Robert Collins
Merge from Aaron Bentley. |
276 |
return self._get_parser().get_value(self._get_section(), |
277 |
option_name) |
|
1185.12.53
by Aaron Bentley
Merged more from Robert |
278 |
except KeyError: |
279 |
pass
|
|
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
280 |
|
1442.1.59
by Robert Collins
Add re-sign command to generate a digital signature on a single revision. |
281 |
def _gpg_signing_command(self): |
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
282 |
"""See Config.gpg_signing_command."""
|
1472
by Robert Collins
post commit hook, first pass implementation |
283 |
return self._get_user_option('gpg_signing_command') |
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
284 |
|
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
285 |
def _log_format(self): |
286 |
"""See Config.log_format."""
|
|
287 |
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 |
288 |
|
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
289 |
def __init__(self, get_filename): |
290 |
super(IniBasedConfig, self).__init__() |
|
291 |
self._get_filename = get_filename |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
292 |
self._parser = None |
1472
by Robert Collins
post commit hook, first pass implementation |
293 |
|
294 |
def _post_commit(self): |
|
295 |
"""See Config.post_commit."""
|
|
296 |
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 |
297 |
|
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
298 |
def _string_to_signature_policy(self, signature_string): |
299 |
"""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 |
300 |
if signature_string.lower() == 'check-available': |
301 |
return CHECK_IF_POSSIBLE |
|
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
302 |
if signature_string.lower() == 'ignore': |
303 |
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 |
304 |
if signature_string.lower() == 'require': |
305 |
return CHECK_ALWAYS |
|
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
306 |
raise errors.BzrError("Invalid signatures policy '%s'" |
307 |
% signature_string) |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
308 |
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
309 |
def _string_to_signing_policy(self, signature_string): |
310 |
"""Convert a string to a signing policy."""
|
|
311 |
if signature_string.lower() == 'when-required': |
|
312 |
return SIGN_WHEN_REQUIRED |
|
313 |
if signature_string.lower() == 'never': |
|
314 |
return SIGN_NEVER |
|
315 |
if signature_string.lower() == 'always': |
|
316 |
return SIGN_ALWAYS |
|
317 |
raise errors.BzrError("Invalid signing policy '%s'" |
|
318 |
% signature_string) |
|
319 |
||
1553.6.12
by Erik Bågfors
remove AliasConfig, based on input from abentley |
320 |
def _get_alias(self, value): |
321 |
try: |
|
322 |
return self._get_parser().get_value("ALIASES", |
|
323 |
value) |
|
324 |
except KeyError: |
|
325 |
pass
|
|
326 |
||
1770.2.7
by Aaron Bentley
Set/get nickname using BranchConfig |
327 |
def _get_nickname(self): |
328 |
return self.get_user_option('nickname') |
|
329 |
||
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
330 |
|
331 |
class GlobalConfig(IniBasedConfig): |
|
332 |
"""The configuration that should be used for a specific location."""
|
|
333 |
||
334 |
def get_editor(self): |
|
1474
by Robert Collins
Merge from Aaron Bentley. |
335 |
return self._get_user_option('editor') |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
336 |
|
337 |
def __init__(self): |
|
338 |
super(GlobalConfig, self).__init__(config_filename) |
|
339 |
||
340 |
||
341 |
class LocationConfig(IniBasedConfig): |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
342 |
"""A configuration object that gives the policy for a location."""
|
343 |
||
344 |
def __init__(self, location): |
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
345 |
name_generator = locations_config_filename |
346 |
if (not os.path.exists(name_generator()) and |
|
347 |
os.path.exists(branches_config_filename())): |
|
348 |
warning('Please rename branches.conf to locations.conf') |
|
349 |
name_generator = branches_config_filename |
|
350 |
super(LocationConfig, self).__init__(name_generator) |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
351 |
self.location = location |
352 |
||
1442.1.9
by Robert Collins
exact section test passes |
353 |
def _get_section(self): |
354 |
"""Get the section we should look in for config items.
|
|
355 |
||
356 |
Returns None if none exists.
|
|
357 |
TODO: perhaps return a NullSection that thunks through to the
|
|
358 |
global config.
|
|
359 |
"""
|
|
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
360 |
sections = self._get_parser() |
1442.1.12
by Robert Collins
LocationConfig section retrieval falls into my lap |
361 |
location_names = self.location.split('/') |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
362 |
if self.location.endswith('/'): |
363 |
del location_names[-1] |
|
1442.1.12
by Robert Collins
LocationConfig section retrieval falls into my lap |
364 |
matches=[] |
1442.1.10
by Robert Collins
explicit over glob test passes |
365 |
for section in sections: |
1442.1.12
by Robert Collins
LocationConfig section retrieval falls into my lap |
366 |
section_names = section.split('/') |
367 |
if section.endswith('/'): |
|
368 |
del section_names[-1] |
|
369 |
names = zip(location_names, section_names) |
|
370 |
matched = True |
|
371 |
for name in names: |
|
372 |
if not fnmatch(name[0], name[1]): |
|
373 |
matched = False |
|
374 |
break
|
|
375 |
if not matched: |
|
376 |
continue
|
|
377 |
# so, for the common prefix they matched.
|
|
378 |
# if section is longer, no match.
|
|
379 |
if len(section_names) > len(location_names): |
|
380 |
continue
|
|
381 |
# if path is longer, and recurse is not true, no match
|
|
382 |
if len(section_names) < len(location_names): |
|
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
383 |
try: |
1551.2.20
by Aaron Bentley
Treated config files as utf-8 |
384 |
if not self._get_parser()[section].as_bool('recurse'): |
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
385 |
continue
|
386 |
except KeyError: |
|
387 |
pass
|
|
1442.1.12
by Robert Collins
LocationConfig section retrieval falls into my lap |
388 |
matches.append((len(section_names), section)) |
389 |
if not len(matches): |
|
390 |
return None |
|
391 |
matches.sort(reverse=True) |
|
392 |
return matches[0][1] |
|
1442.1.9
by Robert Collins
exact section test passes |
393 |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
394 |
def set_user_option(self, option, value): |
395 |
"""Save option and its value in the configuration."""
|
|
396 |
# FIXME: RBC 20051029 This should refresh the parser and also take a
|
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
397 |
# file lock on locations.conf.
|
1185.31.39
by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(), |
398 |
conf_dir = os.path.dirname(self._get_filename()) |
1185.31.43
by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp |
399 |
ensure_config_dir_exists(conf_dir) |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
400 |
location = self.location |
401 |
if location.endswith('/'): |
|
402 |
location = location[:-1] |
|
403 |
if (not location in self._get_parser() and |
|
404 |
not location + '/' in self._get_parser()): |
|
405 |
self._get_parser()[location]={} |
|
406 |
elif location + '/' in self._get_parser(): |
|
407 |
location = location + '/' |
|
408 |
self._get_parser()[location][option]=value |
|
1551.2.49
by abentley
Made ConfigObj output binary-identical files on win32 and *nix |
409 |
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. |
410 |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
411 |
|
412 |
class BranchConfig(Config): |
|
413 |
"""A configuration object giving the policy for a branch."""
|
|
414 |
||
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
415 |
def _get_branch_data_config(self): |
416 |
if self._branch_data_config is None: |
|
417 |
self._branch_data_config = TreeConfig(self.branch) |
|
418 |
return self._branch_data_config |
|
419 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
420 |
def _get_location_config(self): |
421 |
if self._location_config is None: |
|
422 |
self._location_config = LocationConfig(self.branch.base) |
|
423 |
return self._location_config |
|
424 |
||
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
425 |
def _get_global_config(self): |
426 |
if self._global_config is None: |
|
427 |
self._global_config = GlobalConfig() |
|
428 |
return self._global_config |
|
429 |
||
430 |
def _get_best_value(self, option_name): |
|
431 |
"""This returns a user option from local, tree or global config.
|
|
432 |
||
433 |
They are tried in that order. Use get_safe_value if trusted values
|
|
434 |
are necessary.
|
|
435 |
"""
|
|
436 |
for source in self.option_sources: |
|
437 |
value = getattr(source(), option_name)() |
|
438 |
if value is not None: |
|
439 |
return value |
|
440 |
return None |
|
441 |
||
442 |
def _get_safe_value(self, option_name): |
|
443 |
"""This variant of get_best_value never returns untrusted values.
|
|
444 |
|
|
445 |
It does not return values from the branch data, because the branch may
|
|
446 |
not be controlled by the user.
|
|
447 |
||
448 |
We may wish to allow locations.conf to control whether branches are
|
|
449 |
trusted in the future.
|
|
450 |
"""
|
|
451 |
for source in (self._get_location_config, self._get_global_config): |
|
452 |
value = getattr(source(), option_name)() |
|
453 |
if value is not None: |
|
454 |
return value |
|
455 |
return None |
|
456 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
457 |
def _get_user_id(self): |
458 |
"""Return the full user id for the branch.
|
|
459 |
|
|
460 |
e.g. "John Hacker <jhacker@foo.org>"
|
|
461 |
This is looked up in the email controlfile for the branch.
|
|
462 |
"""
|
|
463 |
try: |
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
464 |
return (self.branch.control_files.get_utf8("email") |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
465 |
.read() |
466 |
.decode(bzrlib.user_encoding) |
|
467 |
.rstrip("\r\n")) |
|
468 |
except errors.NoSuchFile, e: |
|
469 |
pass
|
|
470 |
||
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
471 |
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 |
472 |
|
1442.1.19
by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig. |
473 |
def _get_signature_checking(self): |
474 |
"""See Config._get_signature_checking."""
|
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
475 |
return self._get_best_value('_get_signature_checking') |
1442.1.19
by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig. |
476 |
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
477 |
def _get_signing_policy(self): |
478 |
"""See Config._get_signing_policy."""
|
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
479 |
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 |
480 |
|
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
481 |
def _get_user_option(self, option_name): |
482 |
"""See Config._get_user_option."""
|
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
483 |
for source in self.option_sources: |
484 |
value = source()._get_user_option(option_name) |
|
485 |
if value is not None: |
|
486 |
return value |
|
487 |
return None |
|
488 |
||
489 |
def set_user_option(self, name, value, local=False): |
|
490 |
if local is True: |
|
491 |
self._get_location_config().set_user_option(name, value) |
|
492 |
else: |
|
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
493 |
self._get_branch_data_config().set_option(value, name) |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
494 |
|
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
495 |
|
1442.1.59
by Robert Collins
Add re-sign command to generate a digital signature on a single revision. |
496 |
def _gpg_signing_command(self): |
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
497 |
"""See Config.gpg_signing_command."""
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
498 |
return self._get_safe_value('_gpg_signing_command') |
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
499 |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
500 |
def __init__(self, branch): |
501 |
super(BranchConfig, self).__init__() |
|
502 |
self._location_config = None |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
503 |
self._branch_data_config = None |
504 |
self._global_config = None |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
505 |
self.branch = branch |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
506 |
self.option_sources = (self._get_location_config, |
507 |
self._get_branch_data_config, |
|
508 |
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. |
509 |
|
1472
by Robert Collins
post commit hook, first pass implementation |
510 |
def _post_commit(self): |
511 |
"""See Config.post_commit."""
|
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
512 |
return self._get_safe_value('_post_commit') |
1472
by Robert Collins
post commit hook, first pass implementation |
513 |
|
1770.2.7
by Aaron Bentley
Set/get nickname using BranchConfig |
514 |
def _get_nickname(self): |
515 |
value = self._get_best_value('_get_nickname') |
|
516 |
if value is not None: |
|
517 |
return value |
|
518 |
return self.branch.base.split('/')[-2] |
|
519 |
||
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
520 |
def _log_format(self): |
521 |
"""See Config.log_format."""
|
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
522 |
return self._get_best_value('_log_format') |
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
523 |
|
1553.6.12
by Erik Bågfors
remove AliasConfig, based on input from abentley |
524 |
|
1185.31.43
by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp |
525 |
def ensure_config_dir_exists(path=None): |
526 |
"""Make sure a configuration directory exists.
|
|
527 |
This makes sure that the directory exists.
|
|
528 |
On windows, since configuration directories are 2 levels deep,
|
|
529 |
it makes sure both the directory and the parent directory exists.
|
|
530 |
"""
|
|
531 |
if path is None: |
|
532 |
path = config_dir() |
|
533 |
if not os.path.isdir(path): |
|
534 |
if sys.platform == 'win32': |
|
535 |
parent_dir = os.path.dirname(path) |
|
536 |
if not os.path.isdir(parent_dir): |
|
537 |
mutter('creating config parent directory: %r', parent_dir) |
|
538 |
os.mkdir(parent_dir) |
|
539 |
mutter('creating config directory: %r', path) |
|
540 |
os.mkdir(path) |
|
541 |
||
1532
by Robert Collins
Merge in John Meinels integration branch. |
542 |
|
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
543 |
def config_dir(): |
544 |
"""Return per-user configuration directory.
|
|
545 |
||
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
546 |
By default this is ~/.bazaar/
|
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
547 |
|
548 |
TODO: Global option --config-dir to override this.
|
|
549 |
"""
|
|
1185.38.1
by John Arbash Meinel
Adding my win32 patch for moving the home directory. |
550 |
base = os.environ.get('BZR_HOME', None) |
551 |
if sys.platform == 'win32': |
|
552 |
if base is None: |
|
553 |
base = os.environ.get('APPDATA', None) |
|
554 |
if base is None: |
|
555 |
base = os.environ.get('HOME', None) |
|
556 |
if base is None: |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
557 |
raise errors.BzrError('You must have one of BZR_HOME, APPDATA, or HOME set') |
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 \ |
558 |
return pathjoin(base, 'bazaar', '2.0') |
1185.38.1
by John Arbash Meinel
Adding my win32 patch for moving the home directory. |
559 |
else: |
560 |
# cygwin, linux, and darwin all have a $HOME directory
|
|
561 |
if base is None: |
|
562 |
base = os.path.expanduser("~") |
|
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 \ |
563 |
return pathjoin(base, ".bazaar") |
564 |
||
565 |
||
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
566 |
def config_filename(): |
567 |
"""Return per-user configuration ini file filename."""
|
|
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 \ |
568 |
return 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. |
569 |
|
570 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
571 |
def branches_config_filename(): |
572 |
"""Return per-user configuration ini file filename."""
|
|
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 \ |
573 |
return 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. |
574 |
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
575 |
def locations_config_filename(): |
576 |
"""Return per-user configuration ini file filename."""
|
|
577 |
return pathjoin(config_dir(), 'locations.conf') |
|
578 |
||
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
579 |
|
580 |
def _auto_user_id(): |
|
581 |
"""Calculate automatic user identification.
|
|
582 |
||
583 |
Returns (realname, email).
|
|
584 |
||
585 |
Only used when none is set in the environment or the id file.
|
|
586 |
||
587 |
This previously used the FQDN as the default domain, but that can
|
|
588 |
be very slow on machines where DNS is broken. So now we simply
|
|
589 |
use the hostname.
|
|
590 |
"""
|
|
591 |
import socket |
|
592 |
||
593 |
# XXX: Any good way to get real user name on win32?
|
|
594 |
||
595 |
try: |
|
596 |
import pwd |
|
597 |
uid = os.getuid() |
|
598 |
w = pwd.getpwuid(uid) |
|
1553.4.5
by Michael Ellerman
Produce an intelligible error if the user's /etc/passwd is not encoded in |
599 |
|
600 |
try: |
|
601 |
gecos = w.pw_gecos.decode(bzrlib.user_encoding) |
|
602 |
username = w.pw_name.decode(bzrlib.user_encoding) |
|
603 |
except UnicodeDecodeError: |
|
604 |
# We're using pwd, therefore we're on Unix, so /etc/passwd is ok.
|
|
605 |
raise errors.BzrError("Can't decode username in " \ |
|
606 |
"/etc/passwd as %s." % bzrlib.user_encoding) |
|
607 |
||
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
608 |
comma = gecos.find(',') |
609 |
if comma == -1: |
|
610 |
realname = gecos |
|
611 |
else: |
|
612 |
realname = gecos[:comma] |
|
613 |
if not realname: |
|
614 |
realname = username |
|
615 |
||
616 |
except ImportError: |
|
617 |
import getpass |
|
1553.4.5
by Michael Ellerman
Produce an intelligible error if the user's /etc/passwd is not encoded in |
618 |
try: |
619 |
realname = username = getpass.getuser().decode(bzrlib.user_encoding) |
|
620 |
except UnicodeDecodeError: |
|
621 |
raise errors.BzrError("Can't decode username as %s." % \ |
|
622 |
bzrlib.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. |
623 |
|
624 |
return realname, (username + '@' + socket.gethostname()) |
|
625 |
||
626 |
||
1185.16.52
by Martin Pool
- add extract_email_address |
627 |
def extract_email_address(e): |
628 |
"""Return just the address part of an email string.
|
|
629 |
|
|
630 |
That is just the user@domain part, nothing else.
|
|
631 |
This part is required to contain only ascii characters.
|
|
632 |
If it can't be extracted, raises an error.
|
|
633 |
|
|
634 |
>>> extract_email_address('Jane Tester <jane@test.com>')
|
|
635 |
"jane@test.com"
|
|
636 |
"""
|
|
637 |
m = re.search(r'[\w+.-]+@[\w+.-]+', e) |
|
638 |
if not m: |
|
1185.33.31
by Martin Pool
Make annotate cope better with revisions committed without a valid |
639 |
raise errors.BzrError("%r doesn't seem to contain " |
640 |
"a reasonable email address" % e) |
|
1185.16.52
by Martin Pool
- add extract_email_address |
641 |
return m.group(0) |
1185.35.11
by Aaron Bentley
Added support for branch nicks |
642 |
|
1185.85.30
by John Arbash Meinel
Fixing 'bzr push' exposed that IniBasedConfig didn't handle unicode. |
643 |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
644 |
class TreeConfig(IniBasedConfig): |
1185.35.11
by Aaron Bentley
Added support for branch nicks |
645 |
"""Branch configuration data associated with its contents, not location"""
|
646 |
def __init__(self, branch): |
|
647 |
self.branch = branch |
|
648 |
||
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
649 |
def _get_parser(self, file=None): |
650 |
if file is not None: |
|
651 |
return IniBasedConfig._get_parser(file) |
|
652 |
return self._get_config() |
|
653 |
||
1185.35.11
by Aaron Bentley
Added support for branch nicks |
654 |
def _get_config(self): |
655 |
try: |
|
1556.2.1
by Aaron Bentley
Switched to ConfigObj 4.2.0 |
656 |
obj = ConfigObj(self.branch.control_files.get('branch.conf'), |
657 |
encoding='utf-8') |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
658 |
except errors.NoSuchFile: |
1556.2.1
by Aaron Bentley
Switched to ConfigObj 4.2.0 |
659 |
obj = ConfigObj(encoding='utf=8') |
1185.35.11
by Aaron Bentley
Added support for branch nicks |
660 |
return obj |
661 |
||
662 |
def get_option(self, name, section=None, default=None): |
|
663 |
self.branch.lock_read() |
|
664 |
try: |
|
665 |
obj = self._get_config() |
|
666 |
try: |
|
667 |
if section is not None: |
|
668 |
obj[section] |
|
669 |
result = obj[name] |
|
670 |
except KeyError: |
|
671 |
result = default |
|
672 |
finally: |
|
673 |
self.branch.unlock() |
|
674 |
return result |
|
675 |
||
676 |
def set_option(self, value, name, section=None): |
|
677 |
"""Set a per-branch configuration option"""
|
|
678 |
self.branch.lock_write() |
|
679 |
try: |
|
680 |
cfg_obj = self._get_config() |
|
681 |
if section is None: |
|
682 |
obj = cfg_obj |
|
683 |
else: |
|
684 |
try: |
|
685 |
obj = cfg_obj[section] |
|
686 |
except KeyError: |
|
687 |
cfg_obj[section] = {} |
|
688 |
obj = cfg_obj[section] |
|
689 |
obj[name] = value |
|
1556.2.1
by Aaron Bentley
Switched to ConfigObj 4.2.0 |
690 |
out_file = StringIO() |
691 |
cfg_obj.write(out_file) |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
692 |
out_file.seek(0) |
1185.65.12
by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8. |
693 |
self.branch.control_files.put('branch.conf', out_file) |
1185.35.11
by Aaron Bentley
Added support for branch nicks |
694 |
finally: |
695 |
self.branch.unlock() |