/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1
======================
2
Bazaar Developer Guide
3
======================
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
4
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
5
This document describes the Bazaar internals and the development process.
3314.1.1 by Martin Pool
Add Developer's Guide text about PPA builds
6
It's meant for people interested in developing Bazaar, and some parts will
7
also be useful to people developing Bazaar plugins.
8
9
If you have any questions or something seems to be incorrect, unclear or
10
missing, please talk to us in ``irc://irc.freenode.net/#bzr``, or write to
11
the Bazaar mailing list.  To propose a correction or addition to this
12
document, send a merge request or new text to the mailing list.
13
4634.39.12 by Ian Clatworthy
pdf generation of the Developer Guide
14
The latest developer documentation can be found online at
15
http://doc.bazaar-vcs.org/developers/.
1393.1.53 by Martin Pool
- notes from coding-convention discussion
16
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
17
18
Getting Started
19
###############
20
21
Exploring the Bazaar Platform
22
=============================
23
24
Before making changes, it's a good idea to explore the work already
25
done by others. Perhaps the new feature or improvement you're looking
26
for is available in another plug-in already? If you find a bug,
27
perhaps someone else has already fixed it?
28
29
To answer these questions and more, take a moment to explore the
30
overall Bazaar Platform. Here are some links to browse:
31
32
* The Plugins page on the Wiki - http://bazaar-vcs.org/BzrPlugins
33
2466.6.3 by Ian Clatworthy
Incorporate feedback from Aaron B. & Alex B.
34
* The Bazaar product family on Launchpad - https://launchpad.net/bazaar
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
35
36
* Bug Tracker for the core product - https://bugs.launchpad.net/bzr/
37
38
* Blueprint Tracker for the core product - https://blueprints.launchpad.net/bzr/
39
40
If nothing else, perhaps you'll find inspiration in how other developers
41
have solved their challenges.
42
4424.1.1 by Martin Pool
Trim some outdated performance drive documentation, and the performance.png graph
43
Finding Something To Do
44
=======================
45
46
Ad-hoc performance work can also be done. One useful tool is the 'evil' debug
47
flag. For instance running ``bzr -Devil commit -m "test"`` will log a backtrace
48
to the bzr log file for every method call which triggers a slow or non-scalable
49
part of the bzr library. So checking that a given command with ``-Devil`` has
50
no backtraces logged to the log file is a good way to find problem function
51
calls that might be nested deep in the code base.
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
52
53
Planning and Discussing Changes
54
===============================
55
56
There is a very active community around Bazaar. Mostly we meet on IRC
57
(#bzr on irc.freenode.net) and on the mailing list. To join the Bazaar
58
community, see http://bazaar-vcs.org/BzrSupport.
59
60
If you are planning to make a change, it's a very good idea to mention it
61
on the IRC channel and/or on the mailing list. There are many advantages
62
to involving the community before you spend much time on a change.
63
These include:
64
4926.2.1 by Toon Nolten
Corrected two typos in HACKING.txt
65
* you get to build on the wisdom of others, saving time
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
66
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
67
* if others can direct you to similar code, it minimises the work to be done
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
68
69
* it assists everyone in coordinating direction, priorities and effort.
70
71
In summary, maximising the input from others typically minimises the
72
total effort required to get your changes merged. The community is
73
friendly, helpful and always keen to welcome newcomers.
74
75
76
Bazaar Development in a Nutshell
77
================================
78
4595.5.1 by Neil Martinsen-Burrell
added giving back introduction from the wiki
79
.. was from bazaar-vcs.org/BzrGivingBack
80
81
One of the fun things about working on a version control system like Bazaar is
82
that the users have a high level of proficiency in contributing back into
83
the tool.  Consider the following very brief introduction to contributing back
84
to Bazaar.  More detailed instructions are in the following sections.
85
86
Making the change
87
-----------------
88
89
First, get a local copy of the development mainline (See `Why make a local
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
90
copy of bzr.dev?`_.)
4595.5.1 by Neil Martinsen-Burrell
added giving back introduction from the wiki
91
::
92
93
 $ bzr init-repo ~/bzr
94
 $ cd ~/bzr
95
 $ bzr branch http://bazaar-vcs.org/bzr/bzr.dev/ bzr.dev
96
97
Now make your own branch::
98
4595.5.3 by John Arbash Meinel
Suggest a task-specific branch, rather than a generic 'giveback' branch.
99
 $ bzr branch bzr.dev 123456-my-bugfix
4595.5.1 by Neil Martinsen-Burrell
added giving back introduction from the wiki
100
4595.5.3 by John Arbash Meinel
Suggest a task-specific branch, rather than a generic 'giveback' branch.
101
This will give you a branch called "123456-my-bugfix" that you can work on
102
and commit in. Here, you can study the code, make a fix or a new feature.
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
103
Feel free to commit early and often (after all, it's your branch!).
4595.5.1 by Neil Martinsen-Burrell
added giving back introduction from the wiki
104
105
Documentation improvements are an easy place to get started giving back to the
106
Bazaar project.  The documentation is in the `doc/` subdirectory of the Bazaar
107
source tree.
108
109
When you are done, make sure that you commit your last set of changes as well!
110
Once you are happy with your changes, ask for them to be merged, as described
111
below.
112
113
Making a Merge Proposal
114
-----------------------
115
116
The Bazaar developers use Launchpad to further enable a truly distributed
117
style of development.  Anyone can propose a branch for merging into the Bazaar
118
trunk.  To start this process, you need to push your branch to Launchpad.  To
119
do this, you will need a Launchpad account and user name, e.g.
120
`your_lp_username`.  You can push your branch to Launchpad directly from
121
Bazaar::
122
5016.2.1 by Vincent Ladeuil
Try getting better banch names for submissions.
123
  $ bzr push lp:~your_lp_username/bzr/meaningful_name_here
4595.5.1 by Neil Martinsen-Burrell
added giving back introduction from the wiki
124
125
After you have pushed your branch, you will need to propose it for merging to
5016.2.1 by Vincent Ladeuil
Try getting better banch names for submissions.
126
the Bazaar trunk.  Go to
127
<https://launchpad.net/your_lp_username/bzr/meaningful_name_here> and choose
128
"Propose for merging into another branch".  Select "~bzr/bzr/trunk" to hand
129
your changes off to the Bazaar developers for review and merging.
130
131
Using a meaningful name for your branch will help you and the reviewer(s)
132
better track the submission. Use a very succint description of your submission
133
and prefix it with bug number if needed (lp:~mbp/bzr/484558-merge-directory
5016.2.2 by Vincent Ladeuil
Review comment: let's bikeshed !!
134
for example). Alternatively, you can suffix with the bug number
135
(lp:~jameinel/bzr/export-file-511987).
136
4595.5.1 by Neil Martinsen-Burrell
added giving back introduction from the wiki
137
138
Why make a local copy of bzr.dev?
139
---------------------------------
140
141
Making a local mirror of bzr.dev is not strictly necessary, but it means
142
143
- You can use that copy of bzr.dev as your main bzr executable, and keep it
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
144
  up-to-date using ``bzr pull``.
4595.5.1 by Neil Martinsen-Burrell
added giving back introduction from the wiki
145
- Certain operations are faster, and can be done when offline.  For example:
146
147
  - ``bzr bundle``
148
  - ``bzr diff -r ancestor:...``
149
  - ``bzr merge``
150
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
151
- When it's time to create your next branch, it's more convenient.  When you
4595.5.1 by Neil Martinsen-Burrell
added giving back introduction from the wiki
152
  have further contributions to make, you should do them in their own branch::
153
154
    $ cd ~/bzr
155
    $ bzr branch bzr.dev additional_fixes
156
    $ cd additional_fixes # hack, hack, hack
157
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
158
159
160
Understanding the Development Process
161
=====================================
162
3683.1.1 by Martin Pool
Improved review process docs and separate out architectural overview
163
The development team follows many practices including:
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
164
165
* a public roadmap and planning process in which anyone can participate
166
2466.6.2 by Ian Clatworthy
Incorporate feedback from LarstiQ
167
* time based milestones everyone can work towards and plan around
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
168
169
* extensive code review and feedback to contributors
170
171
* complete and rigorous test coverage on any code contributed
172
173
* automated validation that all tests still pass before code is merged
174
  into the main code branch.
175
176
The key tools we use to enable these practices are:
177
178
* Launchpad - https://launchpad.net/
179
180
* Bazaar - http://bazaar-vcs.org/
181
182
* Patch Queue Manager - https://launchpad.net/pqm/
183
5225.2.2 by Martin Pool
Bundle buggy's no longer in use
184
For further information, see <http://wiki.bazaar.canonical.com/BzrDevelopment>.
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
185
186
187
188
189
Preparing a Sandbox for Making Changes to Bazaar
190
================================================
191
2466.6.2 by Ian Clatworthy
Incorporate feedback from LarstiQ
192
Bazaar supports many ways of organising your work. See
193
http://bazaar-vcs.org/SharedRepositoryLayouts for a summary of the
194
popular alternatives.
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
195
196
Of course, the best choice for you will depend on numerous factors:
197
the number of changes you may be making, the complexity of the changes, etc.
198
As a starting suggestion though:
199
200
* create a local copy of the main development branch (bzr.dev) by using
2475.2.4 by Martin Pool
HACKING rest fixes from jam
201
  this command::
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
202
2475.2.4 by Martin Pool
HACKING rest fixes from jam
203
    bzr branch http://bazaar-vcs.org/bzr/bzr.dev/ bzr.dev
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
204
4595.5.2 by Neil Martinsen-Burrell
Include bazaar-vcs.org/BzrGivingBack in HACKING.txt; fix typos in HACKING.txt
205
* keep your copy of bzr.dev pristine (by not developing in it) and keep
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
206
  it up to date (by using bzr pull)
207
208
* create a new branch off your local bzr.dev copy for each issue
209
  (bug or feature) you are working on.
210
211
This approach makes it easy to go back and make any required changes
212
after a code review. Resubmitting the change is then simple with no
4595.5.2 by Neil Martinsen-Burrell
Include bazaar-vcs.org/BzrGivingBack in HACKING.txt; fix typos in HACKING.txt
213
risk of accidentally including edits related to other issues you may
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
214
be working on. After the changes for an issue are accepted and merged,
215
the associated branch can be deleted or archived as you wish.
216
217
218
Navigating the Code Base
219
========================
220
3464.3.4 by Martin Pool
Merge part of the NewDeveloperIntroduction into HACKING
221
.. Was at <http://bazaar-vcs.org/NewDeveloperIntroduction>
222
223
Some of the key files in this directory are:
224
225
bzr
226
    The command you run to start Bazaar itself.  This script is pretty
227
    short and just does some checks then jumps into bzrlib.
228
229
README
230
    This file covers a brief introduction to Bazaar and lists some of its
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
231
    key features.
3464.3.4 by Martin Pool
Merge part of the NewDeveloperIntroduction into HACKING
232
233
NEWS
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
234
    Summary of changes in each Bazaar release that can affect users or
3464.3.4 by Martin Pool
Merge part of the NewDeveloperIntroduction into HACKING
235
    plugin developers.
236
237
setup.py
238
    Installs Bazaar system-wide or to your home directory.  To perform
239
    development work on Bazaar it is not required to run this file - you
240
    can simply run the bzr command from the top level directory of your
241
    development copy. Note: That if you run setup.py this will create a
242
    'build' directory in your development branch. There's nothing wrong
243
    with this but don't be confused by it. The build process puts a copy
244
    of the main code base into this build directory, along with some other
245
    files. You don't need to go in here for anything discussed in this
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
246
    guide.
3464.3.4 by Martin Pool
Merge part of the NewDeveloperIntroduction into HACKING
247
248
bzrlib
249
    Possibly the most exciting folder of all, bzrlib holds the main code
250
    base. This is where you will go to edit python files and contribute to
251
    Bazaar.
252
253
doc
254
    Holds documentation on a whole range of things on Bazaar from the
255
    origination of ideas within the project to information on Bazaar
256
    features and use cases.  Within this directory there is a subdirectory
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
257
    for each translation into a human language.  All the documentation
3464.3.4 by Martin Pool
Merge part of the NewDeveloperIntroduction into HACKING
258
    is in the ReStructuredText markup language.
259
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
260
doc/developers
4595.5.1 by Neil Martinsen-Burrell
added giving back introduction from the wiki
261
    Documentation specifically targeted at Bazaar and plugin developers.
3464.3.4 by Martin Pool
Merge part of the NewDeveloperIntroduction into HACKING
262
    (Including this document.)
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
263
264
265
266
Automatically-generated API reference information is available at
267
<http://starship.python.net/crew/mwh/bzrlibapi/>.
3683.1.1 by Martin Pool
Improved review process docs and separate out architectural overview
268
4634.39.36 by Ian Clatworthy
Get plain-style documentation generation working again
269
See also the `Bazaar Architectural Overview
270
<http://doc.bazaar-vcs.org/developers/overview.html>`_.
3683.1.1 by Martin Pool
Improved review process docs and separate out architectural overview
271
272
273
The Code Review Process
274
#######################
275
276
All code changes coming in to Bazaar are reviewed by someone else.
277
Normally changes by core contributors are reviewed by one other core
278
developer, and changes from other people are reviewed by two core
279
developers.  Use intelligent discretion if the patch is trivial.
280
281
Good reviews do take time. They also regularly require a solid
282
understanding of the overall code base. In practice, this means a small
283
number of people often have a large review burden - with knowledge comes
4595.5.1 by Neil Martinsen-Burrell
added giving back introduction from the wiki
284
responsibility. No one likes their merge requests sitting in a queue going
3683.1.1 by Martin Pool
Improved review process docs and separate out architectural overview
285
nowhere, so reviewing sooner rather than later is strongly encouraged.
286
287
288
289
290
291
Review cover letters
292
====================
293
294
Please put a "cover letter" on your merge request explaining:
295
296
* the reason **why** you're making this change
297
3883.1.5 by Gordon P. Hemsley
Fixed I-before-E typo in passing.
298
* **how** this change achieves this purpose
3683.1.1 by Martin Pool
Improved review process docs and separate out architectural overview
299
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
300
* anything else you may have fixed in passing
3683.1.1 by Martin Pool
Improved review process docs and separate out architectural overview
301
302
* anything significant that you thought of doing, such as a more
303
  extensive fix or a different approach, but didn't or couldn't do now
304
305
A good cover letter makes reviewers' lives easier because they can decide
306
from the letter whether they agree with the purpose and approach, and then
307
assess whether the patch actually does what the cover letter says.
308
Explaining any "drive-by fixes" or roads not taken may also avoid queries
309
from the reviewer.  All in all this should give faster and better reviews.
310
Sometimes writing the cover letter helps the submitter realize something
311
else they need to do.  The size of the cover letter should be proportional
312
to the size and complexity of the patch.
313
314
315
Reviewing proposed changes
316
==========================
317
318
Anyone is welcome to review code, and reply to the thread with their
319
opinion or comments.
320
321
The simplest way to review a proposed change is to just read the patch on
322
the list or in Bundle Buggy.  For more complex changes it may be useful
323
to make a new working tree or branch from trunk, and merge the proposed
324
change into it, so you can experiment with the code or look at a wider
325
context.
326
327
There are three main requirements for code to get in:
328
329
* Doesn't reduce test coverage: if it adds new methods or commands,
330
  there should be tests for them.  There is a good test framework
331
  and plenty of examples to crib from, but if you are having trouble
332
  working out how to test something feel free to post a draft patch
333
  and ask for help.
334
335
* Doesn't reduce design clarity, such as by entangling objects
336
  we're trying to separate.  This is mostly something the more
337
  experienced reviewers need to help check.
338
339
* Improves bugs, features, speed, or code simplicity.
340
341
Code that goes in should not degrade any of these aspects.  Patches are
342
welcome that only cleanup the code without changing the external
343
behaviour.  The core developers take care to keep the code quality high
344
and understandable while recognising that perfect is sometimes the enemy
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
345
of good.
3683.1.1 by Martin Pool
Improved review process docs and separate out architectural overview
346
347
It is easy for reviews to make people notice other things which should be
348
fixed but those things should not hold up the original fix being accepted.
349
New things can easily be recorded in the Bug Tracker instead.
350
351
It's normally much easier to review several smaller patches than one large
352
one.  You might want to use ``bzr-loom`` to maintain threads of related
353
work, or submit a preparatory patch that will make your "real" change
354
easier.
355
356
357
Checklist for reviewers
358
=======================
359
360
* Do you understand what the code's doing and why?
361
362
* Will it perform reasonably for large inputs, both in memory size and
363
  run time?  Are there some scenarios where performance should be
364
  measured?
365
366
* Is it tested, and are the tests at the right level?  Are there both
367
  blackbox (command-line level) and API-oriented tests?
368
369
* If this change will be visible to end users or API users, is it
370
  appropriately documented in NEWS?
371
372
* Does it meet the coding standards below?
373
374
* If it changes the user-visible behaviour, does it update the help
375
  strings and user documentation?
376
377
* If it adds a new major concept or standard practice, does it update the
378
  developer documentation?
379
380
* (your ideas here...)
381
382
4325.5.4 by Martin Pool
Update developer guide to use Launchpad reviews
383
Reviews on Launchpad
384
====================
385
386
From May 2009 on, we prefer people to propose code reviews through
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
387
Launchpad.
4325.5.4 by Martin Pool
Update developer guide to use Launchpad reviews
388
389
 * <https://launchpad.net/+tour/code-review>
390
391
 * <https://help.launchpad.net/Code/Review>
392
4595.5.2 by Neil Martinsen-Burrell
Include bazaar-vcs.org/BzrGivingBack in HACKING.txt; fix typos in HACKING.txt
393
Anyone can propose or comment on a merge proposal just by creating a
4325.5.4 by Martin Pool
Update developer guide to use Launchpad reviews
394
Launchpad account.
395
396
There are two ways to create a new merge proposal: through the web
397
interface or by email.
398
399
400
Proposing a merge through the web
401
---------------------------------
402
4595.5.2 by Neil Martinsen-Burrell
Include bazaar-vcs.org/BzrGivingBack in HACKING.txt; fix typos in HACKING.txt
403
To create the proposal through the web, first push your branch to Launchpad.
404
For example, a branch dealing with documentation belonging to the Launchpad
405
User mbp could be pushed as ::
4325.5.4 by Martin Pool
Update developer guide to use Launchpad reviews
406
407
  bzr push lp:~mbp/bzr/doc
408
4595.5.2 by Neil Martinsen-Burrell
Include bazaar-vcs.org/BzrGivingBack in HACKING.txt; fix typos in HACKING.txt
409
Then go to the branch's web page, which in this case would be
410
<https://code.launchpad.net/~mbp/bzr/doc>.  You can simplify this step by just
4325.5.4 by Martin Pool
Update developer guide to use Launchpad reviews
411
running ::
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
412
4325.5.4 by Martin Pool
Update developer guide to use Launchpad reviews
413
  bzr lp-open
414
4595.5.2 by Neil Martinsen-Burrell
Include bazaar-vcs.org/BzrGivingBack in HACKING.txt; fix typos in HACKING.txt
415
You can then click "Propose for merging into another branch", and enter your
416
cover letter (see above) into the web form.  Typically you'll want to merge
417
into ``~bzr/bzr/trunk`` which will be the default; you might also want to
418
nominate merging into a release branch for a bug fix.  There is the option to
419
specify a specific reviewer or type of review, and you shouldn't normally
420
change those.
4325.5.4 by Martin Pool
Update developer guide to use Launchpad reviews
421
422
Submitting the form takes you to the new page about the merge proposal
423
containing the diff of the changes, comments by interested people, and
424
controls to comment or vote on the change.
425
426
Proposing a merge by mail
427
-------------------------
428
429
To propose a merge by mail, send a bundle to ``merge@code.launchpad.net``.
430
431
You can generate a merge request like this::
432
433
  bzr send -o bug-1234.diff
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
434
4325.5.4 by Martin Pool
Update developer guide to use Launchpad reviews
435
``bzr send`` can also send mail directly if you prefer; see the help.
436
437
Reviewing changes
438
-----------------
439
440
From <https://code.launchpad.net/bzr/+activereviews> you can see all
441
currently active reviews, and choose one to comment on.  This page also
442
shows proposals that are now approved and should be merged by someone with
443
PQM access.
444
445
446
Reviews through Bundle Buggy
447
============================
448
449
The Bundle Buggy tool used up to May 2009 is still available as a review
450
mechanism.
451
452
Sending patches for review
453
--------------------------
454
455
If you'd like to propose a change, please post to the
456
bazaar@lists.canonical.com list with a bundle, patch, or link to a
457
branch. Put ``[PATCH]`` or ``[MERGE]`` in the subject so Bundle Buggy
458
can pick it out, and explain the change in the email message text.
459
Remember to update the NEWS file as part of your change if it makes any
460
changes visible to users or plugin developers. Please include a diff
461
against mainline if you're giving a link to a branch.
462
463
You can generate a merge request like this::
464
465
  bzr send -o bug-1234.patch
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
466
4325.5.4 by Martin Pool
Update developer guide to use Launchpad reviews
467
A ``.patch`` extension is recommended instead of .bundle as many mail clients
468
will send the latter as a binary file.
469
470
``bzr send`` can also send mail directly if you prefer; see the help.
471
472
Please do **NOT** put [PATCH] or [MERGE] in the subject line if you don't
473
want it to be merged. If you want comments from developers rather than
474
to be merged, you can put ``[RFC]`` in the subject line.
475
476
If this change addresses a bug, please put the bug number in the subject
477
line too, in the form ``[#1]`` so that Bundle Buggy can recognize it.
478
479
If the change is intended for a particular release mark that in the
480
subject too, e.g. ``[1.6]``.
3683.1.1 by Martin Pool
Improved review process docs and separate out architectural overview
481
Anyone can "vote" on the mailing list by expressing an opinion. Core
482
developers can also vote using Bundle Buggy. Here are the voting codes and
483
their explanations.
484
485
:approve:  Reviewer wants this submission merged.
486
:tweak:    Reviewer wants this submission merged with small changes. (No
487
  re-review required.)
488
:abstain:  Reviewer does not intend to vote on this patch.
489
:resubmit: Please make changes and resubmit for review.
490
:reject:   Reviewer doesn't want this kind of change merged.
491
:comment:  Not really a vote. Reviewer just wants to comment, for now.
492
493
If a change gets two approvals from core reviewers, and no rejections,
494
then it's OK to come in.  Any of the core developers can bring it into the
495
bzr.dev trunk and backport it to maintenance branches if required.  The
496
Release Manager will merge the change into the branch for a pending
497
release, if any. As a guideline, core developers usually merge their own
498
changes and volunteer to merge other contributions if they were the second
499
reviewer to agree to a change.
500
501
To track the progress of proposed changes, use Bundle Buggy. See
502
http://bundlebuggy.aaronbentley.com/help for a link to all the
503
outstanding merge requests together with an explanation of the columns.
504
Bundle Buggy will also mail you a link to track just your change.
2466.6.2 by Ian Clatworthy
Incorporate feedback from LarstiQ
505
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
506
Coding Style Guidelines
3408.1.5 by Martin Pool
Coding standard: repr methods
507
#######################
1393.1.53 by Martin Pool
- notes from coding-convention discussion
508
3376.2.2 by Martin Pool
Add documentation of assert statement ban
509
hasattr and getattr
3408.1.8 by Martin Pool
merge trunk
510
===================
2974.1.1 by Martin Pool
HACKING: say not to use hasattr()
511
512
``hasattr`` should not be used because it swallows exceptions including
513
``KeyboardInterrupt``.  Instead, say something like ::
514
515
  if getattr(thing, 'name', None) is None
516
517
2795.1.1 by Martin Pool
Document code layout stuff
518
Code layout
3408.1.5 by Martin Pool
Coding standard: repr methods
519
===========
2795.1.1 by Martin Pool
Document code layout stuff
520
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
521
Please write PEP-8__ compliant code.
1393.1.53 by Martin Pool
- notes from coding-convention discussion
522
2795.1.1 by Martin Pool
Document code layout stuff
523
__ http://www.python.org/peps/pep-0008.html
524
1393.1.53 by Martin Pool
- notes from coding-convention discussion
525
One often-missed requirement is that the first line of docstrings
526
should be a self-contained one-sentence summary.
527
2795.1.1 by Martin Pool
Document code layout stuff
528
We use 4 space indents for blocks, and never use tab characters.  (In vim,
529
``set expandtab``.)
530
4210.5.2 by Marius Kruger
update white space policy in HACKING
531
Trailing white space should be avoided, but is allowed.
532
You should however not make lots of unrelated white space changes.
3943.7.1 by Marius Kruger
* Change test_no_tabs to test_coding_style and let it check for trailing newlines too.
533
3943.7.2 by Marius Kruger
* also check for unix style newlines and note in HACKING that this is what we use.
534
Unix style newlines (LF) are used.
535
3943.7.5 by Marius Kruger
* test_source also notes how many longlines exist
536
Each file must have a newline at the end of it.
537
2795.1.1 by Martin Pool
Document code layout stuff
538
Lines should be no more than 79 characters if at all possible.
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
539
Lines that continue a long statement may be indented in either of
2795.1.1 by Martin Pool
Document code layout stuff
540
two ways:
541
542
within the parenthesis or other character that opens the block, e.g.::
543
544
    my_long_method(arg1,
545
                   arg2,
546
                   arg3)
547
548
or indented by four spaces::
549
550
    my_long_method(arg1,
551
        arg2,
552
        arg3)
553
554
The first is considered clearer by some people; however it can be a bit
555
harder to maintain (e.g. when the method name changes), and it does not
556
work well if the relevant parenthesis is already far to the right.  Avoid
557
this::
558
559
     self.legbone.kneebone.shinbone.toebone.shake_it(one,
560
                                                     two,
561
                                                     three)
562
563
but rather ::
564
565
     self.legbone.kneebone.shinbone.toebone.shake_it(one,
566
         two,
567
         three)
568
569
or ::
570
571
     self.legbone.kneebone.shinbone.toebone.shake_it(
572
         one, two, three)
573
574
For long lists, we like to add a trailing comma and put the closing
575
character on the following line.  This makes it easier to add new items in
576
future::
577
578
    from bzrlib.goo import (
579
        jam,
580
        jelly,
581
        marmalade,
582
        )
1393.1.53 by Martin Pool
- notes from coding-convention discussion
583
4595.5.2 by Neil Martinsen-Burrell
Include bazaar-vcs.org/BzrGivingBack in HACKING.txt; fix typos in HACKING.txt
584
There should be spaces between function parameters, but not between the
2795.1.3 by Martin Pool
clarify spacing for function parameters
585
keyword name and the value::
586
587
    call(1, 3, cheese=quark)
1393.1.53 by Martin Pool
- notes from coding-convention discussion
588
2795.1.2 by Martin Pool
emacs indent additions from vila
589
In emacs::
590
591
    ;(defface my-invalid-face
592
    ;  '((t (:background "Red" :underline t)))
593
    ;  "Face used to highlight invalid constructs or other uglyties"
594
    ;  )
595
596
    (defun my-python-mode-hook ()
597
     ;; setup preferred indentation style.
598
     (setq fill-column 79)
599
     (setq indent-tabs-mode nil) ; no tabs, never, I will not repeat
600
    ;  (font-lock-add-keywords 'python-mode
601
    ;                         '(("^\\s *\t" . 'my-invalid-face) ; Leading tabs
602
    ;                            ("[ \t]+$" . 'my-invalid-face)  ; Trailing spaces
603
    ;                            ("^[ \t]+$" . 'my-invalid-face)); Spaces only
604
    ;                          )
605
     )
606
607
    (add-hook 'python-mode-hook 'my-python-mode-hook)
608
609
The lines beginning with ';' are comments. They can be activated
610
if one want to have a strong notice of some tab/space usage
611
violations.
612
613
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
614
Module Imports
3408.1.5 by Martin Pool
Coding standard: repr methods
615
==============
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
616
617
* Imports should be done at the top-level of the file, unless there is
618
  a strong reason to have them lazily loaded when a particular
619
  function runs.  Import statements have a cost, so try to make sure
620
  they don't run inside hot functions.
621
622
* Module names should always be given fully-qualified,
623
  i.e. ``bzrlib.hashcache`` not just ``hashcache``.
624
1393.1.53 by Martin Pool
- notes from coding-convention discussion
625
626
Naming
3408.1.5 by Martin Pool
Coding standard: repr methods
627
======
1393.1.53 by Martin Pool
- notes from coding-convention discussion
628
4719.2.1 by Martin Pool
Tweak documentation about stable interfaces
629
Functions, methods or members that are relatively private are given
2625.3.1 by Ian Clatworthy
Clarify the use of underscore in the naming convention
630
a leading underscore prefix.  Names without a leading underscore are
631
public not just across modules but to programmers using bzrlib as an
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
632
API.
1393.1.53 by Martin Pool
- notes from coding-convention discussion
633
634
We prefer class names to be concatenated capital words (``TestCase``)
635
and variables, methods and functions to be lowercase words joined by
636
underscores (``revision_id``, ``get_revision``).
637
638
For the purposes of naming some names are treated as single compound
639
words: "filename", "revno".
640
641
Consider naming classes as nouns and functions/methods as verbs.
642
2221.4.7 by Aaron Bentley
Add suggestion to HACKING
643
Try to avoid using abbreviations in names, because there can be
644
inconsistency if other people use the full name.
645
1393.1.53 by Martin Pool
- notes from coding-convention discussion
646
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
647
Standard Names
3408.1.5 by Martin Pool
Coding standard: repr methods
648
==============
1393.1.53 by Martin Pool
- notes from coding-convention discussion
649
650
``revision_id`` not ``rev_id`` or ``revid``
651
652
Functions that transform one thing to another should be named ``x_to_y``
653
(not ``x2y`` as occurs in some old code.)
654
1098 by Martin Pool
- notes on how output is written
655
1185.16.85 by mbp at sourcefrog
- rules for using destructors
656
Destructors
3408.1.5 by Martin Pool
Coding standard: repr methods
657
===========
1185.16.85 by mbp at sourcefrog
- rules for using destructors
658
1185.16.150 by Martin Pool
Improved description of python exception policies
659
Python destructors (``__del__``) work differently to those of other
660
languages.  In particular, bear in mind that destructors may be called
661
immediately when the object apparently becomes unreferenced, or at some
662
later time, or possibly never at all.  Therefore we have restrictions on
663
what can be done inside them.
1185.16.85 by mbp at sourcefrog
- rules for using destructors
664
3408.1.5 by Martin Pool
Coding standard: repr methods
665
 0. If you think you need to use a ``__del__`` method ask another
666
    developer for alternatives.  If you do need to use one, explain
667
    why in a comment.
1185.16.85 by mbp at sourcefrog
- rules for using destructors
668
669
 1. Never rely on a ``__del__`` method running.  If there is code that
670
    must run, do it from a ``finally`` block instead.
671
672
 2. Never ``import`` from inside a ``__del__`` method, or you may crash the
673
    interpreter!!
674
675
 3. In some places we raise a warning from the destructor if the object
676
    has not been cleaned up or closed.  This is considered OK: the warning
677
    may not catch every case but it's still useful sometimes.
678
679
4634.62.3 by Andrew Bennetts
Add a brief 'Cleanup methods' section to HACKING.
680
Cleanup methods
681
===============
682
683
Often when something has failed later code, including cleanups invoked
684
from ``finally`` blocks, will fail too.  These secondary failures are
685
generally uninteresting compared to the original exception.  So use the
686
``only_raises`` decorator (from ``bzrlib.decorators``) for methods that
687
are typically called in ``finally`` blocks, such as ``unlock`` methods.
688
For example, ``@only_raises(LockNotHeld, LockBroken)``.  All errors that
4926.2.1 by Toon Nolten
Corrected two typos in HACKING.txt
689
are unlikely to be a knock-on failure from a previous failure should be
4634.62.3 by Andrew Bennetts
Add a brief 'Cleanup methods' section to HACKING.
690
allowed.
691
692
1740.2.5 by Aaron Bentley
Merge from bzr.dev
693
Factories
3408.1.5 by Martin Pool
Coding standard: repr methods
694
=========
1740.2.5 by Aaron Bentley
Merge from bzr.dev
695
696
In some places we have variables which point to callables that construct
697
new instances.  That is to say, they can be used a lot like class objects,
4999.5.1 by Martin von Gagern
Minor reST fixes to HACKING.txt
698
but they shouldn't be *named* like classes::
1740.2.5 by Aaron Bentley
Merge from bzr.dev
699
700
> I think that things named FooBar should create instances of FooBar when
701
> called. Its plain confusing for them to do otherwise. When we have
702
> something that is going to be used as a class - that is, checked for via
703
> isinstance or other such idioms, them I would call it foo_class, so that
704
> it is clear that a callable is not sufficient. If it is only used as a
705
> factory, then yes, foo_factory is what I would use.
706
707
1911.4.15 by John Arbash Meinel
Updated HACKING and docstrings per Martin's suggestions
708
Registries
3408.1.5 by Martin Pool
Coding standard: repr methods
709
==========
1911.4.15 by John Arbash Meinel
Updated HACKING and docstrings per Martin's suggestions
710
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
711
Several places in Bazaar use (or will use) a registry, which is a
712
mapping from names to objects or classes.  The registry allows for
1911.4.15 by John Arbash Meinel
Updated HACKING and docstrings per Martin's suggestions
713
loading in registered code only when it's needed, and keeping
714
associated information such as a help string or description.
715
716
3582.1.1 by Martin Pool
Document InterObject
717
InterObject and multiple dispatch
718
=================================
719
720
The ``InterObject`` provides for two-way `multiple dispatch`__: matching
721
up for example a source and destination repository to find the right way
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
722
to transfer data between them.
3582.1.1 by Martin Pool
Document InterObject
723
3582.1.6 by Martin Pool
developer guide ReST syntax fix
724
.. __: http://en.wikipedia.org/wiki/Multiple_dispatch
725
3582.1.1 by Martin Pool
Document InterObject
726
There is a subclass ``InterObject`` classes for each type of object that is
727
dispatched this way, e.g. ``InterRepository``.  Calling ``.get()`` on this
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
728
class will return an ``InterObject`` instance providing the best match for
3582.1.1 by Martin Pool
Document InterObject
729
those parameters, and this instance then has methods for operations
730
between the objects.
731
4999.5.1 by Martin von Gagern
Minor reST fixes to HACKING.txt
732
::
733
3582.1.1 by Martin Pool
Document InterObject
734
  inter = InterRepository.get(source_repo, target_repo)
735
  inter.fetch(revision_id)
736
737
``InterRepository`` also acts as a registry-like object for its
738
subclasses, and they can be added through ``.register_optimizer``.  The
739
right one to run is selected by asking each class, in reverse order of
740
registration, whether it ``.is_compatible`` with the relevant objects.
741
1996.1.20 by John Arbash Meinel
HACKING and NEWS
742
Lazy Imports
3408.1.5 by Martin Pool
Coding standard: repr methods
743
============
1996.1.20 by John Arbash Meinel
HACKING and NEWS
744
745
To make startup time faster, we use the ``bzrlib.lazy_import`` module to
746
delay importing modules until they are actually used. ``lazy_import`` uses
747
the same syntax as regular python imports. So to import a few modules in a
748
lazy fashion do::
749
750
  from bzrlib.lazy_import import lazy_import
751
  lazy_import(globals(), """
752
  import os
753
  import subprocess
754
  import sys
755
  import time
756
757
  from bzrlib import (
758
     errors,
759
     transport,
1996.3.37 by John Arbash Meinel
Update HACKING and TODO
760
     revision as _mod_revision,
1996.1.20 by John Arbash Meinel
HACKING and NEWS
761
     )
762
  import bzrlib.transport
763
  import bzrlib.xml5
764
  """)
765
766
At this point, all of these exist as a ``ImportReplacer`` object, ready to
1996.3.37 by John Arbash Meinel
Update HACKING and TODO
767
be imported once a member is accessed. Also, when importing a module into
768
the local namespace, which is likely to clash with variable names, it is
2370.1.1 by Ian Clatworthy
Minor corrections to HACKING
769
recommended to prefix it as ``_mod_<module>``. This makes it clearer that
1996.3.37 by John Arbash Meinel
Update HACKING and TODO
770
the variable is a module, and these object should be hidden anyway, since
771
they shouldn't be imported into other namespaces.
1996.1.20 by John Arbash Meinel
HACKING and NEWS
772
773
While it is possible for ``lazy_import()`` to import members of a module
2063.3.1 by wang
fix typos
774
when using the ``from module import member`` syntax, it is recommended to
1996.1.20 by John Arbash Meinel
HACKING and NEWS
775
only use that syntax to load sub modules ``from module import submodule``.
776
This is because variables and classes can frequently be used without
777
needing a sub-member for example::
778
779
  lazy_import(globals(), """
780
  from module import MyClass
781
  """)
782
783
  def test(x):
784
      return isinstance(x, MyClass)
785
786
This will incorrectly fail, because ``MyClass`` is a ``ImportReplacer``
787
object, rather than the real class.
788
1996.1.26 by John Arbash Meinel
Update HACKING and docstrings
789
It also is incorrect to assign ``ImportReplacer`` objects to other variables.
1996.1.20 by John Arbash Meinel
HACKING and NEWS
790
Because the replacer only knows about the original name, it is unable to
791
replace other variables. The ``ImportReplacer`` class will raise an
1996.1.26 by John Arbash Meinel
Update HACKING and docstrings
792
``IllegalUseOfScopeReplacer`` exception if it can figure out that this
793
happened. But it requires accessing a member more than once from the new
794
variable, so some bugs are not detected right away.
1996.1.20 by John Arbash Meinel
HACKING and NEWS
795
796
2598.5.9 by Aaron Bentley
Update NEWS and HACKING
797
The Null revision
3408.1.5 by Martin Pool
Coding standard: repr methods
798
=================
2598.5.9 by Aaron Bentley
Update NEWS and HACKING
799
800
The null revision is the ancestor of all revisions.  Its revno is 0, its
801
revision-id is ``null:``, and its tree is the empty tree.  When referring
802
to the null revision, please use ``bzrlib.revision.NULL_REVISION``.  Old
803
code sometimes uses ``None`` for the null revision, but this practice is
804
being phased out.
805
806
3408.1.5 by Martin Pool
Coding standard: repr methods
807
Object string representations
808
=============================
809
810
Python prints objects using their ``__repr__`` method when they are
811
written to logs, exception tracebacks, or the debugger.  We want
812
objects to have useful representations to help in determining what went
813
wrong.
814
815
If you add a new class you should generally add a ``__repr__`` method
816
unless there is an adequate method in a parent class.  There should be a
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
817
test for the repr.
3408.1.5 by Martin Pool
Coding standard: repr methods
818
819
Representations should typically look like Python constructor syntax, but
820
they don't need to include every value in the object and they don't need
821
to be able to actually execute.  They're to be read by humans, not
822
machines.  Don't hardcode the classname in the format, so that we get the
823
correct value if the method is inherited by a subclass.  If you're
824
printing attributes of the object, including strings, you should normally
825
use ``%r`` syntax (to call their repr in turn).
826
3408.1.10 by Martin Pool
Review feedback
827
Try to avoid the representation becoming more than one or two lines long.
828
(But balance this against including useful information, and simplicity of
829
implementation.)
830
3408.1.5 by Martin Pool
Coding standard: repr methods
831
Because repr methods are often called when something has already gone
3464.3.10 by Martin Pool
Remove example of catching all exceptions from __repr__ in HACKING
832
wrong, they should be written somewhat more defensively than most code.
833
The object may be half-initialized or in some other way in an illegal
834
state.  The repr method shouldn't raise an exception, or it may hide the
835
(probably more useful) underlying exception.
3408.1.5 by Martin Pool
Coding standard: repr methods
836
837
Example::
838
839
    def __repr__(self):
3464.3.10 by Martin Pool
Remove example of catching all exceptions from __repr__ in HACKING
840
        return '%s(%r)' % (self.__class__.__name__,
841
                           self._transport)
3408.1.5 by Martin Pool
Coding standard: repr methods
842
843
3464.3.11 by Martin Pool
Add developer advice against bare except:
844
Exception handling
845
==================
846
847
A bare ``except`` statement will catch all exceptions, including ones that
848
really should terminate the program such as ``MemoryError`` and
849
``KeyboardInterrupt``.  They should rarely be used unless the exception is
850
later re-raised.  Even then, think about whether catching just
851
``Exception`` (which excludes system errors in Python2.5 and later) would
852
be better.
853
854
3619.3.1 by Andrew Bennetts
Move the notes on writing tests out of HACKING into a new file, and improve
855
Test coverage
856
=============
857
4634.39.36 by Ian Clatworthy
Get plain-style documentation generation working again
858
All code should be exercised by the test suite.  See the `Bazaar Testing
859
Guide <http://doc.bazaar-vcs.org/developers/testing.html>`_ for detailed
860
information about writing tests.
3619.3.1 by Andrew Bennetts
Move the notes on writing tests out of HACKING into a new file, and improve
861
3464.3.11 by Martin Pool
Add developer advice against bare except:
862
3408.1.7 by Martin Pool
Move coding standards to be a top-level section in the developer guide
863
Core Topics
864
###########
865
866
Evolving Interfaces
867
===================
868
4719.2.1 by Martin Pool
Tweak documentation about stable interfaces
869
We don't change APIs in stable branches: any supported symbol in a stable
870
release of bzr must not be altered in any way that would result in
3408.1.7 by Martin Pool
Move coding standards to be a top-level section in the developer guide
871
breaking existing code that uses it. That means that method names,
872
parameter ordering, parameter names, variable and attribute names etc must
873
not be changed without leaving a 'deprecated forwarder' behind. This even
874
applies to modules and classes.
875
876
If you wish to change the behaviour of a supported API in an incompatible
877
way, you need to change its name as well. For instance, if I add an optional keyword
878
parameter to branch.commit - that's fine. On the other hand, if I add a
879
keyword parameter to branch.commit which is a *required* transaction
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
880
object, I should rename the API - i.e. to 'branch.commit_transaction'.
3408.1.7 by Martin Pool
Move coding standards to be a top-level section in the developer guide
881
4719.2.1 by Martin Pool
Tweak documentation about stable interfaces
882
  (Actually, that may break code that provides a new implementation of
883
  ``commit`` and doesn't expect to receive the parameter.)
884
3408.1.7 by Martin Pool
Move coding standards to be a top-level section in the developer guide
885
When renaming such supported API's, be sure to leave a deprecated_method (or
886
_function or ...) behind which forwards to the new API. See the
887
bzrlib.symbol_versioning module for decorators that take care of the
888
details for you - such as updating the docstring, and issuing a warning
4595.5.2 by Neil Martinsen-Burrell
Include bazaar-vcs.org/BzrGivingBack in HACKING.txt; fix typos in HACKING.txt
889
when the old API is used.
3408.1.7 by Martin Pool
Move coding standards to be a top-level section in the developer guide
890
891
For unsupported API's, it does not hurt to follow this discipline, but it's
892
not required. Minimally though, please try to rename things so that
893
callers will at least get an AttributeError rather than weird results.
894
895
896
Deprecation decorators
897
----------------------
898
899
``bzrlib.symbol_versioning`` provides decorators that can be attached to
900
methods, functions, and other interfaces to indicate that they should no
3408.1.9 by Martin Pool
Use new-style deprecated_in
901
longer be used.  For example::
902
903
   @deprecated_method(deprecated_in((0, 1, 4)))
904
   def foo(self):
905
        return self._new_foo()
3408.1.7 by Martin Pool
Move coding standards to be a top-level section in the developer guide
906
907
To deprecate a static method you must call ``deprecated_function``
908
(**not** method), after the staticmethod call::
909
910
    @staticmethod
3408.1.9 by Martin Pool
Use new-style deprecated_in
911
    @deprecated_function(deprecated_in((0, 1, 4)))
3408.1.7 by Martin Pool
Move coding standards to be a top-level section in the developer guide
912
    def create_repository(base, shared=False, format=None):
913
914
When you deprecate an API, you should not just delete its tests, because
915
then we might introduce bugs in them.  If the API is still present at all,
916
it should still work.  The basic approach is to use
917
``TestCase.applyDeprecated`` which in one step checks that the API gives
918
the expected deprecation message, and also returns the real result from
919
the method, so that tests can keep running.
920
3427.5.9 by John Arbash Meinel
merge bzr.dev, move update to new location in HACKING
921
Deprecation warnings will be suppressed for final releases, but not for
922
development versions or release candidates, or when running ``bzr
923
selftest``. This gives developers information about whether their code is
924
using deprecated functions, but avoids confusing users about things they
925
can't fix.
926
3408.1.7 by Martin Pool
Move coding standards to be a top-level section in the developer guide
927
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
928
Getting Input
929
=============
930
931
Processing Command Lines
932
------------------------
933
934
bzrlib has a standard framework for parsing command lines and calling
935
processing routines associated with various commands. See builtins.py
2466.6.2 by Ian Clatworthy
Incorporate feedback from LarstiQ
936
for numerous examples.
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
937
938
939
Standard Parameter Types
940
------------------------
941
942
There are some common requirements in the library: some parameters need to be
943
unicode safe, some need byte strings, and so on. At the moment we have
944
only codified one specific pattern: Parameters that need to be unicode
945
should be checked via ``bzrlib.osutils.safe_unicode``. This will coerce the
946
input into unicode in a consistent fashion, allowing trivial strings to be
947
used for programmer convenience, but not performing unpredictably in the
948
presence of different locales.
949
950
951
Writing Output
1098 by Martin Pool
- notes on how output is written
952
==============
953
954
(The strategy described here is what we want to get to, but it's not
955
consistently followed in the code at the moment.)
956
957
bzrlib is intended to be a generically reusable library.  It shouldn't
958
write messages to stdout or stderr, because some programs that use it
959
might want to display that information through a GUI or some other
960
mechanism.
961
962
We can distinguish two types of output from the library:
963
964
 1. Structured data representing the progress or result of an
965
    operation.  For example, for a commit command this will be a list
966
    of the modified files and the finally committed revision number
967
    and id.
968
969
    These should be exposed either through the return code or by calls
970
    to a callback parameter.
971
972
    A special case of this is progress indicators for long-lived
973
    operations, where the caller should pass a ProgressBar object.
974
975
 2. Unstructured log/debug messages, mostly for the benefit of the
976
    developers or users trying to debug problems.  This should always
977
    be sent through ``bzrlib.trace`` and Python ``logging``, so that
978
    it can be redirected by the client.
979
980
The distinction between the two is a bit subjective, but in general if
981
there is any chance that a library would want to see something as
982
structured data, we should make it so.
983
984
The policy about how output is presented in the text-mode client
985
should be only in the command-line tool.
1092.1.22 by Robert Collins
update hacking with some test foo
986
1418 by Robert Collins
merge martins latest
987
4110.2.20 by Martin Pool
Developer docs of progress bars
988
Progress and Activity Indications
989
---------------------------------
990
991
bzrlib has a way for code to display to the user that stuff is happening
992
during a long operation.  There are two particular types: *activity* which
993
means that IO is happening on a Transport, and *progress* which means that
994
higher-level application work is occurring.  Both are drawn together by
995
the `ui_factory`.
996
997
Transport objects are responsible for calling `report_transport_activity`
998
when they do IO.
999
1000
Progress uses a model/view pattern: application code acts on a
1001
`ProgressTask` object, which notifies the UI when it needs to be
1002
displayed.  Progress tasks form a stack.  To create a new progress task on
1003
top of the stack, call `bzrlib.ui.ui_factory.nested_progress_bar()`, then
1004
call `update()` on the returned ProgressTask.  It can be updated with just
1005
a text description, with a numeric count, or with a numeric count and
1006
expected total count.  If an expected total count is provided the view
1007
can show the progress moving along towards the expected total.
1008
1009
The user should call `finish` on the `ProgressTask` when the logical
1010
operation has finished, so it can be removed from the stack.
1011
4595.5.2 by Neil Martinsen-Burrell
Include bazaar-vcs.org/BzrGivingBack in HACKING.txt; fix typos in HACKING.txt
1012
Progress tasks have a complex relationship with generators: it's a very
4110.2.20 by Martin Pool
Developer docs of progress bars
1013
good place to use them, but because python2.4 does not allow ``finally``
1014
blocks in generators it's hard to clean them up properly.  In this case
1015
it's probably better to have the code calling the generator allocate a
1016
progress task for its use and then call `finalize` when it's done, which
1017
will close it if it was not already closed.  The generator should also
1018
finish the progress task when it exits, because it may otherwise be a long
1019
time until the finally block runs.
1020
5117.2.2 by Martin Pool
Clear up UI style guideline
1021
1022
Message guidelines
1023
------------------
5117.2.1 by Martin Pool
Document quoting of filenames
1024
1025
When filenames or similar variables are presented inline within a message,
1026
they should be enclosed in double quotes (ascii 0x22, not chiral unicode
1027
quotes)::
1028
5117.2.2 by Martin Pool
Clear up UI style guideline
1029
  bzr: ERROR: No such file "asdf"
5117.2.1 by Martin Pool
Document quoting of filenames
1030
1031
When we print just a list of filenames there should not be any quoting:
5117.2.3 by Martin Pool
ReST typo correct
1032
see `bug 544297`_.
5117.2.1 by Martin Pool
Document quoting of filenames
1033
1034
.. _bug 544297: https://bugs.launchpad.net/bugs/544297
1035
5117.2.2 by Martin Pool
Clear up UI style guideline
1036
https://wiki.ubuntu.com/UnitsPolicy provides a good explanation about
1037
which unit should be used when. Roughly speaking, IEC standard applies
1038
for base-2 units and SI standard applies for base-10 units:
1039
5117.2.4 by Martin Pool
fix typo
1040
* for network bandwidth and disk sizes, use base-10 (Mbits/s, kB/s, GB)
5117.2.2 by Martin Pool
Clear up UI style guideline
1041
1042
* for RAM sizes, use base-2 (GiB, TiB)
1043
1044
5117.2.1 by Martin Pool
Document quoting of filenames
1045
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1046
Displaying help
1047
===============
1048
1049
Bazaar has online help for various topics through ``bzr help COMMAND`` or
1050
equivalently ``bzr command -h``.  We also have help on command options,
1051
and on other help topics.  (See ``help_topics.py``.)
1052
1053
As for python docstrings, the first paragraph should be a single-sentence
5131.2.2 by Martin
Catch a couple of missed plugin module docstrings, note need for assignment to __doc__ in developer documentation and NEWS
1054
synopsis of the command. These are user-visible and should be prefixed with
1055
``__doc__ =`` so help works under ``python -OO`` with docstrings stripped.
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1056
1057
The help for options should be one or more proper sentences, starting with
1058
a capital letter and finishing with a full stop (period).
1059
1060
All help messages and documentation should have two spaces between
1061
sentences.
1062
1063
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1064
Handling Errors and Exceptions
1065
==============================
1066
1067
Commands should return non-zero when they encounter circumstances that
1068
the user should really pay attention to - which includes trivial shell
1069
pipelines.
1070
1071
Recommended values are:
1072
1073
    0. OK.
1074
    1. Conflicts in merge-like operations, or changes are present in
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1075
       diff-like operations.
1076
    2. Unrepresentable diff changes (i.e. binary files that we cannot show
2475.2.4 by Martin Pool
HACKING rest fixes from jam
1077
       a diff of).
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1078
    3. An error or exception has occurred.
2713.2.2 by Martin Pool
Add mention of exitcode 4 for internal errors
1079
    4. An internal error occurred (one that shows a traceback.)
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1080
1081
Errors are handled through Python exceptions. Exceptions should be defined
1082
inside bzrlib.errors, so that we can see the whole tree at a glance.
1083
1084
We broadly classify errors as either being either internal or not,
3882.4.2 by Martin Pool
Tweak documentation of exception classes
1085
depending on whether ``internal_error`` is set or not.  If we think it's our
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1086
fault, we show a backtrace, an invitation to report the bug, and possibly
1087
other details.  This is the default for errors that aren't specifically
1088
recognized as being caused by a user error.  Otherwise we show a briefer
1089
message, unless -Derror was given.
1090
1091
Many errors originate as "environmental errors" which are raised by Python
1092
or builtin libraries -- for example IOError.  These are treated as being
1093
our fault, unless they're caught in a particular tight scope where we know
1094
that they indicate a user errors.  For example if the repository format
1095
is not found, the user probably gave the wrong path or URL.  But if one of
1096
the files inside the repository is not found, then it's our fault --
1097
either there's a bug in bzr, or something complicated has gone wrong in
1098
the environment that means one internal file was deleted.
1099
1100
Many errors are defined in ``bzrlib/errors.py`` but it's OK for new errors
1101
to be added near the place where they are used.
1102
1103
Exceptions are formatted for the user by conversion to a string
1104
(eventually calling their ``__str__`` method.)  As a convenience the
1105
``._fmt`` member can be used as a template which will be mapped to the
1106
error's instance dict.
1107
1108
New exception classes should be defined when callers might want to catch
1109
that exception specifically, or when it needs a substantially different
1110
format string.
1111
3882.4.1 by Martin Pool
Developer documentation about when to add new exception classes
1112
#. If it is something that a caller can recover from, a custom exception
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1113
   is reasonable.
3882.4.1 by Martin Pool
Developer documentation about when to add new exception classes
1114
1115
#. If it is a data consistency issue, using a builtin like
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1116
   ``ValueError``/``TypeError`` is reasonable.
3882.4.1 by Martin Pool
Developer documentation about when to add new exception classes
1117
1118
#. If it is a programmer error (using an api incorrectly)
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1119
   ``AssertionError`` is reasonable.
3882.4.1 by Martin Pool
Developer documentation about when to add new exception classes
1120
3882.4.2 by Martin Pool
Tweak documentation of exception classes
1121
#. Otherwise, use ``BzrError`` or ``InternalBzrError``.
3882.4.1 by Martin Pool
Developer documentation about when to add new exception classes
1122
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1123
Exception strings should start with a capital letter and should not have a
1124
final fullstop.  If long, they may contain newlines to break the text.
1125
1126
3376.2.3 by Martin Pool
Updated info about assertions
1127
Assertions
3408.1.8 by Martin Pool
merge trunk
1128
==========
3376.2.3 by Martin Pool
Updated info about assertions
1129
1130
Do not use the Python ``assert`` statement, either in tests or elsewhere.
1131
A source test checks that it is not used.  It is ok to explicitly raise
1132
AssertionError.
1133
1134
Rationale:
1135
1136
 * It makes the behaviour vary depending on whether bzr is run with -O
1137
   or not, therefore giving a chance for bugs that occur in one case or
1138
   the other, several of which have already occurred: assertions with
1139
   side effects, code which can't continue unless the assertion passes,
1140
   cases where we should give the user a proper message rather than an
1141
   assertion failure.
1142
 * It's not that much shorter than an explicit if/raise.
1143
 * It tends to lead to fuzzy thinking about whether the check is
1144
   actually needed or not, and whether it's an internal error or not
1145
 * It tends to cause look-before-you-leap patterns.
1146
 * It's unsafe if the check is needed to protect the integrity of the
1147
   user's data.
1148
 * It tends to give poor messages since the developer can get by with
1149
   no explanatory text at all.
1150
 * We can't rely on people always running with -O in normal use, so we
1151
   can't use it for tests that are actually expensive.
1152
 * Expensive checks that help developers are better turned on from the
1153
   test suite or a -D flag.
1154
 * If used instead of ``self.assert*()`` in tests it makes them falsely pass with -O.
1155
1156
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1157
Documenting Changes
1158
===================
1159
1160
When you change bzrlib, please update the relevant documentation for the
1161
change you made: Changes to commands should update their help, and
1162
possibly end user tutorials; changes to the core library should be
1163
reflected in API documentation.
1164
1165
NEWS File
1166
---------
1167
1168
If you make a user-visible change, please add a note to the NEWS file.
1169
The description should be written to make sense to someone who's just
1170
a user of bzr, not a developer: new functions or classes shouldn't be
1171
mentioned, but new commands, changes in behaviour or fixed nontrivial
1172
bugs should be listed.  See the existing entries for an idea of what
1173
should be done.
1174
1175
Within each release, entries in the news file should have the most
1176
user-visible changes first.  So the order should be approximately:
1177
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1178
 * changes to existing behaviour - the highest priority because the
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1179
   user's existing knowledge is incorrect
1180
 * new features - should be brought to their attention
1181
 * bug fixes - may be of interest if the bug was affecting them, and
1182
   should include the bug number if any
4980.1.2 by Neil Martinsen-Burrell
clarify where docs bugs go
1183
 * major documentation changes, including fixed documentation bugs
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1184
 * changes to internal interfaces
1185
1186
People who made significant contributions to each change are listed in
1187
parenthesis.  This can include reporting bugs (particularly with good
1188
details or reproduction recipes), submitting patches, etc.
1189
4980.1.1 by Neil Martinsen-Burrell
mention a sort order for NEWS entries
1190
To help with merging, NEWS entries should be sorted lexicographically
1191
within each section.
1192
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1193
Commands
1194
--------
1195
1196
The docstring of a command is used by ``bzr help`` to generate help output
1197
for the command. The list 'takes_options' attribute on a command is used by
1198
``bzr help`` to document the options for the command - the command
1199
docstring does not need to document them. Finally, the '_see_also'
1200
attribute on a command can be used to reference other related help topics.
1201
1202
API Documentation
1203
-----------------
1204
1205
Functions, methods, classes and modules should have docstrings
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1206
describing how they are used.
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1207
1208
The first line of the docstring should be a self-contained sentence.
1209
1210
For the special case of Command classes, this acts as the user-visible
1211
documentation shown by the help command.
1212
1213
The docstrings should be formatted as reStructuredText_ (like this
1214
document), suitable for processing using the epydoc_ tool into HTML
1215
documentation.
1216
1217
.. _reStructuredText: http://docutils.sourceforge.net/rst.html
1218
.. _epydoc: http://epydoc.sourceforge.net/
1219
1220
1221
General Guidelines
1222
==================
1223
1224
Copyright
1225
---------
1226
1227
The copyright policy for bzr was recently made clear in this email (edited
1228
for grammatical correctness)::
1229
1230
    The attached patch cleans up the copyright and license statements in
1231
    the bzr source. It also adds tests to help us remember to add them
1232
    with the correct text.
1233
1234
    We had the problem that lots of our files were "Copyright Canonical
1235
    Development Ltd" which is not a real company, and some other variations
1236
    on this theme. Also, some files were missing the GPL statements.
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1237
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1238
    I want to be clear about the intent of this patch, since copyright can
1239
    be a little controversial.
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1240
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1241
    1) The big motivation for this is not to shut out the community, but
1242
    just to clean up all of the invalid copyright statements.
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1243
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1244
    2) It has been the general policy for bzr that we want a single
1245
    copyright holder for all of the core code. This is following the model
1246
    set by the FSF, which makes it easier to update the code to a new
1247
    license in case problems are encountered. (For example, if we want to
1248
    upgrade the project universally to GPL v3 it is much simpler if there is
1249
    a single copyright holder). It also makes it clearer if copyright is
1250
    ever debated, there is a single holder, which makes it easier to defend
1251
    in court, etc. (I think the FSF position is that if you assign them
1252
    copyright, they can defend it in court rather than you needing to, and
1253
    I'm sure Canonical would do the same).
1254
    As such, Canonical has requested copyright assignments from all of the
1255
    major contributers.
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1256
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1257
    3) If someone wants to add code and not attribute it to Canonical, there
1258
    is a specific list of files that are excluded from this check. And the
1259
    test failure indicates where that is, and how to update it.
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1260
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1261
    4) If anyone feels that I changed a copyright statement incorrectly, just
1262
    let me know, and I'll be happy to correct it. Whenever you have large
1263
    mechanical changes like this, it is possible to make some mistakes.
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1264
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1265
    Just to reiterate, this is a community project, and it is meant to stay
1266
    that way. Core bzr code is copyright Canonical for legal reasons, and
1267
    the tests are just there to help us maintain that.
1268
1269
1270
Miscellaneous Topics
1271
####################
1272
1273
Debugging
1274
=========
1275
1276
Bazaar has a few facilities to help debug problems by going into pdb_, the
1277
Python debugger.
1278
1279
.. _pdb: http://docs.python.org/lib/debugger-commands.html
1280
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1281
If the ``BZR_PDB`` environment variable is set
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1282
then bzr will go into pdb post-mortem mode when an unhandled exception
1283
occurs.
1284
4578.1.3 by John Arbash Meinel
NEWS and HACKING entries.
1285
If you send a SIGQUIT or SIGBREAK signal to bzr then it will drop into the
1286
debugger immediately. SIGQUIT can be generated by pressing Ctrl-\\ on
1287
Unix.  SIGBREAK is generated with Ctrl-Pause on Windows (some laptops have
1288
this as Fn-Pause).  You can continue execution by typing ``c``.  This can
1289
be disabled if necessary by setting the environment variable
1290
``BZR_SIGQUIT_PDB=0``.
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1291
1292
3959.1.2 by Martin Pool
Brief developer docs about debug flags
1293
Debug Flags
1294
===========
1295
1296
Bazaar accepts some global options starting with ``-D`` such as
1297
``-Dhpss``.  These set a value in `bzrlib.debug.debug_flags`, and
1298
typically cause more information to be written to the trace file.  Most
1299
`mutter` calls should be guarded by a check of those flags so that we
1300
don't write out too much information if it's not needed.
1301
1302
Debug flags may have effects other than just emitting trace messages.
1303
1304
Run ``bzr help global-options`` to see them all.
1305
4070.8.2 by Martin Pool
Initial support for debug_flags config option
1306
These flags may also be set as a comma-separated list in the
1307
``debug_flags`` option in e.g.  ``~/.bazaar/bazaar.conf``.  (Note that it
1308
must be in this global file, not in the branch or location configuration,
1309
because it's currently only loaded at startup time.)  For instance you may
1310
want to always record hpss traces and to see full error tracebacks::
1311
1312
    debug_flags = hpss, error
1313
3959.1.2 by Martin Pool
Brief developer docs about debug flags
1314
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1315
Jargon
1316
======
1317
1318
revno
1319
    Integer identifier for a revision on the main line of a branch.
1320
    Revision 0 is always the null revision; others are 1-based
1321
    indexes into the branch's revision history.
1322
1323
1711.2.95 by John Arbash Meinel
Add HACKING note for the self.outf parameter.
1324
Unicode and Encoding Support
1325
============================
1326
1327
This section discusses various techniques that Bazaar uses to handle
1328
characters that are outside the ASCII set.
1329
1330
``Command.outf``
1331
----------------
1332
1333
When a ``Command`` object is created, it is given a member variable
1334
accessible by ``self.outf``.  This is a file-like object, which is bound to
1335
``sys.stdout``, and should be used to write information to the screen,
1336
rather than directly writing to ``sys.stdout`` or calling ``print``.
1337
This file has the ability to translate Unicode objects into the correct
1711.2.96 by John Arbash Meinel
cleanup from suggestions by Robert and Martin
1338
representation, based on the console encoding.  Also, the class attribute
1339
``encoding_type`` will effect how unprintable characters will be
1711.2.95 by John Arbash Meinel
Add HACKING note for the self.outf parameter.
1340
handled.  This parameter can take one of 3 values:
1341
1342
  replace
1711.2.96 by John Arbash Meinel
cleanup from suggestions by Robert and Martin
1343
    Unprintable characters will be represented with a suitable replacement
1344
    marker (typically '?'), and no exception will be raised. This is for
1345
    any command which generates text for the user to review, rather than
1346
    for automated processing.
1711.2.95 by John Arbash Meinel
Add HACKING note for the self.outf parameter.
1347
    For example: ``bzr log`` should not fail if one of the entries has text
1348
    that cannot be displayed.
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1349
1711.2.95 by John Arbash Meinel
Add HACKING note for the self.outf parameter.
1350
  strict
2063.3.1 by wang
fix typos
1351
    Attempting to print an unprintable character will cause a UnicodeError.
1711.2.95 by John Arbash Meinel
Add HACKING note for the self.outf parameter.
1352
    This is for commands that are intended more as scripting support, rather
1353
    than plain user review.
4595.5.2 by Neil Martinsen-Burrell
Include bazaar-vcs.org/BzrGivingBack in HACKING.txt; fix typos in HACKING.txt
1354
    For example: ``bzr ls`` is designed to be used with shell scripting. One
1355
    use would be ``bzr ls --null --unknowns | xargs -0 rm``.  If ``bzr``
1711.2.95 by John Arbash Meinel
Add HACKING note for the self.outf parameter.
1356
    printed a filename with a '?', the wrong file could be deleted. (At the
1357
    very least, the correct file would not be deleted). An error is used to
1358
    indicate that the requested action could not be performed.
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1359
1711.2.95 by John Arbash Meinel
Add HACKING note for the self.outf parameter.
1360
  exact
1361
    Do not attempt to automatically convert Unicode strings. This is used
1362
    for commands that must handle conversion themselves.
1363
    For example: ``bzr diff`` needs to translate Unicode paths, but should
1364
    not change the exact text of the contents of the files.
1365
1366
1367
``bzrlib.urlutils.unescape_for_display``
1368
----------------------------------------
1369
1370
Because Transports work in URLs (as defined earlier), printing the raw URL
1371
to the user is usually less than optimal. Characters outside the standard
1372
set are printed as escapes, rather than the real character, and local
1373
paths would be printed as ``file://`` urls. The function
1374
``unescape_for_display`` attempts to unescape a URL, such that anything
1375
that cannot be printed in the current encoding stays an escaped URL, but
1376
valid characters are generated where possible.
1377
1378
2405.2.2 by Andrew Bennetts
Add a brief section on portability to HACKING.
1379
Portability Tips
1380
================
1381
1382
The ``bzrlib.osutils`` module has many useful helper functions, including
1383
some more portable variants of functions in the standard library.
1384
1385
In particular, don't use ``shutil.rmtree`` unless it's acceptable for it
1386
to fail on Windows if some files are readonly or still open elsewhere.
1387
Use ``bzrlib.osutils.rmtree`` instead.
1388
1389
1739.1.2 by Robert Collins
More pyrex finesse, documentation.
1390
C Extension Modules
1391
===================
1392
1393
We write some extensions in C using pyrex. We design these to work in
1394
three scenarios:
2449.1.1 by Alexander Belchenko
fix RSTX wrong formatting in HACKING
1395
1739.1.2 by Robert Collins
More pyrex finesse, documentation.
1396
 * User with no C compiler
1397
 * User with C compiler
1398
 * Developers
1399
1400
The recommended way to install bzr is to have a C compiler so that the
1401
extensions can be built, but if no C compiler is present, the pure python
1402
versions we supply will work, though more slowly.
1403
1404
For developers we recommend that pyrex be installed, so that the C
1405
extensions can be changed if needed.
1406
1407
For the C extensions, the extension module should always match the
1408
original python one in all respects (modulo speed). This should be
1409
maintained over time.
1410
1411
To create an extension, add rules to setup.py for building it with pyrex,
1412
and with distutils. Now start with an empty .pyx file. At the top add
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1413
"include 'yourmodule.py'". This will import the contents of foo.py into this
1739.1.2 by Robert Collins
More pyrex finesse, documentation.
1414
file at build time - remember that only one module will be loaded at
1415
runtime. Now you can subclass classes, or replace functions, and only your
1416
changes need to be present in the .pyx file.
1417
1418
Note that pyrex does not support all 2.4 programming idioms, so some
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1419
syntax changes may be required. I.e.
2449.1.1 by Alexander Belchenko
fix RSTX wrong formatting in HACKING
1420
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1421
 - 'from foo import (bar, gam)' needs to change to not use the brackets.
1422
 - 'import foo.bar as bar' needs to be 'import foo.bar; bar = foo.bar'
2449.1.1 by Alexander Belchenko
fix RSTX wrong formatting in HACKING
1423
1739.1.2 by Robert Collins
More pyrex finesse, documentation.
1424
If the changes are too dramatic, consider
1425
maintaining the python code twice - once in the .pyx, and once in the .py,
1426
and no longer including the .py file.
1427
2466.6.1 by Ian Clatworthy
Expand HACKING into Bazaar Developer Guide
1428
1429
Making Installers for OS Windows
1861.2.19 by Alexander Belchenko
HACKING: mention where to get instructions for building windows installers
1430
================================
1861.2.20 by Alexander Belchenko
English
1431
To build a win32 installer, see the instructions on the wiki page:
1861.2.19 by Alexander Belchenko
HACKING: mention where to get instructions for building windows installers
1432
http://bazaar-vcs.org/BzrWin32Installer
1433
1434
2797.1.1 by Ian Clatworthy
Merge Core Developer Hanbook into HACKING
1435
Core Developer Tasks
1436
####################
1437
1438
Overview
1439
========
1440
1441
What is a Core Developer?
1442
-------------------------
1443
1444
While everyone in the Bazaar community is welcome and encouraged to
1445
propose and submit changes, a smaller team is reponsible for pulling those
1446
changes together into a cohesive whole. In addition to the general developer
1447
stuff covered above, "core" developers have responsibility for:
1448
1449
* reviewing changes
1450
* reviewing blueprints
1451
* planning releases
4634.39.36 by Ian Clatworthy
Get plain-style documentation generation working again
1452
* managing releases (see `Releasing Bazaar <http://doc.bazaar-vcs.org/developers/releasing.html>`_)
2797.1.1 by Ian Clatworthy
Merge Core Developer Hanbook into HACKING
1453
1454
.. note::
1455
  Removing barriers to community participation is a key reason for adopting
1456
  distributed VCS technology. While DVCS removes many technical barriers,
1457
  a small number of social barriers are often necessary instead.
1458
  By documenting how the above things are done, we hope to
1459
  encourage more people to participate in these activities, keeping the
1460
  differences between core and non-core contributors to a minimum.
1461
1462
1463
Communicating and Coordinating
1464
------------------------------
1465
1466
While it has many advantages, one of the challenges of distributed
1467
development is keeping everyone else aware of what you're working on.
1468
There are numerous ways to do this:
1469
1470
#. Assign bugs to yourself in Launchpad
1471
#. Mention it on the mailing list
1472
#. Mention it on IRC
1473
1474
As well as the email notifcations that occur when merge requests are sent
1475
and reviewed, you can keep others informed of where you're spending your
1476
energy by emailing the **bazaar-commits** list implicitly. To do this,
1477
install and configure the Email plugin. One way to do this is add these
1478
configuration settings to your central configuration file (e.g.
1479
``~/.bazaar/bazaar.conf`` on Linux)::
1480
1481
  [DEFAULT]
1482
  email = Joe Smith <joe.smith@internode.on.net>
1483
  smtp_server = mail.internode.on.net:25
1484
1485
Then add these lines for the relevant branches in ``locations.conf``::
1486
1487
  post_commit_to = bazaar-commits@lists.canonical.com
1488
  post_commit_mailer = smtplib
1489
1490
While attending a sprint, RobertCollins' Dbus plugin is useful for the
1491
same reason. See the documentation within the plugin for information on
1492
how to set it up and configure it.
1493
1494
1495
Submitting Changes
1496
==================
1497
1498
An Overview of PQM
1499
------------------
1500
1501
Of the many workflows supported by Bazaar, the one adopted for Bazaar
1502
development itself is known as "Decentralized with automatic gatekeeper".
1503
To repeat the explanation of this given on
1504
http://bazaar-vcs.org/Workflows:
1505
1506
.. pull-quote::
1507
  In this workflow, each developer has their own branch or
1508
  branches, plus read-only access to the mainline. A software gatekeeper
1509
  (e.g. PQM) has commit rights to the main branch. When a developer wants
1510
  their work merged, they request the gatekeeper to merge it. The gatekeeper
1511
  does a merge, a compile, and runs the test suite. If the code passes, it
1512
  is merged into the mainline.
1513
1514
In a nutshell, here's the overall submission process:
1515
1516
#. get your work ready (including review except for trivial changes)
1517
#. push to a public location
1518
#. ask PQM to merge from that location
1519
1520
.. note::
1521
  At present, PQM always takes the changes to merge from a branch
1522
  at a URL that can be read by it. For Bazaar, that means a public,
1523
  typically http, URL.
1524
1525
As a result, the following things are needed to use PQM for submissions:
1526
1527
#. A publicly available web server
1528
#. Your OpenPGP key registered with PQM (contact RobertCollins for this)
1529
#. The PQM plugin installed and configured (not strictly required but
1530
   highly recommended).
1531
1532
1533
Selecting a Public Branch Location
1534
----------------------------------
1535
1536
If you don't have your own web server running, branches can always be
1537
pushed to Launchpad. Here's the process for doing that:
1538
1539
Depending on your location throughout the world and the size of your
1540
repository though, it is often quicker to use an alternative public
1541
location to Launchpad, particularly if you can set up your own repo and
1542
push into that. By using an existing repo, push only needs to send the
1543
changes, instead of the complete repository every time. Note that it is
1544
easy to register branches in other locations with Launchpad so no benefits
1545
are lost by going this way.
1546
1547
.. note::
1548
  For Canonical staff, http://people.ubuntu.com/~<user>/ is one
1549
  suggestion for public http branches. Contact your manager for information
1550
  on accessing this system if required.
1551
1552
It should also be noted that best practice in this area is subject to
1553
change as things evolve. For example, once the Bazaar smart server on
1554
Launchpad supports server-side branching, the performance situation will
1555
be very different to what it is now (Jun 2007).
1556
1557
1558
Configuring the PQM Plug-In
1559
---------------------------
1560
1561
While not strictly required, the PQM plugin automates a few things and
1562
reduces the chance of error. Before looking at the plugin, it helps to
1563
understand  a little more how PQM operates. Basically, PQM requires an
1564
email indicating what you want it to do. The email typically looks like
1565
this::
1566
1567
  star-merge source-branch target-branch
1568
1569
For example::
1570
1571
  star-merge http://bzr.arbash-meinel.com/branches/bzr/jam-integration http://bazaar-vcs.org/bzr/bzr.dev
1572
1573
Note that the command needs to be on one line. The subject of the email
1574
will be used for the commit message. The email also needs to be ``gpg``
1575
signed with a key that PQM accepts.
1576
1577
The advantages of using the PQM plugin are:
1578
1579
#. You can use the config policies to make it easy to set up public
1580
   branches, so you don't have to ever type the full paths you want to merge
1581
   from or into.
1582
1583
#. It checks to make sure the public branch last revision matches the
1584
   local last revision so you are submitting what you think you are.
1585
1586
#. It uses the same public_branch and smtp sending settings as bzr-email,
1587
   so if you have one set up, you have the other mostly set up.
1588
1589
#. Thunderbird refuses to not wrap lines, and request lines are usually
1590
   pretty long (you have 2 long URLs in there).
1591
1592
Here are sample configuration settings for the PQM plugin. Here are the
1593
lines in bazaar.conf::
1594
1595
  [DEFAULT]
1596
  email = Joe Smith <joe.smith@internode.on.net>
1597
  smtp_server=mail.internode.on.net:25
1598
1599
And here are the lines in ``locations.conf`` (or ``branch.conf`` for
1600
dirstate-tags branches)::
1601
1602
  [/home/joe/bzr/my-integration]
1603
  push_location = sftp://joe-smith@bazaar.launchpad.net/%7Ejoe-smith/bzr/my-integration/
1604
  push_location:policy = norecurse
1605
  public_branch = http://bazaar.launchpad.net/~joe-smith/bzr/my-integration/
1606
  public_branch:policy = appendpath
1607
  pqm_email = Bazaar PQM <pqm@bazaar-vcs.org>
1608
  pqm_branch = http://bazaar-vcs.org/bzr/bzr.dev
1609
1610
Note that the push settings will be added by the first ``push`` on
1611
a branch. Indeed the preferred way to generate the lines above is to use
1612
``push`` with an argument, then copy-and-paste the other lines into
1613
the relevant file.
1614
1615
1616
Submitting a Change
1617
-------------------
1618
1619
Here is one possible recipe once the above environment is set up:
1620
1621
#. pull bzr.dev => my-integration
1622
#. merge patch => my-integration
1623
#. fix up any final merge conflicts (NEWS being the big killer here).
1624
#. commit
1625
#. push
1626
#. pqm-submit
1627
1628
.. note::
1629
  The ``push`` step is not required if ``my-integration`` is a checkout of
1630
  a public branch.
1631
1632
  Because of defaults, you can type a single message into commit and
1633
  pqm-commit will reuse that.
1634
1635
1636
Tracking Change Acceptance
1637
--------------------------
1638
1639
The web interface to PQM is https://pqm.bazaar-vcs.org/. After submitting
1640
a change, you can visit this URL to confirm it was received and placed in
1641
PQM's queue.
1642
1643
When PQM completes processing a change, an email is sent to you with the
1644
results.
1645
1646
1647
Reviewing Blueprints
1648
====================
1649
1650
Blueprint Tracking Using Launchpad
1651
----------------------------------
1652
1653
New features typically require a fair amount of discussion, design and
1654
debate. For Bazaar, that information is often captured in a so-called
1655
"blueprint" on our Wiki. Overall tracking of blueprints and their status
1656
is done using Launchpad's relevant tracker,
1657
https://blueprints.launchpad.net/bzr/. Once a blueprint for ready for
1658
review, please announce it on the mailing list.
1659
4595.5.2 by Neil Martinsen-Burrell
Include bazaar-vcs.org/BzrGivingBack in HACKING.txt; fix typos in HACKING.txt
1660
Alternatively, send an email beginning with [RFC] with the proposal to the
2797.1.1 by Ian Clatworthy
Merge Core Developer Hanbook into HACKING
1661
list. In some cases, you may wish to attach proposed code  or a proposed
1662
developer document if that best communicates the idea. Debate can then
1663
proceed using the normal merge review processes.
1664
1665
1666
Recording Blueprint Review Feedback
1667
-----------------------------------
1668
1669
Unlike its Bug Tracker, Launchpad's Blueprint Tracker doesn't currently
1670
(Jun 2007) support a chronological list of comment responses. Review
1671
feedback can either be recorded on the Wiki hosting the blueprints or by
1672
using Launchpad's whiteboard feature.
1673
1674
1675
Planning Releases
1676
=================
1677
1678
1679
Using Releases and Milestones in Launchpad
1680
------------------------------------------
1681
1682
TODO ... (Exact policies still under discussion)
1683
1684
1685
Bug Triage
1686
----------
1687
1688
Keeping on top of bugs reported is an important part of ongoing release
1689
planning. Everyone in the community is welcome and encouraged to raise
1690
bugs, confirm bugs raised by others, and nominate a priority. Practically
1691
though, a good percentage of bug triage is often done by the core
1692
developers, partially because of their depth of product knowledge.
1693
1694
With respect to bug triage, core developers are encouraged to play an
1695
active role with particular attention to the following tasks:
1696
1697
* keeping the number of unconfirmed bugs low
1698
* ensuring the priorities are generally right (everything as critical - or
1699
  medium - is meaningless)
1700
* looking out for regressions and turning those around sooner rather than later.
1701
1702
.. note::
1703
  As well as prioritizing bugs and nominating them against a
1704
  target milestone, Launchpad lets core developers offer to mentor others in
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
1705
  fixing them.
3314.1.1 by Martin Pool
Add Developer's Guide text about PPA builds
1706
1707
2475.2.4 by Martin Pool
HACKING rest fixes from jam
1708
..
1709
   vim: ft=rst tw=74 ai