11
:2.4.3: 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
* Cope with Unix filesystems, such as smbfs, where chmod gives 'permission
36
denied'. (Martin Pool, #606537)
38
* When the ``limbo`` or ``pending-deletion`` directories exist, typically
39
because of an interrupted tree update, but are empty, bzr no longer
40
errors out, because there is nothing for the user to clean up. Also,
41
errors in creation of these directories are no longer squelched.
42
(Martin Pool, #427773)
44
* During merges, when two entries end up using the same path for two
45
different file-ids (the same file being 'bzr added' in two different
46
branches) , 'duplicate' conflicts are created instead of 'content'
47
ones. This was previously leading to a 'Malformed tramsform' exception.
48
(Vincent Ladeuil, #880701)
50
* 'Malformed transform' exceptions are now recognized as internal errors
51
instead of user errors and report a traceback. This will reduce user
52
confusion as there is generally nothing users can do about them.
53
(Vincent Ladeuil, #880701)
55
* Prevent a traceback being printed to stderr when logging has problems and
56
accept utf-8 byte string without breaking. (Martin Packman, #714449)
58
* Use ``encoding_type='exact'`` for ``bzr testament`` so that on Windows
59
the sha hash of the long testament matches the sha hash in the short
60
form. (John Arbash Meinel, #1010339)
62
* _Win32Stat object provides members st_uid and st_gid, those are present
63
in Python's os.stat object. These members required for external tools like
64
bzr-git and dulwich. (Alexander Belchenko, #967060)
69
.. Improved or updated documentation.
74
.. Changes that may require updates in plugins or other code that uses
80
.. Major internal changes, unlikely to be visible to users or plugin
81
developers, but interesting for bzr developers.
86
.. Fixes and changes that are only relevant to bzr's test framework and
87
suite. This can include new facilities for writing tests, fixes to
88
spurious test failures and changes to the way things should be tested.
90
* Account for slightly improved compression with newer versions of zlib in
91
``bt.test_btree_index`` tests. (Martin Packman, #940453)
99
This is a bugfix release. Most of the bugs dealt with portability
100
issues. Upgrading is recommended for all users of earlier 2.4 releases.
102
External Compatibility Breaks
103
*****************************
115
* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
116
every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
121
* Fixed an infinite loop when creating a repo at the root of the filesystem,
122
i.e. "/", due to posixpath.normpath() not collapsing 2 leading slashes into
123
one, thus respecting the POSIX standard, but making relpath() loop infinitely.
124
(Florian Vichot, #861008)
126
* Fixed loading of external merge tools from config to properly decode
127
command-lines which contain embedded quotes. (Gordon Tyler, #828803)
129
* Include declaration of 'changed' to avoid an UnboundLocalError in dirstate
130
pyrex code with new Cython versions. (Denys Duchier, #837221)
132
* Prevent several kinds of OverflowError and other fallout from failing to fit
133
stat fields into four bytes in dirstate pack_stat implementations.
134
(Martin Packman, #683191 #706957)
136
* Return early from create_delta_index_from_delta given tiny inputs. This
137
avoids raising a spurious MemoryError on certain platforms such as AIX.
138
(John Arbash Meinel, #856731)
143
* Corrected documentation for ``bzr serve`` in the Admin Guide.
144
(Morten Bøgeskov, Martin Pool, #832576)
159
* Accept both old and new style testtools output in selftest tests.
160
(Jelmer Vernooij, Martin Packman, #815423)
162
* Fix the race for TestingThreadingTCPServer in
163
test_server_crash_while_responding. (Vincent Ladeuil, #869366)
165
* Really corrupt the pack file without depending on a special length or value.
166
(Vincent Ladeuil, #807032)
174
This is a bugfix release. Upgrading is recommended for all users of earlier
177
It includes fixes from previous stable releases and address some issues with
181
External Compatibility Breaks
182
*****************************
184
.. These may require users to change the way they use Bazaar.
189
.. New commands, options, etc that users may wish to try out.
194
.. Improvements to existing commands, especially improved performance
195
or memory usage, or better results.
200
.. Fixes for situations where bzr would previously crash or give incorrect
201
or undesirable results.
203
* ``config.LocationMatcher`` properly excludes unrelated sections.
204
(Vincent Ladeuil, #829237)
206
* ``dirstate.fdatasync`` and ``repository.fdatasync`` can now properly be
207
disabled. (Vincent Ladeuil, #824513)
209
* Disable ``os.fsync`` and ``os.fdatasync`` by default when running
210
``bzr selftest``. You can use ``--sync`` to re-enable them.
211
(John Arbash Meinel, #837293)
213
* Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
215
* Avoid UnicodeDecode error when reporting EINVAL from transports.
216
(IWATA Hidetaka, #829237)
221
.. Improved or updated documentation.
223
* Corrected documentation for BZR_PROGRESS_BAR.
224
(Dennis Benzinger, #735417)
229
.. Changes that may require updates in plugins or other code that uses
235
.. Major internal changes, unlikely to be visible to users or plugin
236
developers, but interesting for bzr developers.
241
.. Fixes and changes that are only relevant to bzr's test framework and
242
suite. This can include new facilities for writing tests, fixes to
243
spurious test failures and changes to the way things should be tested.
245
* The test suite should now be able to run under weird environments where
246
``/etc/passwd`` doesn't contain the ``uid`` for the user running selftest
247
or where ``fakeroot`` is used but ``/root`` is inacessible.
248
(Vincent Ladeuil, #825027)
255
This release marks the start of a new long-term-stable series. From here, we
256
will only make bugfix releases on the 2.4 series (2.4.1, etc, and support it
257
until February 2013), while 2.5 will become our new development series.
259
This is a bugfix and polish release over the 2.3 series, with a large number
260
of bugs fixed (>150 for the 2.4 series alone), and some performance
261
improvements. Support for python 2.4 and 2.5 has been dropped, many large
262
working tree operations have been optimized as well as some stacked branches
265
Only bugfixes from other stables series have been included since 2.4b5 so
266
all known fixed bugs are included here.
268
Users are encouraged to upgrade from the other stable series.
271
External Compatibility Breaks
272
*****************************
274
.. These may require users to change the way they use Bazaar.
279
.. New commands, options, etc that users may wish to try out.
284
.. Improvements to existing commands, especially improved performance
285
or memory usage, or better results.
290
.. Fixes for situations where bzr would previously crash or give incorrect
291
or undesirable results.
293
* A call to CHKInventory's filter-method will not result in a
294
DuplicateFileId error, if you move a subfolder and change a file in
296
(Bastian Bowe, #809901)
298
* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
299
checks to see if the most recent published source package version for
300
that project is present in the branch tags. This should help developers
301
trust whether the packaging branch is up-to-date and can be used for new
302
changes. The level of verbosity is controlled by the config item
303
``launchpad.packaging_verbosity``. It can be set to one of
310
only display if the branch is out-of-date
313
also display single-line up-to-date and missing,
317
(default) display multi-line content for all states
320
(John Arbash Meinel, #609187, #812928)
322
* Cope with not all Python versions having a ``clear`` method on
323
``TestCase._type_equality_funcs``.
324
(Martin [gz], Jelmer Vernooij, #809048)
326
* Fetching tags when fetching the tip revision of a branch is now
327
controlled by the config setting ``branch.fetch_tags``. The behavior has
328
been reverted to 2.3's not-fetching tagged revisions by default.
329
(John Arbash Meinel, #771184)
331
* The fix for bug #513709 caused us to open a new connection when
332
switching a lightweight checkout that was pointing at a bound branch.
333
This isn't necessary because we know the master URL without opening it,
334
avoiding an extra SSH connection, etc.
335
(John Arbash Meinel, #812285)
341
.. Improved or updated documentation.
346
.. Changes that may require updates in plugins or other code that uses
352
.. Major internal changes, unlikely to be visible to users or plugin
353
developers, but interesting for bzr developers.
358
.. Fixes and changes that are only relevant to bzr's test framework and
359
suite. This can include new facilities for writing tests, fixes to
360
spurious test failures and changes to the way things should be tested.
362
* `BranchBuilder.build_snapshot` now supports a "flush" action. This
363
cleanly and reliably allows tests using `BranchBuilder` to construct
364
branches that e.g. rename files out of a directory and unversion that
365
directory in the same revision. Previously some changes were impossible
366
due to the order that `build_snapshot` performs its actions.
369
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
370
just compares the bytes in the dirstate file to its pristine state,
371
rather than opening the WorkingTree and calling ``last_revision()``.
372
This reduces the overall test suite time by about 10% on my laptop.
381
This is the fifth (and last) beta of the 2.4 series leading to
382
2.4.0 release in August 2011. Beta releases are suitable for
383
everyday use but may cause some incompatibilities with plugins.
385
This release includes all bug fixed in previous series known at
386
the time of this release.
388
External Compatibility Breaks
389
*****************************
396
* New command ``verify-signatures`` to check if all commits or specified commits
397
have digital signatures from trusted keys. Requires python-gpgme to be
400
* New option ``--signatures`` for ``bzr log`` to display digital signature
401
verification results for each commit.
403
* Config option acceptable_keys to list which GPG keys are verified as trusted.
405
* Config option validate_signatures_in_log to always show signatures in
411
* ``Branch.open`` is now about 3x faster (about 2ms instead of 6.5ms).
414
* Pack, dirstate, and index files are synced to persistent storage if
415
possible when writing finishes, to reduce the risk of problems caused by
416
a machine crash or similar problem. This can be turned off through the
417
``dirstate.fdatasync`` and ``repository.fdatasync`` options, which can
418
be set in ``locations.conf`` or ``bazaar.conf``. (Martin Pool,
424
* Display a proper error message when a config file content cannot be
425
decoded as UTF-8 or when it cannot be parsed.
426
(Vincent Ladeuil, #502060, #688677, #797246)
428
* Generate a single conflict (instead of two) when merging a branch
429
modifying and renaming a file in a branch that deleted it (or vice-versa).
430
(Vincent Ladeuil, #688101)
432
* Give a more helpful message when the bzr executable doesn't match the
433
library. (This typically happens because of a misconfigured PYTHONPATH
434
or half-installed bzr.)
435
(Martin Pool, #804553)
437
* Properly load utf8-encoded config files. (Vincent Ladeuil, #799212)
439
* ``GraphThunkIdsToKeys.merge_sort`` now properly returns
440
keys rather than ids. (Jelmer Vernooij, #799677)
442
* ``TreeTransformBase.fixup_new_roots`` can now check that a tree root
443
is present. (Jelmer Vernooij, #801257)
448
* New attributes ``WorkingTreeFormat.supports_versioned_directories`` and
449
``RepositoryFormat.supports_versioned_directories``.
450
(Jelmer Vernooij, #765815)
452
* The "revno" field type when using the python version-info format is now
453
a string (to handle dotted revnos) (Benoît Pierre, #796259)
458
* Start implementing localization, starting with command help text (but not
459
the command options themselves). This will allow bootstrapping the bzr
460
internationalization process. (Inada Naoki)
465
* Fix test failures when running as a homeless user (debian buildd). Tests
466
leaking into ``${HOME}/.bzr.log`` should be detected properly now.
467
(Vincent Ladeuil, #798698)
474
This is the fourth beta of the 2.4 series, leading to a 2.4.0 release in
475
August 2011. Beta releases are suitable for everyday use but may cause some
476
incompatibilities with plugins.
478
This release includes all bug fixed in previous series known at the time of
482
External Compatibility Breaks
483
*****************************
485
.. These may require users to change the way they use Bazaar.
487
* Do not treat configuration option 'check_signatures = require' as if
488
it were 'create_signatures = always' (Jonathan Riddell)
493
.. New commands, options, etc that users may wish to try out.
495
* Hooks have been added for config stacks: ``get``, ``set`` and ``remove``
496
are called when an option is respectively read, modified or deleted. Also
497
added ``load`` and ``save`` hooks for config stores, called when the
498
stores are loaded or saved. (Vincent Ladeuil)
500
* New hook server_exception in bzrlib.smart.server to catch any
501
exception caused while running bzr serve.
502
(Jonathan Riddell, #274578)
504
* New hook set_commit_message in bzrlib.msgeditor to set a commit message
505
and revision properties. (Jonathan Riddell, #274578)
507
* Support ``-S`` as an alias for ``--short`` for the ``log`` and
508
``missing`` commands. (Martin von Gagern, #38655)
513
.. Improvements to existing commands, especially improved performance
514
or memory usage, or better results.
516
* ``bzr annotate`` can be run without setting whoami data first.
517
(Jonathan Riddell, #667408)
522
.. Fixes for situations where bzr would previously crash or give incorrect
523
or undesirable results.
525
* Bazaar can now detect when a lock file is held by a dead process
526
originating from the same machine, and steal the lock after printing a
527
message to the user. This is off by default, for safety, but can be
528
turned on by setting the configuration variable ``locks.steal_dead`` to
530
(Martin Pool, #220464)
532
* ``bzr version-info`` now works when the tree is on a dotted revno.
533
(Benoît Pierre, #796259)
535
* Credentials in the log output produced by ``-Dhttp`` are masked so users
536
can more freely post them in bug reports. (Vincent Ladeuil, #723074)
538
* Fix a race condition for ``server_started`` hooks leading to a spurious
539
test failure. (Vincent Ladeuil, #789167)
541
* Fix exporting subdirectory with ``--per-file-timestamps``.
542
(Szilveszter Farkas, #795557)
544
* Handle files that get created but don't get used during TreeTransform.
545
``open()`` can create a file, and still raise an exception before it
546
returns. So anything we might have created, make sure we destroy during
547
``finalize()``. (Martin [gz], #597686)
549
* ``pack_repo`` now uses ``Transport.move`` instead of
550
``Transport.rename``, deleting any existing targets even on SFTP.
551
(Martin von Gagern, #421776)
553
* Pass the ``build_mo`` command to the rest of the setup() calls in
554
setup.py. The ``bdist_wininst`` and ``py2exe`` code paths were failing
555
because ``build_mo`` became a required step that they didn't know about.
556
(John Arbash Meinel, #787122)
558
* Preserve existing ``root-id`` when merging an unrelated branch.
559
(Aaron Bentley, #806356)
561
* Properly avoid re-adding a file after it changes case on CICP
562
filesystems. (John Arbash Meinel, #798130)
564
* Reports the original error when an InvalidHttpResponse exception is
565
encountered to facilitate debug. (Vincent Ladeuil, #788530)
567
* Reports a non-existent file error when trying to merge in a file
568
that does not exist. (Jonathan Riddell, #330063)
570
* ``UIFactory.prompt``, ``UIFactory.get_username``,
571
``UIFactory.get_password`` and ``UIFactory.get_boolean`` now require a
572
unicode prompt to be passed in. (Jelmer Vernooij, #592083)
574
* Support merging into the empty tree. (Aaron Bentley, #595328)
579
.. Improved or updated documentation.
581
* Improve documentation of ``bzr merge --force``.
582
(Neil Martinsen-Burrell, #767307)
584
* Make docs for configuration options for digital signatures match
585
reality. (Jonathan Riddell)
587
* Add user-guide page on GPG signatures. (Jonathan Riddell)
592
.. Changes that may require updates in plugins or other code that uses
595
* Checking for a file id in a `Tree` or `Inventory` using ``in`` is now
596
deprecated. Instead, use `has_id`.
599
* Exporters are now all exposed as generators, rather than as single-call
600
functions, so that calling code can take stream the output.
603
* Information about held lockdir locks returned from eg `LockDir.peek` is
604
now represented as a `LockHeldInfo` object, rather than a plain
608
* Remove `file_status` function.
611
* ``Repository.iter_reverse_revision_history`` is now deprecated.
612
Use ``Graph.iter_lefthand_ancestry`` instead.
613
(Jelmer Vernooij, #739481)
615
* ``Repository.get_ancestry`` has been deprecated. Use
616
``Graph.iter_ancestry`` instead.
617
(Jelmer Vernooij, #784511)
622
.. Major internal changes, unlikely to be visible to users or plugin
623
developers, but interesting for bzr developers.
625
* ``tools/check-newsbugs.py`` accepts a ``--browser`` option to open
626
corresponding launchpad pages in a browser. (Vincent Ladeuil)
631
.. Fixes and changes that are only relevant to bzr's test framework and
632
suite. This can include new facilities for writing tests, fixes to
633
spurious test failures and changes to the way things should be tested.
635
* A `ImportTariffTestCase` base class has been added in
636
``bzrlib.tests.test_import_tariff``, which can be used for import tariff
637
tests in plugins. (Jelmer Vernooij, #793465)
639
* Fix deadlock in `TestImportTariffs.test_simple_serve` when stderr gets
640
more output than fits in the default buffer. This was happening on the
641
Windows buildslave, and could easily happen in other circumstances where
642
the default OS buffer size for pipes is small or the ``python -v``
643
output is large. (Andrew Bennetts, #784802)
645
* Fix spurious test failure on OSX for WorkingTreeFormat2.
646
(Vincent Ladeuil, #787942)
648
* Re-target ``bb.test_merge.TestMerge.test_merge_reversed_revision_range``
649
and rewrite it as a parametrized test to avoid unrelated failures.
650
(Vincent Ladeuil, #795456)
652
* Show log file contents from subprocesses started by
653
`start_bzr_subprocess` in test failure details. This may help diagnose
654
strange hangs and failures involving subprocesses. (Andrew Bennetts)
656
* Skip ``utextwrap`` tests when ``sphinx`` breaks text_wrap by an hostile
657
monkey-patch to textwrap.TextWrapper.wordsep_re.
658
(Vincent Ladeuil, #785098)
660
* Multiple ``selftest --exclude`` options are now combined instead of
661
overriding each other. (Vincent Ladeuil, #746991)
663
* Restore some ``FTPTransport`` test coverage by allowing ``pyftpdlib
664
0.6.0`` to be used. Also restore ``medusa`` support while leaving it
665
disabled to make it easier to use if/when we can in the future.
666
(Vincent Ladeuil, #781140)
668
* `TestImportTariffs` no longer uses the real ``$HOME``. This prevents it
669
from polluting ``$HOME/.bzr.log`` or being accidentally influenced by
670
user configuration such as aliases. It still runs with all the user's
671
plugins enabled, as intended.
672
(Vincent Ladeuil, Andrew Bennetts, #789505)
680
This is the third beta of the 2.4 series, leading to a 2.4.0 release in
681
August 2011. Beta releases are suitable for everyday use but may cause some
682
incompatibilities with plugins.
684
This release includes all bug fixed in previous series known at the time of
688
External Compatibility Breaks
689
*****************************
691
.. These may require users to change the way they use Bazaar.
693
* ``bzr-2.4`` has officially dropped support for python2.4 and python2.5.
694
We will continue to maintain ``bzr-2.3`` for people who still need to
695
use those versions of python. (John Arbash Meinel)
700
.. New commands, options, etc that users may wish to try out.
702
* The text compressor used for 2a repositories now has a tweakable
703
parameter that can be set in bazaar.conf.
704
``bzr.groupcompress.max_entries_per_source`` default of 65536.
705
When doing compression, we build up an index of locations to match
706
against. Setting this higher will result in slightly better compression,
707
at a cost of more memory. Note that a value of 65k represents fully
708
sampling a 1MB file. So this only has an effect when compressing texts
709
larger than N*16 bytes. (John Arbash Meinel, #602614)
714
.. Improvements to existing commands, especially improved performance
715
or memory usage, or better results.
717
* ``bzr branch --stacked`` from a smart server uses the network a little
718
more efficiently. For a simple branch it reduces the number of
719
round-trips by about 20%. (Andrew Bennetts)
721
* ``bzr log --line`` scales the width of the author field with the size of
722
the line. This means that the full author name is shown when the
723
environment variable BZR_COLUMNS=0. (Neil Martinsen-Burrell)
725
* ``bzr pull`` now properly triggers the fast
726
``CHKInventory.iter_changes`` rather than the slow generic
727
inter-Inventory changes. It used to use a ``DirStateRevisionTree`` as
728
one of the source trees, which is faster when we have to read the whole
729
inventory anyway, but much slower when we can get just the delta out of
730
the repository. On a 70k record tree, this changes ``bzr pull`` from 28s
731
down to 17s. (John Arbash Meinel, #780677)
733
* Slightly reduced memory consumption when fetching into a 2a repository
734
by reusing existing caching a little better. (Andrew Bennetts)
736
* Speed up ``bzr status`` by a little bit when there are a couple of
737
modified files. We now track how many files we have seen that need
738
updating, and only rewrite the dirstate file if enough of them have
739
changed. The default is 10, and can be overridden by setting the branch
740
option "``bzr.workingtree.worth_saving_limit``".
741
(Ian Clatworthy, John Arbash Meinel, #380202)
743
* Speed up ``bzr uncommit``. Instead of resetting the dirstate from
744
scratch, use ``update_basis_by_delta``, computing the delta from the
745
repository. (John Arbash Meinel, #780544)
750
.. Fixes for situations where bzr would previously crash or give incorrect
751
or undesirable results.
753
* All Tree types can now be exported as tar.*, zip or directories.
756
* ``bzr merge --no-remember location`` never sets ``submit_branch``.
757
(Vincent Ladeuil, #782169)
759
* ``bzr pull --no-remember location`` never sets
760
``parent_location``. ``bzr push --no-remember location`` never
761
sets ``push_location``. ``bzr send --no-remember
762
submit_location public_location`` never sets ``submit_branch``
763
nor ``public_branch``. (Vincent Ladeuil)
765
* Conflicts involving non-ascii filenames are now properly reported rather
766
than failing with a UnicodeEncodeError. (Martin [GZ], #686161)
768
* Correct parent is now set when using 'switch -b' with bound branches.
769
(A. S. Budden, #513709)
771
* Fix `bzr plugins` regression in bzr 2.4 which resulted in a traceback
772
from writelines on ckj terminals. (Martin [GZ], #754082)
774
* ``WT.inventory`` and ``WT.iter_entries_by_dir()`` was not correctly
775
reporting subdirectories that were tree references (in formats that
776
supported them). (John Arbash Meinel, #764677)
778
* Merging into empty branches now gives an error as this is currently
779
not supported. (Jonathan Riddell, #242175)
781
* Do not show exception to user on pointless commit error.
782
(Jonathan Riddell #317357)
784
* ``WT.update_basis_by_delta`` no longer requires that the deltas match
785
the current WT state. This allows ``update_basis_by_delta`` to be used
786
by more commands than just commit. Updating with a delta allows us to
787
not load the whole inventory, which can take 10+s with large trees.
788
(Jonathan Riddell, John Arbash Meinel, #781168)
790
* ``bzr mv --after old_name new_name`` now works if "new_name" is newly
791
added. (Benoît Pierre)
797
.. Improved or updated documentation.
799
* Restore the workaround for option names including dots (--1.14) which was
800
disabled when we stopped listing --1.9 as a format.
801
(Vincent Ladeuil, #782289)
806
.. Changes that may require updates in plugins or other code that uses
809
* ``annotate_file`` has been deprecated in favor of
810
``annotate_file_revision_tree``. (Jelmer Vernooij, #775598)
812
* ``Branch.fetch`` now takes an optional ``limit`` argument.
813
(Andrew Bennetts, Jelmer Vernooij, #750175)
815
* ``Inter.get`` now raises ``NoCompatibleInter`` if there are no
816
compatible optimisers rather than an instance of the class it is called
817
on. (Jelmer Vernooij)
819
* ``Branch.push`` now takes a ``lossy`` argument.
820
``Branch.lossy_push`` has been removed.
823
* New method ``Repository.get_file_graph`` which can return the
824
per-file revision graph. (Jelmer Vernooij, #775578)
826
* The default implementation of ``Branch`` is now oriented to
827
storing the branch tip. Branch implementations which store the full
828
history should now subclass ``FullHistoryBzrBranch``.
829
``Branch._last_revision_info`` has been renamed to
830
``Branch._read_last_revision_info`` (Jelmer Vernooij)
832
* ``Tree.__iter__`` has been deprecated; use ``Tree.all_file_ids``
833
instead. (Jelmer Vernooij)
835
* ``Tree.get_symlink_target`` now takes an optional ``path``
836
argument. (Jelmer Vernooij)
841
.. Major internal changes, unlikely to be visible to users or plugin
842
developers, but interesting for bzr developers.
844
* ``MutableTree.smart_add`` now uses inventory deltas.
845
(Jelmer Vernooij, #146165)
847
* Removed ``bzrlib.branch._run_with_write_locked_target`` as
848
``bzrlib.cleanup`` provides the same functionality in a more general
849
way. (Andrew Bennetts)
854
.. Fixes and changes that are only relevant to bzr's test framework and
855
suite. This can include new facilities for writing tests, fixes to
856
spurious test failures and changes to the way things should be tested.
858
* A test that was expected to fail but passes instead now counts as a failure
859
catching up with new testtools and subunit handling. (Martin [GZ], #654474)
861
* Make it easier for plugins to reuse the per_workingtree scenarios by
862
restoring the wt_scenarios helper that was accidentally deleted.
863
(Vincent Ladeuil, #783472)
865
* Removed ``test_breakin`` tests that were excessively prone to hanging,
866
did not work on Wine, and partly already disabled.
867
(Martin Pool, #408814, #746985)
869
* Windows locations are different and should be tested accordingly.
870
(Vincent Ladeuil, #788131)
877
This is the second beta of the 2.4 series, leading to a 2.4.0 release in
878
August 2011. Beta releases are suitable for everyday use but may cause some
879
incompatibilities with plugins.
881
This release includes all bug fixed in previous series known at the time of
885
External Compatibility Breaks
886
*****************************
888
.. These may require users to change the way they use Bazaar.
890
* Two command synonyms for ``bzr branch`` have been deprecated, to avoid
891
confusion and to allow the names to later be reused. The removed names
892
are: ``get`` and ``clone``. (Martin Pool, #506265)
897
.. New commands, options, etc that users may wish to try out.
899
* ``bzr commit`` now supports a ``--lossy`` argument that can be used
900
to discard any data that can not be natively represented when committing
901
to a foreign VCS. (Jelmer Vernooij, #587721)
906
.. Improvements to existing commands, especially improved performance
907
or memory usage, or better results.
909
* ``bzr merge`` in large trees is now significantly faster. On a 70k entry
910
tree, the time went from ~3min down to 30s. This also effects ``bzr pull``
911
and ``bzr update`` since they use the same merge logic to update the
912
WorkingTree. (John Arbash Meinel, #759091)
914
* ``bzr revert`` now properly uses ``bzr status``'s optimized
915
``iter_changes``. This can be a significant performance difference (33s
916
to 5s on large trees). (John Arbash Meinel, #759096)
918
* Resolve ``lp:FOO`` urls locally rather than doing an XMLRPC request if
919
the user has done ``bzr launchpad-login``. The bzr+ssh URLs were already
920
being handed off to the remote server anyway (xmlrpc has been mapping
921
``lp:bzr`` to ``bzr+ssh://bazaar.launchpad.net/+branch/bzr``, rather
922
than ``bzr+ssh://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev`` for a few
923
months now.) By doing it ourselves, we can cut out substantial startup
924
time. From Netherlands to London it was taking 368ms to do the XMLRPC
925
call as much as 2s from Sydney. You can test the local logic by using
926
``-Dlaunchpad``. (John Arbash Meinel, #397739)
928
* When building a new WorkingTree (such as during ``bzr co`` or
929
``bzr branch``) we now properly store the stat and hash of files that
930
are old enough. This saves a fair amount of time on the first
931
``bzr status`` (on a 500MB tree, it saves about 30+s).
932
(John Arbash Meinel, #740932)
938
.. Fixes for situations where bzr would previously crash or give incorrect
939
or undesirable results.
941
* Arguments that can't be decoded to unicode in the current posix locale give
942
a clearer error message without a traceback. (Martin [gz], #745712)
944
* ``bzrlib.log._DEFAULT_REQUEST_PARAMS`` is no longer accidentally
945
mutated by ``bzrlib.log._apply_log_request_defaults``. In practice
946
these default values aren't relied on very often so this probably
947
wasn't causing any trouble. (Andrew Bennetts)
949
* ``bzr log`` now works on revisions which are not in the current branch.
950
(Matt Giuca, #241998)
952
* Don't rewrite the dirstate file when non-interesting changes have
953
occurred. This can significantly improve 'bzr status' times when there
954
are only small changes to a large tree.
955
(Ian Clatworthy, John Arbash Meinel, #380202)
957
* Lazy hooks are now reset between test runs. (Jelmer Vernooij, #745566)
959
* ``bzrlib.merge.Merge`` now calls ``iter_changes`` without
960
``include_unversioned=True``. This makes it significantly faster in many
961
cases, because it only looks at modified files, rather than building
962
information about all files. This can cause failures in other
963
TreeTransform code, because it had been expecting to know the names of
964
things which had not changed (such as parent directories). All cases we
965
know about so far have been fixed, but there may be fallout for edge
966
cases that we are missing. (John Arbash Meinel, #759091)
968
* ``SFTPTransport`` is more pro-active about closing file-handles. This
969
reduces the chance of having threads fail from async requests while
970
running the test suite. (John Arbash Meinel, #656170)
972
* Standalone bzr.exe installation on Windows: user can put additional python
973
libraries into ``site-packages`` subdirectory of the installation directory,
974
this might be required for "installing" extra dependencies for some plugins.
975
(Alexander Belchenko, #743256)
977
* ``transform.revert()`` has been updated to use
978
``wt.iter_changes(basis_tree)`` rather than
979
``basis_tree.iter_changes(wt)``. This allows the optimized code path to
980
kick in, improving ``bzr revert`` times significantly (33s to 4s on
981
large trees, 0.7s to 0.3s on small trees.) (John Arbash Meinel, #759096)
983
* ``TreeTransform.create_file/new_file`` can now take an optional ``sha1``
984
parameter. If supplied, when the transform is applied, it will then call
985
``self._tree._observed_sha1`` for those files. This lets us update the
986
hash-cache for content that we create, preventing us from re-reading the
987
content in the next ``bzr status``. (John Arbash Meinel, #740932)
992
* Added a section about using a shared SSH account on a server for bzr+ssh
993
access. (Russell Smith)
995
* The documentation now recommends using SSH rather than SFTP in the
996
tutorials and the examples, because that will generally be much faster
997
and better in cases where it can be used. SFTP is still available and
998
mentioned as an alternative. (Martin Pool, #636712)
1003
.. Changes that may require updates in plugins or other code that uses
1006
* ``Branch.update_revisions`` has been made private and should no
1007
longer be used by external users. Use ``Branch.pull`` or ``Branch.push``
1008
instead. (Jelmer Vernooij, #771765)
1010
* Commands now have an `invoked_as` attribute, showing the name under
1011
which they were called before alias expansion.
1014
* ``Hooks.create_hook`` is now deprecated in favour of ``Hooks.add_hook``.
1017
* If you call `bzrlib.initialize` but forget to enter the resulting object
1018
as a context manager, bzrlib will now be initialized anyhow.
1019
(Previously simple programs calling bzrlib might find the library was
1020
mysteriously silent.)
1023
* Inventory-specific functionality has been split out of ``Tree`` into
1024
a new ``InventoryTree`` class. Tree instances no longer
1025
necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
1027
* Inventory-specific functionality has been split out of ``RevisionTree``
1028
into a new ``InventoryRevisionTree`` class. RevisionTree instances no
1029
longer necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
1031
* New method ``Hooks.uninstall_named_hook``. (Jelmer Vernooij, #301472)
1033
* ``revision_graph_can_have_wrong_parents`` is now an attribute
1034
on ``RepositoryFormat`` rather than a method on ``Repository``.
1037
* ``Testament`` now takes a ``tree`` rather than an
1038
``inventory``. (Jelmer Vernooij, #762608)
1040
* ``TestCase.failUnlessExists`` and ``failIfExists`` are deprecated in
1041
favour of ``assertPathExists`` and ``assertPathDoesNotExist``
1045
* The ``revno`` parameter of ``log.LogRevision`` may now be None,
1046
representing a revision which is not in the current branch.
1047
(Matt Giuca, #241998)
1049
* The various knit pack repository format classes have been moved
1050
from ``bzrlib.repofmt.pack_repo`` to
1051
``bzrlib.repofmt.knitpack_repo``. (Jelmer Vernooij)
1053
* ``RevisionTree`` now has a new method ``get_file_revision``.
1056
* ``WorkingTree`` no longer provides an ``inventory``. Instead,
1057
all inventory-related functionality is now on the subclass
1058
``InventoryWorkingTree`` that all native Bazaar working tree
1059
implementations derive from. (Jelmer Vernooij)
1064
.. Major internal changes, unlikely to be visible to users or plugin
1065
developers, but interesting for bzr developers.
1067
* Added ``osutils.lstat`` and ``osutils.fstat``. These are just the ``os``
1068
functions on Linux, but they are wrapped on Windows so that fstat
1069
matches lstat results across all python versions.
1070
(John Arbash Meinel)
1072
* ``WorkingTree._observed_sha1`` also updates the 'size' column. It
1073
happened to be updated as a side-effect of commit, but if we start using
1074
the function elsewhere we might as well do it directly.
1075
(John Arbash Meinel)
1080
.. Fixes and changes that are only relevant to bzr's test framework and
1081
suite. This can include new facilities for writing tests, fixes to
1082
spurious test failures and changes to the way things should be tested.
1084
* Stop using `failIf`, `failUnless`, `failIfEqual`, etc, that give
1085
`PendingDeprecationWarnings` on Python2.7.
1086
(Martin Pool, #760435)
1094
This is the first beta of the 2.4 series, leading up to a 2.4.0
1095
release in August 2011. Beta releases are suitable for everyday use
1096
but may cause some incompatibilities with plugins. Some plugins may need
1097
small updates to work with 2.4b1.
1099
External Compatibility Breaks
1100
*****************************
1107
* Added ``changelog_merge`` plugin for merging changes to ``Changelog`` files
1108
in GNU format. See ``bzr help changelog_merge`` for details.
1111
* Configuration options can now use references to other options in the same
1112
file by enclosing them with curly brackets (``{other_opt}``). This makes it
1113
possible to use, for example,
1114
``push_location=lp:~vila/bzr/config-{nickname}`` in ``branch.conf`` when
1115
using a loom. During the beta period, the default behaviour is to disable
1116
this feature. It can be activated by declaring ``bzr.config.expand = True``
1117
in ``bazaar.conf``. (Vincent Ladeuil)
1119
* External merge tools can now be configured in bazaar.conf. See
1120
``bzr help configuration`` for more information. (Gordon Tyler, #489915)
1122
* The ``lp:`` directory service now supports Launchpad's QA staging.
1123
(Jelmer Vernooij, #667483)
1128
* A new hidden command ``bzr repair-workingtree``. This is a way to force
1129
the dirstate file to be rebuilt, rather than using a ``bzr checkout``
1130
workaround. (John Arbash Meinel)
1132
* Added a ``Branch.heads_to_fetch`` RPC to the smart server protocol.
1133
This allows formats from plugins (such as looms) to efficiently tell the
1134
client which revisions need to be fetched. (Andrew Bennetts)
1136
* Branching, merging and pulling a branch now copies revisions named in
1137
tags, not just the tag metadata. (Andrew Bennetts, #309682)
1139
* ``bzr cat-revision`` no longer requires a working tree.
1140
(Jelmer Vernooij, #704405)
1142
* ``bzr export --per-file-timestamps`` for .tar.gz files will now
1143
override the mtime for trees exported on Python 2.7 and later, which
1144
expose the 'mtime' field in gzip files. This makes the output of
1145
``bzr export --per-file-timestamps`` for a particular tree
1146
deterministic. (Jelmer Vernooij, #711226)
1148
* ``bzr export --format=zip`` can now export to standard output,
1149
like the other exporters can. (Jelmer Vernooij, #513752)
1151
* ``bzr export`` can now create ``.tar.xz`` and ``.tar.lzma`` files.
1152
(Jelmer Vernooij, #551714)
1154
* Getting all entries from ``CHKInventory.iter_entries_by_dir()`` has been
1155
sped up dramatically for large trees. Iterating by dir is not the best
1156
way to load data from a CHK inventory, so it preloads all the items in
1157
the correct order. (With the gcc-tree, this changes it (re)reading 8GB
1158
of CHK data, down to just 150MB.) This has noticeable affects for things
1159
like building checkouts, etc. (John Arbash Meinel, #737234)
1164
* A MemoryError thrown on the server during a remote operation will now be
1165
usefully reported, and other unexpected errors will include the class name.
1166
(Martin [gz], #722416)
1168
* ``bzr annotate -r-1 file`` will now properly annotate a deleted file.
1169
(Andrew King, #537442)
1171
* ``bzr export`` to zip files will now set a mode on directories.
1172
(Jelmer Vernooij, #207253)
1174
* ``bzr export`` to tgz files will only write out the basename of the
1175
tarfile to the gzip file. (Jelmer Vernooij, #102234)
1177
* ``bzr push --overwrite`` with an older revision specified will now correctly
1178
roll back the target branch. (Jelmer Vernooij, #386576)
1180
* ``bzr lp-propose`` can now propose merges against packaging branches on
1181
Launchpad without requiring the target branch to be specified.
1182
(Jelmer Vernooij, #704647)
1184
* ``bzr lp-propose`` no longer requires a reviewer to be specified. It will
1185
instead leave setting the reviewer up to Launchpad if it was not specified.
1186
(Jelmer Vernooij, #583772)
1188
* ``bzr pull`` will now exit with exit code 1 if there were tag conflicts.
1189
(Jelmer Vernooij, #213185)
1191
* ``bzr mv`` user errors no longer throw UnicodeEncodeError with non-ascii
1192
paths, however they may still print junk if not on a UTF-8 terminal.
1193
(Martin [gz], #707954)
1195
* ``bzr reconfigure --unstacked`` now copies revisions (and their
1196
ancestors) named in tags into the unstacked repository, not just the
1197
ancestry of the branch's tip. (Andrew Bennetts, #401646)
1199
* ``bzr serve`` no longer crashes when a server_started hook is installed and
1200
IPv6 support is available on the system. (Jelmer Vernooij, #293697)
1202
* ``bzr status`` will not rewrite the dirstate file if it only has
1203
'trivial' changes. (Currently limited to dir updates and newly-added
1204
files changing state.) This saves a bit of time for regular operations.
1205
eg. ``bzr status`` in a 100k tree takes 1.4s to compute the status, but 1s
1206
to re-save the dirstate file. (John Arbash Meinel, #765881)
1208
* ``bzr tags`` will no longer choke on branches with ghost revisions in
1209
their mainline and tags on revisions not in the branch ancestry.
1210
(Jelmer Vernooij, #397556)
1212
* ``bzr whoami`` will now display an error if both a new identity and
1213
``--email`` were specified. (Jelmer Vernooij, #680449)
1215
* ``launchpadlib`` doesn't provide the ``uris`` module in some old versions.
1216
(Vincent Ladeuil, #706835)
1218
* Empty entries in the ``NO_PROXY`` variable are no longer treated as matching
1220
(Martin Pool, #586341)
1222
* Plugins incompatible with the current version of bzr no longer produce a
1223
warning on every command invocation. Instead, a message is shown by
1224
``bzr plugins`` and in crash reports.
1225
(#704195, Martin Pool)
1227
* The "pretty" version of ``needs_read_lock`` and ``needs_write_lock`` now
1228
preserves the identity of default parameter values.
1229
(Andrew Bennetts, #718569)
1231
* ``bzr dump-btree --raw`` no longer tracebacks on a B-Tree file
1232
containing no rows. (Eric Siegerman, #715508)
1234
* Fix ``bzr lp-mirror`` to work on command line branch URLs and branches
1235
without an explicit public location. (Max Bowsher)
1237
* On Python 2.6 and higher, use multiprocessing.cpu_count() to retrieve the
1238
number of available processors. (Jelmer Vernooij, #693140)
1243
* Added ``Branch.heads_to_fetch`` method. Implementations of the Branch API
1244
must now inherit or implement this method. (Andrew Bennetts, #721328)
1246
* Added ``bzrlib.mergetools`` module with helper functions for working with
1247
the list of external merge tools. (Gordon Tyler, #489915)
1249
* All methods and arguments that were deprecated before 2.0
1250
have been removed. (Jelmer Vernooij)
1252
* Branch formats should now be registered on the format registry
1253
(``bzrlib.branch.format_registry``) rather than using the class
1254
methods on ``BranchFormat``. (Jelmer Vernooij, #714729)
1256
* ``Branch.set_revision_history`` is now deprecated.
1259
* ``BranchFormat.supports_leaving_lock()`` and
1260
``RepositoryFormat.supports_leaving_lock`` flags have been added.
1263
* ``Branch.fetch`` implementations must now accept an optional
1264
``fetch_tags`` keyword argument. (Andrew Bennetts)
1266
* ``Branch.import_last_revision_info`` is deprecated. Use the
1267
``import_last_revision_info_and_tags`` method instead.
1270
* Because it was too specific to BzrDir implementations,
1271
``ControlDir.sprout`` no longer has a default implementation; it now
1272
raises ``NotImplementedError``. (Jelmer Vernooij, #717937)
1274
* ``bzrlib.deprecated_graph`` has been removed. ``bzrlib.graph``
1275
scales better tree and should be used instead.
1276
(Jelmer Vernooij, #733612)
1278
* ``ControlDirFormat.register_format`` has been removed. Instead,
1279
``Prober`` implementations should now implement a ``known_formats``
1280
method. (Jelmer Vernooij)
1282
* ControlDirFormats can now provide a ``check_status`` method and
1283
raise a custom exception or warning when an unsupported or deprecated
1284
format is being opened. (Jelmer Vernooij, #731311)
1286
* ``bzrlib.revionspec.dwim_revspecs`` is deprecated.
1287
Use ``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_revspec`` and
1288
``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_lazy_revspec``
1289
instead. (Jelmer Vernooij, #721971)
1291
* ``BzrDirFormat`` has a new attribute ``fixed_components`` that
1292
indicates whether the components of the bzrdir can be upgraded
1293
independent of the ``BzrDir``. (Jelmer Vernooij)
1295
* ``BzrProber.register_format`` and ``BzrProber.unregister_format`` are
1296
now deprecated in favour of the ``BzrProber.formats`` format registry.
1299
* ``ControlDir`` implementations no longer have to provide the
1300
``get_branch_transport``, ``get_workingtree_transport`` and
1301
``get_repository_transport`` methods. (Jelmer Vernooij, #730325)
1303
* ``Converter`` has been moved from ``bzrlib.bzrdir`` to
1304
``bzrlib.controldir``. (Jelmer Vernooij)
1306
* Repository formats can now provide
1307
``_get_extra_interrepo_test_combinations`` in the same module
1308
to provide extra test combinations for ``bzrlib.tests.per_repository``.
1311
* Repository formats should now be registered on the format registry
1312
(``bzrlib.repository.format_registry``) rather than using the class
1313
methods on ``RepositoryFormat``. (Jelmer Vernooij)
1315
* Repository formats can now indicate they do not support the full
1316
VersionedFiles API by setting the ``supports_full_versioned_files``
1317
attribute to False. A subset of the VersionedFiles API
1318
(signatures and text graphs) still needs to be supported.
1321
* Repository formats have a new method ``is_deprecated`` that
1322
implementations can override to return True to trigger a deprecation
1323
warning. (Jelmer Vernooij)
1325
* The ``revision_id`` parameter of
1326
``Repository.search_missing_revision_ids`` and
1327
``InterRepository.search_missing_revision_ids`` is deprecated. It is
1328
replaced by the ``revision_ids`` parameter. (Andrew Bennetts)
1330
* Working tree formats should now be registered on the format registry
1331
(``bzrlib.working_tree.format_registry``) rather than using the class
1332
methods on ``WorkingTreeFormat``. (Jelmer Vernooij, #714730)
1334
* Exporting may now be done with a generator
1335
(``bzrlib.export.get_export_generator``) (Geoff/xaav, #791005)
1340
* ``CatchingExceptionThread`` (formerly ThreadWithException) has been moved
1341
out of the ``bzrlib.tests`` hierarchy to make it clearer that it can be used
1342
outside of tests. This class makes it easier to track exceptions in threads
1343
by catching them so they can be re-raised in the controlling thread. It's
1344
available in the ``bzrlib.cethread`` module. (Vincent Ladeuil)
1346
* Correctly propagate malloc failures from diff-delta.c code as MemoryError
1347
so OOM conditions during groupcompress are clearly reported. This entailed a
1348
change to several function signatures. (Martin [gz], #633336)
1350
* ``HookPoint.lazy_hook`` and ``Hooks.install_named_lazy_hook`` can install
1351
hooks for which the callable is loaded lazily. (Jelmer Vernooij)
1356
* The Range parsing for HTTP requests will correctly parse incomplete ranges.
1357
(Vincent Ladeuil, #731240)
1360
vim: tw=74 ft=rst ff=unix