40
46
If nothing else, perhaps you'll find inspiration in how other developers
41
47
have solved their challenges.
43
Finding Something To Do
44
=======================
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.
53
50
Planning and Discussing Changes
54
51
===============================
76
73
Bazaar Development in a Nutshell
77
74
================================
79
.. was from bazaar-vcs.org/BzrGivingBack
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.
89
First, get a local copy of the development mainline (See `Why make a local
95
$ bzr branch http://bazaar-vcs.org/bzr/bzr.dev/ bzr.dev
97
Now make your own branch::
99
$ bzr branch bzr.dev 123456-my-bugfix
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.
103
Feel free to commit early and often (after all, it's your branch!).
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
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
113
Making a Merge Proposal
114
-----------------------
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
123
$ bzr push lp:~your_lp_username/bzr/meaningful_name_here
125
After you have pushed your branch, you will need to propose it for merging to
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.
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
134
for example). Alternatively, you can suffix with the bug number
135
(lp:~jameinel/bzr/export-file-511987).
138
Why make a local copy of bzr.dev?
139
---------------------------------
141
Making a local mirror of bzr.dev is not strictly necessary, but it means
143
- You can use that copy of bzr.dev as your main bzr executable, and keep it
144
up-to-date using ``bzr pull``.
145
- Certain operations are faster, and can be done when offline. For example:
148
- ``bzr diff -r ancestor:...``
151
- When it's time to create your next branch, it's more convenient. When you
152
have further contributions to make, you should do them in their own branch::
155
$ bzr branch bzr.dev additional_fixes
156
$ cd additional_fixes # hack, hack, hack
76
Looking for a 10 minute introduction to submitting a change?
77
See http://bazaar-vcs.org/BzrGivingBack.
79
TODO: Merge that Wiki page into this document.
160
82
Understanding the Development Process
256
178
Holds documentation on a whole range of things on Bazaar from the
257
179
origination of ideas within the project to information on Bazaar
258
180
features and use cases. Within this directory there is a subdirectory
259
for each translation into a human language. All the documentation
181
for each translation into a human language. All the documentation
260
182
is in the ReStructuredText markup language.
263
Documentation specifically targeted at Bazaar and plugin developers.
185
Documentation specifically targetted at Bazaar and plugin developers.
264
186
(Including this document.)
268
Automatically-generated API reference information is available at
269
<http://starship.python.net/crew/mwh/bzrlibapi/>.
271
See also the `Bazaar Architectural Overview
272
<http://doc.bazaar-vcs.org/developers/overview.html>`_.
190
Automatically-generated API reference information is available at
191
<http://starship.python.net/crew/mwh/bzrlibapi/>.
193
See also the `Bazaar Architectural Overview <../../developers/overview.html>`_.
275
196
The Code Review Process
283
204
Good reviews do take time. They also regularly require a solid
284
205
understanding of the overall code base. In practice, this means a small
285
206
number of people often have a large review burden - with knowledge comes
286
responsibility. No one likes their merge requests sitting in a queue going
207
responsibility. No one like their merge requests sitting in a queue going
287
208
nowhere, so reviewing sooner rather than later is strongly encouraged.
212
Sending patches for review
213
==========================
215
If you'd like to propose a change, please post to the
216
bazaar@lists.canonical.com list with a bundle, patch, or link to a
217
branch. Put ``[PATCH]`` or ``[MERGE]`` in the subject so Bundle Buggy
218
can pick it out, and explain the change in the email message text.
219
Remember to update the NEWS file as part of your change if it makes any
220
changes visible to users or plugin developers. Please include a diff
221
against mainline if you're giving a link to a branch.
223
You can generate a merge request like this::
225
bzr send -o bug-1234.patch
227
A ``.patch`` extension is recommended instead of .bundle as many mail clients
228
will send the latter as a binary file.
230
``bzr send`` can also send mail directly if you prefer; see the help.
232
Please do **NOT** put [PATCH] or [MERGE] in the subject line if you don't
233
want it to be merged. If you want comments from developers rather than
234
to be merged, you can put ``[RFC]`` in the subject line.
236
If this change addresses a bug, please put the bug number in the subject
237
line too, in the form ``[#1]`` so that Bundle Buggy can recognize it.
239
If the change is intended for a particular release mark that in the
240
subject too, e.g. ``[1.6]``.
293
243
Review cover letters
382
332
* (your ideas here...)
388
From May 2009 on, we prefer people to propose code reviews through
391
* <https://launchpad.net/+tour/code-review>
393
* <https://help.launchpad.net/Code/Review>
395
Anyone can propose or comment on a merge proposal just by creating a
398
There are two ways to create a new merge proposal: through the web
399
interface or by email.
402
Proposing a merge through the web
403
---------------------------------
405
To create the proposal through the web, first push your branch to Launchpad.
406
For example, a branch dealing with documentation belonging to the Launchpad
407
User mbp could be pushed as ::
409
bzr push lp:~mbp/bzr/doc
411
Then go to the branch's web page, which in this case would be
412
<https://code.launchpad.net/~mbp/bzr/doc>. You can simplify this step by just
417
You can then click "Propose for merging into another branch", and enter your
418
cover letter (see above) into the web form. Typically you'll want to merge
419
into ``~bzr/bzr/trunk`` which will be the default; you might also want to
420
nominate merging into a release branch for a bug fix. There is the option to
421
specify a specific reviewer or type of review, and you shouldn't normally
424
Submitting the form takes you to the new page about the merge proposal
425
containing the diff of the changes, comments by interested people, and
426
controls to comment or vote on the change.
428
Proposing a merge by mail
429
-------------------------
431
To propose a merge by mail, send a bundle to ``merge@code.launchpad.net``.
433
You can generate a merge request like this::
435
bzr send -o bug-1234.diff
437
``bzr send`` can also send mail directly if you prefer; see the help.
442
From <https://code.launchpad.net/bzr/+activereviews> you can see all
443
currently active reviews, and choose one to comment on. This page also
444
shows proposals that are now approved and should be merged by someone with
448
Reviews through Bundle Buggy
449
============================
451
The Bundle Buggy tool used up to May 2009 is still available as a review
454
Sending patches for review
455
--------------------------
457
If you'd like to propose a change, please post to the
458
bazaar@lists.canonical.com list with a bundle, patch, or link to a
459
branch. Put ``[PATCH]`` or ``[MERGE]`` in the subject so Bundle Buggy
460
can pick it out, and explain the change in the email message text.
461
Remember to update the NEWS file as part of your change if it makes any
462
changes visible to users or plugin developers. Please include a diff
463
against mainline if you're giving a link to a branch.
465
You can generate a merge request like this::
467
bzr send -o bug-1234.patch
469
A ``.patch`` extension is recommended instead of .bundle as many mail clients
470
will send the latter as a binary file.
472
``bzr send`` can also send mail directly if you prefer; see the help.
474
Please do **NOT** put [PATCH] or [MERGE] in the subject line if you don't
475
want it to be merged. If you want comments from developers rather than
476
to be merged, you can put ``[RFC]`` in the subject line.
478
If this change addresses a bug, please put the bug number in the subject
479
line too, in the form ``[#1]`` so that Bundle Buggy can recognize it.
481
If the change is intended for a particular release mark that in the
482
subject too, e.g. ``[1.6]``.
335
Bundle Buggy and review outcomes
336
================================
483
338
Anyone can "vote" on the mailing list by expressing an opinion. Core
484
339
developers can also vote using Bundle Buggy. Here are the voting codes and
485
340
their explanations.
530
385
We use 4 space indents for blocks, and never use tab characters. (In vim,
531
386
``set expandtab``.)
533
Trailing white space should be avoided, but is allowed.
534
You should however not make lots of unrelated white space changes.
388
No trailing white space is allowed.
536
390
Unix style newlines (LF) are used.
538
392
Each file must have a newline at the end of it.
540
394
Lines should be no more than 79 characters if at all possible.
541
Lines that continue a long statement may be indented in either of
395
Lines that continue a long statement may be indented in either of
544
398
within the parenthesis or other character that opens the block, e.g.::
631
Functions, methods or members that are relatively private are given
485
Functions, methods or members that are "private" to bzrlib are given
632
486
a leading underscore prefix. Names without a leading underscore are
633
487
public not just across modules but to programmers using bzrlib as an
488
API. As a consequence, a leading underscore is appropriate for names
489
exposed across modules but that are not to be exposed to bzrlib API
636
492
We prefer class names to be concatenated capital words (``TestCase``)
637
493
and variables, methods and functions to be lowercase words joined by
679
535
may not catch every case but it's still useful sometimes.
685
Often when something has failed later code, including cleanups invoked
686
from ``finally`` blocks, will fail too. These secondary failures are
687
generally uninteresting compared to the original exception. So use the
688
``only_raises`` decorator (from ``bzrlib.decorators``) for methods that
689
are typically called in ``finally`` blocks, such as ``unlock`` methods.
690
For example, ``@only_raises(LockNotHeld, LockBroken)``. All errors that
691
are unlikely to be a knock-on failure from a previous failure should be
698
541
In some places we have variables which point to callables that construct
699
542
new instances. That is to say, they can be used a lot like class objects,
700
but they shouldn't be *named* like classes::
543
but they shouldn't be *named* like classes:
702
545
> I think that things named FooBar should create instances of FooBar when
703
546
> called. Its plain confusing for them to do otherwise. When we have
722
565
The ``InterObject`` provides for two-way `multiple dispatch`__: matching
723
566
up for example a source and destination repository to find the right way
724
to transfer data between them.
567
to transfer data between them.
726
569
.. __: http://en.wikipedia.org/wiki/Multiple_dispatch
728
571
There is a subclass ``InterObject`` classes for each type of object that is
729
572
dispatched this way, e.g. ``InterRepository``. Calling ``.get()`` on this
730
class will return an ``InterObject`` instance providing the best match for
573
class will return an ``InterObject`` instance providing the best match for
731
574
those parameters, and this instance then has methods for operations
732
575
between the objects.
736
577
inter = InterRepository.get(source_repo, target_repo)
737
578
inter.fetch(revision_id)
879
719
way, you need to change its name as well. For instance, if I add an optional keyword
880
720
parameter to branch.commit - that's fine. On the other hand, if I add a
881
721
keyword parameter to branch.commit which is a *required* transaction
882
object, I should rename the API - i.e. to 'branch.commit_transaction'.
884
(Actually, that may break code that provides a new implementation of
885
``commit`` and doesn't expect to receive the parameter.)
722
object, I should rename the API - i.e. to 'branch.commit_transaction'.
887
724
When renaming such supported API's, be sure to leave a deprecated_method (or
888
725
_function or ...) behind which forwards to the new API. See the
889
726
bzrlib.symbol_versioning module for decorators that take care of the
890
727
details for you - such as updating the docstring, and issuing a warning
891
when the old API is used.
728
when the old api is used.
893
730
For unsupported API's, it does not hurt to follow this discipline, but it's
894
731
not required. Minimally though, please try to rename things so that
987
824
should be only in the command-line tool.
990
Progress and Activity Indications
991
---------------------------------
993
bzrlib has a way for code to display to the user that stuff is happening
994
during a long operation. There are two particular types: *activity* which
995
means that IO is happening on a Transport, and *progress* which means that
996
higher-level application work is occurring. Both are drawn together by
999
Transport objects are responsible for calling `report_transport_activity`
1002
Progress uses a model/view pattern: application code acts on a
1003
`ProgressTask` object, which notifies the UI when it needs to be
1004
displayed. Progress tasks form a stack. To create a new progress task on
1005
top of the stack, call `bzrlib.ui.ui_factory.nested_progress_bar()`, then
1006
call `update()` on the returned ProgressTask. It can be updated with just
1007
a text description, with a numeric count, or with a numeric count and
1008
expected total count. If an expected total count is provided the view
1009
can show the progress moving along towards the expected total.
1011
The user should call `finish` on the `ProgressTask` when the logical
1012
operation has finished, so it can be removed from the stack.
1014
Progress tasks have a complex relationship with generators: it's a very
1015
good place to use them, but because python2.4 does not allow ``finally``
1016
blocks in generators it's hard to clean them up properly. In this case
1017
it's probably better to have the code calling the generator allocate a
1018
progress task for its use and then call `finalize` when it's done, which
1019
will close it if it was not already closed. The generator should also
1020
finish the progress task when it exits, because it may otherwise be a long
1021
time until the finally block runs.
1023
https://wiki.ubuntu.com/UnitsPolicy provides a good explanation about
1024
which unit should be used when. Roughly speaking, IEC standard applies
1025
for base-2 units and SI standard applies for base-10 units::
1026
* for network bandwidth an disk sizes, use base-10 (Mbits/s, kB/s, GB),
1027
* for RAM sizes, use base-2 (GiB, TiB).
1158
956
Within each release, entries in the news file should have the most
1159
957
user-visible changes first. So the order should be approximately:
1161
* changes to existing behaviour - the highest priority because the
959
* changes to existing behaviour - the highest priority because the
1162
960
user's existing knowledge is incorrect
1163
961
* new features - should be brought to their attention
1164
962
* bug fixes - may be of interest if the bug was affecting them, and
1165
963
should include the bug number if any
1166
* major documentation changes, including fixed documentation bugs
964
* major documentation changes
1167
965
* changes to internal interfaces
1169
967
People who made significant contributions to each change are listed in
1170
968
parenthesis. This can include reporting bugs (particularly with good
1171
969
details or reproduction recipes), submitting patches, etc.
1173
To help with merging, NEWS entries should be sorted lexicographically
1174
within each section.
1217
1012
We had the problem that lots of our files were "Copyright Canonical
1218
1013
Development Ltd" which is not a real company, and some other variations
1219
1014
on this theme. Also, some files were missing the GPL statements.
1221
1016
I want to be clear about the intent of this patch, since copyright can
1222
1017
be a little controversial.
1224
1019
1) The big motivation for this is not to shut out the community, but
1225
1020
just to clean up all of the invalid copyright statements.
1227
1022
2) It has been the general policy for bzr that we want a single
1228
1023
copyright holder for all of the core code. This is following the model
1229
1024
set by the FSF, which makes it easier to update the code to a new
1236
1031
I'm sure Canonical would do the same).
1237
1032
As such, Canonical has requested copyright assignments from all of the
1238
1033
major contributers.
1240
1035
3) If someone wants to add code and not attribute it to Canonical, there
1241
1036
is a specific list of files that are excluded from this check. And the
1242
1037
test failure indicates where that is, and how to update it.
1244
1039
4) If anyone feels that I changed a copyright statement incorrectly, just
1245
1040
let me know, and I'll be happy to correct it. Whenever you have large
1246
1041
mechanical changes like this, it is possible to make some mistakes.
1248
1043
Just to reiterate, this is a community project, and it is meant to stay
1249
1044
that way. Core bzr code is copyright Canonical for legal reasons, and
1250
1045
the tests are just there to help us maintain that.
1262
1057
.. _pdb: http://docs.python.org/lib/debugger-commands.html
1264
If the ``BZR_PDB`` environment variable is set
1059
If the ``BZR_PDB`` environment variable is set
1265
1060
then bzr will go into pdb post-mortem mode when an unhandled exception
1268
If you send a SIGQUIT or SIGBREAK signal to bzr then it will drop into the
1269
debugger immediately. SIGQUIT can be generated by pressing Ctrl-\\ on
1270
Unix. SIGBREAK is generated with Ctrl-Pause on Windows (some laptops have
1271
this as Fn-Pause). You can continue execution by typing ``c``. This can
1272
be disabled if necessary by setting the environment variable
1273
``BZR_SIGQUIT_PDB=0``.
1063
If you send a SIGQUIT signal to bzr, which can be done by pressing
1064
Ctrl-\\ on Unix, bzr will go into the debugger immediately. You can
1065
continue execution by typing ``c``. This can be disabled if necessary
1066
by setting the environment variable ``BZR_SIGQUIT_PDB=0``.
1329
1122
for automated processing.
1330
1123
For example: ``bzr log`` should not fail if one of the entries has text
1331
1124
that cannot be displayed.
1334
1127
Attempting to print an unprintable character will cause a UnicodeError.
1335
1128
This is for commands that are intended more as scripting support, rather
1336
1129
than plain user review.
1337
For example: ``bzr ls`` is designed to be used with shell scripting. One
1338
use would be ``bzr ls --null --unknowns | xargs -0 rm``. If ``bzr``
1130
For exampl: ``bzr ls`` is designed to be used with shell scripting. One
1131
use would be ``bzr ls --null --unknows | xargs -0 rm``. If ``bzr``
1339
1132
printed a filename with a '?', the wrong file could be deleted. (At the
1340
1133
very least, the correct file would not be deleted). An error is used to
1341
1134
indicate that the requested action could not be performed.
1344
1137
Do not attempt to automatically convert Unicode strings. This is used
1345
1138
for commands that must handle conversion themselves.
1394
1187
To create an extension, add rules to setup.py for building it with pyrex,
1395
1188
and with distutils. Now start with an empty .pyx file. At the top add
1396
"include 'yourmodule.py'". This will import the contents of foo.py into this
1189
"include 'yourmodule.py'". This will import the contents of foo.py into this
1397
1190
file at build time - remember that only one module will be loaded at
1398
1191
runtime. Now you can subclass classes, or replace functions, and only your
1399
1192
changes need to be present in the .pyx file.
1401
1194
Note that pyrex does not support all 2.4 programming idioms, so some
1402
syntax changes may be required. I.e.
1195
syntax changes may be required. I.e.
1404
- 'from foo import (bar, gam)' needs to change to not use the brackets.
1405
- 'import foo.bar as bar' needs to be 'import foo.bar; bar = foo.bar'
1197
- 'from foo import (bar, gam)' needs to change to not use the brackets.
1198
- 'import foo.bar as bar' needs to be 'import foo.bar; bar = foo.bar'
1407
1200
If the changes are too dramatic, consider
1408
1201
maintaining the python code twice - once in the .pyx, and once in the .py,
added
removed
doc/developers/HACKING.txt
