~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
17
See also the ``email`` configuration value.
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
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
57
See also the ``bzr_remote_path`` configuration value.
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
224
variables and comments.
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
243
setting variables which can be overridden with the branch config file.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
244
2293.1.6 by Brad Crittenden
post review changes
245
For ``locations.conf``, the variables from the section with the
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
2977.1.1 by Ian Clatworthy
First cut at new look User Guide including chapters 1 and 2
254
Section variables
2977.1.7 by Ian Clatworthy
move config reference into appendices
255
^^^^^^^^^^^^^^^^^
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
256
257
A section variable resides within a section. A section variable contains a
2293.1.3 by Brad Crittenden
Updated version_info.txt for grammar changes
258
variable 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>
261
    check_signatures = require
262
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
263
A variable can reference other variables **in the same configuration file** by
264
enclosing them in curly brackets::
265
266
    my_branch_name = feature_x
267
    my_server      = bzr+ssh://example.com
268
    push_location   = {my_server}/project/{my_branch_name}
269
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
270
2977.1.1 by Ian Clatworthy
First cut at new look User Guide including chapters 1 and 2
271
Variable policies
2977.1.7 by Ian Clatworthy
move config reference into appendices
272
^^^^^^^^^^^^^^^^^
2120.6.13 by James Henstridge
update doc/configuration.txt with information about policies
273
274
Variables defined in a section affect the named directory or URL plus
275
any locations they contain.  Policies can be used to change how a
276
variable value is interpreted for contained locations.  Currently
277
there are three policies available:
278
2120.6.14 by James Henstridge
Fix RST syntax as suggested by j-a-meinel
279
 none:
280
   the value is interpreted the same for contained locations.  This is
281
   the default behaviour.
282
 norecurse:
283
   the value is only used for the exact location specified by the
284
   section name.
285
 appendpath:
286
   for contained locations, any additional path components are
287
   appended to the value.
2120.6.13 by James Henstridge
update doc/configuration.txt with information about policies
288
289
Policies are specified by keys with names of the form "$var:policy".
290
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
291
following could be used::
2120.6.13 by James Henstridge
update doc/configuration.txt with information about policies
292
293
  [/top/location]
294
  push_location = sftp://example.com/location
295
  push_location:policy = appendpath
296
2120.6.14 by James Henstridge
Fix RST syntax as suggested by j-a-meinel
297
With this configuration, the push location for ``/top/location/branch1``
298
would be ``sftp://example.com/location/branch1``.
2120.6.13 by James Henstridge
update doc/configuration.txt with information about policies
299
300
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
301
The main configuration file, bazaar.conf
2977.1.7 by Ian Clatworthy
move config reference into appendices
302
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
303
3974.1.3 by Ian Clatworthy
tweak configuration settings help
304
``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.
305
The default section contains the default
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
306
configuration options for all branches. The default section can be
2293.1.6 by Brad Crittenden
post review changes
307
overriden by providing a branch-specific section in ``locations.conf``.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
308
2293.1.3 by Brad Crittenden
Updated version_info.txt for grammar changes
309
A typical ``bazaar.conf`` section often looks like the following::
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
310
311
    [DEFAULT]
312
    email             = John Doe <jdoe@isp.com>
313
    editor            = /usr/bin/vim
314
    check_signatures  = check-available
315
    create_signatures = when-required
316
2900.2.24 by Vincent Ladeuil
Review feedback.
317
318
The branch location configuration file, locations.conf
2977.1.7 by Ian Clatworthy
move config reference into appendices
319
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2900.2.24 by Vincent Ladeuil
Review feedback.
320
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
321
``locations.conf`` allows one to specify overriding settings for
2900.2.24 by Vincent Ladeuil
Review feedback.
322
a specific branch. The format is almost identical to the default section in
323
bazaar.conf with one significant change: The section header, instead of saying
324
default, will be the path to a branch that you wish to override a value
325
for. The '?' and '*' wildcards are supported::
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
326
327
    [/home/jdoe/branches/nethack]
328
    email = Nethack Admin <nethack@nethack.com>
329
330
    [http://hypothetical.site.com/branches/devel-branch]
331
    create_signatures = always
332
    check_signatures  = always
333
5560.2.1 by Vincent Ladeuil
Fix the remaining references to http://bazaar-vcs.org (except the explicitly historical ones).
334
    [http://example.com/bzr/*]
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
335
    check_signatures  = require
336
2900.2.24 by Vincent Ladeuil
Review feedback.
337
The authentication configuration file, authentication.conf
2977.1.7 by Ian Clatworthy
move config reference into appendices
338
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2900.2.24 by Vincent Ladeuil
Review feedback.
339
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
340
``authentication.conf`` allows one to specify credentials for
2900.2.24 by Vincent Ladeuil
Review feedback.
341
remote servers. This can be used for all the supported transports and any part
342
of bzr that requires authentication (smtp for example).
343
344
The syntax of the file obeys the same rules as the others except for the
345
variable policies which don't apply.
346
347
For more information on the possible uses of the authentication configuration
4927.2.3 by Ian Clatworthy
improve formatting: better linking, notes, etc.
348
file see :doc:`authentication-help`.
2900.2.24 by Vincent Ladeuil
Review feedback.
349
350
2977.1.1 by Ian Clatworthy
First cut at new look User Guide including chapters 1 and 2
351
Common variable options
2977.1.7 by Ian Clatworthy
move config reference into appendices
352
-----------------------
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
353
4070.8.5 by Martin Pool
Add help about debug_flags to configuration topic
354
debug_flags
355
~~~~~~~~~~~
356
357
A comma-separated list of debugging options to turn on.  The same values
358
can be used as with the -D command-line option (see `help global-options`).
359
For example::
360
361
    debug_flags = hpss
362
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
363
email
2977.1.7 by Ian Clatworthy
move config reference into appendices
364
~~~~~
365
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
366
The email address to use when committing a branch. Typically takes the form
367
of::
368
369
    email = Full Name <account@hostname.tld>
370
371
editor
2977.1.7 by Ian Clatworthy
move config reference into appendices
372
~~~~~~
373
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
374
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.
375
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
376
``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment
377
variables.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
378
3974.1.3 by Ian Clatworthy
tweak configuration settings help
379
log_format
380
~~~~~~~~~~
381
382
The default log format to use. Standard log formats are ``long``, ``short``
383
and ``line``. Additional formats may be provided by plugins. The default
384
value is ``long``.
385
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
386
check_signatures
2977.1.7 by Ian Clatworthy
move config reference into appendices
387
~~~~~~~~~~~~~~~~
388
5967.3.1 by Jonathan Riddell
make docs for signing config options match reality
389
Reserved for future use.  These options will allow a policy for branches to
390
require signatures.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
391
392
require
2293.1.3 by Brad Crittenden
Updated version_info.txt for grammar changes
393
    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
394
395
ignore
2376.4.35 by Jonathan Lange
Include configuration documentation for tracker config options.
396
    Do not check gnupg signatures of revisions.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
397
398
check-available
399
    (default) If gnupg signatures for revisions are present, check them.
1861.2.6 by Alexander Belchenko
branding: change Bazaar-NG to Bazaar
400
    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
401
    no signature is present.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
402
403
create_signatures
2977.1.7 by Ian Clatworthy
move config reference into appendices
404
~~~~~~~~~~~~~~~~~
405
5967.3.1 by Jonathan Riddell
make docs for signing config options match reality
406
Defines the behaviour of signing revisions on commits.  By default bzr will not
407
sign new commits.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
408
409
always
5967.3.1 by Jonathan Riddell
make docs for signing config options match reality
410
    Sign every new revision that is committed.  If the signing fails then the
411
    commit will not be made.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
412
413
when-required
5967.3.1 by Jonathan Riddell
make docs for signing config options match reality
414
    Reserved for future use.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
415
416
never
5967.3.1 by Jonathan Riddell
make docs for signing config options match reality
417
    Reserved for future use.
418
419
In future it is planned that ``when-required`` will sign newly
420
committed revisions only when the branch requires them.  ``never`` will refuse
421
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
422
423
recurse
2977.1.7 by Ian Clatworthy
move config reference into appendices
424
~~~~~~~
425
2293.1.6 by Brad Crittenden
post review changes
426
Only useful in ``locations.conf``. Defines whether or not the
427
configuration for this section applies to subdirectories:
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
428
429
true
2293.1.6 by Brad Crittenden
post review changes
430
    (default) This section applies to subdirectories as well.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
431
432
false
433
    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.
434
    branches below it.
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
435
436
gpg_signing_command
2977.1.7 by Ian Clatworthy
move config reference into appendices
437
~~~~~~~~~~~~~~~~~~~
438
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
439
(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
440
For example::
1610.2.1 by James Blackwell
Copied in docs for wiki & First round cleanup
441
442
    gpg_signing_command = /usr/bin/gnpg
443
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
444
bzr_remote_path
2977.1.7 by Ian Clatworthy
move config reference into appendices
445
~~~~~~~~~~~~~~~
446
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
447
(Default: "bzr").  The path to the command that should be used to run the smart
448
server for bzr.  This value may only be specified in locations.conf, because:
449
450
- it's needed before branch.conf is accessible
451
- allowing remote branch.conf files to specify commands would be a security
452
  risk
453
454
It is overridden by the BZR_REMOTE_PATH environment variable.
455
2535.2.1 by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email.
456
smtp_server
2977.1.7 by Ian Clatworthy
move config reference into appendices
457
~~~~~~~~~~~
458
2535.2.1 by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email.
459
(Default: "localhost"). SMTP server to use when Bazaar needs to send
460
email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin.
461
462
smtp_username, smtp_password
2977.1.7 by Ian Clatworthy
move config reference into appendices
463
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
464
2535.2.1 by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email.
465
User and password to authenticate to the SMTP server. If smtp_username
466
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.
467
These settings are only needed if the SMTP server requires authentication
468
to send mail.
2535.2.1 by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email.
469
5425.4.25 by Martin Pool
Support auto-stealing dead locks, but turn it off by default.
470
locks.steal_dead
5425.4.15 by Martin Pool
Add steal_dead_locks option letting automatic lock-breaking be turned off
471
~~~~~~~~~~~~~~~~
472
5425.4.25 by Martin Pool
Support auto-stealing dead locks, but turn it off by default.
473
If set to true, bzr will automatically break locks held by processes from
474
the same machine and user that are no longer alive.  Otherwise, it will
475
print a message and you can break the lock manually, if you are satisfied
476
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
477
2681.1.14 by Aaron Bentley
Update docs
478
mail_client
2977.1.7 by Ian Clatworthy
move config reference into appendices
479
~~~~~~~~~~~
480
2681.1.26 by Aaron Bentley
Merge MAPI support from Lukáš Lalinsky
481
A mail client to use for sending merge requests.
2681.1.27 by Aaron Bentley
Update text, fix whitespace issues
482
By default, bzr will try to use ``mapi`` on Windows.  On other platforms, it
483
will try ``xdg-email``. If either of these fails, it will fall back to
484
``editor``.
2681.1.26 by Aaron Bentley
Merge MAPI support from Lukáš Lalinsky
485
2790.2.5 by Keir Mierle
Change ordering of clients listing.
486
Supported values for specific clients:
487
3921.2.8 by Aaron Bentley
Update docs
488
:claws: Use Claws.  This skips a dialog for attaching files.
2790.2.5 by Keir Mierle
Change ordering of clients listing.
489
:evolution: Use Evolution.
490
:kmail: Use KMail.
491
:mutt: Use Mutt.
492
:thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove 1.5,
493
    this works around some bugs that xdg-email doesn't handle.
494
2790.2.2 by Keir Mierle
Change alphabetic ordering into two categories; one for specific clients the other for generic options.
495
Supported generic values are:
2681.1.26 by Aaron Bentley
Merge MAPI support from Lukáš Lalinsky
496
2790.2.1 by Keir Mierle
Add Mutt as a supported client email program. Also rearranges various listings
497
:default: See above.
498
:editor: Use your editor to compose the merge request.  This also uses
499
    your commit id, (see ``bzr whoami``), smtp_server and (optionally)
500
    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.
501
:mapi: Use your preferred e-mail client on Windows.
502
:xdg-email: Use xdg-email to run your preferred mail program
503
2681.1.14 by Aaron Bentley
Update docs
504
submit_branch
2977.1.7 by Ian Clatworthy
move config reference into appendices
505
~~~~~~~~~~~~~
506
2681.1.14 by Aaron Bentley
Update docs
507
The branch you intend to submit your current work to.  This is automatically
508
set by ``bzr send``, and is also used by the ``submit:`` revision spec.  This
509
should usually be set on a per-branch or per-location basis.
510
511
public_branch
2977.1.7 by Ian Clatworthy
move config reference into appendices
512
~~~~~~~~~~~~~
513
2681.1.14 by Aaron Bentley
Update docs
514
A publically-accessible version of this branch (implying that this version is
515
not publically-accessible).  Used (and set) by ``bzr send``.
516
4840.2.7 by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to
517
suppress_warnings
518
~~~~~~~~~~~~~~~~~
519
520
A list of strings, each string represent a warning that can be emitted by
521
bzr. Mentioning a warning in this list tells bzr to not emit it.
522
523
Valid values:
524
525
* ``format_deprecation``:
526
    whether the format deprecation warning is shown on repositories that are
527
    using deprecated formats.
4840.2.3 by Ted Gould
Adding in text explaining the format_deprecation_warning configuration setting.
528
5448.4.3 by Neil Martinsen-Burrell
use option along with controldir.set_default to control the default format
529
default_format
530
~~~~~~~~~~~~~~
531
532
A format name for the default format used when creating branches.  See ``bzr
533
help formats`` for possible values.
534
2230.3.43 by Aaron Bentley
Update docs
535
5230.1.4 by Martin Pool
Document output_encoding
536
Unicode options
537
---------------
538
539
output_encoding
540
~~~~~~~~~~~~~~~
541
542
A Python unicode encoding name for text output from bzr, such as log
543
information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default
544
is the terminal encoding prefered by the operating system.
545
546
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
547
Branch type specific options
548
----------------------------
2230.3.43 by Aaron Bentley
Update docs
549
3104.2.5 by Ian Clatworthy
fix some broken links and make doc more Windows user friendly
550
These options apply only to branches that use the ``dirstate-tags`` or
551
later format.  They
1551.18.20 by Aaron Bentley
Add environment vars to config document
552
are usually set in ``.bzr/branch/branch.conf`` automatically, but may be
553
manually set in ``locations.conf`` or ``bazaar.conf``.
2230.3.43 by Aaron Bentley
Update docs
554
555
append_revisions_only
2977.1.7 by Ian Clatworthy
move config reference into appendices
556
~~~~~~~~~~~~~~~~~~~~~
557
2293.1.6 by Brad Crittenden
post review changes
558
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
559
removed.  A branch with this setting enabled can only pull from another
560
branch if the other branch's log is a longer version of its own.  This is
561
normally set by ``bzr init --append-revisions-only``. If you set it
562
manually, use either 'True' or 'False' (case-sensitive) to maintain
563
compatibility with previous bzr versions (older than 2.2).
2230.3.43 by Aaron Bentley
Update docs
564
565
parent_location
2977.1.7 by Ian Clatworthy
move config reference into appendices
566
~~~~~~~~~~~~~~~
567
5861.1.3 by Vincent Ladeuil
Fix the docs for push/pull/send regarding --no-remember.
568
If present, the location of the default branch for pull or merge.  This option
569
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.
570
--remember``.
2230.3.43 by Aaron Bentley
Update docs
571
572
push_location
2977.1.7 by Ian Clatworthy
move config reference into appendices
573
~~~~~~~~~~~~~
574
2293.1.3 by Brad Crittenden
Updated version_info.txt for grammar changes
575
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.
576
is normally set by the first ``push`` or ``push --remember``.
2230.3.43 by Aaron Bentley
Update docs
577
4420.1.3 by Vincent Ladeuil
Add NEWS entry and update doc.
578
push_strict
579
~~~~~~~~~~~
580
581
If present, defines the ``--strict`` option default value for checking
582
uncommitted changes before pushing.
583
4721.2.3 by Vincent Ladeuil
Make all test pass by implement --strict for dpush.
584
dpush_strict
585
~~~~~~~~~~~~
586
587
If present, defines the ``--strict`` option default value for checking
588
uncommitted changes before pushing into a different VCS without any
589
custom bzr metadata.
590
2230.3.43 by Aaron Bentley
Update docs
591
bound_location
2977.1.7 by Ian Clatworthy
move config reference into appendices
592
~~~~~~~~~~~~~~
593
2293.1.3 by Brad Crittenden
Updated version_info.txt for grammar changes
594
The location that commits should go to when acting as a checkout.
595
This option is normally set by ``bind``.
2230.3.43 by Aaron Bentley
Update docs
596
597
bound
2977.1.7 by Ian Clatworthy
move config reference into appendices
598
~~~~~
599
2230.3.43 by Aaron Bentley
Update docs
600
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
601
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.
602
603
send_strict
604
~~~~~~~~~~~
605
606
If present, defines the ``--strict`` option default value for checking
607
uncommitted changes before sending a merge directive.
608
5321.1.78 by Gordon Tyler
Added description of settings for merge tools to configuration help topic.
609
610
External Merge Tools
611
--------------------
612
5321.2.3 by Vincent Ladeuil
Prefix mergetools option names with 'bzr.'.
613
bzr.mergetool.<name>
614
~~~~~~~~~~~~~~~~~~~~
5321.1.78 by Gordon Tyler
Added description of settings for merge tools to configuration help topic.
615
616
Defines an external merge tool called <name> with the given command-line.
617
Arguments containing spaces should be quoted using single or double quotes. The
618
executable may omit its path if it can be found on the PATH.
619
620
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.
621
involved in the merge conflict::
622
623
  {base}      file.BASE
624
  {this}      file.THIS
625
  {other}     file.OTHER
626
  {result}    output file
627
  {this_temp} temp copy of file.THIS, used to overwrite output file if merge
628
              succeeds.
629
630
For example::
5321.1.78 by Gordon Tyler
Added description of settings for merge tools to configuration help topic.
631
5321.2.3 by Vincent Ladeuil
Prefix mergetools option names with 'bzr.'.
632
  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.
633
5321.2.3 by Vincent Ladeuil
Prefix mergetools option names with 'bzr.'.
634
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.
635
~~~~~~~~~~~~~~~~~~~~~
5321.1.78 by Gordon Tyler
Added description of settings for merge tools to configuration help topic.
636
637
Specifies which external merge tool (as defined above) should be selected by
638
default in tools such as ``bzr qconflicts``.
639
5860.1.1 by Vincent Ladeuil
Fix some ReST typos in the configuration help and restore the workaround for dotted format names breaking sphinx.
640
For example::
5321.1.78 by Gordon Tyler
Added description of settings for merge tools to configuration help topic.
641
5321.2.3 by Vincent Ladeuil
Prefix mergetools option names with 'bzr.'.
642
  bzr.default_mergetool = kdiff3