~bzr-pqm/bzr/bzr.dev

3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
1
Configuration Settings
2977.1.7 by Ian Clatworthy
move config reference into appendices
2
=======================
1821.1.1 by Alexander Belchenko
win32 installer for bzr.dev.0.9
3
3089.3.1 by Ian Clatworthy
move reference material out of User Guide into User Reference
4
Environment settings
2977.1.7 by Ian Clatworthy
move config reference into appendices
5
---------------------
6
1551.18.20 by Aaron Bentley
Add environment vars to config document
7
While most configuration is handled by configuration files, some options
8
which may be semi-permanent can also be controlled through the environment.
9
10
BZR_EMAIL
2977.1.7 by Ian Clatworthy
move config reference into appendices
11
~~~~~~~~~
12
1551.18.20 by Aaron Bentley
Add environment vars to config document
13
Override the email id used by Bazaar.  Typical format::
14
15
  "John Doe <jdoe@example.com>"
16
6059.3.1 by Vincent Ladeuil
Provide per-config option help
17
See also the ``email`` configuration option.
1551.18.20 by Aaron Bentley
Add environment vars to config document
18
19
BZR_PROGRESS_BAR
2977.1.7 by Ian Clatworthy
move config reference into appendices
20
~~~~~~~~~~~~~~~~
21
4634.168.5 by Neil Martinsen-Burrell
make BZR_PROGRESS_BAR doc match actual behavior
22
Override the progress display.  Possible values are "none" or "text".  If
23
the value is "none" then no progress bar is displayed.  The value "text" draws
24
the ordinary command line progress bar.
1551.18.20 by Aaron Bentley
Add environment vars to config document
25
26
BZR_SIGQUIT_PDB
2977.1.7 by Ian Clatworthy
move config reference into appendices
27
~~~~~~~~~~~~~~~
28
1551.18.20 by Aaron Bentley
Add environment vars to config document
29
Control whether SIGQUIT behaves normally or invokes a breakin debugger.
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
30
3104.2.7 by Ian Clatworthy
feedback from poolie
31
* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
32
* 1 = Invoke breakin debugger (default)
1551.18.20 by Aaron Bentley
Add environment vars to config document
33
34
BZR_HOME
2977.1.7 by Ian Clatworthy
move config reference into appendices
35
~~~~~~~~
36
1551.18.20 by Aaron Bentley
Add environment vars to config document
37
Override the home directory used by Bazaar.
38
39
BZR_SSH
2977.1.7 by Ian Clatworthy
move config reference into appendices
40
~~~~~~~
41
1551.18.20 by Aaron Bentley
Add environment vars to config document
42
Select a different SSH implementation.
43
44
BZR_PDB
2977.1.7 by Ian Clatworthy
move config reference into appendices
45
~~~~~~~
46
1551.18.20 by Aaron Bentley
Add environment vars to config document
47
Control whether to launch a debugger on error.
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
48
49
* 0 = Standard behavior
50
* 1 = Launch debugger
1551.18.20 by Aaron Bentley
Add environment vars to config document
51
52
BZR_REMOTE_PATH
2977.1.7 by Ian Clatworthy
move config reference into appendices
53
~~~~~~~~~~~~~~~
54
1551.18.20 by Aaron Bentley
Add environment vars to config document
55
Path to the Bazaar executable to use when using the bzr+ssh protocol.
56
6059.3.1 by Vincent Ladeuil
Provide per-config option help
57
See also the ``bzr_remote_path`` configuration option.
1551.18.20 by Aaron Bentley
Add environment vars to config document
58
59
BZR_EDITOR
2977.1.7 by Ian Clatworthy
move config reference into appendices
60
~~~~~~~~~~
61
1551.18.20 by Aaron Bentley
Add environment vars to config document
62
Path to the editor Bazaar should use for commit messages, etc.
63
5185.2.1 by John C Barstow
Document BZR_LOG environment variable
64
BZR_LOG
65
~~~~~~~
66
5185.2.2 by John Arbash Meinel
Wrap at <80 characters.
67
Location of the Bazaar log file. You can check the current location by
68
running ``bzr version``.
69
70
The log file contains debug information that is useful for diagnosing or
71
reporting problems with Bazaar.
72
73
Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms
74
will disable logging.
5185.2.1 by John C Barstow
Document BZR_LOG environment variable
75
76
1551.18.20 by Aaron Bentley
Add environment vars to config document
77
BZR_PLUGIN_PATH
2977.1.7 by Ian Clatworthy
move config reference into appendices
78
~~~~~~~~~~~~~~~
79
1551.18.20 by Aaron Bentley
Add environment vars to config document
80
The path to the plugins directory that Bazaar should use.
4628.2.3 by Vincent Ladeuil
Update doc and add NEWS entry.
81
If not set, Bazaar will search for plugins in:
82
4628.2.5 by Vincent Ladeuil
Fixes prompted by review.
83
* the user specific plugin directory (containing the ``user`` plugins),
84
85
* the bzrlib directory (containing the ``core`` plugins),
86
87
* the site specific plugin directory if applicable (containing
88
  the ``site`` plugins).
4628.2.3 by Vincent Ladeuil
Update doc and add NEWS entry.
89
90
If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the
91
the way the plugin are searched. 
92
93
As for the ``PATH`` variables, if multiple directories are
94
specified in ``BZR_PLUGIN_PATH`` they should be separated by the
5278.1.5 by Martin Pool
Correct more sloppy use of the term 'Linux'
95
platform specific appropriate character (':' on Unix,
4628.2.3 by Vincent Ladeuil
Update doc and add NEWS entry.
96
';' on windows)
97
4628.2.5 by Vincent Ladeuil
Fixes prompted by review.
98
By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching
99
in ``user``.  However it will continue to search in ``core`` and
100
``site`` unless they are explicitly removed.
4628.2.3 by Vincent Ladeuil
Update doc and add NEWS entry.
101
102
If you need to change the order or remove one of these
103
directories, you should use special values:
104
105
* ``-user``, ``-core``, ``-site`` will remove the corresponding
106
  path from the default values,
107
108
* ``+user``, ``+core``, ``+site`` will add the corresponding path
109
  before the remaining default values (and also remove it from
110
  the default values).
111
112
Note that the special values 'user', 'core' and 'site' should be
113
used literally, they will be substituted by the corresponding,
114
platform specific, values.
115
5086.1.12 by Vincent Ladeuil
Fix config doc as per Martin's review comments.
116
The examples below use ':' as the separator, windows users
4628.2.3 by Vincent Ladeuil
Update doc and add NEWS entry.
117
should use ';'.
118
5086.1.12 by Vincent Ladeuil
Fix config doc as per Martin's review comments.
119
Overriding the default user plugin directory::
120
121
  BZR_PLUGIN_PATH='/path/to/my/other/plugins'
122
123
Disabling the site directory while retaining the user directory::
124
125
  BZR_PLUGIN_PATH='-site:+user'
126
127
Disabling all plugins (better achieved with --no-plugins)::
128
129
  BZR_PLUGIN_PATH='-user:-core:-site'
130
131
Overriding the default site plugin directory::
132
133
  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user
4628.2.3 by Vincent Ladeuil
Update doc and add NEWS entry.
134
5086.1.10 by Vincent Ladeuil
Fixed as per review comments.
135
BZR_DISABLE_PLUGINS
136
~~~~~~~~~~~~~~~~~~~
137
5086.5.6 by Vincent Ladeuil
Add NEWS entry and cleanup doc.
138
Under special circumstances (mostly when trying to diagnose a
139
bug), it's better to disable a plugin (or several) rather than
140
uninstalling them completely. Such plugins can be specified in
141
the ``BZR_DISABLE_PLUGINS`` environment variable.
5086.1.10 by Vincent Ladeuil
Fixed as per review comments.
142
143
In that case, ``bzr`` will stop loading the specified plugins and
5086.1.12 by Vincent Ladeuil
Fix config doc as per Martin's review comments.
144
will raise an import error if they are explicitly imported (by
145
another plugin that depends on them for example).
146
147
Disabling ``myplugin`` and ``yourplugin`` is achieved by::
148
149
  BZR_DISABLE_PLUGINS='myplugin:yourplugin'
4628.2.3 by Vincent Ladeuil
Update doc and add NEWS entry.
150
5086.5.6 by Vincent Ladeuil
Add NEWS entry and cleanup doc.
151
BZR_PLUGINS_AT
152
~~~~~~~~~~~~~~
153
154
When adding a new feature or working on a bug in a plugin,
155
developers often need to use a specific version of a given
156
plugin. Since python requires that the directory containing the
157
code is named like the plugin itself this make it impossible to
5086.5.10 by Vincent Ladeuil
Cleanup docs.
158
use arbitrary directory names (using a two-level directory scheme
159
is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even
160
if they don't appear in ``BZR_PLUGIN_PATH`` .
5086.5.6 by Vincent Ladeuil
Add NEWS entry and cleanup doc.
161
162
Plugins specified in this environment variable takes precedence
163
over the ones in ``BZR_PLUGIN_PATH``.
164
5086.5.10 by Vincent Ladeuil
Cleanup docs.
165
The variable specified a list of ``plugin_name@plugin path``,
5086.5.6 by Vincent Ladeuil
Add NEWS entry and cleanup doc.
166
``plugin_name`` being the name of the plugin as it appears in
167
python module paths, ``plugin_path`` being the path to the
168
directory containing the plugin code itself
169
(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list
170
separator, use ';' on windows.
171
172
Example:
173
~~~~~~~~
174
175
Using a specific version of ``myplugin``:
176
``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``
177
1551.18.20 by Aaron Bentley
Add environment vars to config document
178
BZRPATH
2977.1.7 by Ian Clatworthy
move config reference into appendices
179
~~~~~~~
180
1551.18.20 by Aaron Bentley
Add environment vars to config document
181
The path where Bazaar should look for shell plugin external commands.
182
183
5335.2.1 by Martin Pool
Mention http_proxy in 'help configuration'
184
http_proxy, https_proxy
185
~~~~~~~~~~~~~~~~~~~~~~~
186
187
Specifies the network proxy for outgoing connections, for example::
188
189
  http_proxy=http://proxy.example.com:3128/ 
190
  https_proxy=http://proxy.example.com:3128/
191
192
2900.2.24 by Vincent Ladeuil
Review feedback.
193
Configuration files
2977.1.7 by Ian Clatworthy
move config reference into appendices
194
-------------------
2900.2.24 by Vincent Ladeuil
Review feedback.
195
196
Location
2977.1.7 by Ian Clatworthy
move config reference into appendices
197
~~~~~~~~
2900.2.24 by Vincent Ladeuil
Review feedback.
198
5278.1.5 by Martin Pool
Correct more sloppy use of the term 'Linux'
199
Configuration files are located in ``$HOME/.bazaar`` on Unix and
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
200
``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0`` on
3104.2.7 by Ian Clatworthy
feedback from poolie
201
Windows. (You can check the location for your system by using
202
``bzr version``.)
203
204
There are three primary configuration files in this location:
2900.2.24 by Vincent Ladeuil
Review feedback.
205
206
* ``bazaar.conf`` describes default configuration options,
207
208
* ``locations.conf`` describes configuration information for
209
  specific branch locations,
210
211
* ``authentication.conf`` describes credential information for
212
  remote servers.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
213
2601.1.1 by James Westby
Split out bug tracker configuration in to its own file.
214
Each branch can also contain a configuration file that sets values specific
215
to that branch. This file is found at ``.bzr/branch/branch.conf`` within the
216
branch. This file is visible to all users of a branch, if you wish to override
217
one of the values for a branch with a setting that is specific to you then you
218
can do so in ``locations.conf``.
219
2977.1.1 by Ian Clatworthy
First cut at new look User Guide including chapters 1 and 2
220
General format
2977.1.7 by Ian Clatworthy
move config reference into appendices
221
~~~~~~~~~~~~~~
2900.2.24 by Vincent Ladeuil
Review feedback.
222
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
223
An ini file has three types of contructs: section headers, section
6082.5.24 by Vincent Ladeuil
More documentation about local section options.
224
options and comments.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
225
2120.6.14 by James Henstridge
Fix RST syntax as suggested by j-a-meinel
226
Comments
2977.1.7 by Ian Clatworthy
move config reference into appendices
227
^^^^^^^^
228
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
229
A comment is any line that starts with a "#" (sometimes called a "hash
230
mark", "pound sign" or "number sign"). Comment lines are ignored by
1861.2.6 by Alexander Belchenko
branding: change Bazaar-NG to Bazaar
231
Bazaar when parsing ini files.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
232
2977.1.1 by Ian Clatworthy
First cut at new look User Guide including chapters 1 and 2
233
Section headers
2977.1.7 by Ian Clatworthy
move config reference into appendices
234
^^^^^^^^^^^^^^^
235
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
236
A section header is a word enclosed in brackets that starts at the begining
2293.1.6 by Brad Crittenden
post review changes
237
of a line.  A typical section header looks like this::
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
238
239
    [DEFAULT]
240
3368.1.1 by Andrew Bennetts
Fix inaccuracy in configuration.txt help topic.
241
The only valid section headers for bazaar.conf currently are [DEFAULT] and
242
[ALIASES].  Section headers are case sensitive. The default section provides for
6082.5.24 by Vincent Ladeuil
More documentation about local section options.
243
setting options which can be overridden with the branch config file.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
244
6082.5.24 by Vincent Ladeuil
More documentation about local section options.
245
For ``locations.conf``, the options from the section with the
2293.1.6 by Brad Crittenden
post review changes
246
longest matching section header are used to the exclusion of other
247
potentially valid section headers. A section header uses the path for
248
the branch as the section header. Some examples include::
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
249
250
    [http://mybranches.isp.com/~jdoe/branchdir]
251
    [/home/jdoe/branches/]
252
253
6082.5.24 by Vincent Ladeuil
More documentation about local section options.
254
Section options
255
^^^^^^^^^^^^^^^
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
256
6082.5.24 by Vincent Ladeuil
More documentation about local section options.
257
A section option resides within a section. A section option contains an
258
option name, an equals sign and a value.  For example::
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
259
260
    email            = John Doe <jdoe@isp.com>
6012.2.11 by Jonathan Riddell
rename config option signing_key to gpg_signing_key
261
    gpg_signing_key  = Amy Pond <amy@example.com>
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
262
6082.5.24 by Vincent Ladeuil
More documentation about local section options.
263
A option can reference other options by enclosing them in curly brackets::
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
264
265
    my_branch_name = feature_x
266
    my_server      = bzr+ssh://example.com
267
    push_location   = {my_server}/project/{my_branch_name}
268
6082.5.24 by Vincent Ladeuil
More documentation about local section options.
269
Option policies
270
^^^^^^^^^^^^^^^
271
272
Options defined in a section affect the named directory or URL plus
273
any locations they contain.  Policies can be used to change how an
274
option value is interpreted for contained locations.  Currently
2120.6.13 by James Henstridge
update doc/configuration.txt with information about policies
275
there are three policies available:
276
2120.6.14 by James Henstridge
Fix RST syntax as suggested by j-a-meinel
277
 none:
278
   the value is interpreted the same for contained locations.  This is
279
   the default behaviour.
280
 norecurse:
281
   the value is only used for the exact location specified by the
282
   section name.
283
 appendpath:
284
   for contained locations, any additional path components are
285
   appended to the value.
2120.6.13 by James Henstridge
update doc/configuration.txt with information about policies
286
6082.5.24 by Vincent Ladeuil
More documentation about local section options.
287
Policies are specified by keys with names of the form "<option_name>:policy".
2120.6.13 by James Henstridge
update doc/configuration.txt with information about policies
288
For example, to define the push location for a tree of branches, the
2120.6.14 by James Henstridge
Fix RST syntax as suggested by j-a-meinel
289
following could be used::
2120.6.13 by James Henstridge
update doc/configuration.txt with information about policies
290
291
  [/top/location]
292
  push_location = sftp://example.com/location
293
  push_location:policy = appendpath
294
2120.6.14 by James Henstridge
Fix RST syntax as suggested by j-a-meinel
295
With this configuration, the push location for ``/top/location/branch1``
296
would be ``sftp://example.com/location/branch1``.
2120.6.13 by James Henstridge
update doc/configuration.txt with information about policies
297
6082.5.24 by Vincent Ladeuil
More documentation about local section options.
298
Section local options
299
^^^^^^^^^^^^^^^^^^^^^
300
301
Some options are defined automatically inside a given section and can be
302
refered to in this section only. 
303
304
For example, the ``appendpath`` policy can be used like this::
305
306
  [/home/vila/src/bzr/bugs]
307
  mypush = lp:~vila/bzr
308
  mypush:policy=appendpath
309
310
Using ``relpath`` to achieve the same result is done like this::
311
312
  [/home/vila/src/bzr/bugs]
313
  mypush = lp:~vila/bzr/{relpath}
314
315
In both cases, when used in a directory like
316
``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::
317
318
   $ bzr config mypush
319
   lp:~vila/bzr/832013-expand-in-stack
320
6082.5.25 by Vincent Ladeuil
Add ``basename`` as a section local option
321
Another such option is ``basename`` which can be used like this::
322
323
  [/home/vila/src/bzr]
324
  mypush = lp:~vila/bzr/{basename}
325
326
When used in a directory like
327
``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::
328
329
   $ bzr config mypush
330
   lp:~vila/bzr/832013-expand-in-stack
331
332
Note that ``basename`` here refers to the base name of ``relpath`` which
333
itself is defined as the relative path between the section name and the
334
location it matches.
335
6524.2.3 by Aaron Bentley
Update docs.
336
Another such option is ``branchname``, which refers to the name of a colocated
6524.2.5 by Aaron Bentley
Update docs.
337
branch.  For non-colocated branches, it behaves like basename.  It can be used
338
like this::
6524.2.3 by Aaron Bentley
Update docs.
339
340
  [/home/vila/src/bzr/bugs]
341
  mypush = lp:~vila/bzr/{branchname}
342
343
When used with a colocated branch named ``832013-expand-in-stack``, we'll get::
344
345
  bzr config mypush
346
  lp:~vila/bzr/832013-expand-in-stack
347
6082.5.24 by Vincent Ladeuil
More documentation about local section options.
348
When an option is local to a Section, it cannot be referred to from option
349
values in any other section from the same ``Store`` nor from any other
350
``Store``.
351
2120.6.13 by James Henstridge
update doc/configuration.txt with information about policies
352
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
353
The main configuration file, bazaar.conf
2977.1.7 by Ian Clatworthy
move config reference into appendices
354
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
355
3974.1.3 by Ian Clatworthy
tweak configuration settings help
356
``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.
357
The default section contains the default
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
358
configuration options for all branches. The default section can be
2293.1.6 by Brad Crittenden
post review changes
359
overriden by providing a branch-specific section in ``locations.conf``.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
360
2293.1.3 by Brad Crittenden
Updated version_info.txt for grammar changes
361
A typical ``bazaar.conf`` section often looks like the following::
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
362
363
    [DEFAULT]
364
    email             = John Doe <jdoe@isp.com>
365
    editor            = /usr/bin/vim
366
    create_signatures = when-required
367
2900.2.24 by Vincent Ladeuil
Review feedback.
368
369
The branch location configuration file, locations.conf
2977.1.7 by Ian Clatworthy
move config reference into appendices
370
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2900.2.24 by Vincent Ladeuil
Review feedback.
371
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
372
``locations.conf`` allows one to specify overriding settings for
2900.2.24 by Vincent Ladeuil
Review feedback.
373
a specific branch. The format is almost identical to the default section in
374
bazaar.conf with one significant change: The section header, instead of saying
375
default, will be the path to a branch that you wish to override a value
376
for. The '?' and '*' wildcards are supported::
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
377
378
    [/home/jdoe/branches/nethack]
379
    email = Nethack Admin <nethack@nethack.com>
380
381
    [http://hypothetical.site.com/branches/devel-branch]
382
    create_signatures = always
383
2900.2.24 by Vincent Ladeuil
Review feedback.
384
The authentication configuration file, authentication.conf
2977.1.7 by Ian Clatworthy
move config reference into appendices
385
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2900.2.24 by Vincent Ladeuil
Review feedback.
386
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
387
``authentication.conf`` allows one to specify credentials for
2900.2.24 by Vincent Ladeuil
Review feedback.
388
remote servers. This can be used for all the supported transports and any part
389
of bzr that requires authentication (smtp for example).
390
391
The syntax of the file obeys the same rules as the others except for the
6082.5.24 by Vincent Ladeuil
More documentation about local section options.
392
option policies which don't apply.
2900.2.24 by Vincent Ladeuil
Review feedback.
393
394
For more information on the possible uses of the authentication configuration
4927.2.3 by Ian Clatworthy
improve formatting: better linking, notes, etc.
395
file see :doc:`authentication-help`.
2900.2.24 by Vincent Ladeuil
Review feedback.
396
397
6082.5.24 by Vincent Ladeuil
More documentation about local section options.
398
Common options
399
--------------
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
400
4070.8.5 by Martin Pool
Add help about debug_flags to configuration topic
401
debug_flags
402
~~~~~~~~~~~
403
404
A comma-separated list of debugging options to turn on.  The same values
405
can be used as with the -D command-line option (see `help global-options`).
406
For example::
407
6059.4.7 by Vincent Ladeuil
Fix doc some more.
408
    debug_flags = hpss
409
410
or::
411
412
    debug_flags = hpss,evil
4070.8.5 by Martin Pool
Add help about debug_flags to configuration topic
413
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
414
email
2977.1.7 by Ian Clatworthy
move config reference into appendices
415
~~~~~
416
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
417
The email address to use when committing a branch. Typically takes the form
418
of::
419
420
    email = Full Name <account@hostname.tld>
421
422
editor
2977.1.7 by Ian Clatworthy
move config reference into appendices
423
~~~~~~
424
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
425
The path of the editor that you wish to use if *bzr commit* is run without
2601.1.1 by James Westby
Split out bug tracker configuration in to its own file.
426
a commit message. This setting is trumped by the environment variable
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
427
``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment
428
variables.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
429
3974.1.3 by Ian Clatworthy
tweak configuration settings help
430
log_format
431
~~~~~~~~~~
432
433
The default log format to use. Standard log formats are ``long``, ``short``
434
and ``line``. Additional formats may be provided by plugins. The default
435
value is ``long``.
436
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
437
check_signatures
2977.1.7 by Ian Clatworthy
move config reference into appendices
438
~~~~~~~~~~~~~~~~
439
5967.3.1 by Jonathan Riddell
make docs for signing config options match reality
440
Reserved for future use.  These options will allow a policy for branches to
441
require signatures.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
442
443
require
2293.1.3 by Brad Crittenden
Updated version_info.txt for grammar changes
444
    The gnupg signature for revisions must be present and must be valid.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
445
446
ignore
2376.4.35 by Jonathan Lange
Include configuration documentation for tracker config options.
447
    Do not check gnupg signatures of revisions.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
448
449
check-available
450
    (default) If gnupg signatures for revisions are present, check them.
1861.2.6 by Alexander Belchenko
branding: change Bazaar-NG to Bazaar
451
    Bazaar will fail if it finds a bad signature, but will not fail if
2293.1.3 by Brad Crittenden
Updated version_info.txt for grammar changes
452
    no signature is present.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
453
454
create_signatures
2977.1.7 by Ian Clatworthy
move config reference into appendices
455
~~~~~~~~~~~~~~~~~
456
5967.3.1 by Jonathan Riddell
make docs for signing config options match reality
457
Defines the behaviour of signing revisions on commits.  By default bzr will not
458
sign new commits.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
459
460
always
5967.3.1 by Jonathan Riddell
make docs for signing config options match reality
461
    Sign every new revision that is committed.  If the signing fails then the
462
    commit will not be made.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
463
464
when-required
5967.3.1 by Jonathan Riddell
make docs for signing config options match reality
465
    Reserved for future use.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
466
467
never
5967.3.1 by Jonathan Riddell
make docs for signing config options match reality
468
    Reserved for future use.
469
470
In future it is planned that ``when-required`` will sign newly
471
committed revisions only when the branch requires them.  ``never`` will refuse
472
to sign newly committed revisions, even if the branch requires signatures.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
473
6006.4.12 by Martin Pool
Documentation and news for fdatasync (bug 343427)
474
dirstate.fdatasync
475
~~~~~~~~~~~~~~~~~~
476
477
If true (default), working tree metadata changes are flushed through the
478
OS buffers to physical disk.  This is somewhat slower, but means data
479
should not be lost if the machine crashes.  See also repository.fdatasync.
480
6012.2.11 by Jonathan Riddell
rename config option signing_key to gpg_signing_key
481
gpg_signing_key
6059.4.7 by Vincent Ladeuil
Fix doc some more.
482
~~~~~~~~~~~~~~~
6012.2.5 by Jonathan Riddell
add signing_key to docs
483
6012.2.11 by Jonathan Riddell
rename config option signing_key to gpg_signing_key
484
The GnuPG user identity to use when signing commits.  Can be an e-mail
6012.2.5 by Jonathan Riddell
add signing_key to docs
485
address, key fingerprint or full key ID.  When unset or when set to
486
"default" Bazaar will use the user e-mail set with ``whoami``.
487
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
488
recurse
2977.1.7 by Ian Clatworthy
move config reference into appendices
489
~~~~~~~
490
2293.1.6 by Brad Crittenden
post review changes
491
Only useful in ``locations.conf``. Defines whether or not the
492
configuration for this section applies to subdirectories:
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
493
494
true
2293.1.6 by Brad Crittenden
post review changes
495
    (default) This section applies to subdirectories as well.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
496
497
false
498
    This section only applies to the branch at this directory and not
2376.4.35 by Jonathan Lange
Include configuration documentation for tracker config options.
499
    branches below it.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
500
501
gpg_signing_command
2977.1.7 by Ian Clatworthy
move config reference into appendices
502
~~~~~~~~~~~~~~~~~~~
503
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
504
(Default: "gpg"). Which program should be used to sign and check revisions.
2293.1.3 by Brad Crittenden
Updated version_info.txt for grammar changes
505
For example::
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
506
507
    gpg_signing_command = /usr/bin/gnpg
508
6012.2.2 by Jonathan Riddell
note that the gpg signing command needs to accept certain options
509
The specified command must accept the options "--clearsign" and "-u <email>".
510
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
511
bzr_remote_path
2977.1.7 by Ian Clatworthy
move config reference into appendices
512
~~~~~~~~~~~~~~~
513
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
514
(Default: "bzr").  The path to the command that should be used to run the smart
515
server for bzr.  This value may only be specified in locations.conf, because:
516
517
- it's needed before branch.conf is accessible
518
- allowing remote branch.conf files to specify commands would be a security
519
  risk
520
521
It is overridden by the BZR_REMOTE_PATH environment variable.
522
2535.2.1 by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email.
523
smtp_server
2977.1.7 by Ian Clatworthy
move config reference into appendices
524
~~~~~~~~~~~
525
2535.2.1 by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email.
526
(Default: "localhost"). SMTP server to use when Bazaar needs to send
527
email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin.
528
529
smtp_username, smtp_password
2977.1.7 by Ian Clatworthy
move config reference into appendices
530
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
531
2535.2.1 by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email.
532
User and password to authenticate to the SMTP server. If smtp_username
533
is set, and smtp_password is not, Bazaar will prompt for a password.
2601.1.1 by James Westby
Split out bug tracker configuration in to its own file.
534
These settings are only needed if the SMTP server requires authentication
535
to send mail.
2535.2.1 by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email.
536
5425.4.25 by Martin Pool
Support auto-stealing dead locks, but turn it off by default.
537
locks.steal_dead
5425.4.15 by Martin Pool
Add steal_dead_locks option letting automatic lock-breaking be turned off
538
~~~~~~~~~~~~~~~~
539
5425.4.25 by Martin Pool
Support auto-stealing dead locks, but turn it off by default.
540
If set to true, bzr will automatically break locks held by processes from
541
the same machine and user that are no longer alive.  Otherwise, it will
542
print a message and you can break the lock manually, if you are satisfied
543
the object is no longer in use.
5425.4.15 by Martin Pool
Add steal_dead_locks option letting automatic lock-breaking be turned off
544
2681.1.14 by Aaron Bentley
Update docs
545
mail_client
2977.1.7 by Ian Clatworthy
move config reference into appendices
546
~~~~~~~~~~~
547
2681.1.26 by Aaron Bentley
Merge MAPI support from Lukáš Lalinsky
548
A mail client to use for sending merge requests.
2681.1.27 by Aaron Bentley
Update text, fix whitespace issues
549
By default, bzr will try to use ``mapi`` on Windows.  On other platforms, it
550
will try ``xdg-email``. If either of these fails, it will fall back to
551
``editor``.
2681.1.26 by Aaron Bentley
Merge MAPI support from Lukáš Lalinsky
552
2790.2.5 by Keir Mierle
Change ordering of clients listing.
553
Supported values for specific clients:
554
3921.2.8 by Aaron Bentley
Update docs
555
:claws: Use Claws.  This skips a dialog for attaching files.
2790.2.5 by Keir Mierle
Change ordering of clients listing.
556
:evolution: Use Evolution.
557
:kmail: Use KMail.
558
:mutt: Use Mutt.
559
:thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove 1.5,
560
    this works around some bugs that xdg-email doesn't handle.
561
2790.2.2 by Keir Mierle
Change alphabetic ordering into two categories; one for specific clients the other for generic options.
562
Supported generic values are:
2681.1.26 by Aaron Bentley
Merge MAPI support from Lukáš Lalinsky
563
2790.2.1 by Keir Mierle
Add Mutt as a supported client email program. Also rearranges various listings
564
:default: See above.
565
:editor: Use your editor to compose the merge request.  This also uses
566
    your commit id, (see ``bzr whoami``), smtp_server and (optionally)
567
    smtp_username and smtp_password.
2790.2.2 by Keir Mierle
Change alphabetic ordering into two categories; one for specific clients the other for generic options.
568
:mapi: Use your preferred e-mail client on Windows.
569
:xdg-email: Use xdg-email to run your preferred mail program
570
6006.4.12 by Martin Pool
Documentation and news for fdatasync (bug 343427)
571
repository.fdatasync
572
~~~~~~~~~~~~~~~~~~~~
573
574
If true (default), repository changes are flushed through the OS buffers
575
to physical disk.  This is somewhat slower, but means data should not be
576
lost if the machine crashes.  See also dirstate.fdatasync.
577
2681.1.14 by Aaron Bentley
Update docs
578
submit_branch
2977.1.7 by Ian Clatworthy
move config reference into appendices
579
~~~~~~~~~~~~~
580
2681.1.14 by Aaron Bentley
Update docs
581
The branch you intend to submit your current work to.  This is automatically
582
set by ``bzr send``, and is also used by the ``submit:`` revision spec.  This
583
should usually be set on a per-branch or per-location basis.
584
585
public_branch
2977.1.7 by Ian Clatworthy
move config reference into appendices
586
~~~~~~~~~~~~~
587
2681.1.14 by Aaron Bentley
Update docs
588
A publically-accessible version of this branch (implying that this version is
589
not publically-accessible).  Used (and set) by ``bzr send``.
590
4840.2.7 by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to
591
suppress_warnings
592
~~~~~~~~~~~~~~~~~
593
594
A list of strings, each string represent a warning that can be emitted by
595
bzr. Mentioning a warning in this list tells bzr to not emit it.
596
597
Valid values:
598
599
* ``format_deprecation``:
600
    whether the format deprecation warning is shown on repositories that are
601
    using deprecated formats.
4840.2.3 by Ted Gould
Adding in text explaining the format_deprecation_warning configuration setting.
602
5448.4.3 by Neil Martinsen-Burrell
use option along with controldir.set_default to control the default format
603
default_format
604
~~~~~~~~~~~~~~
605
606
A format name for the default format used when creating branches.  See ``bzr
607
help formats`` for possible values.
608
2230.3.43 by Aaron Bentley
Update docs
609
5230.1.4 by Martin Pool
Document output_encoding
610
Unicode options
611
---------------
612
613
output_encoding
614
~~~~~~~~~~~~~~~
615
616
A Python unicode encoding name for text output from bzr, such as log
617
information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default
618
is the terminal encoding prefered by the operating system.
619
620
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
621
Branch type specific options
622
----------------------------
2230.3.43 by Aaron Bentley
Update docs
623
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
624
These options apply only to branches that use the ``dirstate-tags`` or
625
later format.  They
1551.18.20 by Aaron Bentley
Add environment vars to config document
626
are usually set in ``.bzr/branch/branch.conf`` automatically, but may be
627
manually set in ``locations.conf`` or ``bazaar.conf``.
2230.3.43 by Aaron Bentley
Update docs
628
629
append_revisions_only
2977.1.7 by Ian Clatworthy
move config reference into appendices
630
~~~~~~~~~~~~~~~~~~~~~
631
2293.1.6 by Brad Crittenden
post review changes
632
If set to "True" then revisions can only be appended to the log, not
4989.2.13 by Vincent Ladeuil
append_revisions_only accept all valid booleans, update doc to
633
removed.  A branch with this setting enabled can only pull from another
634
branch if the other branch's log is a longer version of its own.  This is
635
normally set by ``bzr init --append-revisions-only``. If you set it
636
manually, use either 'True' or 'False' (case-sensitive) to maintain
637
compatibility with previous bzr versions (older than 2.2).
2230.3.43 by Aaron Bentley
Update docs
638
639
parent_location
2977.1.7 by Ian Clatworthy
move config reference into appendices
640
~~~~~~~~~~~~~~~
641
5861.1.3 by Vincent Ladeuil
Fix the docs for push/pull/send regarding --no-remember.
642
If present, the location of the default branch for pull or merge.  This option
643
is normally set when creating a branch, the first ``pull`` or by ``pull
2601.1.1 by James Westby
Split out bug tracker configuration in to its own file.
644
--remember``.
2230.3.43 by Aaron Bentley
Update docs
645
646
push_location
2977.1.7 by Ian Clatworthy
move config reference into appendices
647
~~~~~~~~~~~~~
648
2293.1.3 by Brad Crittenden
Updated version_info.txt for grammar changes
649
If present, the location of the default branch for push.  This option
5861.1.3 by Vincent Ladeuil
Fix the docs for push/pull/send regarding --no-remember.
650
is normally set by the first ``push`` or ``push --remember``.
2230.3.43 by Aaron Bentley
Update docs
651
4420.1.3 by Vincent Ladeuil
Add NEWS entry and update doc.
652
push_strict
653
~~~~~~~~~~~
654
655
If present, defines the ``--strict`` option default value for checking
656
uncommitted changes before pushing.
657
4721.2.3 by Vincent Ladeuil
Make all test pass by implement --strict for dpush.
658
dpush_strict
659
~~~~~~~~~~~~
660
661
If present, defines the ``--strict`` option default value for checking
662
uncommitted changes before pushing into a different VCS without any
663
custom bzr metadata.
664
2230.3.43 by Aaron Bentley
Update docs
665
bound_location
2977.1.7 by Ian Clatworthy
move config reference into appendices
666
~~~~~~~~~~~~~~
667
2293.1.3 by Brad Crittenden
Updated version_info.txt for grammar changes
668
The location that commits should go to when acting as a checkout.
669
This option is normally set by ``bind``.
2230.3.43 by Aaron Bentley
Update docs
670
671
bound
2977.1.7 by Ian Clatworthy
move config reference into appendices
672
~~~~~
673
2230.3.43 by Aaron Bentley
Update docs
674
If set to "True", the branch should act as a checkout, and push each commit to
2293.1.3 by Brad Crittenden
Updated version_info.txt for grammar changes
675
the bound_location.  This option is normally set by ``bind``/``unbind``.
4464.3.4 by Vincent Ladeuil
Fix bug #206577 by adding a --strict option to send.
676
677
send_strict
678
~~~~~~~~~~~
679
680
If present, defines the ``--strict`` option default value for checking
681
uncommitted changes before sending a merge directive.
682
6046.2.5 by Shannon Weyrick
Document add.maximum_file_size more
683
add.maximum_file_size
684
~~~~~~~~~~~~~~~~~~~~~
685
6046.2.9 by Shannon Weyrick
Make it explicit in docs that large file skips happen only in recursive mode. Add test.
686
Defines the maximum file size the command line "add" operation will allow
687
in recursive mode, with files larger than this value being skipped. You may 
688
specify this value as an integer (in which case it is interpreted as bytes), 
689
or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of 0 
690
will disable skipping.
5321.1.78 by Gordon Tyler
Added description of settings for merge tools to configuration help topic.
691
692
External Merge Tools
693
--------------------
694
5321.2.3 by Vincent Ladeuil
Prefix mergetools option names with 'bzr.'.
695
bzr.mergetool.<name>
696
~~~~~~~~~~~~~~~~~~~~
5321.1.78 by Gordon Tyler
Added description of settings for merge tools to configuration help topic.
697
698
Defines an external merge tool called <name> with the given command-line.
699
Arguments containing spaces should be quoted using single or double quotes. The
700
executable may omit its path if it can be found on the PATH.
701
702
The following markers can be used in the command-line to substitute filenames
5860.1.1 by Vincent Ladeuil
Fix some ReST typos in the configuration help and restore the workaround for dotted format names breaking sphinx.
703
involved in the merge conflict::
704
705
  {base}      file.BASE
706
  {this}      file.THIS
707
  {other}     file.OTHER
708
  {result}    output file
709
  {this_temp} temp copy of file.THIS, used to overwrite output file if merge
710
              succeeds.
711
712
For example::
5321.1.78 by Gordon Tyler
Added description of settings for merge tools to configuration help topic.
713
5321.2.3 by Vincent Ladeuil
Prefix mergetools option names with 'bzr.'.
714
  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}
5321.1.78 by Gordon Tyler
Added description of settings for merge tools to configuration help topic.
715
6564.2.4 by Vincent Ladeuil
Fix formattting.
716
Because ``mergetool`` and ``config`` itself both use curly braces as
717
interpolation markers, trying to display the mergetool line results in the
718
following problem::
6564.2.3 by Vincent Ladeuil
Don't explain gory details, most users won't care.
719
6564.2.1 by Vincent Ladeuil
Clarify why mergetool templates cannot be displayed by bzr config TEMPLATE
720
721
  $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o {result}'
722
  $ bzr config bzr.mergetool.kdiff3
723
  bzr: ERROR: Option base is not defined while expanding "kdiff3 {base} {this} {other} -o {result}".
724
6564.2.4 by Vincent Ladeuil
Fix formattting.
725
To avoid this, ``config`` can be instructed not to try expanding variables::
6564.2.1 by Vincent Ladeuil
Clarify why mergetool templates cannot be displayed by bzr config TEMPLATE
726
727
  $ bzr config --all bzr.mergetool.kdiff3
728
  branch:
729
    bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}
730
731
5321.2.3 by Vincent Ladeuil
Prefix mergetools option names with 'bzr.'.
732
bzr.default_mergetool
5860.1.1 by Vincent Ladeuil
Fix some ReST typos in the configuration help and restore the workaround for dotted format names breaking sphinx.
733
~~~~~~~~~~~~~~~~~~~~~
5321.1.78 by Gordon Tyler
Added description of settings for merge tools to configuration help topic.
734
735
Specifies which external merge tool (as defined above) should be selected by
736
default in tools such as ``bzr qconflicts``.
737
5860.1.1 by Vincent Ladeuil
Fix some ReST typos in the configuration help and restore the workaround for dotted format names breaking sphinx.
738
For example::
5321.1.78 by Gordon Tyler
Added description of settings for merge tools to configuration help topic.
739
5321.2.3 by Vincent Ladeuil
Prefix mergetools option names with 'bzr.'.
740
  bzr.default_mergetool = kdiff3