11
:2.4.0: NOT RELEASED YET
13
External Compatibility Breaks
14
*****************************
16
.. These may require users to change the way they use Bazaar.
21
.. New commands, options, etc that users may wish to try out.
26
.. Improvements to existing commands, especially improved performance
27
or memory usage, or better results.
32
.. Fixes for situations where bzr would previously crash or give incorrect
33
or undesirable results.
38
.. Improved or updated documentation.
43
.. Changes that may require updates in plugins or other code that uses
49
.. Major internal changes, unlikely to be visible to users or plugin
50
developers, but interesting for bzr developers.
55
.. Fixes and changes that are only relevant to bzr's test framework and
56
suite. This can include new facilities for writing tests, fixes to
57
spurious test failures and changes to the way things should be tested.
59
* `BranchBuilder.build_snapshot` now supports a "flush" action. This
60
cleanly and reliably allows tests using `BranchBuilder` to construct
61
branches that e.g. rename files out of a directory and unversion that
62
directory in the same revision. Previously some changes were impossible
63
due to the order that `build_snapshot` performs its actions.
66
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
67
just compares the bytes in the dirstate file to its pristine state,
68
rather than opening the WorkingTree and calling ``last_revision()``.
69
This reduces the overall test suite time by about 10% on my laptop.
78
This is the fifth (and last) beta of the 2.4 series leading to
79
2.4.0 release in Auguest 2011. Beta releases are suitable for
80
everyday use but may cause some incompatibilities with plugins.
82
This release includes all bug fixed in previous series known at
83
the time of this release.
85
External Compatibility Breaks
86
*****************************
93
* New command ``verify-signatures`` to check if all commits or specified commits
94
have digital signatures from trusted keys. Requires python-gpgme to be
97
* New option ``--signatures`` for ``bzr log`` to display digital signature
98
verification results for each commit.
100
* Config option acceptable_keys to list which GPG keys are verified as trusted.
102
* Config option validate_signatures_in_log to always show signatures in
108
* ``Branch.open`` is now about 3x faster (about 2ms instead of 6.5ms).
114
* Display a proper error message when a config file content cannot be
115
decoded as UTF-8 or when it cannot be parsed.
116
(Vincent Ladeuil, #502060, #688677, #797246)
118
* Generate a single conflict (instead of two) when merging a branch
119
modifying and renaming a file in a branch that deleted it (or vice-versa).
120
(Vincent Ladeuil, #688101)
122
* Give a more helpful message when the bzr executable doesn't match the
123
library. (This typically happens because of a misconfigured PYTHONPATH
124
or half-installed bzr.)
125
(Martin Pool, #804553)
127
* Properly load utf8-encoded config files. (Vincent Ladeuil, #799212)
129
* ``GraphThunkIdsToKeys.merge_sort`` now properly returns
130
keys rather than ids. (Jelmer Vernooij, #799677)
132
* ``TreeTransformBase.fixup_new_roots`` can now check that a tree root
133
is present. (Jelmer Vernooij, #801257)
138
* New attributes ``WorkingTreeFormat.supports_versioned_directories`` and
139
``RepositoryFormat.supports_versioned_directories``.
140
(Jelmer Vernooij, #765815)
142
* The "revno" field type when using the python version-info format is now
143
a string (to handle dotted revnos) (Benoît Pierre, #796259)
148
* Start implementing localization, starting with command help text (but not
149
the command options themselves). This will allow bootstrapping the bzr
150
internationalization process. (Inada Naoki)
155
* Fix test failures when running as a homeless user (debian buildd). Tests
156
leaking into ``${HOME}/.bzr.log`` should be detected properly now.
157
(Vincent Ladeuil, #798698)
164
This is the fourth beta of the 2.4 series, leading to a 2.4.0 release in
165
August 2011. Beta releases are suitable for everyday use but may cause some
166
incompatibilities with plugins.
168
This release includes all bug fixed in previous series known at the time of
172
External Compatibility Breaks
173
*****************************
175
.. These may require users to change the way they use Bazaar.
177
* Do not treat configuration option 'check_signatures = require' as if
178
it were 'create_signatures = always' (Jonathan Riddell)
183
.. New commands, options, etc that users may wish to try out.
185
* Hooks have been added for config stacks: ``get``, ``set`` and ``remove``
186
are called when an option is respectively read, modified or deleted. Also
187
added ``load`` and ``save`` hooks for config stores, called when the
188
stores are loaded or saved. (Vincent Ladeuil)
190
* New hook server_exception in bzrlib.smart.server to catch any
191
exception caused while running bzr serve.
192
(Jonathan Riddell, #274578)
194
* New hook set_commit_message in bzrlib.msgeditor to set a commit message
195
and revision properties. (Jonathan Riddell, #274578)
197
* Support ``-S`` as an alias for ``--short`` for the ``log`` and
198
``missing`` commands. (Martin von Gagern, #38655)
203
.. Improvements to existing commands, especially improved performance
204
or memory usage, or better results.
206
* ``bzr annotate`` can be run without setting whoami data first.
207
(Jonathan Riddell, #667408)
212
.. Fixes for situations where bzr would previously crash or give incorrect
213
or undesirable results.
215
* Bazaar can now detect when a lock file is held by a dead process
216
originating from the same machine, and steal the lock after printing a
217
message to the user. This is off by default, for safety, but can be
218
turned on by setting the configuration variable ``locks.steal_dead`` to
220
(Martin Pool, #220464)
222
* ``bzr version-info`` now works when the tree is on a dotted revno.
223
(Benoît Pierre, #796259)
225
* Credentials in the log output produced by ``-Dhttp`` are masked so users
226
can more freely post them in bug reports. (Vincent Ladeuil, #723074)
228
* Fix a race condition for ``server_started`` hooks leading to a spurious
229
test failure. (Vincent Ladeuil, #789167)
231
* Fix exporting subdirectory with ``--per-file-timestamps``.
232
(Szilveszter Farkas, #795557)
234
* Handle files that get created but don't get used during TreeTransform.
235
``open()`` can create a file, and still raise an exception before it
236
returns. So anything we might have created, make sure we destroy during
237
``finalize()``. (Martin [gz], #597686)
239
* ``pack_repo`` now uses ``Transport.move`` instead of
240
``Transport.rename``, deleting any existing targets even on SFTP.
241
(Martin von Gagern, #421776)
243
* Pass the ``build_mo`` command to the rest of the setup() calls in
244
setup.py. The ``bdist_wininst`` and ``py2exe`` code paths were failing
245
because ``build_mo`` became a required step that they didn't know about.
246
(John Arbash Meinel, #787122)
248
* Preserve existing ``root-id`` when merging an unrelated branch.
249
(Aaron Bentley, #806356)
251
* Properly avoid re-adding a file after it changes case on CICP
252
filesystems. (John Arbash Meinel, #798130)
254
* Reports the original error when an InvalidHttpResponse exception is
255
encountered to facilitate debug. (Vincent Ladeuil, #788530)
257
* Reports a non-existant file error when trying to merge in a file
258
that does not exist. (Jonathan Riddell, #330063)
260
* ``UIFactory.prompt``, ``UIFactory.get_username``,
261
``UIFactory.get_password`` and ``UIFactory.get_boolean`` now require a
262
unicode prompt to be passed in. (Jelmer Vernooij, #592083)
264
* Support merging into the empty tree. (Aaron Bentley, #595328)
269
.. Improved or updated documentation.
271
* Improve documentation of ``bzr merge --force``.
272
(Neil Martinsen-Burrell, #767307)
274
* Make docs for configuration options for digital signatures match
275
reality. (Jonathan Riddell)
277
* Add user-guide page on GPG signatures. (Jonathan Riddell)
282
.. Changes that may require updates in plugins or other code that uses
285
* Checking for a file id in a `Tree` or `Inventory` using ``in`` is now
286
deprecated. Instead, use `has_id`.
289
* Exporters are now all exposed as generators, rather than as single-call
290
functions, so that calling code can take stream the output.
293
* Information about held lockdir locks returned from eg `LockDir.peek` is
294
now represented as a `LockHeldInfo` object, rather than a plain
298
* Remove `file_status` function.
301
* ``Repository.iter_reverse_revision_history`` is now deprecated.
302
Use ``Graph.iter_lefthand_ancestry`` instead.
303
(Jelmer Vernooij, #739481)
305
* ``Repository.get_ancestry`` has been deprecated. Use
306
``Graph.iter_ancestry`` instead.
307
(Jelmer Vernooij, #784511)
312
.. Major internal changes, unlikely to be visible to users or plugin
313
developers, but interesting for bzr developers.
315
* ``tools/check-newsbugs.py`` accepts a ``--browser`` option to open
316
corresponding launchpad pages in a browser. (Vincent Ladeuil)
321
.. Fixes and changes that are only relevant to bzr's test framework and
322
suite. This can include new facilities for writing tests, fixes to
323
spurious test failures and changes to the way things should be tested.
325
* A `ImportTariffTestCase` base class has been added in
326
``bzrlib.tests.test_import_tariff``, which can be used for import tariff
327
tests in plugins. (Jelmer Vernooij, #793465)
329
* Fix deadlock in `TestImportTariffs.test_simple_serve` when stderr gets
330
more output than fits in the default buffer. This was happening on the
331
Windows buildslave, and could easily happen in other circumstances where
332
the default OS buffer size for pipes is small or the ``python -v``
333
output is large. (Andrew Bennetts, #784802)
335
* Fix spurious test failure on OSX for WorkingTreeFormat2.
336
(Vincent Ladeuil, #787942)
338
* Re-target ``bb.test_merge.TestMerge.test_merge_reversed_revision_range``
339
and rewrite it as a parameterized test to avoid unrelated failures.
340
(Vincent Ladeuil, #795456)
342
* Show log file contents from subprocesses started by
343
`start_bzr_subprocess` in test failure details. This may help diagnose
344
strange hangs and failures involving subprocesses. (Andrew Bennetts)
346
* Skip ``utextwrap`` tests when ``sphinx`` breaks text_wrap by an hostile
347
monkeypatch to textwrap.TextWrapper.wordsep_re.
348
(Vincent Ladeuil, #785098)
350
* Multiple ``selftest --exclude`` options are now combined instead of
351
overriding each other. (Vincent Ladeuil, #746991)
353
* Restore some ``FTPTransport`` test coverage by allowing ``pyftpdlib
354
0.6.0`` to be used. Also restore ``medusa`` support while leaving it
355
disabled to make it easier to use if/when we can in the future.
356
(Vincent Ladeuil, #781140)
358
* `TestImportTariffs` no longer uses the real ``$HOME``. This prevents it
359
from polluting ``$HOME/.bzr.log`` or being accidentally influenced by
360
user configuration such as aliases. It still runs with all the user's
361
plugins enabled, as intended.
362
(Vincent Ladeuil, Andrew Bennetts, #789505)
370
This is the third beta of the 2.4 series, leading to a 2.4.0 release in
371
August 2011. Beta releases are suitable for everyday use but may cause some
372
incompatibilities with plugins.
374
This release includes all bug fixed in previous series known at the time of
11
:2.4b3: NOT RELEASED YET
378
13
External Compatibility Breaks
379
14
*****************************
381
16
.. These may require users to change the way they use Bazaar.
383
* ``bzr-2.4`` has officially dropped support for python2.4 and python2.5.
384
We will continue to maintain ``bzr-2.3`` for people who still need to
385
use those versions of python. (John Arbash Meinel)
390
21
.. New commands, options, etc that users may wish to try out.
392
* The text compressor used for 2a repositories now has a tweakable
393
parameter that can be set in bazaar.conf.
394
``bzr.groupcompress.max_entries_per_source`` default of 65536.
395
When doing compression, we build up an index of locations to match
396
against. Setting this higher will result in slightly better compression,
397
at a cost of more memory. Note that a value of 65k represents fully
398
sampling a 1MB file. So this only has an effect when compressing texts
399
larger than N*16 bytes. (John Arbash Meinel, #602614)
404
26
.. Improvements to existing commands, especially improved performance
405
27
or memory usage, or better results.
407
* ``bzr branch --stacked`` from a smart server uses the network a little
408
more efficiently. For a simple branch it reduces the number of
409
round-trips by about 20%. (Andrew Bennetts)
411
* ``bzr log --line`` scales the width of the author field with the size of
412
the line. This means that the full author name is shown when the
413
environment variable BZR_COLUMNS=0. (Neil Martinsen-Burrell)
415
* ``bzr pull`` now properly triggers the fast
416
``CHKInventory.iter_changes`` rather than the slow generic
417
inter-Inventory changes. It used to use a ``DirStateRevisionTree`` as
418
one of the source trees, which is faster when we have to read the whole
419
inventory anyway, but much slower when we can get just the delta out of
420
the repository. On a 70k record tree, this changes ``bzr pull`` from 28s
421
down to 17s. (John Arbash Meinel, #780677)
423
* Slightly reduced memory consumption when fetching into a 2a repository
424
by reusing existing caching a little better. (Andrew Bennetts)
426
* Speed up ``bzr status`` by a little bit when there are a couple of
427
modified files. We now track how many files we have seen that need
428
updating, and only rewrite the dirstate file if enough of them have
429
changed. The default is 10, and can be overridden by setting the branch
430
option "``bzr.workingtree.worth_saving_limit``".
431
(Ian Clatworthy, John Arbash Meinel, #380202)
433
* Speed up ``bzr uncommit``. Instead of resetting the dirstate from
434
scratch, use ``update_basis_by_delta``, computing the delta from the
435
repository. (John Arbash Meinel, #780544)
440
32
.. Fixes for situations where bzr would previously crash or give incorrect
441
33
or undesirable results.
443
* All Tree types can now be exported as tar.*, zip or directories.
446
* ``bzr merge --no-remember location`` never sets ``submit_branch``.
447
(Vincent Ladeuil, #782169)
449
* ``bzr pull --no-remember location`` never sets
450
``parent_location``. ``bzr push --no-remember location`` never
451
sets ``push_location``. ``bzr send --no-remember
452
submit_location public_location`` never sets ``submit_branch``
453
nor ``public_branch``. (Vincent Ladeuil)
455
* Conflicts involving non-ascii filenames are now properly reported rather
456
than failing with a UnicodeEncodeError. (Martin [GZ], #686161)
458
* Correct parent is now set when using 'switch -b' with bound branches.
459
(A. S. Budden, #513709)
461
* Fix `bzr plugins` regression in bzr 2.4 which resulted in a traceback
462
from writelines on ckj terminals. (Martin [GZ], #754082)
464
* ``WT.inventory`` and ``WT.iter_entries_by_dir()`` was not correctly
465
reporting subdirectories that were tree references (in formats that
466
supported them). (John Arbash Meinel, #764677)
468
* Merging into empty branches now gives an error as this is currently
469
not supported. (Jonathan Riddell, #242175)
471
* Do not show exception to user on pointless commit error.
472
(Jonathan Riddell #317357)
474
* ``WT.update_basis_by_delta`` no longer requires that the deltas match
475
the current WT state. This allows ``update_basis_by_delta`` to be used
476
by more commands than just commit. Updating with a delta allows us to
477
not load the whole inventory, which can take 10+s with large trees.
478
(Jonathan Riddell, John Arbash Meinel, #781168)
480
* ``bzr mv --after old_name new_name`` now works if "new_name" is newly
481
added. (Benoît Pierre)
487
38
.. Improved or updated documentation.
489
* Restore the workaround for option names including dots (--1.14) which was
490
disabled when we stopped listing --1.9 as a format.
491
(Vincent Ladeuil, #782289)