11
:2.4.2: 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.
35
* During merges, when two entries end up using the same path for two
36
different file-ids (the same file being 'bzr added' in two different
37
branches) , 'duplicate' conflicts are created instead of 'content'
38
ones. This was previously leading to a 'Malformed tramsform' exception.
39
(Vincent Ladeuil, #880701)
41
* 'Malformed transform' exceptions are now recognized as internal errors
42
instead of user errors and report a traceback. This will reduce user
43
confusion as there is generally nothing users can do about them.
44
(Vincent Ladeuil, #880701)
49
.. Improved or updated documentation.
54
.. Changes that may require updates in plugins or other code that uses
60
.. Major internal changes, unlikely to be visible to users or plugin
61
developers, but interesting for bzr developers.
66
.. Fixes and changes that are only relevant to bzr's test framework and
67
suite. This can include new facilities for writing tests, fixes to
68
spurious test failures and changes to the way things should be tested.
76
This is a bugfix release. Most of the bugs dealt with portability
77
issues. Upgrading is recommended for all users of earlier 2.4 releases.
79
External Compatibility Breaks
80
*****************************
92
* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
93
every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
98
* Fixed an infinite loop when creating a repo at the root of the filesystem,
99
i.e. "/", due to posixpath.normpath() not collapsing 2 leading slashes into
100
one, thus respecting the POSIX standard, but making relpath() loop infinitely.
101
(Florian Vichot, #861008)
103
* Fixed loading of external merge tools from config to properly decode
104
command-lines which contain embedded quotes. (Gordon Tyler, #828803)
106
* Include declaration of 'changed' to avoid an UnboundLocalError in dirstate
107
pyrex code with new Cython versions. (Denys Duchier, #837221)
109
* Prevent several kinds of OverflowError and other fallout from failing to fit
110
stat fields into four bytes in dirstate pack_stat implementations.
111
(Martin Packman, #683191 #706957)
113
* Return early from create_delta_index_from_delta given tiny inputs. This
114
avoids raising a spurious MemoryError on certain platforms such as AIX.
115
(John Arbash Meinel, #856731)
121
* Corrected documentation for ``bzr serve`` in the Admin Guide.
122
(Morten Bøgeskov, Martin Pool, #832576)
137
* Accept both old and new style testtools output in selftest tests.
138
(Jelmer Vernooij, Martin Packman, #815423)
140
* Fix the race for TestingThreadingTCPServer in
141
test_server_crash_while_responding. (Vincent Ladeuil, #869366)
143
* Really corrupt the pack file without depending on a special length or value.
144
(Vincent Ladeuil, #807032)
152
This is a bugfix release. Upgrading is recommended for all users of earlier
155
It includes fixes from previous stable releases and address some issues with
159
External Compatibility Breaks
160
*****************************
162
.. These may require users to change the way they use Bazaar.
167
.. New commands, options, etc that users may wish to try out.
172
.. Improvements to existing commands, especially improved performance
173
or memory usage, or better results.
178
.. Fixes for situations where bzr would previously crash or give incorrect
179
or undesirable results.
181
* ``config.LocationMatcher`` properly excludes unrelated sections.
182
(Vincent Ladeuil, #829237)
184
* ``dirstate.fdatasync`` and ``repository.fdatasync`` can now properly be
185
disabled. (Vincent Ladeuil, #824513)
187
* Disable ``os.fsync`` and ``os.fdatasync`` by default when running
188
``bzr selftest``. You can use ``--sync`` to re-enable them.
189
(John Arbash Meinel, #837293)
191
* Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
193
* Avoid UnicodeDecode error when reporting EINVAL from transports.
194
(IWATA Hidetaka, #829237)
199
.. Improved or updated documentation.
201
* Corrected documentation for BZR_PROGRESS_BAR.
202
(Dennis Benzinger, #735417)
207
.. Changes that may require updates in plugins or other code that uses
213
.. Major internal changes, unlikely to be visible to users or plugin
214
developers, but interesting for bzr developers.
219
.. Fixes and changes that are only relevant to bzr's test framework and
220
suite. This can include new facilities for writing tests, fixes to
221
spurious test failures and changes to the way things should be tested.
223
* The test suite should now be able to run under weird environments where
224
``/etc/passwd`` doesn't contain the ``uid`` for the user running selftest
225
or where ``fakeroot`` is used but ``/root`` is inacessible.
226
(Vincent Ladeuil, #825027)
233
This release marks the start of a new long-term-stable series. From here, we
234
will only make bugfix releases on the 2.4 series (2.4.1, etc, and support it
235
until February 2013), while 2.5 will become our new development series.
237
This is a bugfix and polish release over the 2.3 series, with a large number
238
of bugs fixed (>150 for the 2.4 series alone), and some performance
239
improvements. Support for python 2.4 and 2.5 has been dropped, many large
240
working tree operations have been optimized as well as some stacked branches
243
Only bugfixes from other stables series have been included since 2.4b5 so
244
all known fixed bugs are included here.
246
Users are encouraged to upgrade from the other stable series.
249
External Compatibility Breaks
250
*****************************
252
.. These may require users to change the way they use Bazaar.
257
.. New commands, options, etc that users may wish to try out.
262
.. Improvements to existing commands, especially improved performance
263
or memory usage, or better results.
268
.. Fixes for situations where bzr would previously crash or give incorrect
269
or undesirable results.
271
* A call to CHKInventory's filter-method will not result in a
272
DuplicateFileId error, if you move a subfolder and change a file in
274
(Bastian Bowe, #809901)
276
* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
277
checks to see if the most recent published source package version for
278
that project is present in the branch tags. This should help developers
279
trust whether the packaging branch is up-to-date and can be used for new
280
changes. The level of verbosity is controlled by the config item
281
``launchpad.packaging_verbosity``. It can be set to one of
288
only display if the branch is out-of-date
291
also display single-line up-to-date and missing,
295
(default) display multi-line content for all states
298
(John Arbash Meinel, #609187, #812928)
300
* Cope with not all Python versions having a ``clear`` method on
301
``TestCase._type_equality_funcs``.
302
(Martin [gz], Jelmer Vernooij, #809048)
304
* Fetching tags when fetching the tip revision of a branch is now
305
controlled by the config setting ``branch.fetch_tags``. The behavior has
306
been reverted to 2.3's not-fetching tagged revisions by default.
307
(John Arbash Meinel, #771184)
309
* The fix for bug #513709 caused us to open a new connection when
310
switching a lightweight checkout that was pointing at a bound branch.
311
This isn't necessary because we know the master URL without opening it,
312
avoiding an extra SSH connection, etc.
313
(John Arbash Meinel, #812285)
319
.. Improved or updated documentation.
324
.. Changes that may require updates in plugins or other code that uses
330
.. Major internal changes, unlikely to be visible to users or plugin
331
developers, but interesting for bzr developers.
336
.. Fixes and changes that are only relevant to bzr's test framework and
337
suite. This can include new facilities for writing tests, fixes to
338
spurious test failures and changes to the way things should be tested.
340
* `BranchBuilder.build_snapshot` now supports a "flush" action. This
341
cleanly and reliably allows tests using `BranchBuilder` to construct
342
branches that e.g. rename files out of a directory and unversion that
343
directory in the same revision. Previously some changes were impossible
344
due to the order that `build_snapshot` performs its actions.
347
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
348
just compares the bytes in the dirstate file to its pristine state,
349
rather than opening the WorkingTree and calling ``last_revision()``.
350
This reduces the overall test suite time by about 10% on my laptop.
359
This is the fifth (and last) beta of the 2.4 series leading to
360
2.4.0 release in August 2011. Beta releases are suitable for
361
everyday use but may cause some incompatibilities with plugins.
363
This release includes all bug fixed in previous series known at
364
the time of this release.
366
External Compatibility Breaks
367
*****************************
374
* New command ``verify-signatures`` to check if all commits or specified commits
375
have digital signatures from trusted keys. Requires python-gpgme to be
378
* New option ``--signatures`` for ``bzr log`` to display digital signature
379
verification results for each commit.
381
* Config option acceptable_keys to list which GPG keys are verified as trusted.
383
* Config option validate_signatures_in_log to always show signatures in
389
* ``Branch.open`` is now about 3x faster (about 2ms instead of 6.5ms).
392
* Pack, dirstate, and index files are synced to persistent storage if
393
possible when writing finishes, to reduce the risk of problems caused by
394
a machine crash or similar problem. This can be turned off through the
395
``dirstate.fdatasync`` and ``repository.fdatasync`` options, which can
396
be set in ``locations.conf`` or ``bazaar.conf``. (Martin Pool,
402
* Display a proper error message when a config file content cannot be
403
decoded as UTF-8 or when it cannot be parsed.
404
(Vincent Ladeuil, #502060, #688677, #797246)
406
* Generate a single conflict (instead of two) when merging a branch
407
modifying and renaming a file in a branch that deleted it (or vice-versa).
408
(Vincent Ladeuil, #688101)
410
* Give a more helpful message when the bzr executable doesn't match the
411
library. (This typically happens because of a misconfigured PYTHONPATH
412
or half-installed bzr.)
413
(Martin Pool, #804553)
415
* Properly load utf8-encoded config files. (Vincent Ladeuil, #799212)
417
* ``GraphThunkIdsToKeys.merge_sort`` now properly returns
418
keys rather than ids. (Jelmer Vernooij, #799677)
420
* ``TreeTransformBase.fixup_new_roots`` can now check that a tree root
421
is present. (Jelmer Vernooij, #801257)
426
* New attributes ``WorkingTreeFormat.supports_versioned_directories`` and
427
``RepositoryFormat.supports_versioned_directories``.
428
(Jelmer Vernooij, #765815)
430
* The "revno" field type when using the python version-info format is now
431
a string (to handle dotted revnos) (Benoît Pierre, #796259)
436
* Start implementing localization, starting with command help text (but not
437
the command options themselves). This will allow bootstrapping the bzr
438
internationalization process. (Inada Naoki)
443
* Fix test failures when running as a homeless user (debian buildd). Tests
444
leaking into ``${HOME}/.bzr.log`` should be detected properly now.
445
(Vincent Ladeuil, #798698)
452
This is the fourth beta of the 2.4 series, leading to a 2.4.0 release in
453
August 2011. Beta releases are suitable for everyday use but may cause some
454
incompatibilities with plugins.
456
This release includes all bug fixed in previous series known at the time of
460
External Compatibility Breaks
461
*****************************
463
.. These may require users to change the way they use Bazaar.
465
* Do not treat configuration option 'check_signatures = require' as if
466
it were 'create_signatures = always' (Jonathan Riddell)
471
.. New commands, options, etc that users may wish to try out.
473
* Hooks have been added for config stacks: ``get``, ``set`` and ``remove``
474
are called when an option is respectively read, modified or deleted. Also
475
added ``load`` and ``save`` hooks for config stores, called when the
476
stores are loaded or saved. (Vincent Ladeuil)
478
* New hook server_exception in bzrlib.smart.server to catch any
479
exception caused while running bzr serve.
480
(Jonathan Riddell, #274578)
482
* New hook set_commit_message in bzrlib.msgeditor to set a commit message
483
and revision properties. (Jonathan Riddell, #274578)
485
* Support ``-S`` as an alias for ``--short`` for the ``log`` and
486
``missing`` commands. (Martin von Gagern, #38655)
491
.. Improvements to existing commands, especially improved performance
492
or memory usage, or better results.
494
* ``bzr annotate`` can be run without setting whoami data first.
495
(Jonathan Riddell, #667408)
500
.. Fixes for situations where bzr would previously crash or give incorrect
501
or undesirable results.
503
* Bazaar can now detect when a lock file is held by a dead process
504
originating from the same machine, and steal the lock after printing a
505
message to the user. This is off by default, for safety, but can be
506
turned on by setting the configuration variable ``locks.steal_dead`` to
508
(Martin Pool, #220464)
510
* ``bzr version-info`` now works when the tree is on a dotted revno.
511
(Benoît Pierre, #796259)
513
* Credentials in the log output produced by ``-Dhttp`` are masked so users
514
can more freely post them in bug reports. (Vincent Ladeuil, #723074)
516
* Fix a race condition for ``server_started`` hooks leading to a spurious
517
test failure. (Vincent Ladeuil, #789167)
519
* Fix exporting subdirectory with ``--per-file-timestamps``.
520
(Szilveszter Farkas, #795557)
522
* Handle files that get created but don't get used during TreeTransform.
523
``open()`` can create a file, and still raise an exception before it
524
returns. So anything we might have created, make sure we destroy during
525
``finalize()``. (Martin [gz], #597686)
527
* ``pack_repo`` now uses ``Transport.move`` instead of
528
``Transport.rename``, deleting any existing targets even on SFTP.
529
(Martin von Gagern, #421776)
531
* Pass the ``build_mo`` command to the rest of the setup() calls in
532
setup.py. The ``bdist_wininst`` and ``py2exe`` code paths were failing
533
because ``build_mo`` became a required step that they didn't know about.
534
(John Arbash Meinel, #787122)
536
* Preserve existing ``root-id`` when merging an unrelated branch.
537
(Aaron Bentley, #806356)
539
* Properly avoid re-adding a file after it changes case on CICP
540
filesystems. (John Arbash Meinel, #798130)
542
* Reports the original error when an InvalidHttpResponse exception is
543
encountered to facilitate debug. (Vincent Ladeuil, #788530)
545
* Reports a non-existent file error when trying to merge in a file
546
that does not exist. (Jonathan Riddell, #330063)
548
* ``UIFactory.prompt``, ``UIFactory.get_username``,
549
``UIFactory.get_password`` and ``UIFactory.get_boolean`` now require a
550
unicode prompt to be passed in. (Jelmer Vernooij, #592083)
552
* Support merging into the empty tree. (Aaron Bentley, #595328)
557
.. Improved or updated documentation.
559
* Improve documentation of ``bzr merge --force``.
560
(Neil Martinsen-Burrell, #767307)
562
* Make docs for configuration options for digital signatures match
563
reality. (Jonathan Riddell)
565
* Add user-guide page on GPG signatures. (Jonathan Riddell)
570
.. Changes that may require updates in plugins or other code that uses
573
* Checking for a file id in a `Tree` or `Inventory` using ``in`` is now
574
deprecated. Instead, use `has_id`.
577
* Exporters are now all exposed as generators, rather than as single-call
578
functions, so that calling code can take stream the output.
581
* Information about held lockdir locks returned from eg `LockDir.peek` is
582
now represented as a `LockHeldInfo` object, rather than a plain
586
* Remove `file_status` function.
589
* ``Repository.iter_reverse_revision_history`` is now deprecated.
590
Use ``Graph.iter_lefthand_ancestry`` instead.
591
(Jelmer Vernooij, #739481)
593
* ``Repository.get_ancestry`` has been deprecated. Use
594
``Graph.iter_ancestry`` instead.
595
(Jelmer Vernooij, #784511)
600
.. Major internal changes, unlikely to be visible to users or plugin
601
developers, but interesting for bzr developers.
603
* ``tools/check-newsbugs.py`` accepts a ``--browser`` option to open
604
corresponding launchpad pages in a browser. (Vincent Ladeuil)
609
.. Fixes and changes that are only relevant to bzr's test framework and
610
suite. This can include new facilities for writing tests, fixes to
611
spurious test failures and changes to the way things should be tested.
613
* A `ImportTariffTestCase` base class has been added in
614
``bzrlib.tests.test_import_tariff``, which can be used for import tariff
615
tests in plugins. (Jelmer Vernooij, #793465)
617
* Fix deadlock in `TestImportTariffs.test_simple_serve` when stderr gets
618
more output than fits in the default buffer. This was happening on the
619
Windows buildslave, and could easily happen in other circumstances where
620
the default OS buffer size for pipes is small or the ``python -v``
621
output is large. (Andrew Bennetts, #784802)
623
* Fix spurious test failure on OSX for WorkingTreeFormat2.
624
(Vincent Ladeuil, #787942)
626
* Re-target ``bb.test_merge.TestMerge.test_merge_reversed_revision_range``
627
and rewrite it as a parametrized test to avoid unrelated failures.
628
(Vincent Ladeuil, #795456)
630
* Show log file contents from subprocesses started by
631
`start_bzr_subprocess` in test failure details. This may help diagnose
632
strange hangs and failures involving subprocesses. (Andrew Bennetts)
634
* Skip ``utextwrap`` tests when ``sphinx`` breaks text_wrap by an hostile
635
monkey-patch to textwrap.TextWrapper.wordsep_re.
636
(Vincent Ladeuil, #785098)
638
* Multiple ``selftest --exclude`` options are now combined instead of
639
overriding each other. (Vincent Ladeuil, #746991)
641
* Restore some ``FTPTransport`` test coverage by allowing ``pyftpdlib
642
0.6.0`` to be used. Also restore ``medusa`` support while leaving it
643
disabled to make it easier to use if/when we can in the future.
644
(Vincent Ladeuil, #781140)
646
* `TestImportTariffs` no longer uses the real ``$HOME``. This prevents it
647
from polluting ``$HOME/.bzr.log`` or being accidentally influenced by
648
user configuration such as aliases. It still runs with all the user's
649
plugins enabled, as intended.
650
(Vincent Ladeuil, Andrew Bennetts, #789505)
658
This is the third beta of the 2.4 series, leading to a 2.4.0 release in
659
August 2011. Beta releases are suitable for everyday use but may cause some
660
incompatibilities with plugins.
662
This release includes all bug fixed in previous series known at the time of
666
External Compatibility Breaks
667
*****************************
669
.. These may require users to change the way they use Bazaar.
671
* ``bzr-2.4`` has officially dropped support for python2.4 and python2.5.
672
We will continue to maintain ``bzr-2.3`` for people who still need to
673
use those versions of python. (John Arbash Meinel)
678
.. New commands, options, etc that users may wish to try out.
680
* The text compressor used for 2a repositories now has a tweakable
681
parameter that can be set in bazaar.conf.
682
``bzr.groupcompress.max_entries_per_source`` default of 65536.
683
When doing compression, we build up an index of locations to match
684
against. Setting this higher will result in slightly better compression,
685
at a cost of more memory. Note that a value of 65k represents fully
686
sampling a 1MB file. So this only has an effect when compressing texts
687
larger than N*16 bytes. (John Arbash Meinel, #602614)
692
.. Improvements to existing commands, especially improved performance
693
or memory usage, or better results.
695
* ``bzr branch --stacked`` from a smart server uses the network a little
696
more efficiently. For a simple branch it reduces the number of
697
round-trips by about 20%. (Andrew Bennetts)
699
* ``bzr log --line`` scales the width of the author field with the size of
700
the line. This means that the full author name is shown when the
701
environment variable BZR_COLUMNS=0. (Neil Martinsen-Burrell)
703
* ``bzr pull`` now properly triggers the fast
704
``CHKInventory.iter_changes`` rather than the slow generic
705
inter-Inventory changes. It used to use a ``DirStateRevisionTree`` as
706
one of the source trees, which is faster when we have to read the whole
707
inventory anyway, but much slower when we can get just the delta out of
708
the repository. On a 70k record tree, this changes ``bzr pull`` from 28s
709
down to 17s. (John Arbash Meinel, #780677)
711
* Slightly reduced memory consumption when fetching into a 2a repository
712
by reusing existing caching a little better. (Andrew Bennetts)
714
* Speed up ``bzr status`` by a little bit when there are a couple of
715
modified files. We now track how many files we have seen that need
716
updating, and only rewrite the dirstate file if enough of them have
717
changed. The default is 10, and can be overridden by setting the branch
718
option "``bzr.workingtree.worth_saving_limit``".
719
(Ian Clatworthy, John Arbash Meinel, #380202)
721
* Speed up ``bzr uncommit``. Instead of resetting the dirstate from
722
scratch, use ``update_basis_by_delta``, computing the delta from the
723
repository. (John Arbash Meinel, #780544)
728
.. Fixes for situations where bzr would previously crash or give incorrect
729
or undesirable results.
731
* All Tree types can now be exported as tar.*, zip or directories.
734
* ``bzr merge --no-remember location`` never sets ``submit_branch``.
735
(Vincent Ladeuil, #782169)
737
* ``bzr pull --no-remember location`` never sets
738
``parent_location``. ``bzr push --no-remember location`` never
739
sets ``push_location``. ``bzr send --no-remember
740
submit_location public_location`` never sets ``submit_branch``
741
nor ``public_branch``. (Vincent Ladeuil)
743
* Conflicts involving non-ascii filenames are now properly reported rather
744
than failing with a UnicodeEncodeError. (Martin [GZ], #686161)
746
* Correct parent is now set when using 'switch -b' with bound branches.
747
(A. S. Budden, #513709)
749
* Fix `bzr plugins` regression in bzr 2.4 which resulted in a traceback
750
from writelines on ckj terminals. (Martin [GZ], #754082)
752
* ``WT.inventory`` and ``WT.iter_entries_by_dir()`` was not correctly
753
reporting subdirectories that were tree references (in formats that
754
supported them). (John Arbash Meinel, #764677)
756
* Merging into empty branches now gives an error as this is currently
757
not supported. (Jonathan Riddell, #242175)
759
* Do not show exception to user on pointless commit error.
760
(Jonathan Riddell #317357)
762
* ``WT.update_basis_by_delta`` no longer requires that the deltas match
763
the current WT state. This allows ``update_basis_by_delta`` to be used
764
by more commands than just commit. Updating with a delta allows us to
765
not load the whole inventory, which can take 10+s with large trees.
766
(Jonathan Riddell, John Arbash Meinel, #781168)
768
* ``bzr mv --after old_name new_name`` now works if "new_name" is newly
769
added. (Benoît Pierre)
775
.. Improved or updated documentation.
777
* Restore the workaround for option names including dots (--1.14) which was
778
disabled when we stopped listing --1.9 as a format.
779
(Vincent Ladeuil, #782289)
784
.. Changes that may require updates in plugins or other code that uses
787
* ``annotate_file`` has been deprecated in favor of
788
``annotate_file_revision_tree``. (Jelmer Vernooij, #775598)
790
* ``Branch.fetch`` now takes an optional ``limit`` argument.
791
(Andrew Bennetts, Jelmer Vernooij, #750175)
793
* ``Inter.get`` now raises ``NoCompatibleInter`` if there are no
794
compatible optimisers rather than an instance of the class it is called
795
on. (Jelmer Vernooij)
797
* ``Branch.push`` now takes a ``lossy`` argument.
798
``Branch.lossy_push`` has been removed.
801
* New method ``Repository.get_file_graph`` which can return the
802
per-file revision graph. (Jelmer Vernooij, #775578)
804
* The default implementation of ``Branch`` is now oriented to
805
storing the branch tip. Branch implementations which store the full
806
history should now subclass ``FullHistoryBzrBranch``.
807
``Branch._last_revision_info`` has been renamed to
808
``Branch._read_last_revision_info`` (Jelmer Vernooij)
810
* ``Tree.__iter__`` has been deprecated; use ``Tree.all_file_ids``
811
instead. (Jelmer Vernooij)
813
* ``Tree.get_symlink_target`` now takes an optional ``path``
814
argument. (Jelmer Vernooij)
819
.. Major internal changes, unlikely to be visible to users or plugin
820
developers, but interesting for bzr developers.
822
* ``MutableTree.smart_add`` now uses inventory deltas.
823
(Jelmer Vernooij, #146165)
825
* Removed ``bzrlib.branch._run_with_write_locked_target`` as
826
``bzrlib.cleanup`` provides the same functionality in a more general
827
way. (Andrew Bennetts)
832
.. Fixes and changes that are only relevant to bzr's test framework and
833
suite. This can include new facilities for writing tests, fixes to
834
spurious test failures and changes to the way things should be tested.
836
* A test that was expected to fail but passes instead now counts as a failure
837
catching up with new testtools and subunit handling. (Martin [GZ], #654474)
839
* Make it easier for plugins to reuse the per_workingtree scenarios by
840
restoring the wt_scenarios helper that was accidentally deleted.
841
(Vincent Ladeuil, #783472)
843
* Removed ``test_breakin`` tests that were excessively prone to hanging,
844
did not work on Wine, and partly already disabled.
845
(Martin Pool, #408814, #746985)
847
* Windows locations are different and should be tested accordingly.
848
(Vincent Ladeuil, #788131)
855
This is the second beta of the 2.4 series, leading to a 2.4.0 release in
856
August 2011. Beta releases are suitable for everyday use but may cause some
857
incompatibilities with plugins.
859
This release includes all bug fixed in previous series known at the time of
863
External Compatibility Breaks
864
*****************************
866
.. These may require users to change the way they use Bazaar.
868
* Two command synonyms for ``bzr branch`` have been deprecated, to avoid
869
confusion and to allow the names to later be reused. The removed names
870
are: ``get`` and ``clone``. (Martin Pool, #506265)
875
.. New commands, options, etc that users may wish to try out.
877
* ``bzr commit`` now supports a ``--lossy`` argument that can be used
878
to discard any data that can not be natively represented when committing
879
to a foreign VCS. (Jelmer Vernooij, #587721)
884
.. Improvements to existing commands, especially improved performance
885
or memory usage, or better results.
887
* ``bzr merge`` in large trees is now significantly faster. On a 70k entry
888
tree, the time went from ~3min down to 30s. This also effects ``bzr pull``
889
and ``bzr update`` since they use the same merge logic to update the
890
WorkingTree. (John Arbash Meinel, #759091)
892
* ``bzr revert`` now properly uses ``bzr status``'s optimized
893
``iter_changes``. This can be a significant performance difference (33s
894
to 5s on large trees). (John Arbash Meinel, #759096)
896
* Resolve ``lp:FOO`` urls locally rather than doing an XMLRPC request if
897
the user has done ``bzr launchpad-login``. The bzr+ssh URLs were already
898
being handed off to the remote server anyway (xmlrpc has been mapping
899
``lp:bzr`` to ``bzr+ssh://bazaar.launchpad.net/+branch/bzr``, rather
900
than ``bzr+ssh://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev`` for a few
901
months now.) By doing it ourselves, we can cut out substantial startup
902
time. From Netherlands to London it was taking 368ms to do the XMLRPC
903
call as much as 2s from Sydney. You can test the local logic by using
904
``-Dlaunchpad``. (John Arbash Meinel, #397739)
906
* When building a new WorkingTree (such as during ``bzr co`` or
907
``bzr branch``) we now properly store the stat and hash of files that
908
are old enough. This saves a fair amount of time on the first
909
``bzr status`` (on a 500MB tree, it saves about 30+s).
910
(John Arbash Meinel, #740932)
916
.. Fixes for situations where bzr would previously crash or give incorrect
917
or undesirable results.
919
* Arguments that can't be decoded to unicode in the current posix locale give
920
a clearer error message without a traceback. (Martin [gz], #745712)
922
* ``bzrlib.log._DEFAULT_REQUEST_PARAMS`` is no longer accidentally
923
mutated by ``bzrlib.log._apply_log_request_defaults``. In practice
924
these default values aren't relied on very often so this probably
925
wasn't causing any trouble. (Andrew Bennetts)
927
* ``bzr log`` now works on revisions which are not in the current branch.
928
(Matt Giuca, #241998)
930
* Don't rewrite the dirstate file when non-interesting changes have
931
occurred. This can significantly improve 'bzr status' times when there
932
are only small changes to a large tree.
933
(Ian Clatworthy, John Arbash Meinel, #380202)
935
* Lazy hooks are now reset between test runs. (Jelmer Vernooij, #745566)
937
* ``bzrlib.merge.Merge`` now calls ``iter_changes`` without
938
``include_unversioned=True``. This makes it significantly faster in many
939
cases, because it only looks at modified files, rather than building
940
information about all files. This can cause failures in other
941
TreeTransform code, because it had been expecting to know the names of
942
things which had not changed (such as parent directories). All cases we
943
know about so far have been fixed, but there may be fallout for edge
944
cases that we are missing. (John Arbash Meinel, #759091)
946
* ``SFTPTransport`` is more pro-active about closing file-handles. This
947
reduces the chance of having threads fail from async requests while
948
running the test suite. (John Arbash Meinel, #656170)
950
* Standalone bzr.exe installation on Windows: user can put additional python
951
libraries into ``site-packages`` subdirectory of the installation directory,
952
this might be required for "installing" extra dependencies for some plugins.
953
(Alexander Belchenko, #743256)
955
* ``transform.revert()`` has been updated to use
956
``wt.iter_changes(basis_tree)`` rather than
957
``basis_tree.iter_changes(wt)``. This allows the optimized code path to
958
kick in, improving ``bzr revert`` times significantly (33s to 4s on
959
large trees, 0.7s to 0.3s on small trees.) (John Arbash Meinel, #759096)
961
* ``TreeTransform.create_file/new_file`` can now take an optional ``sha1``
962
parameter. If supplied, when the transform is applied, it will then call
963
``self._tree._observed_sha1`` for those files. This lets us update the
964
hash-cache for content that we create, preventing us from re-reading the
965
content in the next ``bzr status``. (John Arbash Meinel, #740932)
970
* Added a section about using a shared SSH account on a server for bzr+ssh
971
access. (Russell Smith)
973
* The documentation now recommends using SSH rather than SFTP in the
974
tutorials and the examples, because that will generally be much faster
975
and better in cases where it can be used. SFTP is still available and
976
mentioned as an alternative. (Martin Pool, #636712)
981
.. Changes that may require updates in plugins or other code that uses
984
* ``Branch.update_revisions`` has been made private and should no
985
longer be used by external users. Use ``Branch.pull`` or ``Branch.push``
986
instead. (Jelmer Vernooij, #771765)
988
* Commands now have an `invoked_as` attribute, showing the name under
989
which they were called before alias expansion.
992
* ``Hooks.create_hook`` is now deprecated in favour of ``Hooks.add_hook``.
995
* If you call `bzrlib.initialize` but forget to enter the resulting object
996
as a context manager, bzrlib will now be initialized anyhow.
997
(Previously simple programs calling bzrlib might find the library was
998
mysteriously silent.)
1001
* Inventory-specific functionality has been split out of ``Tree`` into
1002
a new ``InventoryTree`` class. Tree instances no longer
1003
necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
1005
* Inventory-specific functionality has been split out of ``RevisionTree``
1006
into a new ``InventoryRevisionTree`` class. RevisionTree instances no
1007
longer necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
1009
* New method ``Hooks.uninstall_named_hook``. (Jelmer Vernooij, #301472)
1011
* ``revision_graph_can_have_wrong_parents`` is now an attribute
1012
on ``RepositoryFormat`` rather than a method on ``Repository``.
1015
* ``Testament`` now takes a ``tree`` rather than an
1016
``inventory``. (Jelmer Vernooij, #762608)
1018
* ``TestCase.failUnlessExists`` and ``failIfExists`` are deprecated in
1019
favour of ``assertPathExists`` and ``assertPathDoesNotExist``
1023
* The ``revno`` parameter of ``log.LogRevision`` may now be None,
1024
representing a revision which is not in the current branch.
1025
(Matt Giuca, #241998)
1027
* The various knit pack repository format classes have been moved
1028
from ``bzrlib.repofmt.pack_repo`` to
1029
``bzrlib.repofmt.knitpack_repo``. (Jelmer Vernooij)
1031
* ``RevisionTree`` now has a new method ``get_file_revision``.
1034
* ``WorkingTree`` no longer provides an ``inventory``. Instead,
1035
all inventory-related functionality is now on the subclass
1036
``InventoryWorkingTree`` that all native Bazaar working tree
1037
implementations derive from. (Jelmer Vernooij)
1042
.. Major internal changes, unlikely to be visible to users or plugin
1043
developers, but interesting for bzr developers.
1045
* Added ``osutils.lstat`` and ``osutils.fstat``. These are just the ``os``
1046
functions on Linux, but they are wrapped on Windows so that fstat
1047
matches lstat results across all python versions.
1048
(John Arbash Meinel)
1050
* ``WorkingTree._observed_sha1`` also updates the 'size' column. It
1051
happened to be updated as a side-effect of commit, but if we start using
1052
the function elsewhere we might as well do it directly.
1053
(John Arbash Meinel)
1058
.. Fixes and changes that are only relevant to bzr's test framework and
1059
suite. This can include new facilities for writing tests, fixes to
1060
spurious test failures and changes to the way things should be tested.
1062
* Stop using `failIf`, `failUnless`, `failIfEqual`, etc, that give
1063
`PendingDeprecationWarnings` on Python2.7.
1064
(Martin Pool, #760435)
1072
This is the first beta of the 2.4 series, leading up to a 2.4.0
1073
release in August 2011. Beta releases are suitable for everyday use
1074
but may cause some incompatibilities with plugins. Some plugins may need
1075
small updates to work with 2.4b1.
1077
External Compatibility Breaks
1078
*****************************
1085
* Added ``changelog_merge`` plugin for merging changes to ``Changelog`` files
1086
in GNU format. See ``bzr help changelog_merge`` for details.
1089
* Configuration options can now use references to other options in the same
1090
file by enclosing them with curly brackets (``{other_opt}``). This makes it
1091
possible to use, for example,
1092
``push_location=lp:~vila/bzr/config-{nickname}`` in ``branch.conf`` when
1093
using a loom. During the beta period, the default behaviour is to disable
1094
this feature. It can be activated by declaring ``bzr.config.expand = True``
1095
in ``bazaar.conf``. (Vincent Ladeuil)
1097
* External merge tools can now be configured in bazaar.conf. See
1098
``bzr help configuration`` for more information. (Gordon Tyler, #489915)
1100
* The ``lp:`` directory service now supports Launchpad's QA staging.
1101
(Jelmer Vernooij, #667483)
1106
* A new hidden command ``bzr repair-workingtree``. This is a way to force
1107
the dirstate file to be rebuilt, rather than using a ``bzr checkout``
1108
workaround. (John Arbash Meinel)
1110
* Added a ``Branch.heads_to_fetch`` RPC to the smart server protocol.
1111
This allows formats from plugins (such as looms) to efficiently tell the
1112
client which revisions need to be fetched. (Andrew Bennetts)
1114
* Branching, merging and pulling a branch now copies revisions named in
1115
tags, not just the tag metadata. (Andrew Bennetts, #309682)
1117
* ``bzr cat-revision`` no longer requires a working tree.
1118
(Jelmer Vernooij, #704405)
1120
* ``bzr export --per-file-timestamps`` for .tar.gz files will now
1121
override the mtime for trees exported on Python 2.7 and later, which
1122
expose the 'mtime' field in gzip files. This makes the output of
1123
``bzr export --per-file-timestamps`` for a particular tree
1124
deterministic. (Jelmer Vernooij, #711226)
1126
* ``bzr export --format=zip`` can now export to standard output,
1127
like the other exporters can. (Jelmer Vernooij, #513752)
1129
* ``bzr export`` can now create ``.tar.xz`` and ``.tar.lzma`` files.
1130
(Jelmer Vernooij, #551714)
1132
* Getting all entries from ``CHKInventory.iter_entries_by_dir()`` has been
1133
sped up dramatically for large trees. Iterating by dir is not the best
1134
way to load data from a CHK inventory, so it preloads all the items in
1135
the correct order. (With the gcc-tree, this changes it (re)reading 8GB
1136
of CHK data, down to just 150MB.) This has noticeable affects for things
1137
like building checkouts, etc. (John Arbash Meinel, #737234)
1142
* A MemoryError thrown on the server during a remote operation will now be
1143
usefully reported, and other unexpected errors will include the class name.
1144
(Martin [gz], #722416)
1146
* ``bzr annotate -r-1 file`` will now properly annotate a deleted file.
1147
(Andrew King, #537442)
1149
* ``bzr export`` to zip files will now set a mode on directories.
1150
(Jelmer Vernooij, #207253)
1152
* ``bzr export`` to tgz files will only write out the basename of the
1153
tarfile to the gzip file. (Jelmer Vernooij, #102234)
1155
* ``bzr push --overwrite`` with an older revision specified will now correctly
1156
roll back the target branch. (Jelmer Vernooij, #386576)
1158
* ``bzr lp-propose`` can now propose merges against packaging branches on
1159
Launchpad without requiring the target branch to be specified.
1160
(Jelmer Vernooij, #704647)
1162
* ``bzr lp-propose`` no longer requires a reviewer to be specified. It will
1163
instead leave setting the reviewer up to Launchpad if it was not specified.
1164
(Jelmer Vernooij, #583772)
1166
* ``bzr pull`` will now exit with exit code 1 if there were tag conflicts.
1167
(Jelmer Vernooij, #213185)
1169
* ``bzr mv`` user errors no longer throw UnicodeEncodeError with non-ascii
1170
paths, however they may still print junk if not on a UTF-8 terminal.
1171
(Martin [gz], #707954)
1173
* ``bzr reconfigure --unstacked`` now copies revisions (and their
1174
ancestors) named in tags into the unstacked repository, not just the
1175
ancestry of the branch's tip. (Andrew Bennetts, #401646)
1177
* ``bzr serve`` no longer crashes when a server_started hook is installed and
1178
IPv6 support is available on the system. (Jelmer Vernooij, #293697)
1180
* ``bzr status`` will not rewrite the dirstate file if it only has
1181
'trivial' changes. (Currently limited to dir updates and newly-added
1182
files changing state.) This saves a bit of time for regular operations.
1183
eg. ``bzr status`` in a 100k tree takes 1.4s to compute the status, but 1s
1184
to re-save the dirstate file. (John Arbash Meinel, #765881)
1186
* ``bzr tags`` will no longer choke on branches with ghost revisions in
1187
their mainline and tags on revisions not in the branch ancestry.
1188
(Jelmer Vernooij, #397556)
1190
* ``bzr whoami`` will now display an error if both a new identity and
1191
``--email`` were specified. (Jelmer Vernooij, #680449)
1193
* ``launchpadlib`` doesn't provide the ``uris`` module in some old versions.
1194
(Vincent Ladeuil, #706835)
1196
* Empty entries in the ``NO_PROXY`` variable are no longer treated as matching
1198
(Martin Pool, #586341)
1200
* Plugins incompatible with the current version of bzr no longer produce a
1201
warning on every command invocation. Instead, a message is shown by
1202
``bzr plugins`` and in crash reports.
1203
(#704195, Martin Pool)
1205
* The "pretty" version of ``needs_read_lock`` and ``needs_write_lock`` now
1206
preserves the identity of default parameter values.
1207
(Andrew Bennetts, #718569)
1209
* ``bzr dump-btree --raw`` no longer tracebacks on a B-Tree file
1210
containing no rows. (Eric Siegerman, #715508)
1212
* Fix ``bzr lp-mirror`` to work on command line branch URLs and branches
1213
without an explicit public location. (Max Bowsher)
1215
* On Python 2.6 and higher, use multiprocessing.cpu_count() to retrieve the
1216
number of available processors. (Jelmer Vernooij, #693140)
1221
* Added ``Branch.heads_to_fetch`` method. Implementations of the Branch API
1222
must now inherit or implement this method. (Andrew Bennetts, #721328)
1224
* Added ``bzrlib.mergetools`` module with helper functions for working with
1225
the list of external merge tools. (Gordon Tyler, #489915)
1227
* All methods and arguments that were deprecated before 2.0
1228
have been removed. (Jelmer Vernooij)
1230
* Branch formats should now be registered on the format registry
1231
(``bzrlib.branch.format_registry``) rather than using the class
1232
methods on ``BranchFormat``. (Jelmer Vernooij, #714729)
1234
* ``Branch.set_revision_history`` is now deprecated.
1237
* ``BranchFormat.supports_leaving_lock()`` and
1238
``RepositoryFormat.supports_leaving_lock`` flags have been added.
1241
* ``Branch.fetch`` implementations must now accept an optional
1242
``fetch_tags`` keyword argument. (Andrew Bennetts)
1244
* ``Branch.import_last_revision_info`` is deprecated. Use the
1245
``import_last_revision_info_and_tags`` method instead.
1248
* Because it was too specific to BzrDir implementations,
1249
``ControlDir.sprout`` no longer has a default implementation; it now
1250
raises ``NotImplementedError``. (Jelmer Vernooij, #717937)
1252
* ``bzrlib.deprecated_graph`` has been removed. ``bzrlib.graph``
1253
scales better tree and should be used instead.
1254
(Jelmer Vernooij, #733612)
1256
* ``ControlDirFormat.register_format`` has been removed. Instead,
1257
``Prober`` implementations should now implement a ``known_formats``
1258
method. (Jelmer Vernooij)
1260
* ControlDirFormats can now provide a ``check_status`` method and
1261
raise a custom exception or warning when an unsupported or deprecated
1262
format is being opened. (Jelmer Vernooij, #731311)
1264
* ``bzrlib.revionspec.dwim_revspecs`` is deprecated.
1265
Use ``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_revspec`` and
1266
``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_lazy_revspec``
1267
instead. (Jelmer Vernooij, #721971)
1269
* ``BzrDirFormat`` has a new attribute ``fixed_components`` that
1270
indicates whether the components of the bzrdir can be upgraded
1271
independent of the ``BzrDir``. (Jelmer Vernooij)
1273
* ``BzrProber.register_format`` and ``BzrProber.unregister_format`` are
1274
now deprecated in favour of the ``BzrProber.formats`` format registry.
1277
* ``ControlDir`` implementations no longer have to provide the
1278
``get_branch_transport``, ``get_workingtree_transport`` and
1279
``get_repository_transport`` methods. (Jelmer Vernooij, #730325)
1281
* ``Converter`` has been moved from ``bzrlib.bzrdir`` to
1282
``bzrlib.controldir``. (Jelmer Vernooij)
1284
* Repository formats can now provide
1285
``_get_extra_interrepo_test_combinations`` in the same module
1286
to provide extra test combinations for ``bzrlib.tests.per_repository``.
1289
* Repository formats should now be registered on the format registry
1290
(``bzrlib.repository.format_registry``) rather than using the class
1291
methods on ``RepositoryFormat``. (Jelmer Vernooij)
1293
* Repository formats can now indicate they do not support the full
1294
VersionedFiles API by setting the ``supports_full_versioned_files``
1295
attribute to False. A subset of the VersionedFiles API
1296
(signatures and text graphs) still needs to be supported.
1299
* Repository formats have a new method ``is_deprecated`` that
1300
implementations can override to return True to trigger a deprecation
1301
warning. (Jelmer Vernooij)
1303
* The ``revision_id`` parameter of
1304
``Repository.search_missing_revision_ids`` and
1305
``InterRepository.search_missing_revision_ids`` is deprecated. It is
1306
replaced by the ``revision_ids`` parameter. (Andrew Bennetts)
1308
* Working tree formats should now be registered on the format registry
1309
(``bzrlib.working_tree.format_registry``) rather than using the class
1310
methods on ``WorkingTreeFormat``. (Jelmer Vernooij, #714730)
1312
* Exporting may now be done with a generator
1313
(``bzrlib.export.get_export_generator``) (Geoff/xaav, #791005)
1318
* ``CatchingExceptionThread`` (formerly ThreadWithException) has been moved
1319
out of the ``bzrlib.tests`` hierarchy to make it clearer that it can be used
1320
outside of tests. This class makes it easier to track exceptions in threads
1321
by catching them so they can be re-raised in the controlling thread. It's
1322
available in the ``bzrlib.cethread`` module. (Vincent Ladeuil)
1324
* Correctly propagate malloc failures from diff-delta.c code as MemoryError
1325
so OOM conditions during groupcompress are clearly reported. This entailed a
1326
change to several function signatures. (Martin [gz], #633336)
1328
* ``HookPoint.lazy_hook`` and ``Hooks.install_named_lazy_hook`` can install
1329
hooks for which the callable is loaded lazily. (Jelmer Vernooij)
1334
* The Range parsing for HTTP requests will correctly parse incomplete ranges.
1335
(Vincent Ladeuil, #731240)
1338
vim: tw=74 ft=rst ff=unix
added
removed
doc/en/release-notes/bzr-2.4.txt
