11
11
the Bazaar mailing list. To propose a correction or addition to this
12
12
document, send a merge request or new text to the mailing list.
14
The latest developer documentation can be found online at
15
http://doc.bazaar-vcs.org/developers/.
14
The current version of this document is available in the file
15
``doc/en/developer-guide/HACKING.txt`` in the source tree, or at
16
http://doc.bazaar-vcs.org/bzr.dev/en/developer-guide/HACKING.html
19
`Bazaar Developer Documentation Catalog <../../developers/index.html>`_.
62
68
to involving the community before you spend much time on a change.
65
* you get to build on the wisdom of others, saving time
71
* you get to build on the wisdom on others, saving time
67
* if others can direct you to similar code, it minimises the work to be done
73
* if others can direct you to similar code, it minimises the work to be done
69
75
* it assists everyone in coordinating direction, priorities and effort.
76
82
Bazaar Development in a Nutshell
77
83
================================
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
85
Looking for a 10 minute introduction to submitting a change?
86
See http://bazaar-vcs.org/BzrGivingBack.
88
TODO: Merge that Wiki page into this document.
160
91
Understanding the Development Process
256
187
Holds documentation on a whole range of things on Bazaar from the
257
188
origination of ideas within the project to information on Bazaar
258
189
features and use cases. Within this directory there is a subdirectory
259
for each translation into a human language. All the documentation
190
for each translation into a human language. All the documentation
260
191
is in the ReStructuredText markup language.
263
Documentation specifically targeted at Bazaar and plugin developers.
194
Documentation specifically targetted at Bazaar and plugin developers.
264
195
(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>`_.
199
Automatically-generated API reference information is available at
200
<http://starship.python.net/crew/mwh/bzrlibapi/>.
202
See also the `Bazaar Architectural Overview <../../developers/overview.html>`_.
275
205
The Code Review Process
402
332
Proposing a merge through the web
403
333
---------------------------------
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 ::
335
To create the propsal through the web: push your branch to Launchpad, eg::
409
337
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
339
then go to the branch's web page, which in this case would be
340
<https://code.launchpad.net/~mbp/bzr/doc>. You can automate that 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
345
You can then click "Propose for merging into another branch", and enter a
346
cover letter into the web form. Typically you'll want to merge into
347
``~bzr/bzr/trunk`` which will be the default; you might also want to
348
nominate merging into a release branch for a bug fix. There is the option
349
to specify a specific reviewer or type of review, and you shouldn't
350
normally change those.
424
352
Submitting the form takes you to the new page about the merge proposal
425
353
containing the diff of the changes, comments by interested people, and
631
Functions, methods or members that are relatively private are given
559
Functions, methods or members that are "private" to bzrlib are given
632
560
a leading underscore prefix. Names without a leading underscore are
633
561
public not just across modules but to programmers using bzrlib as an
562
API. As a consequence, a leading underscore is appropriate for names
563
exposed across modules but that are not to be exposed to bzrlib API
636
566
We prefer class names to be concatenated capital words (``TestCase``)
637
567
and variables, methods and functions to be lowercase words joined by
679
609
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
615
In some places we have variables which point to callables that construct
699
616
new instances. That is to say, they can be used a lot like class objects,
700
but they shouldn't be *named* like classes::
617
but they shouldn't be *named* like classes:
702
619
> I think that things named FooBar should create instances of FooBar when
703
620
> called. Its plain confusing for them to do otherwise. When we have
722
639
The ``InterObject`` provides for two-way `multiple dispatch`__: matching
723
640
up for example a source and destination repository to find the right way
724
to transfer data between them.
641
to transfer data between them.
726
643
.. __: http://en.wikipedia.org/wiki/Multiple_dispatch
728
645
There is a subclass ``InterObject`` classes for each type of object that is
729
646
dispatched this way, e.g. ``InterRepository``. Calling ``.get()`` on this
730
class will return an ``InterObject`` instance providing the best match for
647
class will return an ``InterObject`` instance providing the best match for
731
648
those parameters, and this instance then has methods for operations
732
649
between the objects.
736
651
inter = InterRepository.get(source_repo, target_repo)
737
652
inter.fetch(revision_id)
868
782
Evolving Interfaces
869
783
===================
871
We don't change APIs in stable branches: any supported symbol in a stable
872
release of bzr must not be altered in any way that would result in
785
We have a commitment to 6 months API stability - any supported symbol in a
786
release of bzr MUST NOT be altered in any way that would result in
873
787
breaking existing code that uses it. That means that method names,
874
788
parameter ordering, parameter names, variable and attribute names etc must
875
789
not be changed without leaving a 'deprecated forwarder' behind. This even
879
793
way, you need to change its name as well. For instance, if I add an optional keyword
880
794
parameter to branch.commit - that's fine. On the other hand, if I add a
881
795
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.)
796
object, I should rename the API - i.e. to 'branch.commit_transaction'.
887
798
When renaming such supported API's, be sure to leave a deprecated_method (or
888
799
_function or ...) behind which forwards to the new API. See the
889
800
bzrlib.symbol_versioning module for decorators that take care of the
890
801
details for you - such as updating the docstring, and issuing a warning
891
when the old API is used.
802
when the old api is used.
893
804
For unsupported API's, it does not hurt to follow this discipline, but it's
894
805
not required. Minimally though, please try to rename things so that
1021
932
time until the finally block runs.
1027
When filenames or similar variables are presented inline within a message,
1028
they should be enclosed in double quotes (ascii 0x22, not chiral unicode
1031
bzr: ERROR: No such file "asdf"
1033
When we print just a list of filenames there should not be any quoting:
1036
.. _bug 544297: https://bugs.launchpad.net/bugs/544297
1038
https://wiki.ubuntu.com/UnitsPolicy provides a good explanation about
1039
which unit should be used when. Roughly speaking, IEC standard applies
1040
for base-2 units and SI standard applies for base-10 units:
1042
* for network bandwidth and disk sizes, use base-10 (Mbits/s, kB/s, GB)
1044
* for RAM sizes, use base-2 (GiB, TiB)
1114
1000
#. If it is something that a caller can recover from, a custom exception
1117
1003
#. If it is a data consistency issue, using a builtin like
1118
``ValueError``/``TypeError`` is reasonable.
1004
``ValueError``/``TypeError`` is reasonable.
1120
1006
#. If it is a programmer error (using an api incorrectly)
1121
``AssertionError`` is reasonable.
1007
``AssertionError`` is reasonable.
1123
1009
#. Otherwise, use ``BzrError`` or ``InternalBzrError``.
1177
1063
Within each release, entries in the news file should have the most
1178
1064
user-visible changes first. So the order should be approximately:
1180
* changes to existing behaviour - the highest priority because the
1066
* changes to existing behaviour - the highest priority because the
1181
1067
user's existing knowledge is incorrect
1182
1068
* new features - should be brought to their attention
1183
1069
* bug fixes - may be of interest if the bug was affecting them, and
1184
1070
should include the bug number if any
1185
* major documentation changes, including fixed documentation bugs
1071
* major documentation changes
1186
1072
* changes to internal interfaces
1188
1074
People who made significant contributions to each change are listed in
1189
1075
parenthesis. This can include reporting bugs (particularly with good
1190
1076
details or reproduction recipes), submitting patches, etc.
1192
To help with merging, NEWS entries should be sorted lexicographically
1193
within each section.
1236
1119
We had the problem that lots of our files were "Copyright Canonical
1237
1120
Development Ltd" which is not a real company, and some other variations
1238
1121
on this theme. Also, some files were missing the GPL statements.
1240
1123
I want to be clear about the intent of this patch, since copyright can
1241
1124
be a little controversial.
1243
1126
1) The big motivation for this is not to shut out the community, but
1244
1127
just to clean up all of the invalid copyright statements.
1246
1129
2) It has been the general policy for bzr that we want a single
1247
1130
copyright holder for all of the core code. This is following the model
1248
1131
set by the FSF, which makes it easier to update the code to a new
1255
1138
I'm sure Canonical would do the same).
1256
1139
As such, Canonical has requested copyright assignments from all of the
1257
1140
major contributers.
1259
1142
3) If someone wants to add code and not attribute it to Canonical, there
1260
1143
is a specific list of files that are excluded from this check. And the
1261
1144
test failure indicates where that is, and how to update it.
1263
1146
4) If anyone feels that I changed a copyright statement incorrectly, just
1264
1147
let me know, and I'll be happy to correct it. Whenever you have large
1265
1148
mechanical changes like this, it is possible to make some mistakes.
1267
1150
Just to reiterate, this is a community project, and it is meant to stay
1268
1151
that way. Core bzr code is copyright Canonical for legal reasons, and
1269
1152
the tests are just there to help us maintain that.
1281
1164
.. _pdb: http://docs.python.org/lib/debugger-commands.html
1283
If the ``BZR_PDB`` environment variable is set
1166
If the ``BZR_PDB`` environment variable is set
1284
1167
then bzr will go into pdb post-mortem mode when an unhandled exception
1287
If you send a SIGQUIT or SIGBREAK signal to bzr then it will drop into the
1288
debugger immediately. SIGQUIT can be generated by pressing Ctrl-\\ on
1289
Unix. SIGBREAK is generated with Ctrl-Pause on Windows (some laptops have
1290
this as Fn-Pause). You can continue execution by typing ``c``. This can
1291
be disabled if necessary by setting the environment variable
1292
``BZR_SIGQUIT_PDB=0``.
1170
If you send a SIGQUIT signal to bzr, which can be done by pressing
1171
Ctrl-\\ on Unix, bzr will go into the debugger immediately. You can
1172
continue execution by typing ``c``. This can be disabled if necessary
1173
by setting the environment variable ``BZR_SIGQUIT_PDB=0``.
1348
1229
for automated processing.
1349
1230
For example: ``bzr log`` should not fail if one of the entries has text
1350
1231
that cannot be displayed.
1353
1234
Attempting to print an unprintable character will cause a UnicodeError.
1354
1235
This is for commands that are intended more as scripting support, rather
1355
1236
than plain user review.
1356
For example: ``bzr ls`` is designed to be used with shell scripting. One
1357
use would be ``bzr ls --null --unknowns | xargs -0 rm``. If ``bzr``
1237
For exampl: ``bzr ls`` is designed to be used with shell scripting. One
1238
use would be ``bzr ls --null --unknows | xargs -0 rm``. If ``bzr``
1358
1239
printed a filename with a '?', the wrong file could be deleted. (At the
1359
1240
very least, the correct file would not be deleted). An error is used to
1360
1241
indicate that the requested action could not be performed.
1363
1244
Do not attempt to automatically convert Unicode strings. This is used
1364
1245
for commands that must handle conversion themselves.
1413
1294
To create an extension, add rules to setup.py for building it with pyrex,
1414
1295
and with distutils. Now start with an empty .pyx file. At the top add
1415
"include 'yourmodule.py'". This will import the contents of foo.py into this
1296
"include 'yourmodule.py'". This will import the contents of foo.py into this
1416
1297
file at build time - remember that only one module will be loaded at
1417
1298
runtime. Now you can subclass classes, or replace functions, and only your
1418
1299
changes need to be present in the .pyx file.
1420
1301
Note that pyrex does not support all 2.4 programming idioms, so some
1421
syntax changes may be required. I.e.
1302
syntax changes may be required. I.e.
1423
- 'from foo import (bar, gam)' needs to change to not use the brackets.
1424
- 'import foo.bar as bar' needs to be 'import foo.bar; bar = foo.bar'
1304
- 'from foo import (bar, gam)' needs to change to not use the brackets.
1305
- 'import foo.bar as bar' needs to be 'import foo.bar; bar = foo.bar'
1426
1307
If the changes are too dramatic, consider
1427
1308
maintaining the python code twice - once in the .pyx, and once in the .py,
1659
1540
https://blueprints.launchpad.net/bzr/. Once a blueprint for ready for
1660
1541
review, please announce it on the mailing list.
1662
Alternatively, send an email beginning with [RFC] with the proposal to the
1543
Alternatively, send an email begining with [RFC] with the proposal to the
1663
1544
list. In some cases, you may wish to attach proposed code or a proposed
1664
1545
developer document if that best communicates the idea. Debate can then
1665
1546
proceed using the normal merge review processes.
added
removed
doc/en/developer-guide/HACKING.txt
