bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
1861.2.6
by Alexander Belchenko
branding: change Bazaar-NG to Bazaar |
1 |
==================== |
2 |
Bazaar configuration |
|
3 |
==================== |
|
|
1821.1.1
by Alexander Belchenko
win32 installer for bzr.dev.0.9 |
4 |
|
|
1861.2.6
by Alexander Belchenko
branding: change Bazaar-NG to Bazaar |
5 |
Information on how to configure Bazaar. |
|
1821.1.1
by Alexander Belchenko
win32 installer for bzr.dev.0.9 |
6 |
|
|
2513.1.8
by Martin Pool
Doc testing of exceptions |
7 |
.. TODO: Should have some explanation of why you'd want things in |
8 |
.. branch.conf. |
|
9 |
||
|
1551.18.20
by Aaron Bentley
Add environment vars to config document |
10 |
|
11 |
Environment variables |
|
12 |
===================== |
|
13 |
While most configuration is handled by configuration files, some options |
|
14 |
which may be semi-permanent can also be controlled through the environment. |
|
15 |
||
16 |
BZR_EMAIL |
|
17 |
--------- |
|
18 |
Override the email id used by Bazaar. Typical format:: |
|
19 |
||
20 |
"John Doe <jdoe@example.com>" |
|
21 |
||
22 |
See also the ``email`` configuration value. |
|
23 |
||
24 |
BZR_PROGRESS_BAR |
|
25 |
---------------- |
|
26 |
Override the progress display. Possible values are "none", "dots", "tty" |
|
27 |
||
28 |
BZR_SIGQUIT_PDB |
|
29 |
--------------- |
|
30 |
Control whether SIGQUIT behaves normally or invokes a breakin debugger. |
|
31 |
0 = Standard SIGQUIT behavior |
|
32 |
1 = Invoke breakin debugger (default) |
|
33 |
||
34 |
BZR_HOME |
|
35 |
-------- |
|
36 |
Override the home directory used by Bazaar. |
|
37 |
||
38 |
BZR_SSH |
|
39 |
------- |
|
40 |
Select a different SSH implementation. |
|
41 |
||
42 |
BZR_PDB |
|
43 |
------- |
|
44 |
Control whether to launch a debugger on error. |
|
45 |
0 = Standard behavior |
|
46 |
1 = Launch debugger |
|
47 |
||
48 |
BZR_REMOTE_PATH |
|
49 |
--------------- |
|
50 |
Path to the Bazaar executable to use when using the bzr+ssh protocol. |
|
51 |
||
52 |
See also the ``bzr_remote_path`` configuration value |
|
53 |
||
54 |
BZR_EDITOR |
|
55 |
---------- |
|
56 |
Path to the editor Bazaar should use for commit messages, etc. |
|
57 |
||
58 |
BZR_PLUGIN_PATH |
|
59 |
--------------- |
|
60 |
The path to the plugins directory that Bazaar should use. |
|
61 |
||
62 |
BZRPATH |
|
63 |
------- |
|
64 |
The path where Bazaar should look for shell plugin external commands. |
|
65 |
||
66 |
||
|
2601.1.1
by James Westby
Split out bug tracker configuration in to its own file. |
67 |
Location of configuration files |
68 |
=============================== |
|
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
69 |
Each user gets a pair of configurations files in ``$HOME/.bazaar``. The first |
70 |
one, named ``bazaar.conf``, includes default configuration options. The other |
|
71 |
file, ``locations.conf``, contains configuration information for specific |
|
72 |
branch locations. These files are sometimes referred to as ``ini files``. |
|
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
73 |
|
|
2601.1.1
by James Westby
Split out bug tracker configuration in to its own file. |
74 |
Each branch can also contain a configuration file that sets values specific |
75 |
to that branch. This file is found at ``.bzr/branch/branch.conf`` within the |
|
76 |
branch. This file is visible to all users of a branch, if you wish to override |
|
77 |
one of the values for a branch with a setting that is specific to you then you |
|
78 |
can do so in ``locations.conf``. |
|
79 |
||
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
80 |
General Format |
81 |
============== |
|
82 |
An ini file has three types of contructs: section headers, section |
|
83 |
variables and comments. |
|
84 |
||
|
2120.6.14
by James Henstridge
Fix RST syntax as suggested by j-a-meinel |
85 |
Comments |
86 |
-------- |
|
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
87 |
A comment is any line that starts with a "#" (sometimes called a "hash |
88 |
mark", "pound sign" or "number sign"). Comment lines are ignored by |
|
|
1861.2.6
by Alexander Belchenko
branding: change Bazaar-NG to Bazaar |
89 |
Bazaar when parsing ini files. |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
90 |
|
|
2120.6.14
by James Henstridge
Fix RST syntax as suggested by j-a-meinel |
91 |
Section Headers |
92 |
--------------- |
|
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
93 |
A section header is a word enclosed in brackets that starts at the begining |
|
2293.1.6
by Brad Crittenden
post review changes |
94 |
of a line. A typical section header looks like this:: |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
95 |
|
96 |
[DEFAULT] |
|
97 |
||
|
2293.1.6
by Brad Crittenden
post review changes |
98 |
The only valid section header for bazaar.conf is [DEFAULT], which is |
99 |
case sensitive. The default section provides for setting variables |
|
100 |
which can be overridden with the branch config file. |
|
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
101 |
|
|
2293.1.6
by Brad Crittenden
post review changes |
102 |
For ``locations.conf``, the variables from the section with the |
103 |
longest matching section header are used to the exclusion of other |
|
104 |
potentially valid section headers. A section header uses the path for |
|
105 |
the branch as the section header. Some examples include:: |
|
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
106 |
|
107 |
[http://mybranches.isp.com/~jdoe/branchdir] |
|
108 |
[/home/jdoe/branches/] |
|
109 |
||
110 |
||
|
2120.6.14
by James Henstridge
Fix RST syntax as suggested by j-a-meinel |
111 |
Section Variables |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
112 |
----------------- |
113 |
||
114 |
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 |
115 |
variable name, an equals sign and a value. For example:: |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
116 |
|
117 |
email = John Doe <jdoe@isp.com> |
|
118 |
check_signatures = require |
|
119 |
||
120 |
||
|
2120.6.14
by James Henstridge
Fix RST syntax as suggested by j-a-meinel |
121 |
Variable Policies |
|
2120.6.13
by James Henstridge
update doc/configuration.txt with information about policies |
122 |
----------------- |
123 |
||
124 |
Variables defined in a section affect the named directory or URL plus |
|
125 |
any locations they contain. Policies can be used to change how a |
|
126 |
variable value is interpreted for contained locations. Currently |
|
127 |
there are three policies available: |
|
128 |
||
|
2120.6.14
by James Henstridge
Fix RST syntax as suggested by j-a-meinel |
129 |
none: |
130 |
the value is interpreted the same for contained locations. This is |
|
131 |
the default behaviour. |
|
132 |
norecurse: |
|
133 |
the value is only used for the exact location specified by the |
|
134 |
section name. |
|
135 |
appendpath: |
|
136 |
for contained locations, any additional path components are |
|
137 |
appended to the value. |
|
|
2120.6.13
by James Henstridge
update doc/configuration.txt with information about policies |
138 |
|
139 |
Policies are specified by keys with names of the form "$var:policy". |
|
140 |
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 |
141 |
following could be used:: |
|
2120.6.13
by James Henstridge
update doc/configuration.txt with information about policies |
142 |
|
143 |
[/top/location] |
|
144 |
push_location = sftp://example.com/location |
|
145 |
push_location:policy = appendpath |
|
146 |
||
|
2120.6.14
by James Henstridge
Fix RST syntax as suggested by j-a-meinel |
147 |
With this configuration, the push location for ``/top/location/branch1`` |
148 |
would be ``sftp://example.com/location/branch1``. |
|
|
2120.6.13
by James Henstridge
update doc/configuration.txt with information about policies |
149 |
|
150 |
||
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
151 |
The main configuration file, bazaar.conf |
152 |
---------------------------------------- |
|
153 |
||
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
154 |
The main configuration file, ``$HOME/.bazaar/bazaar.conf``, only allows one |
155 |
section called ``[DEFAULT]``. This default section contains the default |
|
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
156 |
configuration options for all branches. The default section can be |
|
2293.1.6
by Brad Crittenden
post review changes |
157 |
overriden by providing a branch-specific section in ``locations.conf``. |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
158 |
|
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
159 |
A typical ``bazaar.conf`` section often looks like the following:: |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
160 |
|
161 |
[DEFAULT] |
|
162 |
email = John Doe <jdoe@isp.com> |
|
163 |
editor = /usr/bin/vim |
|
164 |
check_signatures = check-available |
|
165 |
create_signatures = when-required |
|
166 |
||
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
167 |
``$HOME/.bazaar/locations.conf`` allows one to specify overriding settings for a |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
168 |
specific branch. The format is almost identical to the default section in |
169 |
bazaar.conf with one significant change: The section header, instead of |
|
170 |
saying default, will be the path to a branch that you wish to override a |
|
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
171 |
value for. The '?' and '*' wildcards are supported:: |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
172 |
|
173 |
[/home/jdoe/branches/nethack] |
|
174 |
email = Nethack Admin <nethack@nethack.com> |
|
175 |
||
176 |
[http://hypothetical.site.com/branches/devel-branch] |
|
177 |
create_signatures = always |
|
178 |
check_signatures = always |
|
179 |
||
|
1861.2.8
by Alexander Belchenko
More branding: bazaar-ng -> Bazaar; bazaar-ng.org -> bazaar-vcs.org |
180 |
[http://bazaar-vcs.org/bzr/*] |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
181 |
check_signatures = require |
182 |
||
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
183 |
Common Variable Options |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
184 |
======================= |
185 |
||
186 |
||
187 |
----- |
|
188 |
The email address to use when committing a branch. Typically takes the form |
|
189 |
of:: |
|
190 |
||
191 |
email = Full Name <account@hostname.tld> |
|
192 |
||
193 |
editor |
|
194 |
------ |
|
195 |
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. |
196 |
a commit message. This setting is trumped by the environment variable |
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
197 |
``$BZR_EDITOR``, and overrides ``$VISUAL`` and ``$EDITOR``. |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
198 |
|
199 |
check_signatures |
|
200 |
---------------- |
|
201 |
Defines the behavior for signatures. |
|
202 |
||
203 |
require |
|
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
204 |
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 |
205 |
|
206 |
ignore |
|
|
2376.4.35
by Jonathan Lange
Include configuration documentation for tracker config options. |
207 |
Do not check gnupg signatures of revisions. |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
208 |
|
209 |
check-available |
|
210 |
(default) If gnupg signatures for revisions are present, check them. |
|
|
1861.2.6
by Alexander Belchenko
branding: change Bazaar-NG to Bazaar |
211 |
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 |
212 |
no signature is present. |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
213 |
|
214 |
create_signatures |
|
215 |
----------------- |
|
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
216 |
Defines the behaviour of signing revisions. |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
217 |
|
218 |
always |
|
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
219 |
Sign every new revision that is committed. |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
220 |
|
221 |
when-required |
|
222 |
(default) Sign newly committed revisions only when the branch requires |
|
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
223 |
signed revisions. |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
224 |
|
225 |
never |
|
|
2293.1.6
by Brad Crittenden
post review changes |
226 |
Refuse to sign newly committed revisions, even if the branch |
227 |
requires signatures. |
|
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
228 |
|
229 |
recurse |
|
230 |
------- |
|
|
2293.1.6
by Brad Crittenden
post review changes |
231 |
Only useful in ``locations.conf``. Defines whether or not the |
232 |
configuration for this section applies to subdirectories: |
|
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
233 |
|
234 |
true |
|
|
2293.1.6
by Brad Crittenden
post review changes |
235 |
(default) This section applies to subdirectories as well. |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
236 |
|
237 |
false |
|
238 |
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. |
239 |
branches below it. |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
240 |
|
241 |
gpg_signing_command |
|
242 |
------------------- |
|
243 |
(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 |
244 |
For example:: |
|
1610.2.1
by James Blackwell
Copied in docs for wiki & First round cleanup |
245 |
|
246 |
gpg_signing_command = /usr/bin/gnpg |
|
247 |
||
|
1551.18.17
by Aaron Bentley
Introduce bzr_remote_path configuration variable |
248 |
bzr_remote_path |
249 |
--------------- |
|
250 |
(Default: "bzr"). The path to the command that should be used to run the smart |
|
251 |
server for bzr. This value may only be specified in locations.conf, because: |
|
252 |
||
253 |
- it's needed before branch.conf is accessible |
|
254 |
- allowing remote branch.conf files to specify commands would be a security |
|
255 |
risk |
|
256 |
||
257 |
It is overridden by the BZR_REMOTE_PATH environment variable. |
|
258 |
||
|
2535.2.1
by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email. |
259 |
smtp_server |
260 |
----------- |
|
261 |
(Default: "localhost"). SMTP server to use when Bazaar needs to send |
|
262 |
email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin. |
|
263 |
||
264 |
smtp_username, smtp_password |
|
265 |
---------------------------- |
|
266 |
User and password to authenticate to the SMTP server. If smtp_username |
|
267 |
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. |
268 |
These settings are only needed if the SMTP server requires authentication |
269 |
to send mail. |
|
|
2535.2.1
by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email. |
270 |
|
|
2681.1.14
by Aaron Bentley
Update docs |
271 |
mail_client |
272 |
----------- |
|
|
2681.1.26
by Aaron Bentley
Merge MAPI support from Lukáš Lalinsky |
273 |
A mail client to use for sending merge requests. |
|
2681.1.27
by Aaron Bentley
Update text, fix whitespace issues |
274 |
By default, bzr will try to use ``mapi`` on Windows. On other platforms, it |
275 |
will try ``xdg-email``. If either of these fails, it will fall back to |
|
276 |
``editor``. |
|
|
2681.1.26
by Aaron Bentley
Merge MAPI support from Lukáš Lalinsky |
277 |
|
|
2790.2.5
by Keir Mierle
Change ordering of clients listing. |
278 |
Supported values for specific clients: |
279 |
||
280 |
:evolution: Use Evolution. |
|
281 |
:kmail: Use KMail. |
|
282 |
:mutt: Use Mutt. |
|
283 |
:thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove 1.5, |
|
284 |
this works around some bugs that xdg-email doesn't handle. |
|
285 |
||
|
2790.2.2
by Keir Mierle
Change alphabetic ordering into two categories; one for specific clients the other for generic options. |
286 |
Supported generic values are: |
|
2681.1.26
by Aaron Bentley
Merge MAPI support from Lukáš Lalinsky |
287 |
|
|
2790.2.1
by Keir Mierle
Add Mutt as a supported client email program. Also rearranges various listings |
288 |
:default: See above. |
289 |
:editor: Use your editor to compose the merge request. This also uses |
|
290 |
your commit id, (see ``bzr whoami``), smtp_server and (optionally) |
|
291 |
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. |
292 |
:mapi: Use your preferred e-mail client on Windows. |
293 |
:xdg-email: Use xdg-email to run your preferred mail program |
|
294 |
||
|
2681.1.14
by Aaron Bentley
Update docs |
295 |
submit_branch |
296 |
------------- |
|
297 |
The branch you intend to submit your current work to. This is automatically |
|
298 |
set by ``bzr send``, and is also used by the ``submit:`` revision spec. This |
|
299 |
should usually be set on a per-branch or per-location basis. |
|
300 |
||
301 |
public_branch |
|
302 |
------------- |
|
303 |
A publically-accessible version of this branch (implying that this version is |
|
304 |
not publically-accessible). Used (and set) by ``bzr send``. |
|
305 |
||
|
2230.3.43
by Aaron Bentley
Update docs |
306 |
|
307 |
Branch 6 Options |
|
308 |
================ |
|
309 |
||
|
1551.18.20
by Aaron Bentley
Add environment vars to config document |
310 |
These options apply only to branches that use the "dirstate-tags" format. They |
311 |
are usually set in ``.bzr/branch/branch.conf`` automatically, but may be |
|
312 |
manually set in ``locations.conf`` or ``bazaar.conf``. |
|
|
2230.3.43
by Aaron Bentley
Update docs |
313 |
|
314 |
append_revisions_only |
|
315 |
--------------------- |
|
|
2293.1.6
by Brad Crittenden
post review changes |
316 |
If set to "True" then revisions can only be appended to the log, not |
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
317 |
removed. A branch with this setting enabled can only pull from |
318 |
another branch if the other branch's log is a longer version of its |
|
319 |
own. This is normally set by ``bzr init --append-revisions-only``. |
|
|
2230.3.43
by Aaron Bentley
Update docs |
320 |
|
321 |
parent_location |
|
322 |
--------------- |
|
323 |
If present, the location of the default branch for pull or merge. |
|
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
324 |
This option is normally set by ``pull --remember`` or ``merge |
|
2601.1.1
by James Westby
Split out bug tracker configuration in to its own file. |
325 |
--remember``. |
|
2230.3.43
by Aaron Bentley
Update docs |
326 |
|
327 |
push_location |
|
328 |
------------- |
|
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
329 |
If present, the location of the default branch for push. This option |
330 |
is normally set by ``push --remember``. |
|
|
2230.3.43
by Aaron Bentley
Update docs |
331 |
|
332 |
bound_location |
|
333 |
-------------- |
|
|
2293.1.3
by Brad Crittenden
Updated version_info.txt for grammar changes |
334 |
The location that commits should go to when acting as a checkout. |
335 |
This option is normally set by ``bind``. |
|
|
2230.3.43
by Aaron Bentley
Update docs |
336 |
|
337 |
bound |
|
338 |
----- |
|
339 |
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 |
340 |
the bound_location. This option is normally set by ``bind``/``unbind``. |
|
2376.4.35
by Jonathan Lange
Include configuration documentation for tracker config options. |
341 |