15
15
"John Doe <jdoe@example.com>"
17
See also the ``email`` configuration option.
17
See also the ``email`` configuration value.
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.
22
Override the progress display. Possible values are "none", "dots", "tty"
55
53
Path to the Bazaar executable to use when using the bzr+ssh protocol.
57
See also the ``bzr_remote_path`` configuration option.
55
See also the ``bzr_remote_path`` configuration value.
62
60
Path to the editor Bazaar should use for commit messages, etc.
67
Location of the Bazaar log file. You can check the current location by
68
running ``bzr version``.
70
The log file contains debug information that is useful for diagnosing or
71
reporting problems with Bazaar.
73
Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms
113
98
used literally, they will be substituted by the corresponding,
114
99
platform specific, values.
116
The examples below use ':' as the separator, windows users
104
The examples below uses ':' as the separator, windows users
119
Overriding the default user plugin directory::
121
BZR_PLUGIN_PATH='/path/to/my/other/plugins'
123
Disabling the site directory while retaining the user directory::
125
BZR_PLUGIN_PATH='-site:+user'
127
Disabling all plugins (better achieved with --no-plugins)::
129
BZR_PLUGIN_PATH='-user:-core:-site'
131
Overriding the default site plugin directory::
133
BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user
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.
143
In that case, ``bzr`` will stop loading the specified plugins and
144
will raise an import error if they are explicitly imported (by
145
another plugin that depends on them for example).
147
Disabling ``myplugin`` and ``yourplugin`` is achieved by::
149
BZR_DISABLE_PLUGINS='myplugin:yourplugin'
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
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`` .
162
Plugins specified in this environment variable takes precedence
163
over the ones in ``BZR_PLUGIN_PATH``.
165
The variable specified a list of ``plugin_name@plugin path``,
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.
175
Using a specific version of ``myplugin``:
176
``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``
107
Overriding the default user plugin directory:
108
``BZR_PLUGIN_PATH='/path/to/my/other/plugins'``
110
Disabling the site directory while retaining the user directory:
111
``BZR_PLUGIN_PATH='-site:+user'``
113
Disabling all plugins (better achieved with --no-plugins):
114
``BZR_PLUGIN_PATH='-user:-core:-site'``
116
Overriding the default site plugin directory:
117
``BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user``
181
124
The path where Bazaar should look for shell plugin external commands.
184
http_proxy, https_proxy
185
~~~~~~~~~~~~~~~~~~~~~~~
187
Specifies the network proxy for outgoing connections, for example::
189
http_proxy=http://proxy.example.com:3128/
190
https_proxy=http://proxy.example.com:3128/
193
127
Configuration files
194
128
-------------------
199
Configuration files are located in ``$HOME/.bazaar`` on Unix and
133
Configuration files are located in ``$HOME/.bazaar`` on Linux/Unix and
200
134
``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0`` on
201
135
Windows. (You can check the location for your system by using
202
136
``bzr version``.)
258
192
variable name, an equals sign and a value. For example::
260
194
email = John Doe <jdoe@isp.com>
261
gpg_signing_key = Amy Pond <amy@example.com>
263
A variable can reference other variables **in the same configuration file** by
264
enclosing them in curly brackets::
266
my_branch_name = feature_x
267
my_server = bzr+ssh://example.com
268
push_location = {my_server}/project/{my_branch_name}
195
check_signatures = require
271
198
Variable policies
329
257
[http://hypothetical.site.com/branches/devel-branch]
330
258
create_signatures = always
259
check_signatures = always
261
[http://bazaar-vcs.org/bzr/*]
262
check_signatures = require
332
264
The authentication configuration file, authentication.conf
333
265
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
402
329
create_signatures
403
330
~~~~~~~~~~~~~~~~~
405
Defines the behaviour of signing revisions on commits. By default bzr will not
332
Defines the behaviour of signing revisions.
409
Sign every new revision that is committed. If the signing fails then the
410
commit will not be made.
335
Sign every new revision that is committed.
413
Reserved for future use.
338
(default) Sign newly committed revisions only when the branch requires
416
Reserved for future use.
418
In future it is planned that ``when-required`` will sign newly
419
committed revisions only when the branch requires them. ``never`` will refuse
420
to sign newly committed revisions, even if the branch requires signatures.
425
If true (default), working tree metadata changes are flushed through the
426
OS buffers to physical disk. This is somewhat slower, but means data
427
should not be lost if the machine crashes. See also repository.fdatasync.
432
The GnuPG user identity to use when signing commits. Can be an e-mail
433
address, key fingerprint or full key ID. When unset or when set to
434
"default" Bazaar will use the user e-mail set with ``whoami``.
342
Refuse to sign newly committed revisions, even if the branch
548
440
whether the format deprecation warning is shown on repositories that are
549
441
using deprecated formats.
554
A format name for the default format used when creating branches. See ``bzr
555
help formats`` for possible values.
564
A Python unicode encoding name for text output from bzr, such as log
565
information. Values include: utf8, cp850, ascii, iso-8859-1. The default
566
is the terminal encoding prefered by the operating system.
569
444
Branch type specific options
570
445
----------------------------
578
453
~~~~~~~~~~~~~~~~~~~~~
580
455
If set to "True" then revisions can only be appended to the log, not
581
removed. A branch with this setting enabled can only pull from another
582
branch if the other branch's log is a longer version of its own. This is
583
normally set by ``bzr init --append-revisions-only``. If you set it
584
manually, use either 'True' or 'False' (case-sensitive) to maintain
585
compatibility with previous bzr versions (older than 2.2).
456
removed. A branch with this setting enabled can only pull from
457
another branch if the other branch's log is a longer version of its
458
own. This is normally set by ``bzr init --append-revisions-only``.
590
If present, the location of the default branch for pull or merge. This option
591
is normally set when creating a branch, the first ``pull`` or by ``pull
463
If present, the location of the default branch for pull or merge.
464
This option is normally set by ``pull --remember`` or ``merge
597
470
If present, the location of the default branch for push. This option
598
is normally set by the first ``push`` or ``push --remember``.
471
is normally set by ``push --remember``.
628
501
If present, defines the ``--strict`` option default value for checking
629
502
uncommitted changes before sending a merge directive.
638
Defines an external merge tool called <name> with the given command-line.
639
Arguments containing spaces should be quoted using single or double quotes. The
640
executable may omit its path if it can be found on the PATH.
642
The following markers can be used in the command-line to substitute filenames
643
involved in the merge conflict::
649
{this_temp} temp copy of file.THIS, used to overwrite output file if merge
654
bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}
656
bzr.default_mergetool
657
~~~~~~~~~~~~~~~~~~~~~
659
Specifies which external merge tool (as defined above) should be selected by
660
default in tools such as ``bzr qconflicts``.
664
bzr.default_mergetool = kdiff3
added
removed
bzrlib/help_topics/en/configuration.txt
