178
222
def _get_signing_policy(self):
179
223
"""Template method to override signature creation policy."""
227
def expand_options(self, string, env=None):
228
"""Expand option references in the string in the configuration context.
230
:param string: The string containing option to expand.
232
:param env: An option dict defining additional configuration options or
233
overriding existing ones.
235
:returns: The expanded string.
237
return self._expand_options_in_string(string, env)
239
def _expand_options_in_list(self, slist, env=None, _ref_stack=None):
240
"""Expand options in a list of strings in the configuration context.
242
:param slist: A list of strings.
244
:param env: An option dict defining additional configuration options or
245
overriding existing ones.
247
:param _ref_stack: Private list containing the options being
248
expanded to detect loops.
250
:returns: The flatten list of expanded strings.
252
# expand options in each value separately flattening lists
255
value = self._expand_options_in_string(s, env, _ref_stack)
256
if isinstance(value, list):
262
def _expand_options_in_string(self, string, env=None, _ref_stack=None):
263
"""Expand options in the string in the configuration context.
265
:param string: The string to be expanded.
267
:param env: An option dict defining additional configuration options or
268
overriding existing ones.
270
:param _ref_stack: Private list containing the options being
271
expanded to detect loops.
273
:returns: The expanded string.
276
# Not much to expand there
278
if _ref_stack is None:
279
# What references are currently resolved (to detect loops)
281
if self.option_ref_re is None:
282
# We want to match the most embedded reference first (i.e. for
283
# '{{foo}}' we will get '{foo}',
284
# for '{bar{baz}}' we will get '{baz}'
285
self.option_ref_re = re.compile('({[^{}]+})')
287
# We need to iterate until no more refs appear ({{foo}} will need two
288
# iterations for example).
290
raw_chunks = self.option_ref_re.split(result)
291
if len(raw_chunks) == 1:
292
# Shorcut the trivial case: no refs
296
# Split will isolate refs so that every other chunk is a ref
298
for chunk in raw_chunks:
301
# Keep only non-empty strings (or we get bogus empty
302
# slots when a list value is involved).
307
if name in _ref_stack:
308
raise errors.OptionExpansionLoop(string, _ref_stack)
309
_ref_stack.append(name)
310
value = self._expand_option(name, env, _ref_stack)
312
raise errors.ExpandingUnknownOption(name, string)
313
if isinstance(value, list):
321
# Once a list appears as the result of an expansion, all
322
# callers will get a list result. This allows a consistent
323
# behavior even when some options in the expansion chain
324
# defined as strings (no comma in their value) but their
325
# expanded value is a list.
326
return self._expand_options_in_list(chunks, env, _ref_stack)
328
result = ''.join(chunks)
331
def _expand_option(self, name, env, _ref_stack):
332
if env is not None and name in env:
333
# Special case, values provided in env takes precedence over
337
# FIXME: This is a limited implementation, what we really need is a
338
# way to query the bzr config for the value of an option,
339
# respecting the scope rules (That is, once we implement fallback
340
# configs, getting the option value should restart from the top
341
# config, not the current one) -- vila 20101222
342
value = self.get_user_option(name, expand=False)
343
if isinstance(value, list):
344
value = self._expand_options_in_list(value, env, _ref_stack)
346
value = self._expand_options_in_string(value, env, _ref_stack)
181
349
def _get_user_option(self, option_name):
182
350
"""Template method to provide a user option."""
185
def get_user_option(self, option_name):
186
"""Get a generic option - no special process, no default."""
187
return self._get_user_option(option_name)
189
def get_user_option_as_bool(self, option_name):
353
def get_user_option(self, option_name, expand=None):
354
"""Get a generic option - no special process, no default.
356
:param option_name: The queried option.
358
:param expand: Whether options references should be expanded.
360
:returns: The value of the option.
363
expand = _get_expand_default_value()
364
value = self._get_user_option(option_name)
366
if isinstance(value, list):
367
value = self._expand_options_in_list(value)
368
elif isinstance(value, dict):
369
trace.warning('Cannot expand "%s":'
370
' Dicts do not support option expansion'
373
value = self._expand_options_in_string(value)
376
def get_user_option_as_bool(self, option_name, expand=None):
190
377
"""Get a generic option as a boolean - no special process, no default.
192
379
:return None if the option doesn't exist or its value can't be
193
380
interpreted as a boolean. Returns True or False otherwise.
195
s = self._get_user_option(option_name)
382
s = self.get_user_option(option_name, expand=expand)
197
384
# The option doesn't exist
1517
2086
return StringIO()
1519
2088
def _get_configobj(self):
1520
return ConfigObj(self._get_config_file(), encoding='utf-8')
2089
f = self._get_config_file()
2091
return ConfigObj(f, encoding='utf-8')
1522
2095
def _set_configobj(self, configobj):
1523
2096
out_file = StringIO()
1524
2097
configobj.write(out_file)
1525
2098
out_file.seek(0)
1526
2099
self._transport.put_file(self._filename, out_file)
2102
class Option(object):
2103
"""An option definition.
2105
The option *values* are stored in config files and found in sections.
2107
Here we define various properties about the option itself, its default
2108
value, in which config files it can be stored, etc (TBC).
2111
def __init__(self, name, default=None):
2113
self.default = default
2115
def get_default(self):
2121
option_registry = registry.Registry()
2124
option_registry.register(
2125
'editor', Option('editor'),
2126
help='The command called to launch an editor to enter a message.')
2129
class Section(object):
2130
"""A section defines a dict of option name => value.
2132
This is merely a read-only dict which can add some knowledge about the
2133
options. It is *not* a python dict object though and doesn't try to mimic
2137
def __init__(self, section_id, options):
2138
self.id = section_id
2139
# We re-use the dict-like object received
2140
self.options = options
2142
def get(self, name, default=None):
2143
return self.options.get(name, default)
2146
# Mostly for debugging use
2147
return "<config.%s id=%s>" % (self.__class__.__name__, self.id)
2150
_NewlyCreatedOption = object()
2151
"""Was the option created during the MutableSection lifetime"""
2154
class MutableSection(Section):
2155
"""A section allowing changes and keeping track of the original values."""
2157
def __init__(self, section_id, options):
2158
super(MutableSection, self).__init__(section_id, options)
2161
def set(self, name, value):
2162
if name not in self.options:
2163
# This is a new option
2164
self.orig[name] = _NewlyCreatedOption
2165
elif name not in self.orig:
2166
self.orig[name] = self.get(name, None)
2167
self.options[name] = value
2169
def remove(self, name):
2170
if name not in self.orig:
2171
self.orig[name] = self.get(name, None)
2172
del self.options[name]
2175
class Store(object):
2176
"""Abstract interface to persistent storage for configuration options."""
2178
readonly_section_class = Section
2179
mutable_section_class = MutableSection
2181
def is_loaded(self):
2182
"""Returns True if the Store has been loaded.
2184
This is used to implement lazy loading and ensure the persistent
2185
storage is queried only when needed.
2187
raise NotImplementedError(self.is_loaded)
2190
"""Loads the Store from persistent storage."""
2191
raise NotImplementedError(self.load)
2193
def _load_from_string(self, str_or_unicode):
2194
"""Create a store from a string in configobj syntax.
2196
:param str_or_unicode: A string representing the file content. This will
2197
be encoded to suit store needs internally.
2199
This is for tests and should not be used in production unless a
2200
convincing use case can be demonstrated :)
2202
raise NotImplementedError(self._load_from_string)
2205
"""Unloads the Store.
2207
This should make is_loaded() return False. This is used when the caller
2208
knows that the persistent storage has changed or may have change since
2211
raise NotImplementedError(self.unload)
2214
"""Saves the Store to persistent storage."""
2215
raise NotImplementedError(self.save)
2217
def external_url(self):
2218
raise NotImplementedError(self.external_url)
2220
def get_sections(self):
2221
"""Returns an ordered iterable of existing sections.
2223
:returns: An iterable of (name, dict).
2225
raise NotImplementedError(self.get_sections)
2227
def get_mutable_section(self, section_name=None):
2228
"""Returns the specified mutable section.
2230
:param section_name: The section identifier
2232
raise NotImplementedError(self.get_mutable_section)
2235
# Mostly for debugging use
2236
return "<config.%s(%s)>" % (self.__class__.__name__,
2237
self.external_url())
2240
class IniFileStore(Store):
2241
"""A config Store using ConfigObj for storage.
2243
:ivar transport: The transport object where the config file is located.
2245
:ivar file_name: The config file basename in the transport directory.
2247
:ivar _config_obj: Private member to hold the ConfigObj instance used to
2248
serialize/deserialize the config file.
2251
def __init__(self, transport, file_name):
2252
"""A config Store using ConfigObj for storage.
2254
:param transport: The transport object where the config file is located.
2256
:param file_name: The config file basename in the transport directory.
2258
super(IniFileStore, self).__init__()
2259
self.transport = transport
2260
self.file_name = file_name
2261
self._config_obj = None
2263
def is_loaded(self):
2264
return self._config_obj != None
2267
self._config_obj = None
2270
"""Load the store from the associated file."""
2271
if self.is_loaded():
2273
content = self.transport.get_bytes(self.file_name)
2274
self._load_from_string(content)
2276
def _load_from_string(self, str_or_unicode):
2277
"""Create a config store from a string.
2279
:param str_or_unicode: A string representing the file content. This will
2280
be utf-8 encoded internally.
2282
This is for tests and should not be used in production unless a
2283
convincing use case can be demonstrated :)
2285
if self.is_loaded():
2286
raise AssertionError('Already loaded: %r' % (self._config_obj,))
2287
co_input = StringIO(str_or_unicode.encode('utf-8'))
2289
# The config files are always stored utf8-encoded
2290
self._config_obj = ConfigObj(co_input, encoding='utf-8')
2291
except configobj.ConfigObjError, e:
2292
self._config_obj = None
2293
raise errors.ParseConfigError(e.errors, self.external_url())
2296
if not self.is_loaded():
2300
self._config_obj.write(out)
2301
self.transport.put_bytes(self.file_name, out.getvalue())
2303
def external_url(self):
2304
# FIXME: external_url should really accepts an optional relpath
2305
# parameter (bug #750169) :-/ -- vila 2011-04-04
2306
# The following will do in the interim but maybe we don't want to
2307
# expose a path here but rather a config ID and its associated
2308
# object </hand wawe>.
2309
return urlutils.join(self.transport.external_url(), self.file_name)
2311
def get_sections(self):
2312
"""Get the configobj section in the file order.
2314
:returns: An iterable of (name, dict).
2316
# We need a loaded store
2319
except errors.NoSuchFile:
2320
# If the file doesn't exist, there is no sections
2322
cobj = self._config_obj
2324
yield self.readonly_section_class(None, cobj)
2325
for section_name in cobj.sections:
2326
yield self.readonly_section_class(section_name, cobj[section_name])
2328
def get_mutable_section(self, section_name=None):
2329
# We need a loaded store
2332
except errors.NoSuchFile:
2333
# The file doesn't exist, let's pretend it was empty
2334
self._load_from_string('')
2335
if section_name is None:
2336
section = self._config_obj
2338
section = self._config_obj.setdefault(section_name, {})
2339
return self.mutable_section_class(section_name, section)
2342
# Note that LockableConfigObjStore inherits from ConfigObjStore because we need
2343
# unlockable stores for use with objects that can already ensure the locking
2344
# (think branches). If different stores (not based on ConfigObj) are created,
2345
# they may face the same issue.
2348
class LockableIniFileStore(IniFileStore):
2349
"""A ConfigObjStore using locks on save to ensure store integrity."""
2351
def __init__(self, transport, file_name, lock_dir_name=None):
2352
"""A config Store using ConfigObj for storage.
2354
:param transport: The transport object where the config file is located.
2356
:param file_name: The config file basename in the transport directory.
2358
if lock_dir_name is None:
2359
lock_dir_name = 'lock'
2360
self.lock_dir_name = lock_dir_name
2361
super(LockableIniFileStore, self).__init__(transport, file_name)
2362
self._lock = lockdir.LockDir(self.transport, self.lock_dir_name)
2364
def lock_write(self, token=None):
2365
"""Takes a write lock in the directory containing the config file.
2367
If the directory doesn't exist it is created.
2369
# FIXME: This doesn't check the ownership of the created directories as
2370
# ensure_config_dir_exists does. It should if the transport is local
2371
# -- vila 2011-04-06
2372
self.transport.create_prefix()
2373
return self._lock.lock_write(token)
2378
def break_lock(self):
2379
self._lock.break_lock()
2383
# We need to be able to override the undecorated implementation
2384
self.save_without_locking()
2386
def save_without_locking(self):
2387
super(LockableIniFileStore, self).save()
2390
# FIXME: global, bazaar, shouldn't that be 'user' instead or even
2391
# 'user_defaults' as opposed to 'user_overrides', 'system_defaults'
2392
# (/etc/bzr/bazaar.conf) and 'system_overrides' ? -- vila 2011-04-05
2394
# FIXME: Moreover, we shouldn't need classes for these stores either, factory
2395
# functions or a registry will make it easier and clearer for tests, focusing
2396
# on the relevant parts of the API that needs testing -- vila 20110503 (based
2397
# on a poolie's remark)
2398
class GlobalStore(LockableIniFileStore):
2400
def __init__(self, possible_transports=None):
2401
t = transport.get_transport(config_dir(),
2402
possible_transports=possible_transports)
2403
super(GlobalStore, self).__init__(t, 'bazaar.conf')
2406
class LocationStore(LockableIniFileStore):
2408
def __init__(self, possible_transports=None):
2409
t = transport.get_transport(config_dir(),
2410
possible_transports=possible_transports)
2411
super(LocationStore, self).__init__(t, 'locations.conf')
2414
class BranchStore(IniFileStore):
2416
def __init__(self, branch):
2417
super(BranchStore, self).__init__(branch.control_transport,
2419
self.branch = branch
2421
def lock_write(self, token=None):
2422
return self.branch.lock_write(token)
2425
return self.branch.unlock()
2429
# We need to be able to override the undecorated implementation
2430
self.save_without_locking()
2432
def save_without_locking(self):
2433
super(BranchStore, self).save()
2436
class SectionMatcher(object):
2437
"""Select sections into a given Store.
2439
This intended to be used to postpone getting an iterable of sections from a
2443
def __init__(self, store):
2446
def get_sections(self):
2447
# This is where we require loading the store so we can see all defined
2449
sections = self.store.get_sections()
2450
# Walk the revisions in the order provided
2455
def match(self, secion):
2456
raise NotImplementedError(self.match)
2459
class LocationSection(Section):
2461
def __init__(self, section, length, extra_path):
2462
super(LocationSection, self).__init__(section.id, section.options)
2463
self.length = length
2464
self.extra_path = extra_path
2466
def get(self, name, default=None):
2467
value = super(LocationSection, self).get(name, default)
2468
if value is not None:
2469
policy_name = self.get(name + ':policy', None)
2470
policy = _policy_value.get(policy_name, POLICY_NONE)
2471
if policy == POLICY_APPENDPATH:
2472
value = urlutils.join(value, self.extra_path)
2476
class LocationMatcher(SectionMatcher):
2478
def __init__(self, store, location):
2479
super(LocationMatcher, self).__init__(store)
2480
if location.startswith('file://'):
2481
location = urlutils.local_path_from_url(location)
2482
self.location = location
2484
def _get_matching_sections(self):
2485
"""Get all sections matching ``location``."""
2486
# We slightly diverge from LocalConfig here by allowing the no-name
2487
# section as the most generic one and the lower priority.
2488
no_name_section = None
2490
# Filter out the no_name_section so _iter_for_location_by_parts can be
2491
# used (it assumes all sections have a name).
2492
for section in self.store.get_sections():
2493
if section.id is None:
2494
no_name_section = section
2496
sections.append(section)
2497
# Unfortunately _iter_for_location_by_parts deals with section names so
2498
# we have to resync.
2499
filtered_sections = _iter_for_location_by_parts(
2500
[s.id for s in sections], self.location)
2501
iter_sections = iter(sections)
2502
matching_sections = []
2503
if no_name_section is not None:
2504
matching_sections.append(
2505
LocationSection(no_name_section, 0, self.location))
2506
for section_id, extra_path, length in filtered_sections:
2507
# a section id is unique for a given store so it's safe to iterate
2509
section = iter_sections.next()
2510
if section_id == section.id:
2511
matching_sections.append(
2512
LocationSection(section, length, extra_path))
2513
return matching_sections
2515
def get_sections(self):
2516
# Override the default implementation as we want to change the order
2517
matching_sections = self._get_matching_sections()
2518
# We want the longest (aka more specific) locations first
2519
sections = sorted(matching_sections,
2520
key=lambda section: (section.length, section.id),
2522
# Sections mentioning 'ignore_parents' restrict the selection
2523
for section in sections:
2524
# FIXME: We really want to use as_bool below -- vila 2011-04-07
2525
ignore = section.get('ignore_parents', None)
2526
if ignore is not None:
2527
ignore = ui.bool_from_string(ignore)
2530
# Finally, we have a valid section
2534
class Stack(object):
2535
"""A stack of configurations where an option can be defined"""
2537
def __init__(self, sections_def, store=None, mutable_section_name=None):
2538
"""Creates a stack of sections with an optional store for changes.
2540
:param sections_def: A list of Section or callables that returns an
2541
iterable of Section. This defines the Sections for the Stack and
2542
can be called repeatedly if needed.
2544
:param store: The optional Store where modifications will be
2545
recorded. If none is specified, no modifications can be done.
2547
:param mutable_section_name: The name of the MutableSection where
2548
changes are recorded. This requires the ``store`` parameter to be
2551
self.sections_def = sections_def
2553
self.mutable_section_name = mutable_section_name
2555
def get(self, name):
2556
"""Return the *first* option value found in the sections.
2558
This is where we guarantee that sections coming from Store are loaded
2559
lazily: the loading is delayed until we need to either check that an
2560
option exists or get its value, which in turn may require to discover
2561
in which sections it can be defined. Both of these (section and option
2562
existence) require loading the store (even partially).
2564
# FIXME: No caching of options nor sections yet -- vila 20110503
2566
# Ensuring lazy loading is achieved by delaying section matching (which
2567
# implies querying the persistent storage) until it can't be avoided
2568
# anymore by using callables to describe (possibly empty) section
2570
for section_or_callable in self.sections_def:
2571
# Each section can expand to multiple ones when a callable is used
2572
if callable(section_or_callable):
2573
sections = section_or_callable()
2575
sections = [section_or_callable]
2576
for section in sections:
2577
value = section.get(name)
2578
if value is not None:
2580
if value is not None:
2583
# If the option is registered, it may provide a default value
2585
opt = option_registry.get(name)
2590
value = opt.get_default()
2593
def _get_mutable_section(self):
2594
"""Get the MutableSection for the Stack.
2596
This is where we guarantee that the mutable section is lazily loaded:
2597
this means we won't load the corresponding store before setting a value
2598
or deleting an option. In practice the store will often be loaded but
2599
this allows helps catching some programming errors.
2601
section = self.store.get_mutable_section(self.mutable_section_name)
2604
def set(self, name, value):
2605
"""Set a new value for the option."""
2606
section = self._get_mutable_section()
2607
section.set(name, value)
2609
def remove(self, name):
2610
"""Remove an existing option."""
2611
section = self._get_mutable_section()
2612
section.remove(name)
2615
# Mostly for debugging use
2616
return "<config.%s(%s)>" % (self.__class__.__name__, id(self))
2619
class _CompatibleStack(Stack):
2620
"""Place holder for compatibility with previous design.
2622
This is intended to ease the transition from the Config-based design to the
2623
Stack-based design and should not be used nor relied upon by plugins.
2625
One assumption made here is that the daughter classes will all use Stores
2626
derived from LockableIniFileStore).
2628
It implements set() by re-loading the store before applying the
2629
modification and saving it.
2631
The long term plan being to implement a single write by store to save
2632
all modifications, this class should not be used in the interim.
2635
def set(self, name, value):
2638
super(_CompatibleStack, self).set(name, value)
2639
# Force a write to persistent storage
2643
class GlobalStack(_CompatibleStack):
2647
gstore = GlobalStore()
2648
super(GlobalStack, self).__init__([gstore.get_sections], gstore)
2651
class LocationStack(_CompatibleStack):
2653
def __init__(self, location):
2654
lstore = LocationStore()
2655
matcher = LocationMatcher(lstore, location)
2656
gstore = GlobalStore()
2657
super(LocationStack, self).__init__(
2658
[matcher.get_sections, gstore.get_sections], lstore)
2660
class BranchStack(_CompatibleStack):
2662
def __init__(self, branch):
2663
bstore = BranchStore(branch)
2664
lstore = LocationStore()
2665
matcher = LocationMatcher(lstore, branch.base)
2666
gstore = GlobalStore()
2667
super(BranchStack, self).__init__(
2668
[matcher.get_sections, bstore.get_sections, gstore.get_sections],
2670
self.branch = branch
2673
class cmd_config(commands.Command):
2674
__doc__ = """Display, set or remove a configuration option.
2676
Display the active value for a given option.
2678
If --all is specified, NAME is interpreted as a regular expression and all
2679
matching options are displayed mentioning their scope. The active value
2680
that bzr will take into account is the first one displayed for each option.
2682
If no NAME is given, --all .* is implied.
2684
Setting a value is achieved by using name=value without spaces. The value
2685
is set in the most relevant scope and can be checked by displaying the
2689
takes_args = ['name?']
2693
# FIXME: This should be a registry option so that plugins can register
2694
# their own config files (or not) -- vila 20101002
2695
commands.Option('scope', help='Reduce the scope to the specified'
2696
' configuration file',
2698
commands.Option('all',
2699
help='Display all the defined values for the matching options.',
2701
commands.Option('remove', help='Remove the option from'
2702
' the configuration file'),
2705
@commands.display_command
2706
def run(self, name=None, all=False, directory=None, scope=None,
2708
if directory is None:
2710
directory = urlutils.normalize_url(directory)
2712
raise errors.BzrError(
2713
'--all and --remove are mutually exclusive.')
2715
# Delete the option in the given scope
2716
self._remove_config_option(name, directory, scope)
2718
# Defaults to all options
2719
self._show_matching_options('.*', directory, scope)
2722
name, value = name.split('=', 1)
2724
# Display the option(s) value(s)
2726
self._show_matching_options(name, directory, scope)
2728
self._show_value(name, directory, scope)
2731
raise errors.BzrError(
2732
'Only one option can be set.')
2733
# Set the option value
2734
self._set_config_option(name, value, directory, scope)
2736
def _get_configs(self, directory, scope=None):
2737
"""Iterate the configurations specified by ``directory`` and ``scope``.
2739
:param directory: Where the configurations are derived from.
2741
:param scope: A specific config to start from.
2743
if scope is not None:
2744
if scope == 'bazaar':
2745
yield GlobalConfig()
2746
elif scope == 'locations':
2747
yield LocationConfig(directory)
2748
elif scope == 'branch':
2749
(_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
2751
yield br.get_config()
2754
(_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
2756
yield br.get_config()
2757
except errors.NotBranchError:
2758
yield LocationConfig(directory)
2759
yield GlobalConfig()
2761
def _show_value(self, name, directory, scope):
2763
for c in self._get_configs(directory, scope):
2766
for (oname, value, section, conf_id, parser) in c._get_options():
2768
# Display only the first value and exit
2770
# FIXME: We need to use get_user_option to take policies
2771
# into account and we need to make sure the option exists
2772
# too (hence the two for loops), this needs a better API
2774
value = c.get_user_option(name)
2775
# Quote the value appropriately
2776
value = parser._quote(value)
2777
self.outf.write('%s\n' % (value,))
2781
raise errors.NoSuchConfigOption(name)
2783
def _show_matching_options(self, name, directory, scope):
2784
name = lazy_regex.lazy_compile(name)
2785
# We want any error in the regexp to be raised *now* so we need to
2786
# avoid the delay introduced by the lazy regexp. But, we still do
2787
# want the nicer errors raised by lazy_regex.
2788
name._compile_and_collapse()
2791
for c in self._get_configs(directory, scope):
2792
for (oname, value, section, conf_id, parser) in c._get_options():
2793
if name.search(oname):
2794
if cur_conf_id != conf_id:
2795
# Explain where the options are defined
2796
self.outf.write('%s:\n' % (conf_id,))
2797
cur_conf_id = conf_id
2799
if (section not in (None, 'DEFAULT')
2800
and cur_section != section):
2801
# Display the section if it's not the default (or only)
2803
self.outf.write(' [%s]\n' % (section,))
2804
cur_section = section
2805
self.outf.write(' %s = %s\n' % (oname, value))
2807
def _set_config_option(self, name, value, directory, scope):
2808
for conf in self._get_configs(directory, scope):
2809
conf.set_user_option(name, value)
2812
raise errors.NoSuchConfig(scope)
2814
def _remove_config_option(self, name, directory, scope):
2816
raise errors.BzrCommandError(
2817
'--remove expects an option to remove.')
2819
for conf in self._get_configs(directory, scope):
2820
for (section_name, section, conf_id) in conf._get_sections():
2821
if scope is not None and conf_id != scope:
2822
# Not the right configuration file
2825
if conf_id != conf.config_id():
2826
conf = self._get_configs(directory, conf_id).next()
2827
# We use the first section in the first config where the
2828
# option is defined to remove it
2829
conf.remove_user_option(name, section_name)
2834
raise errors.NoSuchConfig(scope)
2836
raise errors.NoSuchConfigOption(name)
2840
# We need adapters that can build a Store or a Stack in a test context. Test
2841
# classes, based on TestCaseWithTransport, can use the registry to parametrize
2842
# themselves. The builder will receive a test instance and should return a
2843
# ready-to-use store or stack. Plugins that define new store/stacks can also
2844
# register themselves here to be tested against the tests defined in
2845
# bzrlib.tests.test_config. Note that the builder can be called multiple times
2846
# for the same tests.
2848
# The registered object should be a callable receiving a test instance
2849
# parameter (inheriting from tests.TestCaseWithTransport) and returning a Store
2851
test_store_builder_registry = registry.Registry()
2853
# The registered object should be a callable receiving a test instance
2854
# parameter (inheriting from tests.TestCaseWithTransport) and returning a Stack
2856
test_stack_builder_registry = registry.Registry()
added
removed
bzrlib/config.py
