2323.6.2
by Martin Pool
Move responsibility for suggesting upgrades to ui object |
1 |
# Copyright (C) 2005, 2007 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
|
|
73 |
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. |
74 |
|
75 |
import bzrlib
|
|
1996.3.31
by John Arbash Meinel
Make bzrlib.config use lazy importing |
76 |
from bzrlib import (
|
77 |
errors,
|
|
78 |
osutils,
|
|
2120.6.9
by James Henstridge
Fixes for issues brought up in John's review |
79 |
symbol_versioning,
|
1996.3.31
by John Arbash Meinel
Make bzrlib.config use lazy importing |
80 |
urlutils,
|
2245.4.3
by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils |
81 |
win32utils,
|
1996.3.31
by John Arbash Meinel
Make bzrlib.config use lazy importing |
82 |
)
|
83 |
import bzrlib.util.configobj.configobj as configobj
|
|
84 |
""") |
|
85 |
||
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
86 |
from bzrlib.trace import mutter, warning |
87 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
88 |
|
1442.1.14
by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE |
89 |
CHECK_IF_POSSIBLE=0 |
90 |
CHECK_ALWAYS=1 |
|
91 |
CHECK_NEVER=2 |
|
92 |
||
93 |
||
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
94 |
SIGN_WHEN_REQUIRED=0 |
95 |
SIGN_ALWAYS=1 |
|
96 |
SIGN_NEVER=2 |
|
97 |
||
98 |
||
2120.6.1
by James Henstridge
add support for norecurse and appendpath policies when reading configuration files |
99 |
POLICY_NONE = 0 |
100 |
POLICY_NORECURSE = 1 |
|
101 |
POLICY_APPENDPATH = 2 |
|
102 |
||
2120.6.8
by James Henstridge
Change syntax for setting config option policies. Rather than |
103 |
_policy_name = { |
104 |
POLICY_NONE: None, |
|
105 |
POLICY_NORECURSE: 'norecurse', |
|
106 |
POLICY_APPENDPATH: 'appendpath', |
|
107 |
}
|
|
108 |
_policy_value = { |
|
109 |
None: POLICY_NONE, |
|
110 |
'none': POLICY_NONE, |
|
111 |
'norecurse': POLICY_NORECURSE, |
|
112 |
'appendpath': POLICY_APPENDPATH, |
|
113 |
}
|
|
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
114 |
|
115 |
||
116 |
STORE_LOCATION = POLICY_NONE |
|
117 |
STORE_LOCATION_NORECURSE = POLICY_NORECURSE |
|
118 |
STORE_LOCATION_APPENDPATH = POLICY_APPENDPATH |
|
119 |
STORE_BRANCH = 3 |
|
120 |
STORE_GLOBAL = 4 |
|
121 |
||
2120.6.1
by James Henstridge
add support for norecurse and appendpath policies when reading configuration files |
122 |
|
1474
by Robert Collins
Merge from Aaron Bentley. |
123 |
class ConfigObj(configobj.ConfigObj): |
124 |
||
125 |
def get_bool(self, section, key): |
|
1556.2.2
by Aaron Bentley
Fixed get_bool |
126 |
return self[section].as_bool(key) |
1474
by Robert Collins
Merge from Aaron Bentley. |
127 |
|
128 |
def get_value(self, section, name): |
|
129 |
# Try [] for the old DEFAULT section.
|
|
130 |
if section == "DEFAULT": |
|
131 |
try: |
|
132 |
return self[name] |
|
133 |
except KeyError: |
|
134 |
pass
|
|
135 |
return self[section][name] |
|
136 |
||
137 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
138 |
class Config(object): |
139 |
"""A configuration policy - what username, editor, gpg needs etc."""
|
|
140 |
||
141 |
def get_editor(self): |
|
142 |
"""Get the users pop up editor."""
|
|
143 |
raise NotImplementedError |
|
144 |
||
1442.1.15
by Robert Collins
make getting the signature checking policy a template method |
145 |
def _get_signature_checking(self): |
146 |
"""Template method to override signature checking policy."""
|
|
147 |
||
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
148 |
def _get_signing_policy(self): |
149 |
"""Template method to override signature creation policy."""
|
|
150 |
||
1993.3.6
by James Henstridge
get rid of the recurse argument to get_user_option() |
151 |
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. |
152 |
"""Template method to provide a user option."""
|
153 |
return None |
|
154 |
||
1993.3.6
by James Henstridge
get rid of the recurse argument to get_user_option() |
155 |
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. |
156 |
"""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() |
157 |
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. |
158 |
|
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
159 |
def gpg_signing_command(self): |
160 |
"""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. |
161 |
result = self._gpg_signing_command() |
162 |
if result is None: |
|
163 |
result = "gpg" |
|
164 |
return result |
|
165 |
||
166 |
def _gpg_signing_command(self): |
|
167 |
"""See gpg_signing_command()."""
|
|
168 |
return None |
|
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
169 |
|
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
170 |
def log_format(self): |
171 |
"""What log format should be used"""
|
|
172 |
result = self._log_format() |
|
1553.2.4
by Erik Bågfors
Support for setting the default log format at a configuration option |
173 |
if result is None: |
174 |
result = "long" |
|
175 |
return result |
|
176 |
||
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
177 |
def _log_format(self): |
178 |
"""See log_format()."""
|
|
1553.2.4
by Erik Bågfors
Support for setting the default log format at a configuration option |
179 |
return None |
180 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
181 |
def __init__(self): |
182 |
super(Config, self).__init__() |
|
183 |
||
1472
by Robert Collins
post commit hook, first pass implementation |
184 |
def post_commit(self): |
185 |
"""An ordered list of python functions to call.
|
|
186 |
||
187 |
Each function takes branch, rev_id as parameters.
|
|
188 |
"""
|
|
189 |
return self._post_commit() |
|
190 |
||
191 |
def _post_commit(self): |
|
192 |
"""See Config.post_commit."""
|
|
193 |
return None |
|
194 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
195 |
def user_email(self): |
196 |
"""Return just the email component of a username."""
|
|
1185.33.31
by Martin Pool
Make annotate cope better with revisions committed without a valid |
197 |
return extract_email_address(self.username()) |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
198 |
|
199 |
def username(self): |
|
200 |
"""Return email-style username.
|
|
201 |
|
|
202 |
Something similar to 'Martin Pool <mbp@sourcefrog.net>'
|
|
203 |
|
|
1861.4.1
by Matthieu Moy
BZREMAIL renamed to BZR_EMAIL. |
204 |
$BZR_EMAIL can be set to override this (as well as the
|
205 |
deprecated $BZREMAIL), then
|
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
206 |
the concrete policy type is checked, and finally
|
1185.37.2
by Jamie Wilkinson
Fix a typo and grammar in Config.username() docstring. |
207 |
$EMAIL is examined.
|
208 |
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 |
209 |
created.
|
210 |
|
|
211 |
TODO: Check it's reasonably well-formed.
|
|
212 |
"""
|
|
1861.4.1
by Matthieu Moy
BZREMAIL renamed to BZR_EMAIL. |
213 |
v = os.environ.get('BZR_EMAIL') |
214 |
if v: |
|
215 |
return v.decode(bzrlib.user_encoding) |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
216 |
v = os.environ.get('BZREMAIL') |
217 |
if v: |
|
1861.4.1
by Matthieu Moy
BZREMAIL renamed to BZR_EMAIL. |
218 |
warning('BZREMAIL is deprecated in favor of BZR_EMAIL. Please update your configuration.') |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
219 |
return v.decode(bzrlib.user_encoding) |
220 |
||
221 |
v = self._get_user_id() |
|
222 |
if v: |
|
223 |
return v |
|
224 |
||
225 |
v = os.environ.get('EMAIL') |
|
226 |
if v: |
|
227 |
return v.decode(bzrlib.user_encoding) |
|
228 |
||
229 |
name, email = _auto_user_id() |
|
230 |
if name: |
|
231 |
return '%s <%s>' % (name, email) |
|
232 |
else: |
|
233 |
return email |
|
234 |
||
1442.1.14
by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE |
235 |
def signature_checking(self): |
236 |
"""What is the current policy for signature checking?."""
|
|
1442.1.15
by Robert Collins
make getting the signature checking policy a template method |
237 |
policy = self._get_signature_checking() |
238 |
if policy is not None: |
|
239 |
return policy |
|
1442.1.14
by Robert Collins
Create a default signature checking policy of CHECK_IF_POSSIBLE |
240 |
return CHECK_IF_POSSIBLE |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
241 |
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
242 |
def signing_policy(self): |
243 |
"""What is the current policy for signature checking?."""
|
|
244 |
policy = self._get_signing_policy() |
|
245 |
if policy is not None: |
|
246 |
return policy |
|
247 |
return SIGN_WHEN_REQUIRED |
|
248 |
||
1442.1.21
by Robert Collins
create signature_needed() call for commit to trigger creating signatures |
249 |
def signature_needed(self): |
250 |
"""Is a signature needed when committing ?."""
|
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
251 |
policy = self._get_signing_policy() |
252 |
if policy is None: |
|
253 |
policy = self._get_signature_checking() |
|
254 |
if policy is not None: |
|
255 |
warning("Please use create_signatures, not check_signatures " |
|
256 |
"to set signing policy.") |
|
257 |
if policy == CHECK_ALWAYS: |
|
258 |
return True |
|
259 |
elif policy == SIGN_ALWAYS: |
|
1442.1.21
by Robert Collins
create signature_needed() call for commit to trigger creating signatures |
260 |
return True |
261 |
return False |
|
262 |
||
1553.6.12
by Erik Bågfors
remove AliasConfig, based on input from abentley |
263 |
def get_alias(self, value): |
264 |
return self._get_alias(value) |
|
265 |
||
266 |
def _get_alias(self, value): |
|
267 |
pass
|
|
268 |
||
1770.2.7
by Aaron Bentley
Set/get nickname using BranchConfig |
269 |
def get_nickname(self): |
270 |
return self._get_nickname() |
|
271 |
||
272 |
def _get_nickname(self): |
|
273 |
return None |
|
274 |
||
1442.1.15
by Robert Collins
make getting the signature checking policy a template method |
275 |
|
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
276 |
class IniBasedConfig(Config): |
277 |
"""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 |
278 |
|
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
279 |
def _get_parser(self, file=None): |
1185.12.51
by Aaron Bentley
Allowed second call of _get_parser() to not require a file |
280 |
if self._parser is not None: |
281 |
return self._parser |
|
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
282 |
if file is None: |
283 |
input = self._get_filename() |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
284 |
else: |
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
285 |
input = file |
1185.12.51
by Aaron Bentley
Allowed second call of _get_parser() to not require a file |
286 |
try: |
1551.2.20
by Aaron Bentley
Treated config files as utf-8 |
287 |
self._parser = ConfigObj(input, encoding='utf-8') |
1474
by Robert Collins
Merge from Aaron Bentley. |
288 |
except configobj.ConfigObjError, e: |
1185.12.51
by Aaron Bentley
Allowed second call of _get_parser() to not require a file |
289 |
raise errors.ParseConfigError(e.errors, e.config.filename) |
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
290 |
return self._parser |
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
291 |
|
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
292 |
def _get_matching_sections(self): |
293 |
"""Return an ordered list of (section_name, extra_path) pairs.
|
|
294 |
||
295 |
If the section contains inherited configuration, extra_path is
|
|
296 |
a string containing the additional path components.
|
|
297 |
"""
|
|
298 |
section = self._get_section() |
|
299 |
if section is not None: |
|
300 |
return [(section, '')] |
|
301 |
else: |
|
302 |
return [] |
|
303 |
||
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
304 |
def _get_section(self): |
305 |
"""Override this to define the section used by the config."""
|
|
306 |
return "DEFAULT" |
|
307 |
||
2120.6.1
by James Henstridge
add support for norecurse and appendpath policies when reading configuration files |
308 |
def _get_option_policy(self, section, option_name): |
309 |
"""Return the policy for the given (section, option_name) pair."""
|
|
310 |
return POLICY_NONE |
|
311 |
||
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
312 |
def _get_signature_checking(self): |
313 |
"""See Config._get_signature_checking."""
|
|
1474
by Robert Collins
Merge from Aaron Bentley. |
314 |
policy = self._get_user_option('check_signatures') |
315 |
if policy: |
|
316 |
return self._string_to_signature_policy(policy) |
|
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
317 |
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
318 |
def _get_signing_policy(self): |
1773.4.3
by Martin Pool
[merge] bzr.dev |
319 |
"""See Config._get_signing_policy"""
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
320 |
policy = self._get_user_option('create_signatures') |
321 |
if policy: |
|
322 |
return self._string_to_signing_policy(policy) |
|
323 |
||
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
324 |
def _get_user_id(self): |
325 |
"""Get the user id from the 'email' key in the current section."""
|
|
1474
by Robert Collins
Merge from Aaron Bentley. |
326 |
return self._get_user_option('email') |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
327 |
|
1993.3.6
by James Henstridge
get rid of the recurse argument to get_user_option() |
328 |
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. |
329 |
"""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 |
330 |
for (section, extra_path) in self._get_matching_sections(): |
331 |
try: |
|
2120.6.1
by James Henstridge
add support for norecurse and appendpath policies when reading configuration files |
332 |
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 |
333 |
except KeyError: |
2120.6.1
by James Henstridge
add support for norecurse and appendpath policies when reading configuration files |
334 |
continue
|
335 |
policy = self._get_option_policy(section, option_name) |
|
336 |
if policy == POLICY_NONE: |
|
337 |
return value |
|
338 |
elif policy == POLICY_NORECURSE: |
|
339 |
# norecurse items only apply to the exact path
|
|
340 |
if extra_path: |
|
341 |
continue
|
|
342 |
else: |
|
343 |
return value |
|
344 |
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 |
345 |
if extra_path: |
346 |
value = urlutils.join(value, extra_path) |
|
347 |
return value |
|
2120.6.6
by James Henstridge
fix test_set_push_location test |
348 |
else: |
349 |
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 |
350 |
else: |
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
351 |
return None |
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
352 |
|
1442.1.59
by Robert Collins
Add re-sign command to generate a digital signature on a single revision. |
353 |
def _gpg_signing_command(self): |
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
354 |
"""See Config.gpg_signing_command."""
|
1472
by Robert Collins
post commit hook, first pass implementation |
355 |
return self._get_user_option('gpg_signing_command') |
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
356 |
|
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
357 |
def _log_format(self): |
358 |
"""See Config.log_format."""
|
|
359 |
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 |
360 |
|
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
361 |
def __init__(self, get_filename): |
362 |
super(IniBasedConfig, self).__init__() |
|
363 |
self._get_filename = get_filename |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
364 |
self._parser = None |
1472
by Robert Collins
post commit hook, first pass implementation |
365 |
|
366 |
def _post_commit(self): |
|
367 |
"""See Config.post_commit."""
|
|
368 |
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 |
369 |
|
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
370 |
def _string_to_signature_policy(self, signature_string): |
371 |
"""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 |
372 |
if signature_string.lower() == 'check-available': |
373 |
return CHECK_IF_POSSIBLE |
|
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
374 |
if signature_string.lower() == 'ignore': |
375 |
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 |
376 |
if signature_string.lower() == 'require': |
377 |
return CHECK_ALWAYS |
|
1442.1.16
by Robert Collins
allow global overriding of signature policy to never check |
378 |
raise errors.BzrError("Invalid signatures policy '%s'" |
379 |
% signature_string) |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
380 |
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
381 |
def _string_to_signing_policy(self, signature_string): |
382 |
"""Convert a string to a signing policy."""
|
|
383 |
if signature_string.lower() == 'when-required': |
|
384 |
return SIGN_WHEN_REQUIRED |
|
385 |
if signature_string.lower() == 'never': |
|
386 |
return SIGN_NEVER |
|
387 |
if signature_string.lower() == 'always': |
|
388 |
return SIGN_ALWAYS |
|
389 |
raise errors.BzrError("Invalid signing policy '%s'" |
|
390 |
% signature_string) |
|
391 |
||
1553.6.12
by Erik Bågfors
remove AliasConfig, based on input from abentley |
392 |
def _get_alias(self, value): |
393 |
try: |
|
394 |
return self._get_parser().get_value("ALIASES", |
|
395 |
value) |
|
396 |
except KeyError: |
|
397 |
pass
|
|
398 |
||
1770.2.7
by Aaron Bentley
Set/get nickname using BranchConfig |
399 |
def _get_nickname(self): |
400 |
return self.get_user_option('nickname') |
|
401 |
||
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
402 |
|
403 |
class GlobalConfig(IniBasedConfig): |
|
404 |
"""The configuration that should be used for a specific location."""
|
|
405 |
||
406 |
def get_editor(self): |
|
1474
by Robert Collins
Merge from Aaron Bentley. |
407 |
return self._get_user_option('editor') |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
408 |
|
409 |
def __init__(self): |
|
410 |
super(GlobalConfig, self).__init__(config_filename) |
|
411 |
||
1816.2.1
by Robey Pointer
add set_user_option to GlobalConfig, and make /etc/passwd username lookup try harder with encodings |
412 |
def set_user_option(self, option, value): |
413 |
"""Save option and its value in the configuration."""
|
|
414 |
# FIXME: RBC 20051029 This should refresh the parser and also take a
|
|
415 |
# file lock on bazaar.conf.
|
|
416 |
conf_dir = os.path.dirname(self._get_filename()) |
|
417 |
ensure_config_dir_exists(conf_dir) |
|
418 |
if 'DEFAULT' not in self._get_parser(): |
|
419 |
self._get_parser()['DEFAULT'] = {} |
|
420 |
self._get_parser()['DEFAULT'][option] = value |
|
421 |
f = open(self._get_filename(), 'wb') |
|
422 |
self._get_parser().write(f) |
|
423 |
f.close() |
|
424 |
||
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
425 |
|
426 |
class LocationConfig(IniBasedConfig): |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
427 |
"""A configuration object that gives the policy for a location."""
|
428 |
||
429 |
def __init__(self, location): |
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
430 |
name_generator = locations_config_filename |
431 |
if (not os.path.exists(name_generator()) and |
|
432 |
os.path.exists(branches_config_filename())): |
|
1830.2.1
by John Arbash Meinel
Make it clearer what config file needs to be renamed. |
433 |
if sys.platform == 'win32': |
434 |
warning('Please rename %s to %s' |
|
435 |
% (branches_config_filename(), |
|
436 |
locations_config_filename())) |
|
437 |
else: |
|
438 |
warning('Please rename ~/.bazaar/branches.conf' |
|
439 |
' to ~/.bazaar/locations.conf') |
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
440 |
name_generator = branches_config_filename |
441 |
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) |
442 |
# local file locations are looked up by local path, rather than
|
443 |
# by file url. This is because the config file is a user
|
|
444 |
# file, and we would rather not expose the user to file urls.
|
|
445 |
if location.startswith('file://'): |
|
446 |
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 |
447 |
self.location = location |
448 |
||
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
449 |
def _get_matching_sections(self): |
450 |
"""Return an ordered list of section names matching this location."""
|
|
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
451 |
sections = self._get_parser() |
1442.1.12
by Robert Collins
LocationConfig section retrieval falls into my lap |
452 |
location_names = self.location.split('/') |
1442.1.18
by Robert Collins
permit per branch location overriding of signature checking policy |
453 |
if self.location.endswith('/'): |
454 |
del location_names[-1] |
|
1442.1.12
by Robert Collins
LocationConfig section retrieval falls into my lap |
455 |
matches=[] |
1442.1.10
by Robert Collins
explicit over glob test passes |
456 |
for section in sections: |
1878.1.1
by John Arbash Meinel
Entries in locations.conf should prefer local paths if available (bug #53653) |
457 |
# location is a local path if possible, so we need
|
458 |
# to convert 'file://' urls to local paths if necessary.
|
|
459 |
# This also avoids having file:///path be a more exact
|
|
460 |
# match than '/path'.
|
|
461 |
if section.startswith('file://'): |
|
462 |
section_path = urlutils.local_path_from_url(section) |
|
463 |
else: |
|
464 |
section_path = section |
|
465 |
section_names = section_path.split('/') |
|
1442.1.12
by Robert Collins
LocationConfig section retrieval falls into my lap |
466 |
if section.endswith('/'): |
467 |
del section_names[-1] |
|
468 |
names = zip(location_names, section_names) |
|
469 |
matched = True |
|
470 |
for name in names: |
|
471 |
if not fnmatch(name[0], name[1]): |
|
472 |
matched = False |
|
473 |
break
|
|
474 |
if not matched: |
|
475 |
continue
|
|
476 |
# so, for the common prefix they matched.
|
|
477 |
# if section is longer, no match.
|
|
478 |
if len(section_names) > len(location_names): |
|
479 |
continue
|
|
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
480 |
matches.append((len(section_names), section, |
481 |
'/'.join(location_names[len(section_names):]))) |
|
1442.1.12
by Robert Collins
LocationConfig section retrieval falls into my lap |
482 |
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 |
483 |
sections = [] |
484 |
for (length, section, extra_path) in matches: |
|
485 |
sections.append((section, extra_path)) |
|
486 |
# should we stop looking for parent configs here?
|
|
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
487 |
try: |
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
488 |
if self._get_parser()[section].as_bool('ignore_parents'): |
489 |
break
|
|
1993.3.1
by James Henstridge
first go at making location config lookup recursive |
490 |
except KeyError: |
491 |
pass
|
|
1993.3.3
by James Henstridge
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match |
492 |
return sections |
1442.1.9
by Robert Collins
exact section test passes |
493 |
|
2120.6.1
by James Henstridge
add support for norecurse and appendpath policies when reading configuration files |
494 |
def _get_option_policy(self, section, option_name): |
495 |
"""Return the policy for the given (section, option_name) pair."""
|
|
496 |
# check for the old 'recurse=False' flag
|
|
497 |
try: |
|
498 |
recurse = self._get_parser()[section].as_bool('recurse') |
|
499 |
except KeyError: |
|
500 |
recurse = True |
|
501 |
if not recurse: |
|
502 |
return POLICY_NORECURSE |
|
503 |
||
2120.6.10
by James Henstridge
Catch another deprecation warning, and more cleanup |
504 |
policy_key = option_name + ':policy' |
2120.6.8
by James Henstridge
Change syntax for setting config option policies. Rather than |
505 |
try: |
506 |
policy_name = self._get_parser()[section][policy_key] |
|
507 |
except KeyError: |
|
508 |
policy_name = None |
|
2120.6.1
by James Henstridge
add support for norecurse and appendpath policies when reading configuration files |
509 |
|
2120.6.8
by James Henstridge
Change syntax for setting config option policies. Rather than |
510 |
return _policy_value[policy_name] |
2120.6.1
by James Henstridge
add support for norecurse and appendpath policies when reading configuration files |
511 |
|
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
512 |
def _set_option_policy(self, section, option_name, option_policy): |
513 |
"""Set the policy for the given option name in the given section."""
|
|
514 |
# The old recurse=False option affects all options in the
|
|
515 |
# section. To handle multiple policies in the section, we
|
|
516 |
# need to convert it to a policy_norecurse key.
|
|
517 |
try: |
|
518 |
recurse = self._get_parser()[section].as_bool('recurse') |
|
519 |
except KeyError: |
|
520 |
pass
|
|
521 |
else: |
|
2120.6.9
by James Henstridge
Fixes for issues brought up in John's review |
522 |
symbol_versioning.warn( |
2120.6.11
by James Henstridge
s/0.13/0.14/ in deprecation warning |
523 |
'The recurse option is deprecated as of 0.14. '
|
2120.6.9
by James Henstridge
Fixes for issues brought up in John's review |
524 |
'The section "%s" has been converted to use policies.' |
525 |
% section, |
|
526 |
DeprecationWarning) |
|
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
527 |
del self._get_parser()[section]['recurse'] |
2120.6.9
by James Henstridge
Fixes for issues brought up in John's review |
528 |
if not recurse: |
529 |
for key in self._get_parser()[section].keys(): |
|
530 |
if not key.endswith(':policy'): |
|
531 |
self._get_parser()[section][key + |
|
532 |
':policy'] = 'norecurse' |
|
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
533 |
|
2120.6.9
by James Henstridge
Fixes for issues brought up in John's review |
534 |
policy_key = option_name + ':policy' |
2120.6.8
by James Henstridge
Change syntax for setting config option policies. Rather than |
535 |
policy_name = _policy_name[option_policy] |
536 |
if policy_name is not None: |
|
537 |
self._get_parser()[section][policy_key] = policy_name |
|
538 |
else: |
|
539 |
if policy_key in self._get_parser()[section]: |
|
540 |
del self._get_parser()[section][policy_key] |
|
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
541 |
|
542 |
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. |
543 |
"""Save option and its value in the configuration."""
|
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
544 |
assert store in [STORE_LOCATION, |
545 |
STORE_LOCATION_NORECURSE, |
|
546 |
STORE_LOCATION_APPENDPATH], 'bad storage policy' |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
547 |
# FIXME: RBC 20051029 This should refresh the parser and also take a
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
548 |
# file lock on locations.conf.
|
1185.31.39
by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(), |
549 |
conf_dir = os.path.dirname(self._get_filename()) |
1185.31.43
by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp |
550 |
ensure_config_dir_exists(conf_dir) |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
551 |
location = self.location |
552 |
if location.endswith('/'): |
|
553 |
location = location[:-1] |
|
554 |
if (not location in self._get_parser() and |
|
555 |
not location + '/' in self._get_parser()): |
|
556 |
self._get_parser()[location]={} |
|
557 |
elif location + '/' in self._get_parser(): |
|
558 |
location = location + '/' |
|
559 |
self._get_parser()[location][option]=value |
|
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
560 |
# the allowed values of store match the config policies
|
561 |
self._set_option_policy(location, option, store) |
|
1551.2.49
by abentley
Made ConfigObj output binary-identical files on win32 and *nix |
562 |
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. |
563 |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
564 |
|
565 |
class BranchConfig(Config): |
|
566 |
"""A configuration object giving the policy for a branch."""
|
|
567 |
||
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
568 |
def _get_branch_data_config(self): |
569 |
if self._branch_data_config is None: |
|
570 |
self._branch_data_config = TreeConfig(self.branch) |
|
571 |
return self._branch_data_config |
|
572 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
573 |
def _get_location_config(self): |
574 |
if self._location_config is None: |
|
575 |
self._location_config = LocationConfig(self.branch.base) |
|
576 |
return self._location_config |
|
577 |
||
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
578 |
def _get_global_config(self): |
579 |
if self._global_config is None: |
|
580 |
self._global_config = GlobalConfig() |
|
581 |
return self._global_config |
|
582 |
||
583 |
def _get_best_value(self, option_name): |
|
584 |
"""This returns a user option from local, tree or global config.
|
|
585 |
||
586 |
They are tried in that order. Use get_safe_value if trusted values
|
|
587 |
are necessary.
|
|
588 |
"""
|
|
589 |
for source in self.option_sources: |
|
590 |
value = getattr(source(), option_name)() |
|
591 |
if value is not None: |
|
592 |
return value |
|
593 |
return None |
|
594 |
||
595 |
def _get_safe_value(self, option_name): |
|
596 |
"""This variant of get_best_value never returns untrusted values.
|
|
597 |
|
|
598 |
It does not return values from the branch data, because the branch may
|
|
599 |
not be controlled by the user.
|
|
600 |
||
601 |
We may wish to allow locations.conf to control whether branches are
|
|
602 |
trusted in the future.
|
|
603 |
"""
|
|
604 |
for source in (self._get_location_config, self._get_global_config): |
|
605 |
value = getattr(source(), option_name)() |
|
606 |
if value is not None: |
|
607 |
return value |
|
608 |
return None |
|
609 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
610 |
def _get_user_id(self): |
611 |
"""Return the full user id for the branch.
|
|
612 |
|
|
613 |
e.g. "John Hacker <jhacker@foo.org>"
|
|
614 |
This is looked up in the email controlfile for the branch.
|
|
615 |
"""
|
|
616 |
try: |
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
617 |
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 |
618 |
.read() |
619 |
.decode(bzrlib.user_encoding) |
|
620 |
.rstrip("\r\n")) |
|
621 |
except errors.NoSuchFile, e: |
|
622 |
pass
|
|
623 |
||
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
624 |
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 |
625 |
|
1442.1.19
by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig. |
626 |
def _get_signature_checking(self): |
627 |
"""See Config._get_signature_checking."""
|
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
628 |
return self._get_best_value('_get_signature_checking') |
1442.1.19
by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig. |
629 |
|
1770.2.1
by Aaron Bentley
Use create_signature for signing policy, deprecate check_signatures for this |
630 |
def _get_signing_policy(self): |
631 |
"""See Config._get_signing_policy."""
|
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
632 |
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 |
633 |
|
1993.3.6
by James Henstridge
get rid of the recurse argument to get_user_option() |
634 |
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. |
635 |
"""See Config._get_user_option."""
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
636 |
for source in self.option_sources: |
1993.3.6
by James Henstridge
get rid of the recurse argument to get_user_option() |
637 |
value = source()._get_user_option(option_name) |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
638 |
if value is not None: |
639 |
return value |
|
640 |
return None |
|
641 |
||
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
642 |
def set_user_option(self, name, value, store=STORE_BRANCH): |
643 |
if store == STORE_BRANCH: |
|
1770.2.6
by Aaron Bentley
Ensure branch.conf works properly |
644 |
self._get_branch_data_config().set_option(value, name) |
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
645 |
elif store == STORE_GLOBAL: |
2120.6.7
by James Henstridge
Fix GlobalConfig.set_user_option() call |
646 |
self._get_global_config().set_user_option(name, value) |
2120.6.4
by James Henstridge
add support for specifying policy when storing options |
647 |
else: |
648 |
self._get_location_config().set_user_option(name, value, store) |
|
1442.1.69
by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name. |
649 |
|
1442.1.59
by Robert Collins
Add re-sign command to generate a digital signature on a single revision. |
650 |
def _gpg_signing_command(self): |
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
651 |
"""See Config.gpg_signing_command."""
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
652 |
return self._get_safe_value('_gpg_signing_command') |
1442.1.56
by Robert Collins
gpg_signing_command configuration item |
653 |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
654 |
def __init__(self, branch): |
655 |
super(BranchConfig, self).__init__() |
|
656 |
self._location_config = None |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
657 |
self._branch_data_config = None |
658 |
self._global_config = None |
|
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
659 |
self.branch = branch |
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
660 |
self.option_sources = (self._get_location_config, |
661 |
self._get_branch_data_config, |
|
662 |
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. |
663 |
|
1472
by Robert Collins
post commit hook, first pass implementation |
664 |
def _post_commit(self): |
665 |
"""See Config.post_commit."""
|
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
666 |
return self._get_safe_value('_post_commit') |
1472
by Robert Collins
post commit hook, first pass implementation |
667 |
|
1770.2.7
by Aaron Bentley
Set/get nickname using BranchConfig |
668 |
def _get_nickname(self): |
1824.1.1
by Robert Collins
Add BranchConfig.has_explicit_nickname call. |
669 |
value = self._get_explicit_nickname() |
1770.2.7
by Aaron Bentley
Set/get nickname using BranchConfig |
670 |
if value is not None: |
671 |
return value |
|
2120.5.2
by Alexander Belchenko
(jam) Fix for bug #66857 |
672 |
return urlutils.unescape(self.branch.base.split('/')[-2]) |
1770.2.7
by Aaron Bentley
Set/get nickname using BranchConfig |
673 |
|
1824.1.1
by Robert Collins
Add BranchConfig.has_explicit_nickname call. |
674 |
def has_explicit_nickname(self): |
675 |
"""Return true if a nickname has been explicitly assigned."""
|
|
676 |
return self._get_explicit_nickname() is not None |
|
677 |
||
678 |
def _get_explicit_nickname(self): |
|
679 |
return self._get_best_value('_get_nickname') |
|
680 |
||
1553.2.9
by Erik Bågfors
log_formatter => log_format for "named" formatters |
681 |
def _log_format(self): |
682 |
"""See Config.log_format."""
|
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
683 |
return self._get_best_value('_log_format') |
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
684 |
|
1553.6.12
by Erik Bågfors
remove AliasConfig, based on input from abentley |
685 |
|
1185.31.43
by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp |
686 |
def ensure_config_dir_exists(path=None): |
687 |
"""Make sure a configuration directory exists.
|
|
688 |
This makes sure that the directory exists.
|
|
689 |
On windows, since configuration directories are 2 levels deep,
|
|
690 |
it makes sure both the directory and the parent directory exists.
|
|
691 |
"""
|
|
692 |
if path is None: |
|
693 |
path = config_dir() |
|
694 |
if not os.path.isdir(path): |
|
695 |
if sys.platform == 'win32': |
|
696 |
parent_dir = os.path.dirname(path) |
|
697 |
if not os.path.isdir(parent_dir): |
|
698 |
mutter('creating config parent directory: %r', parent_dir) |
|
699 |
os.mkdir(parent_dir) |
|
700 |
mutter('creating config directory: %r', path) |
|
701 |
os.mkdir(path) |
|
702 |
||
1532
by Robert Collins
Merge in John Meinels integration branch. |
703 |
|
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
704 |
def config_dir(): |
705 |
"""Return per-user configuration directory.
|
|
706 |
||
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
707 |
By default this is ~/.bazaar/
|
1442.1.1
by Robert Collins
move config_dir into bzrlib.config |
708 |
|
709 |
TODO: Global option --config-dir to override this.
|
|
710 |
"""
|
|
1185.38.1
by John Arbash Meinel
Adding my win32 patch for moving the home directory. |
711 |
base = os.environ.get('BZR_HOME', None) |
712 |
if sys.platform == 'win32': |
|
713 |
if base is None: |
|
2245.4.3
by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils |
714 |
base = win32utils.get_appdata_location_unicode() |
1185.38.1
by John Arbash Meinel
Adding my win32 patch for moving the home directory. |
715 |
if base is None: |
716 |
base = os.environ.get('HOME', None) |
|
717 |
if base is None: |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
718 |
raise errors.BzrError('You must have one of BZR_HOME, APPDATA, or HOME set') |
1996.3.31
by John Arbash Meinel
Make bzrlib.config use lazy importing |
719 |
return osutils.pathjoin(base, 'bazaar', '2.0') |
1185.38.1
by John Arbash Meinel
Adding my win32 patch for moving the home directory. |
720 |
else: |
721 |
# cygwin, linux, and darwin all have a $HOME directory
|
|
722 |
if base is None: |
|
723 |
base = os.path.expanduser("~") |
|
1996.3.31
by John Arbash Meinel
Make bzrlib.config use lazy importing |
724 |
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 \ |
725 |
|
726 |
||
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
727 |
def config_filename(): |
728 |
"""Return per-user configuration ini file filename."""
|
|
1996.3.31
by John Arbash Meinel
Make bzrlib.config use lazy importing |
729 |
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. |
730 |
|
731 |
||
1442.1.6
by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs |
732 |
def branches_config_filename(): |
733 |
"""Return per-user configuration ini file filename."""
|
|
1996.3.31
by John Arbash Meinel
Make bzrlib.config use lazy importing |
734 |
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. |
735 |
|
1830.2.1
by John Arbash Meinel
Make it clearer what config file needs to be renamed. |
736 |
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
737 |
def locations_config_filename(): |
738 |
"""Return per-user configuration ini file filename."""
|
|
1996.3.31
by John Arbash Meinel
Make bzrlib.config use lazy importing |
739 |
return osutils.pathjoin(config_dir(), 'locations.conf') |
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
740 |
|
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
741 |
|
1836.1.6
by John Arbash Meinel
Creating a helper function for getting the user ignore filename |
742 |
def user_ignore_config_filename(): |
743 |
"""Return the user default ignore filename"""
|
|
1996.3.31
by John Arbash Meinel
Make bzrlib.config use lazy importing |
744 |
return osutils.pathjoin(config_dir(), 'ignore') |
1836.1.6
by John Arbash Meinel
Creating a helper function for getting the user ignore filename |
745 |
|
746 |
||
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
747 |
def _auto_user_id(): |
748 |
"""Calculate automatic user identification.
|
|
749 |
||
750 |
Returns (realname, email).
|
|
751 |
||
752 |
Only used when none is set in the environment or the id file.
|
|
753 |
||
754 |
This previously used the FQDN as the default domain, but that can
|
|
755 |
be very slow on machines where DNS is broken. So now we simply
|
|
756 |
use the hostname.
|
|
757 |
"""
|
|
758 |
import socket |
|
759 |
||
2245.4.3
by Alexander Belchenko
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils |
760 |
if sys.platform == 'win32': |
761 |
name = win32utils.get_user_name_unicode() |
|
762 |
if name is None: |
|
763 |
raise errors.BzrError("Cannot autodetect user name.\n" |
|
764 |
"Please, set your name with command like:\n" |
|
765 |
'bzr whoami "Your Name <name@domain.com>"') |
|
766 |
host = win32utils.get_host_name_unicode() |
|
767 |
if host is None: |
|
768 |
host = socket.gethostname() |
|
769 |
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. |
770 |
|
771 |
try: |
|
772 |
import pwd |
|
773 |
uid = os.getuid() |
|
774 |
w = pwd.getpwuid(uid) |
|
1553.4.5
by Michael Ellerman
Produce an intelligible error if the user's /etc/passwd is not encoded in |
775 |
|
1816.2.1
by Robey Pointer
add set_user_option to GlobalConfig, and make /etc/passwd username lookup try harder with encodings |
776 |
# we try utf-8 first, because on many variants (like Linux),
|
777 |
# /etc/passwd "should" be in utf-8, and because it's unlikely to give
|
|
778 |
# false positives. (many users will have their user encoding set to
|
|
779 |
# latin-1, which cannot raise UnicodeError.)
|
|
780 |
try: |
|
781 |
gecos = w.pw_gecos.decode('utf-8') |
|
782 |
encoding = 'utf-8' |
|
783 |
except UnicodeError: |
|
784 |
try: |
|
785 |
gecos = w.pw_gecos.decode(bzrlib.user_encoding) |
|
786 |
encoding = bzrlib.user_encoding |
|
787 |
except UnicodeError: |
|
788 |
raise errors.BzrCommandError('Unable to determine your name. ' |
|
789 |
'Use "bzr whoami" to set it.') |
|
790 |
try: |
|
791 |
username = w.pw_name.decode(encoding) |
|
792 |
except UnicodeError: |
|
793 |
raise errors.BzrCommandError('Unable to determine your name. ' |
|
794 |
'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 |
795 |
|
1442.1.2
by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing. |
796 |
comma = gecos.find(',') |
797 |
if comma == -1: |
|
798 |
realname = gecos |
|
799 |
else: |
|
800 |
realname = gecos[:comma] |
|
801 |
if not realname: |
|
802 |
realname = username |
|
803 |
||
804 |
except ImportError: |
|
805 |
import getpass |
|
1553.4.5
by Michael Ellerman
Produce an intelligible error if the user's /etc/passwd is not encoded in |
806 |
try: |
807 |
realname = username = getpass.getuser().decode(bzrlib.user_encoding) |
|
808 |
except UnicodeDecodeError: |
|
809 |
raise errors.BzrError("Can't decode username as %s." % \ |
|
810 |
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. |
811 |
|
812 |
return realname, (username + '@' + socket.gethostname()) |
|
813 |
||
814 |
||
1185.16.52
by Martin Pool
- add extract_email_address |
815 |
def extract_email_address(e): |
816 |
"""Return just the address part of an email string.
|
|
817 |
|
|
818 |
That is just the user@domain part, nothing else.
|
|
819 |
This part is required to contain only ascii characters.
|
|
820 |
If it can't be extracted, raises an error.
|
|
821 |
|
|
822 |
>>> extract_email_address('Jane Tester <jane@test.com>')
|
|
823 |
"jane@test.com"
|
|
824 |
"""
|
|
825 |
m = re.search(r'[\w+.-]+@[\w+.-]+', e) |
|
826 |
if not m: |
|
2055.2.2
by John Arbash Meinel
Switch extract_email_address() to use a more specific exception |
827 |
raise errors.NoEmailInUsername(e) |
1185.16.52
by Martin Pool
- add extract_email_address |
828 |
return m.group(0) |
1185.35.11
by Aaron Bentley
Added support for branch nicks |
829 |
|
1185.85.30
by John Arbash Meinel
Fixing 'bzr push' exposed that IniBasedConfig didn't handle unicode. |
830 |
|
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
831 |
class TreeConfig(IniBasedConfig): |
1185.35.11
by Aaron Bentley
Added support for branch nicks |
832 |
"""Branch configuration data associated with its contents, not location"""
|
833 |
def __init__(self, branch): |
|
834 |
self.branch = branch |
|
835 |
||
1770.2.5
by Aaron Bentley
Integrate branch.conf into BranchConfig |
836 |
def _get_parser(self, file=None): |
837 |
if file is not None: |
|
838 |
return IniBasedConfig._get_parser(file) |
|
839 |
return self._get_config() |
|
840 |
||
1185.35.11
by Aaron Bentley
Added support for branch nicks |
841 |
def _get_config(self): |
842 |
try: |
|
1556.2.1
by Aaron Bentley
Switched to ConfigObj 4.2.0 |
843 |
obj = ConfigObj(self.branch.control_files.get('branch.conf'), |
844 |
encoding='utf-8') |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
845 |
except errors.NoSuchFile: |
1556.2.1
by Aaron Bentley
Switched to ConfigObj 4.2.0 |
846 |
obj = ConfigObj(encoding='utf=8') |
1185.35.11
by Aaron Bentley
Added support for branch nicks |
847 |
return obj |
848 |
||
849 |
def get_option(self, name, section=None, default=None): |
|
850 |
self.branch.lock_read() |
|
851 |
try: |
|
852 |
obj = self._get_config() |
|
853 |
try: |
|
854 |
if section is not None: |
|
855 |
obj[section] |
|
856 |
result = obj[name] |
|
857 |
except KeyError: |
|
858 |
result = default |
|
859 |
finally: |
|
860 |
self.branch.unlock() |
|
861 |
return result |
|
862 |
||
863 |
def set_option(self, value, name, section=None): |
|
864 |
"""Set a per-branch configuration option"""
|
|
865 |
self.branch.lock_write() |
|
866 |
try: |
|
867 |
cfg_obj = self._get_config() |
|
868 |
if section is None: |
|
869 |
obj = cfg_obj |
|
870 |
else: |
|
871 |
try: |
|
872 |
obj = cfg_obj[section] |
|
873 |
except KeyError: |
|
874 |
cfg_obj[section] = {} |
|
875 |
obj = cfg_obj[section] |
|
876 |
obj[name] = value |
|
1556.2.1
by Aaron Bentley
Switched to ConfigObj 4.2.0 |
877 |
out_file = StringIO() |
878 |
cfg_obj.write(out_file) |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
879 |
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. |
880 |
self.branch.control_files.put('branch.conf', out_file) |
1185.35.11
by Aaron Bentley
Added support for branch nicks |
881 |
finally: |
882 |
self.branch.unlock() |