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
* 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)
144
* Corrected documentation for ``bzr serve`` in the Admin Guide.
145
(Morten Bøgeskov, Martin Pool, #832576)
160
* Accept both old and new style testtools output in selftest tests.
161
(Jelmer Vernooij, Martin Packman, #815423)
163
* Fix the race for TestingThreadingTCPServer in
164
test_server_crash_while_responding. (Vincent Ladeuil, #869366)
166
* Really corrupt the pack file without depending on a special length or value.
167
(Vincent Ladeuil, #807032)
175
This is a bugfix release. Upgrading is recommended for all users of earlier
178
It includes fixes from previous stable releases and address some issues with
182
External Compatibility Breaks
183
*****************************
185
.. These may require users to change the way they use Bazaar.
190
.. New commands, options, etc that users may wish to try out.
195
.. Improvements to existing commands, especially improved performance
196
or memory usage, or better results.
201
.. Fixes for situations where bzr would previously crash or give incorrect
202
or undesirable results.
204
* ``config.LocationMatcher`` properly excludes unrelated sections.
205
(Vincent Ladeuil, #829237)
207
* ``dirstate.fdatasync`` and ``repository.fdatasync`` can now properly be
208
disabled. (Vincent Ladeuil, #824513)
210
* Disable ``os.fsync`` and ``os.fdatasync`` by default when running
211
``bzr selftest``. You can use ``--sync`` to re-enable them.
212
(John Arbash Meinel, #837293)
214
* Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
216
* Avoid UnicodeDecode error when reporting EINVAL from transports.
217
(IWATA Hidetaka, #829237)
222
.. Improved or updated documentation.
224
* Corrected documentation for BZR_PROGRESS_BAR.
225
(Dennis Benzinger, #735417)
230
.. Changes that may require updates in plugins or other code that uses
236
.. Major internal changes, unlikely to be visible to users or plugin
237
developers, but interesting for bzr developers.
242
.. Fixes and changes that are only relevant to bzr's test framework and
243
suite. This can include new facilities for writing tests, fixes to
244
spurious test failures and changes to the way things should be tested.
246
* The test suite should now be able to run under weird environments where
247
``/etc/passwd`` doesn't contain the ``uid`` for the user running selftest
248
or where ``fakeroot`` is used but ``/root`` is inacessible.
249
(Vincent Ladeuil, #825027)
256
This release marks the start of a new long-term-stable series. From here, we
257
will only make bugfix releases on the 2.4 series (2.4.1, etc, and support it
258
until February 2013), while 2.5 will become our new development series.
260
This is a bugfix and polish release over the 2.3 series, with a large number
261
of bugs fixed (>150 for the 2.4 series alone), and some performance
262
improvements. Support for python 2.4 and 2.5 has been dropped, many large
263
working tree operations have been optimized as well as some stacked branches
266
Only bugfixes from other stables series have been included since 2.4b5 so
267
all known fixed bugs are included here.
269
Users are encouraged to upgrade from the other stable series.
272
External Compatibility Breaks
273
*****************************
275
.. These may require users to change the way they use Bazaar.
280
.. New commands, options, etc that users may wish to try out.
285
.. Improvements to existing commands, especially improved performance
286
or memory usage, or better results.
291
.. Fixes for situations where bzr would previously crash or give incorrect
292
or undesirable results.
294
* A call to CHKInventory's filter-method will not result in a
295
DuplicateFileId error, if you move a subfolder and change a file in
297
(Bastian Bowe, #809901)
299
* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
300
checks to see if the most recent published source package version for
301
that project is present in the branch tags. This should help developers
302
trust whether the packaging branch is up-to-date and can be used for new
303
changes. The level of verbosity is controlled by the config item
304
``launchpad.packaging_verbosity``. It can be set to one of
311
only display if the branch is out-of-date
314
also display single-line up-to-date and missing,
318
(default) display multi-line content for all states
321
(John Arbash Meinel, #609187, #812928)
323
* Cope with not all Python versions having a ``clear`` method on
324
``TestCase._type_equality_funcs``.
325
(Martin [gz], Jelmer Vernooij, #809048)
327
* Fetching tags when fetching the tip revision of a branch is now
328
controlled by the config setting ``branch.fetch_tags``. The behavior has
329
been reverted to 2.3's not-fetching tagged revisions by default.
330
(John Arbash Meinel, #771184)
332
* The fix for bug #513709 caused us to open a new connection when
333
switching a lightweight checkout that was pointing at a bound branch.
334
This isn't necessary because we know the master URL without opening it,
335
avoiding an extra SSH connection, etc.
336
(John Arbash Meinel, #812285)
342
.. Improved or updated documentation.
347
.. Changes that may require updates in plugins or other code that uses
353
.. Major internal changes, unlikely to be visible to users or plugin
354
developers, but interesting for bzr developers.
359
.. Fixes and changes that are only relevant to bzr's test framework and
360
suite. This can include new facilities for writing tests, fixes to
361
spurious test failures and changes to the way things should be tested.
363
* `BranchBuilder.build_snapshot` now supports a "flush" action. This
364
cleanly and reliably allows tests using `BranchBuilder` to construct
365
branches that e.g. rename files out of a directory and unversion that
366
directory in the same revision. Previously some changes were impossible
367
due to the order that `build_snapshot` performs its actions.
370
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
371
just compares the bytes in the dirstate file to its pristine state,
372
rather than opening the WorkingTree and calling ``last_revision()``.
373
This reduces the overall test suite time by about 10% on my laptop.
382
This is the fifth (and last) beta of the 2.4 series leading to
383
2.4.0 release in August 2011. Beta releases are suitable for
384
everyday use but may cause some incompatibilities with plugins.
386
This release includes all bug fixed in previous series known at
387
the time of this release.
389
External Compatibility Breaks
390
*****************************
397
* New command ``verify-signatures`` to check if all commits or specified commits
398
have digital signatures from trusted keys. Requires python-gpgme to be
401
* New option ``--signatures`` for ``bzr log`` to display digital signature
402
verification results for each commit.
404
* Config option acceptable_keys to list which GPG keys are verified as trusted.
406
* Config option validate_signatures_in_log to always show signatures in
412
* ``Branch.open`` is now about 3x faster (about 2ms instead of 6.5ms).
415
* Pack, dirstate, and index files are synced to persistent storage if
416
possible when writing finishes, to reduce the risk of problems caused by
417
a machine crash or similar problem. This can be turned off through the
418
``dirstate.fdatasync`` and ``repository.fdatasync`` options, which can
419
be set in ``locations.conf`` or ``bazaar.conf``. (Martin Pool,
425
* Display a proper error message when a config file content cannot be
426
decoded as UTF-8 or when it cannot be parsed.
427
(Vincent Ladeuil, #502060, #688677, #797246)
429
* Generate a single conflict (instead of two) when merging a branch
430
modifying and renaming a file in a branch that deleted it (or vice-versa).
431
(Vincent Ladeuil, #688101)
433
* Give a more helpful message when the bzr executable doesn't match the
434
library. (This typically happens because of a misconfigured PYTHONPATH
435
or half-installed bzr.)
436
(Martin Pool, #804553)
438
* Properly load utf8-encoded config files. (Vincent Ladeuil, #799212)
440
* ``GraphThunkIdsToKeys.merge_sort`` now properly returns
441
keys rather than ids. (Jelmer Vernooij, #799677)
443
* ``TreeTransformBase.fixup_new_roots`` can now check that a tree root
444
is present. (Jelmer Vernooij, #801257)
449
* New attributes ``WorkingTreeFormat.supports_versioned_directories`` and
450
``RepositoryFormat.supports_versioned_directories``.
451
(Jelmer Vernooij, #765815)
453
* The "revno" field type when using the python version-info format is now
454
a string (to handle dotted revnos) (Benoît Pierre, #796259)
459
* Start implementing localization, starting with command help text (but not
460
the command options themselves). This will allow bootstrapping the bzr
461
internationalization process. (Inada Naoki)
466
* Fix test failures when running as a homeless user (debian buildd). Tests
467
leaking into ``${HOME}/.bzr.log`` should be detected properly now.
468
(Vincent Ladeuil, #798698)
475
This is the fourth beta of the 2.4 series, leading to a 2.4.0 release in
476
August 2011. Beta releases are suitable for everyday use but may cause some
477
incompatibilities with plugins.
479
This release includes all bug fixed in previous series known at the time of
483
External Compatibility Breaks
484
*****************************
486
.. These may require users to change the way they use Bazaar.
488
* Do not treat configuration option 'check_signatures = require' as if
489
it were 'create_signatures = always' (Jonathan Riddell)
494
.. New commands, options, etc that users may wish to try out.
496
* Hooks have been added for config stacks: ``get``, ``set`` and ``remove``
497
are called when an option is respectively read, modified or deleted. Also
498
added ``load`` and ``save`` hooks for config stores, called when the
499
stores are loaded or saved. (Vincent Ladeuil)
501
* New hook server_exception in bzrlib.smart.server to catch any
502
exception caused while running bzr serve.
503
(Jonathan Riddell, #274578)
505
* New hook set_commit_message in bzrlib.msgeditor to set a commit message
506
and revision properties. (Jonathan Riddell, #274578)
508
* Support ``-S`` as an alias for ``--short`` for the ``log`` and
509
``missing`` commands. (Martin von Gagern, #38655)
514
.. Improvements to existing commands, especially improved performance
515
or memory usage, or better results.
517
* ``bzr annotate`` can be run without setting whoami data first.
518
(Jonathan Riddell, #667408)
523
.. Fixes for situations where bzr would previously crash or give incorrect
524
or undesirable results.
526
* Bazaar can now detect when a lock file is held by a dead process
527
originating from the same machine, and steal the lock after printing a
528
message to the user. This is off by default, for safety, but can be
529
turned on by setting the configuration variable ``locks.steal_dead`` to
531
(Martin Pool, #220464)
533
* ``bzr version-info`` now works when the tree is on a dotted revno.
534
(Benoît Pierre, #796259)
536
* Credentials in the log output produced by ``-Dhttp`` are masked so users
537
can more freely post them in bug reports. (Vincent Ladeuil, #723074)
539
* Fix a race condition for ``server_started`` hooks leading to a spurious
540
test failure. (Vincent Ladeuil, #789167)
542
* Fix exporting subdirectory with ``--per-file-timestamps``.
543
(Szilveszter Farkas, #795557)
545
* Handle files that get created but don't get used during TreeTransform.
546
``open()`` can create a file, and still raise an exception before it
547
returns. So anything we might have created, make sure we destroy during
548
``finalize()``. (Martin [gz], #597686)
550
* ``pack_repo`` now uses ``Transport.move`` instead of
551
``Transport.rename``, deleting any existing targets even on SFTP.
552
(Martin von Gagern, #421776)
554
* Pass the ``build_mo`` command to the rest of the setup() calls in
555
setup.py. The ``bdist_wininst`` and ``py2exe`` code paths were failing
556
because ``build_mo`` became a required step that they didn't know about.
557
(John Arbash Meinel, #787122)
559
* Preserve existing ``root-id`` when merging an unrelated branch.
560
(Aaron Bentley, #806356)
562
* Properly avoid re-adding a file after it changes case on CICP
563
filesystems. (John Arbash Meinel, #798130)
565
* Reports the original error when an InvalidHttpResponse exception is
566
encountered to facilitate debug. (Vincent Ladeuil, #788530)
568
* Reports a non-existent file error when trying to merge in a file
569
that does not exist. (Jonathan Riddell, #330063)
571
* ``UIFactory.prompt``, ``UIFactory.get_username``,
572
``UIFactory.get_password`` and ``UIFactory.get_boolean`` now require a
573
unicode prompt to be passed in. (Jelmer Vernooij, #592083)
575
* Support merging into the empty tree. (Aaron Bentley, #595328)
580
.. Improved or updated documentation.
582
* Improve documentation of ``bzr merge --force``.
583
(Neil Martinsen-Burrell, #767307)
585
* Make docs for configuration options for digital signatures match
586
reality. (Jonathan Riddell)
588
* Add user-guide page on GPG signatures. (Jonathan Riddell)
593
.. Changes that may require updates in plugins or other code that uses
596
* Checking for a file id in a `Tree` or `Inventory` using ``in`` is now
597
deprecated. Instead, use `has_id`.
600
* Exporters are now all exposed as generators, rather than as single-call
601
functions, so that calling code can take stream the output.
604
* Information about held lockdir locks returned from eg `LockDir.peek` is
605
now represented as a `LockHeldInfo` object, rather than a plain
609
* Remove `file_status` function.
612
* ``Repository.iter_reverse_revision_history`` is now deprecated.
613
Use ``Graph.iter_lefthand_ancestry`` instead.
614
(Jelmer Vernooij, #739481)
616
* ``Repository.get_ancestry`` has been deprecated. Use
617
``Graph.iter_ancestry`` instead.
618
(Jelmer Vernooij, #784511)
623
.. Major internal changes, unlikely to be visible to users or plugin
624
developers, but interesting for bzr developers.
626
* ``tools/check-newsbugs.py`` accepts a ``--browser`` option to open
627
corresponding launchpad pages in a browser. (Vincent Ladeuil)
632
.. Fixes and changes that are only relevant to bzr's test framework and
633
suite. This can include new facilities for writing tests, fixes to
634
spurious test failures and changes to the way things should be tested.
636
* A `ImportTariffTestCase` base class has been added in
637
``bzrlib.tests.test_import_tariff``, which can be used for import tariff
638
tests in plugins. (Jelmer Vernooij, #793465)
640
* Fix deadlock in `TestImportTariffs.test_simple_serve` when stderr gets
641
more output than fits in the default buffer. This was happening on the
642
Windows buildslave, and could easily happen in other circumstances where
643
the default OS buffer size for pipes is small or the ``python -v``
644
output is large. (Andrew Bennetts, #784802)
646
* Fix spurious test failure on OSX for WorkingTreeFormat2.
647
(Vincent Ladeuil, #787942)
649
* Re-target ``bb.test_merge.TestMerge.test_merge_reversed_revision_range``
650
and rewrite it as a parametrized test to avoid unrelated failures.
651
(Vincent Ladeuil, #795456)
653
* Show log file contents from subprocesses started by
654
`start_bzr_subprocess` in test failure details. This may help diagnose
655
strange hangs and failures involving subprocesses. (Andrew Bennetts)
657
* Skip ``utextwrap`` tests when ``sphinx`` breaks text_wrap by an hostile
658
monkey-patch to textwrap.TextWrapper.wordsep_re.
659
(Vincent Ladeuil, #785098)
661
* Multiple ``selftest --exclude`` options are now combined instead of
662
overriding each other. (Vincent Ladeuil, #746991)
664
* Restore some ``FTPTransport`` test coverage by allowing ``pyftpdlib
665
0.6.0`` to be used. Also restore ``medusa`` support while leaving it
666
disabled to make it easier to use if/when we can in the future.
667
(Vincent Ladeuil, #781140)
669
* `TestImportTariffs` no longer uses the real ``$HOME``. This prevents it
670
from polluting ``$HOME/.bzr.log`` or being accidentally influenced by
671
user configuration such as aliases. It still runs with all the user's
672
plugins enabled, as intended.
673
(Vincent Ladeuil, Andrew Bennetts, #789505)
681
This is the third beta of the 2.4 series, leading to a 2.4.0 release in
682
August 2011. Beta releases are suitable for everyday use but may cause some
683
incompatibilities with plugins.
685
This release includes all bug fixed in previous series known at the time of
689
External Compatibility Breaks
690
*****************************
692
.. These may require users to change the way they use Bazaar.
694
* ``bzr-2.4`` has officially dropped support for python2.4 and python2.5.
695
We will continue to maintain ``bzr-2.3`` for people who still need to
696
use those versions of python. (John Arbash Meinel)
701
.. New commands, options, etc that users may wish to try out.
703
* The text compressor used for 2a repositories now has a tweakable
704
parameter that can be set in bazaar.conf.
705
``bzr.groupcompress.max_entries_per_source`` default of 65536.
706
When doing compression, we build up an index of locations to match
707
against. Setting this higher will result in slightly better compression,
708
at a cost of more memory. Note that a value of 65k represents fully
709
sampling a 1MB file. So this only has an effect when compressing texts
710
larger than N*16 bytes. (John Arbash Meinel, #602614)
715
.. Improvements to existing commands, especially improved performance
716
or memory usage, or better results.
718
* ``bzr branch --stacked`` from a smart server uses the network a little
719
more efficiently. For a simple branch it reduces the number of
720
round-trips by about 20%. (Andrew Bennetts)
722
* ``bzr log --line`` scales the width of the author field with the size of
723
the line. This means that the full author name is shown when the
724
environment variable BZR_COLUMNS=0. (Neil Martinsen-Burrell)
726
* ``bzr pull`` now properly triggers the fast
727
``CHKInventory.iter_changes`` rather than the slow generic
728
inter-Inventory changes. It used to use a ``DirStateRevisionTree`` as
729
one of the source trees, which is faster when we have to read the whole
730
inventory anyway, but much slower when we can get just the delta out of
731
the repository. On a 70k record tree, this changes ``bzr pull`` from 28s
732
down to 17s. (John Arbash Meinel, #780677)
734
* Slightly reduced memory consumption when fetching into a 2a repository
735
by reusing existing caching a little better. (Andrew Bennetts)
737
* Speed up ``bzr status`` by a little bit when there are a couple of
738
modified files. We now track how many files we have seen that need
739
updating, and only rewrite the dirstate file if enough of them have
740
changed. The default is 10, and can be overridden by setting the branch
741
option "``bzr.workingtree.worth_saving_limit``".
742
(Ian Clatworthy, John Arbash Meinel, #380202)
744
* Speed up ``bzr uncommit``. Instead of resetting the dirstate from
745
scratch, use ``update_basis_by_delta``, computing the delta from the
746
repository. (John Arbash Meinel, #780544)
751
.. Fixes for situations where bzr would previously crash or give incorrect
752
or undesirable results.
754
* All Tree types can now be exported as tar.*, zip or directories.
757
* ``bzr merge --no-remember location`` never sets ``submit_branch``.
758
(Vincent Ladeuil, #782169)
760
* ``bzr pull --no-remember location`` never sets
761
``parent_location``. ``bzr push --no-remember location`` never
762
sets ``push_location``. ``bzr send --no-remember
763
submit_location public_location`` never sets ``submit_branch``
764
nor ``public_branch``. (Vincent Ladeuil)
766
* Conflicts involving non-ascii filenames are now properly reported rather
767
than failing with a UnicodeEncodeError. (Martin [GZ], #686161)
769
* Correct parent is now set when using 'switch -b' with bound branches.
770
(A. S. Budden, #513709)
772
* Fix `bzr plugins` regression in bzr 2.4 which resulted in a traceback
773
from writelines on ckj terminals. (Martin [GZ], #754082)
775
* ``WT.inventory`` and ``WT.iter_entries_by_dir()`` was not correctly
776
reporting subdirectories that were tree references (in formats that
777
supported them). (John Arbash Meinel, #764677)
779
* Merging into empty branches now gives an error as this is currently
780
not supported. (Jonathan Riddell, #242175)
782
* Do not show exception to user on pointless commit error.
783
(Jonathan Riddell #317357)
785
* ``WT.update_basis_by_delta`` no longer requires that the deltas match
786
the current WT state. This allows ``update_basis_by_delta`` to be used
787
by more commands than just commit. Updating with a delta allows us to
788
not load the whole inventory, which can take 10+s with large trees.
789
(Jonathan Riddell, John Arbash Meinel, #781168)
791
* ``bzr mv --after old_name new_name`` now works if "new_name" is newly
792
added. (Benoît Pierre)
798
.. Improved or updated documentation.
800
* Restore the workaround for option names including dots (--1.14) which was
801
disabled when we stopped listing --1.9 as a format.
802
(Vincent Ladeuil, #782289)
807
.. Changes that may require updates in plugins or other code that uses
810
* ``annotate_file`` has been deprecated in favor of
811
``annotate_file_revision_tree``. (Jelmer Vernooij, #775598)
813
* ``Branch.fetch`` now takes an optional ``limit`` argument.
814
(Andrew Bennetts, Jelmer Vernooij, #750175)
816
* ``Inter.get`` now raises ``NoCompatibleInter`` if there are no
817
compatible optimisers rather than an instance of the class it is called
818
on. (Jelmer Vernooij)
820
* ``Branch.push`` now takes a ``lossy`` argument.
821
``Branch.lossy_push`` has been removed.
824
* New method ``Repository.get_file_graph`` which can return the
825
per-file revision graph. (Jelmer Vernooij, #775578)
827
* The default implementation of ``Branch`` is now oriented to
828
storing the branch tip. Branch implementations which store the full
829
history should now subclass ``FullHistoryBzrBranch``.
830
``Branch._last_revision_info`` has been renamed to
831
``Branch._read_last_revision_info`` (Jelmer Vernooij)
833
* ``Tree.__iter__`` has been deprecated; use ``Tree.all_file_ids``
834
instead. (Jelmer Vernooij)
836
* ``Tree.get_symlink_target`` now takes an optional ``path``
837
argument. (Jelmer Vernooij)
842
.. Major internal changes, unlikely to be visible to users or plugin
843
developers, but interesting for bzr developers.
845
* ``MutableTree.smart_add`` now uses inventory deltas.
846
(Jelmer Vernooij, #146165)
848
* Removed ``bzrlib.branch._run_with_write_locked_target`` as
849
``bzrlib.cleanup`` provides the same functionality in a more general
850
way. (Andrew Bennetts)
855
.. Fixes and changes that are only relevant to bzr's test framework and
856
suite. This can include new facilities for writing tests, fixes to
857
spurious test failures and changes to the way things should be tested.
859
* A test that was expected to fail but passes instead now counts as a failure
860
catching up with new testtools and subunit handling. (Martin [GZ], #654474)
862
* Make it easier for plugins to reuse the per_workingtree scenarios by
863
restoring the wt_scenarios helper that was accidentally deleted.
864
(Vincent Ladeuil, #783472)
866
* Removed ``test_breakin`` tests that were excessively prone to hanging,
867
did not work on Wine, and partly already disabled.
868
(Martin Pool, #408814, #746985)
870
* Windows locations are different and should be tested accordingly.
871
(Vincent Ladeuil, #788131)
878
This is the second beta of the 2.4 series, leading to a 2.4.0 release in
879
August 2011. Beta releases are suitable for everyday use but may cause some
880
incompatibilities with plugins.
882
This release includes all bug fixed in previous series known at the time of
886
External Compatibility Breaks
887
*****************************
889
.. These may require users to change the way they use Bazaar.
891
* Two command synonyms for ``bzr branch`` have been deprecated, to avoid
892
confusion and to allow the names to later be reused. The removed names
893
are: ``get`` and ``clone``. (Martin Pool, #506265)
898
.. New commands, options, etc that users may wish to try out.
900
* ``bzr commit`` now supports a ``--lossy`` argument that can be used
901
to discard any data that can not be natively represented when committing
902
to a foreign VCS. (Jelmer Vernooij, #587721)
907
.. Improvements to existing commands, especially improved performance
908
or memory usage, or better results.
910
* ``bzr merge`` in large trees is now significantly faster. On a 70k entry
911
tree, the time went from ~3min down to 30s. This also effects ``bzr pull``
912
and ``bzr update`` since they use the same merge logic to update the
913
WorkingTree. (John Arbash Meinel, #759091)
915
* ``bzr revert`` now properly uses ``bzr status``'s optimized
916
``iter_changes``. This can be a significant performance difference (33s
917
to 5s on large trees). (John Arbash Meinel, #759096)
919
* Resolve ``lp:FOO`` urls locally rather than doing an XMLRPC request if
920
the user has done ``bzr launchpad-login``. The bzr+ssh URLs were already
921
being handed off to the remote server anyway (xmlrpc has been mapping
922
``lp:bzr`` to ``bzr+ssh://bazaar.launchpad.net/+branch/bzr``, rather
923
than ``bzr+ssh://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev`` for a few
924
months now.) By doing it ourselves, we can cut out substantial startup
925
time. From Netherlands to London it was taking 368ms to do the XMLRPC
926
call as much as 2s from Sydney. You can test the local logic by using
927
``-Dlaunchpad``. (John Arbash Meinel, #397739)
929
* When building a new WorkingTree (such as during ``bzr co`` or
930
``bzr branch``) we now properly store the stat and hash of files that
931
are old enough. This saves a fair amount of time on the first
932
``bzr status`` (on a 500MB tree, it saves about 30+s).
933
(John Arbash Meinel, #740932)
939
.. Fixes for situations where bzr would previously crash or give incorrect
940
or undesirable results.
942
* Arguments that can't be decoded to unicode in the current posix locale give
943
a clearer error message without a traceback. (Martin [gz], #745712)
945
* ``bzrlib.log._DEFAULT_REQUEST_PARAMS`` is no longer accidentally
946
mutated by ``bzrlib.log._apply_log_request_defaults``. In practice
947
these default values aren't relied on very often so this probably
948
wasn't causing any trouble. (Andrew Bennetts)
950
* ``bzr log`` now works on revisions which are not in the current branch.
951
(Matt Giuca, #241998)
953
* Don't rewrite the dirstate file when non-interesting changes have
954
occurred. This can significantly improve 'bzr status' times when there
955
are only small changes to a large tree.
956
(Ian Clatworthy, John Arbash Meinel, #380202)
958
* Lazy hooks are now reset between test runs. (Jelmer Vernooij, #745566)
960
* ``bzrlib.merge.Merge`` now calls ``iter_changes`` without
961
``include_unversioned=True``. This makes it significantly faster in many
962
cases, because it only looks at modified files, rather than building
963
information about all files. This can cause failures in other
964
TreeTransform code, because it had been expecting to know the names of
965
things which had not changed (such as parent directories). All cases we
966
know about so far have been fixed, but there may be fallout for edge
967
cases that we are missing. (John Arbash Meinel, #759091)
969
* ``SFTPTransport`` is more pro-active about closing file-handles. This
970
reduces the chance of having threads fail from async requests while
971
running the test suite. (John Arbash Meinel, #656170)
973
* Standalone bzr.exe installation on Windows: user can put additional python
974
libraries into ``site-packages`` subdirectory of the installation directory,
975
this might be required for "installing" extra dependencies for some plugins.
976
(Alexander Belchenko, #743256)
978
* ``transform.revert()`` has been updated to use
979
``wt.iter_changes(basis_tree)`` rather than
980
``basis_tree.iter_changes(wt)``. This allows the optimized code path to
981
kick in, improving ``bzr revert`` times significantly (33s to 4s on
982
large trees, 0.7s to 0.3s on small trees.) (John Arbash Meinel, #759096)
984
* ``TreeTransform.create_file/new_file`` can now take an optional ``sha1``
985
parameter. If supplied, when the transform is applied, it will then call
986
``self._tree._observed_sha1`` for those files. This lets us update the
987
hash-cache for content that we create, preventing us from re-reading the
988
content in the next ``bzr status``. (John Arbash Meinel, #740932)
993
* Added a section about using a shared SSH account on a server for bzr+ssh
994
access. (Russell Smith)
996
* The documentation now recommends using SSH rather than SFTP in the
997
tutorials and the examples, because that will generally be much faster
998
and better in cases where it can be used. SFTP is still available and
999
mentioned as an alternative. (Martin Pool, #636712)
1004
.. Changes that may require updates in plugins or other code that uses
1007
* ``Branch.update_revisions`` has been made private and should no
1008
longer be used by external users. Use ``Branch.pull`` or ``Branch.push``
1009
instead. (Jelmer Vernooij, #771765)
1011
* Commands now have an `invoked_as` attribute, showing the name under
1012
which they were called before alias expansion.
1015
* ``Hooks.create_hook`` is now deprecated in favour of ``Hooks.add_hook``.
1018
* If you call `bzrlib.initialize` but forget to enter the resulting object
1019
as a context manager, bzrlib will now be initialized anyhow.
1020
(Previously simple programs calling bzrlib might find the library was
1021
mysteriously silent.)
1024
* Inventory-specific functionality has been split out of ``Tree`` into
1025
a new ``InventoryTree`` class. Tree instances no longer
1026
necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
1028
* Inventory-specific functionality has been split out of ``RevisionTree``
1029
into a new ``InventoryRevisionTree`` class. RevisionTree instances no
1030
longer necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
1032
* New method ``Hooks.uninstall_named_hook``. (Jelmer Vernooij, #301472)
1034
* ``revision_graph_can_have_wrong_parents`` is now an attribute
1035
on ``RepositoryFormat`` rather than a method on ``Repository``.
1038
* ``Testament`` now takes a ``tree`` rather than an
1039
``inventory``. (Jelmer Vernooij, #762608)
1041
* ``TestCase.failUnlessExists`` and ``failIfExists`` are deprecated in
1042
favour of ``assertPathExists`` and ``assertPathDoesNotExist``
1046
* The ``revno`` parameter of ``log.LogRevision`` may now be None,
1047
representing a revision which is not in the current branch.
1048
(Matt Giuca, #241998)
1050
* The various knit pack repository format classes have been moved
1051
from ``bzrlib.repofmt.pack_repo`` to
1052
``bzrlib.repofmt.knitpack_repo``. (Jelmer Vernooij)
1054
* ``RevisionTree`` now has a new method ``get_file_revision``.
1057
* ``WorkingTree`` no longer provides an ``inventory``. Instead,
1058
all inventory-related functionality is now on the subclass
1059
``InventoryWorkingTree`` that all native Bazaar working tree
1060
implementations derive from. (Jelmer Vernooij)
1065
.. Major internal changes, unlikely to be visible to users or plugin
1066
developers, but interesting for bzr developers.
1068
* Added ``osutils.lstat`` and ``osutils.fstat``. These are just the ``os``
1069
functions on Linux, but they are wrapped on Windows so that fstat
1070
matches lstat results across all python versions.
1071
(John Arbash Meinel)
1073
* ``WorkingTree._observed_sha1`` also updates the 'size' column. It
1074
happened to be updated as a side-effect of commit, but if we start using
1075
the function elsewhere we might as well do it directly.
1076
(John Arbash Meinel)
1081
.. Fixes and changes that are only relevant to bzr's test framework and
1082
suite. This can include new facilities for writing tests, fixes to
1083
spurious test failures and changes to the way things should be tested.
1085
* Stop using `failIf`, `failUnless`, `failIfEqual`, etc, that give
1086
`PendingDeprecationWarnings` on Python2.7.
1087
(Martin Pool, #760435)
1095
This is the first beta of the 2.4 series, leading up to a 2.4.0
1096
release in August 2011. Beta releases are suitable for everyday use
1097
but may cause some incompatibilities with plugins. Some plugins may need
1098
small updates to work with 2.4b1.
1100
External Compatibility Breaks
1101
*****************************
1108
* Added ``changelog_merge`` plugin for merging changes to ``Changelog`` files
1109
in GNU format. See ``bzr help changelog_merge`` for details.
1112
* Configuration options can now use references to other options in the same
1113
file by enclosing them with curly brackets (``{other_opt}``). This makes it
1114
possible to use, for example,
1115
``push_location=lp:~vila/bzr/config-{nickname}`` in ``branch.conf`` when
1116
using a loom. During the beta period, the default behaviour is to disable
1117
this feature. It can be activated by declaring ``bzr.config.expand = True``
1118
in ``bazaar.conf``. (Vincent Ladeuil)
1120
* External merge tools can now be configured in bazaar.conf. See
1121
``bzr help configuration`` for more information. (Gordon Tyler, #489915)
1123
* The ``lp:`` directory service now supports Launchpad's QA staging.
1124
(Jelmer Vernooij, #667483)
1129
* A new hidden command ``bzr repair-workingtree``. This is a way to force
1130
the dirstate file to be rebuilt, rather than using a ``bzr checkout``
1131
workaround. (John Arbash Meinel)
1133
* Added a ``Branch.heads_to_fetch`` RPC to the smart server protocol.
1134
This allows formats from plugins (such as looms) to efficiently tell the
1135
client which revisions need to be fetched. (Andrew Bennetts)
1137
* Branching, merging and pulling a branch now copies revisions named in
1138
tags, not just the tag metadata. (Andrew Bennetts, #309682)
1140
* ``bzr cat-revision`` no longer requires a working tree.
1141
(Jelmer Vernooij, #704405)
1143
* ``bzr export --per-file-timestamps`` for .tar.gz files will now
1144
override the mtime for trees exported on Python 2.7 and later, which
1145
expose the 'mtime' field in gzip files. This makes the output of
1146
``bzr export --per-file-timestamps`` for a particular tree
1147
deterministic. (Jelmer Vernooij, #711226)
1149
* ``bzr export --format=zip`` can now export to standard output,
1150
like the other exporters can. (Jelmer Vernooij, #513752)
1152
* ``bzr export`` can now create ``.tar.xz`` and ``.tar.lzma`` files.
1153
(Jelmer Vernooij, #551714)
1155
* Getting all entries from ``CHKInventory.iter_entries_by_dir()`` has been
1156
sped up dramatically for large trees. Iterating by dir is not the best
1157
way to load data from a CHK inventory, so it preloads all the items in
1158
the correct order. (With the gcc-tree, this changes it (re)reading 8GB
1159
of CHK data, down to just 150MB.) This has noticeable affects for things
1160
like building checkouts, etc. (John Arbash Meinel, #737234)
1165
* A MemoryError thrown on the server during a remote operation will now be
1166
usefully reported, and other unexpected errors will include the class name.
1167
(Martin [gz], #722416)
1169
* ``bzr annotate -r-1 file`` will now properly annotate a deleted file.
1170
(Andrew King, #537442)
1172
* ``bzr export`` to zip files will now set a mode on directories.
1173
(Jelmer Vernooij, #207253)
1175
* ``bzr export`` to tgz files will only write out the basename of the
1176
tarfile to the gzip file. (Jelmer Vernooij, #102234)
1178
* ``bzr push --overwrite`` with an older revision specified will now correctly
1179
roll back the target branch. (Jelmer Vernooij, #386576)
1181
* ``bzr lp-propose`` can now propose merges against packaging branches on
1182
Launchpad without requiring the target branch to be specified.
1183
(Jelmer Vernooij, #704647)
1185
* ``bzr lp-propose`` no longer requires a reviewer to be specified. It will
1186
instead leave setting the reviewer up to Launchpad if it was not specified.
1187
(Jelmer Vernooij, #583772)
1189
* ``bzr pull`` will now exit with exit code 1 if there were tag conflicts.
1190
(Jelmer Vernooij, #213185)
1192
* ``bzr mv`` user errors no longer throw UnicodeEncodeError with non-ascii
1193
paths, however they may still print junk if not on a UTF-8 terminal.
1194
(Martin [gz], #707954)
1196
* ``bzr reconfigure --unstacked`` now copies revisions (and their
1197
ancestors) named in tags into the unstacked repository, not just the
1198
ancestry of the branch's tip. (Andrew Bennetts, #401646)
1200
* ``bzr serve`` no longer crashes when a server_started hook is installed and
1201
IPv6 support is available on the system. (Jelmer Vernooij, #293697)
1203
* ``bzr status`` will not rewrite the dirstate file if it only has
1204
'trivial' changes. (Currently limited to dir updates and newly-added
1205
files changing state.) This saves a bit of time for regular operations.
1206
eg. ``bzr status`` in a 100k tree takes 1.4s to compute the status, but 1s
1207
to re-save the dirstate file. (John Arbash Meinel, #765881)
1209
* ``bzr tags`` will no longer choke on branches with ghost revisions in
1210
their mainline and tags on revisions not in the branch ancestry.
1211
(Jelmer Vernooij, #397556)
1213
* ``bzr whoami`` will now display an error if both a new identity and
1214
``--email`` were specified. (Jelmer Vernooij, #680449)
1216
* ``launchpadlib`` doesn't provide the ``uris`` module in some old versions.
1217
(Vincent Ladeuil, #706835)
1219
* Empty entries in the ``NO_PROXY`` variable are no longer treated as matching
1221
(Martin Pool, #586341)
1223
* Plugins incompatible with the current version of bzr no longer produce a
1224
warning on every command invocation. Instead, a message is shown by
1225
``bzr plugins`` and in crash reports.
1226
(#704195, Martin Pool)
1228
* The "pretty" version of ``needs_read_lock`` and ``needs_write_lock`` now
1229
preserves the identity of default parameter values.
1230
(Andrew Bennetts, #718569)
1232
* ``bzr dump-btree --raw`` no longer tracebacks on a B-Tree file
1233
containing no rows. (Eric Siegerman, #715508)
1235
* Fix ``bzr lp-mirror`` to work on command line branch URLs and branches
1236
without an explicit public location. (Max Bowsher)
1238
* On Python 2.6 and higher, use multiprocessing.cpu_count() to retrieve the
1239
number of available processors. (Jelmer Vernooij, #693140)
1244
* Added ``Branch.heads_to_fetch`` method. Implementations of the Branch API
1245
must now inherit or implement this method. (Andrew Bennetts, #721328)
1247
* Added ``bzrlib.mergetools`` module with helper functions for working with
1248
the list of external merge tools. (Gordon Tyler, #489915)
1250
* All methods and arguments that were deprecated before 2.0
1251
have been removed. (Jelmer Vernooij)
1253
* Branch formats should now be registered on the format registry
1254
(``bzrlib.branch.format_registry``) rather than using the class
1255
methods on ``BranchFormat``. (Jelmer Vernooij, #714729)
1257
* ``Branch.set_revision_history`` is now deprecated.
1260
* ``BranchFormat.supports_leaving_lock()`` and
1261
``RepositoryFormat.supports_leaving_lock`` flags have been added.
1264
* ``Branch.fetch`` implementations must now accept an optional
1265
``fetch_tags`` keyword argument. (Andrew Bennetts)
1267
* ``Branch.import_last_revision_info`` is deprecated. Use the
1268
``import_last_revision_info_and_tags`` method instead.
1271
* Because it was too specific to BzrDir implementations,
1272
``ControlDir.sprout`` no longer has a default implementation; it now
1273
raises ``NotImplementedError``. (Jelmer Vernooij, #717937)
1275
* ``bzrlib.deprecated_graph`` has been removed. ``bzrlib.graph``
1276
scales better tree and should be used instead.
1277
(Jelmer Vernooij, #733612)
1279
* ``ControlDirFormat.register_format`` has been removed. Instead,
1280
``Prober`` implementations should now implement a ``known_formats``
1281
method. (Jelmer Vernooij)
1283
* ControlDirFormats can now provide a ``check_status`` method and
1284
raise a custom exception or warning when an unsupported or deprecated
1285
format is being opened. (Jelmer Vernooij, #731311)
1287
* ``bzrlib.revionspec.dwim_revspecs`` is deprecated.
1288
Use ``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_revspec`` and
1289
``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_lazy_revspec``
1290
instead. (Jelmer Vernooij, #721971)
1292
* ``BzrDirFormat`` has a new attribute ``fixed_components`` that
1293
indicates whether the components of the bzrdir can be upgraded
1294
independent of the ``BzrDir``. (Jelmer Vernooij)
1296
* ``BzrProber.register_format`` and ``BzrProber.unregister_format`` are
1297
now deprecated in favour of the ``BzrProber.formats`` format registry.
1300
* ``ControlDir`` implementations no longer have to provide the
1301
``get_branch_transport``, ``get_workingtree_transport`` and
1302
``get_repository_transport`` methods. (Jelmer Vernooij, #730325)
1304
* ``Converter`` has been moved from ``bzrlib.bzrdir`` to
1305
``bzrlib.controldir``. (Jelmer Vernooij)
1307
* Repository formats can now provide
1308
``_get_extra_interrepo_test_combinations`` in the same module
1309
to provide extra test combinations for ``bzrlib.tests.per_repository``.
1312
* Repository formats should now be registered on the format registry
1313
(``bzrlib.repository.format_registry``) rather than using the class
1314
methods on ``RepositoryFormat``. (Jelmer Vernooij)
1316
* Repository formats can now indicate they do not support the full
1317
VersionedFiles API by setting the ``supports_full_versioned_files``
1318
attribute to False. A subset of the VersionedFiles API
1319
(signatures and text graphs) still needs to be supported.
1322
* Repository formats have a new method ``is_deprecated`` that
1323
implementations can override to return True to trigger a deprecation
1324
warning. (Jelmer Vernooij)
1326
* The ``revision_id`` parameter of
1327
``Repository.search_missing_revision_ids`` and
1328
``InterRepository.search_missing_revision_ids`` is deprecated. It is
1329
replaced by the ``revision_ids`` parameter. (Andrew Bennetts)
1331
* Working tree formats should now be registered on the format registry
1332
(``bzrlib.working_tree.format_registry``) rather than using the class
1333
methods on ``WorkingTreeFormat``. (Jelmer Vernooij, #714730)
1335
* Exporting may now be done with a generator
1336
(``bzrlib.export.get_export_generator``) (Geoff/xaav, #791005)
1341
* ``CatchingExceptionThread`` (formerly ThreadWithException) has been moved
1342
out of the ``bzrlib.tests`` hierarchy to make it clearer that it can be used
1343
outside of tests. This class makes it easier to track exceptions in threads
1344
by catching them so they can be re-raised in the controlling thread. It's
1345
available in the ``bzrlib.cethread`` module. (Vincent Ladeuil)
1347
* Correctly propagate malloc failures from diff-delta.c code as MemoryError
1348
so OOM conditions during groupcompress are clearly reported. This entailed a
1349
change to several function signatures. (Martin [gz], #633336)
1351
* ``HookPoint.lazy_hook`` and ``Hooks.install_named_lazy_hook`` can install
1352
hooks for which the callable is loaded lazily. (Jelmer Vernooij)
1357
* The Range parsing for HTTP requests will correctly parse incomplete ranges.
1358
(Vincent Ladeuil, #731240)
1361
vim: tw=74 ft=rst ff=unix