5743.3.7
by Vincent Ladeuil
Add some documentation about option and sections. |
1 |
Configuring Bazaar |
2 |
================== |
|
3 |
||
6332.1.2
by Vincent Ladeuil
Add a contents directive and fold the initial remarks about config option in the right section. |
4 |
.. contents:: |
5 |
:depth: 2 |
|
6 |
||
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
7 |
As a Bazaar developer there are a few things you need to know about |
8 |
configuration: |
|
9 |
||
6362.3.2
by Vincent Ladeuil
Fix as per jelmer's review. |
10 |
* how to add a new option, |
11 |
||
12 |
* how add a new stack, |
|
13 |
||
14 |
* how add a new store. |
|
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
15 |
|
16 |
The first sections in this document summarize the steps needed when adding a |
|
17 |
new configuration item, the rest of the document gives more internal details |
|
18 |
on how this is implemented. |
|
19 |
||
20 |
Get an option value |
|
21 |
------------------- |
|
22 |
||
23 |
Options values are obtained with ``stack.get(option_name)`` where ``stack`` |
|
24 |
is one of the daughter classes of ``config.Stack``, see their docstrings for |
|
25 |
a description of which sections are used from which stores. |
|
26 |
||
27 |
The value returned is of the type declared for that ``Option`` and if |
|
28 |
nothing is specifically declared you will get the default for that option. |
|
29 |
||
30 |
Add a new option |
|
31 |
---------------- |
|
6332.1.3
by Vincent Ladeuil
Better tweaks (the value is not a property of the option). |
32 |
|
33 |
You add a new ``Option`` to the ``option_registry``, either inside |
|
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
34 |
``bzrlib/config.py`` or during initialization of your plugin (use |
35 |
``register_lazy`` in this case). New plugins should have systematic |
|
36 |
hierarchical names so that related values are grouped together:: |
|
6332.1.1
by Martin Pool
Attempted developer documentation of configuration |
37 |
|
38 |
option_registry.register( |
|
39 |
Option('dirstate.fdatasync', default=True, |
|
40 |
from_unicode=bool_from_store, |
|
41 |
help="Flush dirstate changes onto physical disk? ....")) |
|
42 |
||
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
43 |
You then need to decide which stack is appropriate to implement the Option |
44 |
policy: |
|
45 |
||
46 |
* which config files (aka ``Store``) needs to be queried, which sections are |
|
47 |
relevant and in what order, |
|
48 |
||
49 |
* which section will receive the modifications (if relevant). |
|
50 |
||
51 |
The docstrings for the existing stacks cover most of the known use cases. |
|
52 |
||
53 |
Modify an option value or delete an option |
|
54 |
------------------------------------------ |
|
55 |
||
56 |
Just reading an option is what is needed most of the time, modifying option |
|
57 |
values or removing options is usually something that is not automated but |
|
58 |
left to the user (with ``bzr config``). |
|
59 |
||
60 |
Nevertheless, if you need to save a modified option value, use |
|
61 |
``.set(option_name, value)`` and ``.remove(option_name)`` to delete the |
|
62 |
option. Both methods are provided by the ``Stack`` object. |
|
63 |
||
64 |
But before doing that, you must be sure that the stack you're using have a |
|
65 |
writable section (this is true for ``GlobalStack`` which uses the |
|
66 |
``DEFAULT`` section in ``bazaar.conf`` and for ``BranchStack``which uses the |
|
67 |
no-name section in ``branch.conf``). |
|
68 |
||
69 |
Old and new configuration code |
|
70 |
------------------------------ |
|
6332.1.3
by Vincent Ladeuil
Better tweaks (the value is not a property of the option). |
71 |
|
72 |
There is (as of late 2011) some older and some newer configuration code. The |
|
73 |
old code has specific methods for various checks or uses classes like |
|
74 |
``GlobalConfig``. Don't add to to it; try to remove it. |
|
6332.1.1
by Martin Pool
Attempted developer documentation of configuration |
75 |
|
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
76 |
If you encounter an option using the old code you may want to migrate |
77 |
it. This generally involves: |
|
78 |
||
79 |
* registering the option, |
|
80 |
||
81 |
* replace the old config by a stack: |
|
82 |
||
83 |
* ``GlobalConfig`` became ``GlobalStack``, |
|
84 |
||
85 |
* ``LocationConfig`` became ``LocationStack``, |
|
86 |
||
87 |
* ``BranchConfig`` became ``BranchStack`` (or in this case, |
|
88 |
``get_config()`` became ``get_config_stack()``. |
|
89 |
||
6362.3.2
by Vincent Ladeuil
Fix as per jelmer's review. |
90 |
* replace the custom accessor calls with ``conf.get(option_name)``. |
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
91 |
|
92 |
The new config code provides some help for commonly encountered use cases |
|
93 |
that can allow further simplifications like: |
|
94 |
||
95 |
* providing a default value when the option is not defined in any way by the |
|
96 |
user, |
|
97 |
||
98 |
* convert the unicode string provided by the user into a suitable |
|
99 |
representation (integer, list, etc). |
|
100 |
||
6499.2.2
by Vincent Ladeuil
Mention that a given config option cannot be safely handled via both APIs at the same time. |
101 |
If you start migrating a given option to the config stacks, don't stop |
102 |
mid-way, all its uses should be covered (tests included). There are some |
|
103 |
edge cases where updates via one API will be not be seen by the other API |
|
104 |
(see http://pad.lv/948339 and http://pad.lv/948344 for details). Roughly, |
|
105 |
the old API always trigger an IO while the new one cache values to avoid |
|
106 |
them. This works fine as long as a given option is handled via a single API. |
|
107 |
||
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
108 |
Adding a new stack |
109 |
------------------ |
|
110 |
||
111 |
Stacks capture the various places an option can be declared by the user with |
|
112 |
associated levels of generality and query them in the appropriate order |
|
113 |
returning the first definition found. For example, the |
|
114 |
``append_revisions_only`` option may be declared for all branches of a user |
|
115 |
in ``bazaar.conf``, or for a hierarchy of branches in ``locations.conf`` or |
|
116 |
in a single branch in ``branch.conf``. |
|
117 |
||
118 |
Defining a new stack means you need a new way to expose these levels to the |
|
119 |
user that is not covered by the existing stacks. |
|
120 |
||
121 |
This is achieved by declaring: |
|
122 |
||
123 |
* which stores can provide a value for the option, |
|
124 |
||
125 |
* which sections apply to the stack instance, some filtering for a given |
|
126 |
context can be defined, |
|
127 |
||
128 |
* which (store, section) should receive the modifications. |
|
129 |
||
130 |
Mapping different sections to different stacks is a powerful way to organize |
|
131 |
the options and provide various levels of configuration to the user. This is |
|
132 |
achieved with ``Store`` and ``SectionMatcher`` objects. |
|
133 |
||
134 |
||
135 |
Adding a new store |
|
136 |
------------------ |
|
137 |
||
138 |
The following stores are used by ``bzr`` in ways that illustrate various |
|
139 |
uses of sections. |
|
140 |
||
141 |
bazaar.conf |
|
142 |
=========== |
|
143 |
||
144 |
``bzr`` itself defines two sections here: |
|
145 |
||
146 |
* ``DEFAULT`` where global options are defined, |
|
147 |
||
148 |
* ``ALIASES`` where command aliases are defined. This section is *not* |
|
149 |
available via ``GlobalStack``, instead, the ``bzr alias`` command uses it |
|
150 |
for its own purposes. |
|
151 |
||
152 |
Plugins can define either additional options in the ``DEFAULT`` section or |
|
153 |
new sections for their own needs (this is not especially encouraged |
|
154 |
though). The ``bzr-bookmarks`` plugin defines a ``BOOKMARKS`` section there |
|
155 |
for example. |
|
156 |
||
157 |
pkgimport.conf |
|
158 |
============== |
|
159 |
||
160 |
The Ubuntu package importer defines a store and two stacks involving |
|
161 |
``pkgimport.conf``. A no-name section contains the options common to all |
|
162 |
packages and sections named after their corresponding package can also be |
|
163 |
defined. |
|
164 |
||
165 |
The ``ImporterStack`` uses ``locations.conf`` and the no-name section in |
|
166 |
``pkgimport.conf`` for the importer options. |
|
167 |
||
168 |
The ``PackageStack`` uses only ``pkgimport.conf`` and uses the section name |
|
169 |
after the package followed by the no-name section. |
|
170 |
||
171 |
location.conf |
|
172 |
============= |
|
173 |
||
174 |
``bzr`` defines sections corresponding to URLs there and includes the |
|
175 |
relevant sections in ``LocationStack`` and ``BranchStack``. No no-name |
|
176 |
section is recognized in this file. |
|
177 |
||
178 |
branch.conf |
|
179 |
=========== |
|
180 |
||
181 |
This file defines the option for a given branch and uses only the no-name |
|
182 |
section. |
|
183 |
||
5743.12.10
by Vincent Ladeuil
Add documentation. |
184 |
Option |
185 |
------ |
|
186 |
||
187 |
The Option object is used to define its properties: |
|
188 |
||
189 |
* name: a name: a valid python identifier (even if it's not used as an |
|
190 |
identifier in python itself). This is also used to register the option. |
|
191 |
||
6332.1.2
by Vincent Ladeuil
Add a contents directive and fold the initial remarks about config option in the right section. |
192 |
* from_unicode: a callable accepting a unicode string and returning a |
193 |
suitable value for the option. If the string cannot be coerced it should |
|
194 |
return None. |
|
195 |
||
6393.3.3
by Vincent Ladeuil
Add Option.override_from_env allowing environ variables to override config settings |
196 |
* override_from_env: a list of environment variables. The first variable set |
197 |
will be used as the option value overriding any other definition of the |
|
198 |
option. |
|
199 |
||
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
200 |
* default: the default value that Stack.get() should return if no value can |
201 |
be found for the option. This can also be a callable as long as it returns |
|
202 |
a unicode string. |
|
5743.12.10
by Vincent Ladeuil
Add documentation. |
203 |
|
6082.2.1
by Vincent Ladeuil
Implement default values from environment for config options |
204 |
* default_from_env: a list of environment variables. The first variable set |
205 |
will provide a default value overriding 'default' which remains the |
|
6082.2.2
by Vincent Ladeuil
Fix typos. |
206 |
default value if *no* environment variable is set. |
6082.2.1
by Vincent Ladeuil
Implement default values from environment for config options |
207 |
|
6056.2.4
by Vincent Ladeuil
Option help is now part of the object itself. |
208 |
* help: a doc string describing the option, the first line should be a |
209 |
summary and can be followed by a blank line and a more detailed |
|
6332.1.3
by Vincent Ladeuil
Better tweaks (the value is not a property of the option). |
210 |
explanation. This will be displayed to the user with:: |
211 |
||
212 |
bzr help <option name> |
|
6059.1.1
by Vincent Ladeuil
Implement from_unicode to convert config option values from store. |
213 |
|
6059.1.5
by Vincent Ladeuil
Handle invalid config option values. |
214 |
* invalid: the action to be taken when an invalid value is encountered in a |
215 |
store (during a Stack.get()). |
|
216 |
||
6332.1.3
by Vincent Ladeuil
Better tweaks (the value is not a property of the option). |
217 |
The value of an option is a unicode string or ``None`` if it's not |
218 |
defined. By using ``from_unicode`` you can turn this string into a more |
|
6385.1.2
by Vincent Ladeuil
Add tests for Store quoting/unquoting |
219 |
appropriate representation. |
220 |
||
221 |
If you need a list value, you should use ``ListOption`` instead. |
|
222 |
||
6449.2.4
by Jelmer Vernooij
Document RegistryOption in developer docs. |
223 |
For options that take their values from a ``Registry`` object, |
224 |
``RegistryOption`` can be used. This will automatically take care of |
|
225 |
looking up the specified values in the dictionary and documenting the |
|
226 |
possible values in help. |
|
6332.1.3
by Vincent Ladeuil
Better tweaks (the value is not a property of the option). |
227 |
|
5743.3.7
by Vincent Ladeuil
Add some documentation about option and sections. |
228 |
Sections |
229 |
-------- |
|
230 |
||
231 |
Options are grouped into sections which share some properties with the well |
|
232 |
known dict objects: |
|
233 |
||
5743.12.10
by Vincent Ladeuil
Add documentation. |
234 |
* the key is the name, |
235 |
* you can get, set and remove an option, |
|
236 |
* the value is a unicode string. |
|
5743.3.7
by Vincent Ladeuil
Add some documentation about option and sections. |
237 |
|
5743.3.10
by Vincent Ladeuil
Fix typos mentioned in reviews. |
238 |
MutableSection is needed to set or remove an option, ReadOnlySection should |
5743.3.7
by Vincent Ladeuil
Add some documentation about option and sections. |
239 |
be used otherwise. |
240 |
||
6082.5.24
by Vincent Ladeuil
More documentation about local section options. |
241 |
|
5743.4.16
by Vincent Ladeuil
Some doc for the stores. |
242 |
Stores |
243 |
------ |
|
244 |
||
5743.4.25
by Vincent Ladeuil
Address review comments by jelmer and poolie. |
245 |
Options can be persistent in which case they are saved into Stores. |
5743.4.16
by Vincent Ladeuil
Some doc for the stores. |
246 |
|
247 |
``config.Store`` defines the abstract interface that all stores should |
|
248 |
implement. |
|
249 |
||
5743.4.25
by Vincent Ladeuil
Address review comments by jelmer and poolie. |
250 |
This object doesn't provide direct access to the options, it only provides |
251 |
access to Sections. This is deliberate to ensure that sections can be |
|
252 |
properly shared by reusing the same underlying objects. Accessing options |
|
253 |
should be done via the ``Section`` objects. |
|
5743.4.16
by Vincent Ladeuil
Some doc for the stores. |
254 |
|
255 |
A ``Store`` can contain one or more sections, each section is uniquely |
|
256 |
identified by a unicode string. |
|
257 |
||
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
258 |
``config.IniFileStore`` is an implementation that use ``ConfigObj``. |
5743.4.16
by Vincent Ladeuil
Some doc for the stores. |
259 |
|
260 |
Depending on the object it is associated with (or not) a ``Store`` also needs |
|
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
261 |
to implement a locking mechanism. ``LockableIniFileStore`` implements such a |
262 |
mechanism for ``IniFileStore`` based stores. |
|
5743.5.6
by Vincent Ladeuil
Mention that the test framework ought to support adding new stores. |
263 |
|
264 |
Classes are provided for the usual Bazaar configuration files and could be |
|
265 |
used as examples to define new ones if needed. The associated tests provides a |
|
266 |
basis for new classes which only need to register themselves in the right |
|
267 |
places to inherit from the existing basic tests and add their own specific |
|
268 |
ones. |
|
5743.2.29
by Vincent Ladeuil
Add doc for the section matchers. |
269 |
|
6385.1.1
by Vincent Ladeuil
Stores allow Stacks to control when values are quoted/unquoted |
270 |
A ``Store`` defines how option values are stored, this includes: |
271 |
||
272 |
* defining the sections where the options are grouped, |
|
273 |
||
274 |
* defining how the values are quoted/unquoted for storage purposes. Stacks |
|
275 |
use the unquoted values internally (default value handling and option |
|
276 |
expansion are simpler this way) and ``bzr config`` quote them when they |
|
277 |
need to be displayed. |
|
278 |
||
279 |
||
5743.2.29
by Vincent Ladeuil
Add doc for the section matchers. |
280 |
Filtering sections |
281 |
------------------ |
|
282 |
||
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
283 |
For some contexts, only some sections from a given store will apply. The |
284 |
``SectionMatcher`` objects are used to define which sections in a store |
|
285 |
apply to a given context. |
|
5743.2.29
by Vincent Ladeuil
Add doc for the section matchers. |
286 |
|
287 |
The main constraint here is that a ``SectionMatcher`` should delay the loading |
|
288 |
of the associated store as long as possible. The constructor should collect |
|
289 |
all data needed for the selection and uses it while processing the sections in |
|
290 |
``get_sections``. |
|
291 |
||
6123.7.1
by Vincent Ladeuil
Provide config.IdMatcher for config files defining secion names as unique ids |
292 |
Only ``ReadOnlySection`` objects are manipulated here but a |
293 |
``SectionMatcher`` can return dedicated ``Section`` objects to provide |
|
294 |
additional context (the ``LocationSection`` add an ``extra_path`` attribute |
|
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
295 |
to implement the section local options for example). If no sections match, |
6123.7.1
by Vincent Ladeuil
Provide config.IdMatcher for config files defining secion names as unique ids |
296 |
an empty list is returned. |
5743.2.29
by Vincent Ladeuil
Add doc for the section matchers. |
297 |
|
6362.3.1
by Vincent Ladeuil
Config doc refresh, clarifying the sections used in the implemented stacks. |
298 |
Options local to a section can be defined for special purposes and be |
6082.5.24
by Vincent Ladeuil
More documentation about local section options. |
299 |
handled by ``Section.get()``. One such option is ``relpath`` which is |
300 |
defined in ``LocationSection`` as an alternative to the ``appendpath`` |
|
301 |
policy. |
|
302 |
||
6082.5.25
by Vincent Ladeuil
Add ``basename`` as a section local option |
303 |
For ``appendpath``, the ``LocationSection`` will carry ``extra_path`` as the |
304 |
relative path between the section name and the location used. ``relpath`` |
|
305 |
will be available as a ``Section`` local option with the same |
|
306 |
value. ``basename`` will carry the location base name and be available as a |
|
307 |
local option with the same name. Note that such options can only be expanded |
|
308 |
inside the section that defines them. |
|
5743.1.24
by Vincent Ladeuil
Some generic doc about stacks. |
309 |
|
6123.7.1
by Vincent Ladeuil
Provide config.IdMatcher for config files defining secion names as unique ids |
310 |
Specific section matchers can be implemented by overriding ``get_sections`` |
311 |
or just ``match``. |
|
312 |
||
313 |
``bzrlib`` provides: |
|
314 |
||
6123.7.2
by Vincent Ladeuil
Rename IdMatcher to NameMatcher. |
315 |
* ``NameMatcher(store, unique_id)``: To select a single section matching |
6123.7.1
by Vincent Ladeuil
Provide config.IdMatcher for config files defining secion names as unique ids |
316 |
``unique_id``. |
317 |
||
6402.2.4
by Vincent Ladeuil
Add doc and news entry |
318 |
* ``LocationMatcher(store, location)``: To select all sections that match |
319 |
``location`` sorted by decreasing number of path components. |
|
320 |
||
6402.2.6
by Vincent Ladeuil
Fix {relpath} support, realizing that when a section ends with a glob, it's not obivous to decide what should be done. |
321 |
* ``StartingPathMatcher(store, location)``: To select all sections that |
322 |
match ``location`` in the order they appear in the ``store``. |
|
6402.2.4
by Vincent Ladeuil
Add doc and news entry |
323 |
|
5743.1.24
by Vincent Ladeuil
Some generic doc about stacks. |
324 |
Stacks |
325 |
------ |
|
326 |
||
6332.1.3
by Vincent Ladeuil
Better tweaks (the value is not a property of the option). |
327 |
An option can take different values depending on the context it is |
328 |
used. This can involve configuration files, options from the command line, |
|
5743.1.24
by Vincent Ladeuil
Some generic doc about stacks. |
329 |
default values in bzrlib and then some. |
330 |
||
331 |
Such a context is implemented by creating a list of ``Section`` stacked upon |
|
332 |
each other. A ``Stack`` can then be asked for an option value and returns the |
|
333 |
first definition found. |
|
334 |
||
335 |
This provides a great flexibility to decide priorities between sections when |
|
336 |
the stack is defined without to worry about them in the code itself. |
|
337 |
||
338 |
A stack also defines a mutable section (which can be None) to handle |
|
339 |
modifications. |
|
340 |
||
341 |
Many sections (or even stores) are aimed at providing default values for an |
|
342 |
option but these sections shouldn't be modified lightly as modifying an option |
|
343 |
used for different contexts will indeed be seen by all these contexts. |
|
344 |
||
5743.1.35
by Vincent Ladeuil
Address some review comments from jelmer and poolie. |
345 |
Default values in configuration files are defined by users. Developers |
5743.1.24
by Vincent Ladeuil
Some generic doc about stacks. |
346 |
shouldn't have to modify them, as such, no mechanism nor heuristics are used |
5743.1.35
by Vincent Ladeuil
Address some review comments from jelmer and poolie. |
347 |
to find which section (or sections) should be modified. |
5743.1.24
by Vincent Ladeuil
Some generic doc about stacks. |
348 |
|
5743.1.35
by Vincent Ladeuil
Address some review comments from jelmer and poolie. |
349 |
A ``Stack`` defines a mutable section when there is no ambiguity. If there |
350 |
is one, then the *user* should be able to decide and in this case a new |
|
351 |
``Stack`` can be created cheaply. |
|
5743.1.24
by Vincent Ladeuil
Some generic doc about stacks. |
352 |
|
5743.6.5
by Vincent Ladeuil
Complement the stacks doc. |
353 |
Different stacks can be created for different purposes, the existing |
5743.6.16
by Vincent Ladeuil
Fix typo. |
354 |
``GlobalStack``, ``LocationStack`` and ``BranchStack`` can be used as basis |
5743.6.5
by Vincent Ladeuil
Complement the stacks doc. |
355 |
or examples. These classes are the only ones that should be used in code, |
356 |
``Stores`` can be used to build them but shouldn't be used otherwise, ditto |
|
357 |
for sections. Again, the associated tests could and should be used against the |
|
358 |
created stacks. |
|
6393.1.1
by Vincent Ladeuil
Provides MemoryStack to simplify configuration setup in tests |
359 |
|
360 |
Also note that ``MemoryStack`` can be used without any disk resources which |
|
361 |
allows for simpler and faster tests. A common pattern is to accept a |
|
362 |
``config`` parameter related to a given feature and test it with predefined |
|
363 |
configurations without involving the whole |
|
364 |
stack. ``bzrlib.tests.test_commit``, ``bzrlib.tests.test_gpg`` and |
|
365 |
``bzrlib.tests.test_smtp_connection`` are good examples. |
|
366 |