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
* During merges, when two entries end up using the same path for two
39
different file-ids (the same file being 'bzr added' in two different
40
branches) , 'duplicate' conflicts are created instead of 'content'
41
ones. This was previously leading to a 'Malformed tramsform' exception.
42
(Vincent Ladeuil, #880701)
44
* Fix a traceback when trying to checkout a tree that also has an entry
45
with file-id `TREE_ROOT` somewhere other than at the root directory.
46
(John Arbash Meinel, #830947)
48
* Handle when an uncommit/update tries to add a file to an otherwise empty
49
directory. The ``Dirstate.update_basis_by_delta`` would end up
50
incorrectly flagging the delta as invalid. (Brian de Alwis, #855155)
52
* 'Malformed transform' exceptions are now recognized as internal errors
53
instead of user errors and report a traceback. This will reduce user
54
confusion as there is generally nothing users can do about them.
55
(Vincent Ladeuil, #880701)
57
* Prevent a traceback being printed to stderr when logging has problems and
58
accept utf-8 byte string without breaking. (Martin Packman, #714449)
60
* Some filesystems give ``EOPNOTSUPP`` when trying to call ``fdatasync``.
61
This shouldn't be treated as a fatal error.
62
(John Arbash Meinel, #1075108)
64
* Teach the bzr client how to reconnect if we get ``ConnectionReset``
65
while making an RPC request. This doesn't handle all possible network
66
disconnects, but it should at least handle when the server is asked to
67
shutdown gracefully. This is a backport of the functionality in bzr-2.5.
68
(John Arbash Meinel, #819604)
70
* Use ``encoding_type='exact'`` for ``bzr testament`` so that on Windows
71
the sha hash of the long testament matches the sha hash in the short
72
form. (John Arbash Meinel, #1010339)
74
* When the ``limbo`` or ``pending-deletion`` directories exist, typically
75
because of an interrupted tree update, but are empty, bzr no longer
76
errors out, because there is nothing for the user to clean up. Also,
77
errors in creation of these directories are no longer squelched.
78
(Martin Pool, #427773)
80
* _Win32Stat object provides members st_uid and st_gid, those are present
81
in Python's os.stat object. These members required for external tools like
82
bzr-git and dulwich. (Alexander Belchenko, #967060)
87
.. Improved or updated documentation.
92
.. Changes that may require updates in plugins or other code that uses
98
.. Major internal changes, unlikely to be visible to users or plugin
99
developers, but interesting for bzr developers.
104
.. Fixes and changes that are only relevant to bzr's test framework and
105
suite. This can include new facilities for writing tests, fixes to
106
spurious test failures and changes to the way things should be tested.
108
* Account for slightly improved compression with newer versions of zlib in
109
``bt.test_btree_index`` tests. (Martin Packman, #940453)
117
This is a bugfix release. Most of the bugs dealt with portability
118
issues. Upgrading is recommended for all users of earlier 2.4 releases.
120
External Compatibility Breaks
121
*****************************
133
* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
134
every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
139
* Fixed an infinite loop when creating a repo at the root of the filesystem,
140
i.e. "/", due to posixpath.normpath() not collapsing 2 leading slashes into
141
one, thus respecting the POSIX standard, but making relpath() loop infinitely.
142
(Florian Vichot, #861008)
144
* Fixed loading of external merge tools from config to properly decode
145
command-lines which contain embedded quotes. (Gordon Tyler, #828803)
147
* Include declaration of 'changed' to avoid an UnboundLocalError in dirstate
148
pyrex code with new Cython versions. (Denys Duchier, #837221)
150
* Prevent several kinds of OverflowError and other fallout from failing to fit
151
stat fields into four bytes in dirstate pack_stat implementations.
152
(Martin Packman, #683191 #706957)
154
* Return early from create_delta_index_from_delta given tiny inputs. This
155
avoids raising a spurious MemoryError on certain platforms such as AIX.
156
(John Arbash Meinel, #856731)
161
* Corrected documentation for ``bzr serve`` in the Admin Guide.
162
(Morten Bøgeskov, Martin Pool, #832576)
177
* Accept both old and new style testtools output in selftest tests.
178
(Jelmer Vernooij, Martin Packman, #815423)
180
* Fix the race for TestingThreadingTCPServer in
181
test_server_crash_while_responding. (Vincent Ladeuil, #869366)
183
* Really corrupt the pack file without depending on a special length or value.
184
(Vincent Ladeuil, #807032)
192
This is a bugfix release. Upgrading is recommended for all users of earlier
195
It includes fixes from previous stable releases and address some issues with
199
External Compatibility Breaks
200
*****************************
202
.. These may require users to change the way they use Bazaar.
207
.. New commands, options, etc that users may wish to try out.
212
.. Improvements to existing commands, especially improved performance
213
or memory usage, or better results.
218
.. Fixes for situations where bzr would previously crash or give incorrect
219
or undesirable results.
221
* ``config.LocationMatcher`` properly excludes unrelated sections.
222
(Vincent Ladeuil, #829237)
224
* ``dirstate.fdatasync`` and ``repository.fdatasync`` can now properly be
225
disabled. (Vincent Ladeuil, #824513)
227
* Disable ``os.fsync`` and ``os.fdatasync`` by default when running
228
``bzr selftest``. You can use ``--sync`` to re-enable them.
229
(John Arbash Meinel, #837293)
231
* Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
233
* Avoid UnicodeDecode error when reporting EINVAL from transports.
234
(IWATA Hidetaka, #829237)
239
.. Improved or updated documentation.
241
* Corrected documentation for BZR_PROGRESS_BAR.
242
(Dennis Benzinger, #735417)
247
.. Changes that may require updates in plugins or other code that uses
253
.. Major internal changes, unlikely to be visible to users or plugin
254
developers, but interesting for bzr developers.
259
.. Fixes and changes that are only relevant to bzr's test framework and
260
suite. This can include new facilities for writing tests, fixes to
261
spurious test failures and changes to the way things should be tested.
263
* The test suite should now be able to run under weird environments where
264
``/etc/passwd`` doesn't contain the ``uid`` for the user running selftest
265
or where ``fakeroot`` is used but ``/root`` is inacessible.
266
(Vincent Ladeuil, #825027)
273
This release marks the start of a new long-term-stable series. From here, we
274
will only make bugfix releases on the 2.4 series (2.4.1, etc, and support it
275
until February 2013), while 2.5 will become our new development series.
277
This is a bugfix and polish release over the 2.3 series, with a large number
278
of bugs fixed (>150 for the 2.4 series alone), and some performance
279
improvements. Support for python 2.4 and 2.5 has been dropped, many large
280
working tree operations have been optimized as well as some stacked branches
283
Only bugfixes from other stables series have been included since 2.4b5 so
284
all known fixed bugs are included here.
286
Users are encouraged to upgrade from the other stable series.
289
External Compatibility Breaks
290
*****************************
292
.. These may require users to change the way they use Bazaar.
297
.. New commands, options, etc that users may wish to try out.
302
.. Improvements to existing commands, especially improved performance
303
or memory usage, or better results.
308
.. Fixes for situations where bzr would previously crash or give incorrect
309
or undesirable results.
311
* A call to CHKInventory's filter-method will not result in a
312
DuplicateFileId error, if you move a subfolder and change a file in
314
(Bastian Bowe, #809901)
316
* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
317
checks to see if the most recent published source package version for
318
that project is present in the branch tags. This should help developers
319
trust whether the packaging branch is up-to-date and can be used for new
320
changes. The level of verbosity is controlled by the config item
321
``launchpad.packaging_verbosity``. It can be set to one of
328
only display if the branch is out-of-date
331
also display single-line up-to-date and missing,
335
(default) display multi-line content for all states
338
(John Arbash Meinel, #609187, #812928)
340
* Cope with not all Python versions having a ``clear`` method on
341
``TestCase._type_equality_funcs``.
342
(Martin [gz], Jelmer Vernooij, #809048)
344
* Fetching tags when fetching the tip revision of a branch is now
345
controlled by the config setting ``branch.fetch_tags``. The behavior has
346
been reverted to 2.3's not-fetching tagged revisions by default.
347
(John Arbash Meinel, #771184)
349
* The fix for bug #513709 caused us to open a new connection when
350
switching a lightweight checkout that was pointing at a bound branch.
351
This isn't necessary because we know the master URL without opening it,
352
avoiding an extra SSH connection, etc.
353
(John Arbash Meinel, #812285)
359
.. Improved or updated documentation.
364
.. Changes that may require updates in plugins or other code that uses
370
.. Major internal changes, unlikely to be visible to users or plugin
371
developers, but interesting for bzr developers.
376
.. Fixes and changes that are only relevant to bzr's test framework and
377
suite. This can include new facilities for writing tests, fixes to
378
spurious test failures and changes to the way things should be tested.
380
* `BranchBuilder.build_snapshot` now supports a "flush" action. This
381
cleanly and reliably allows tests using `BranchBuilder` to construct
382
branches that e.g. rename files out of a directory and unversion that
383
directory in the same revision. Previously some changes were impossible
384
due to the order that `build_snapshot` performs its actions.
387
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
388
just compares the bytes in the dirstate file to its pristine state,
389
rather than opening the WorkingTree and calling ``last_revision()``.
390
This reduces the overall test suite time by about 10% on my laptop.
399
This is the fifth (and last) beta of the 2.4 series leading to
400
2.4.0 release in August 2011. Beta releases are suitable for
401
everyday use but may cause some incompatibilities with plugins.
403
This release includes all bug fixed in previous series known at
404
the time of this release.
406
External Compatibility Breaks
407
*****************************
414
* New command ``verify-signatures`` to check if all commits or specified commits
415
have digital signatures from trusted keys. Requires python-gpgme to be
418
* New option ``--signatures`` for ``bzr log`` to display digital signature
419
verification results for each commit.
421
* Config option acceptable_keys to list which GPG keys are verified as trusted.
423
* Config option validate_signatures_in_log to always show signatures in
429
* ``Branch.open`` is now about 3x faster (about 2ms instead of 6.5ms).
432
* Pack, dirstate, and index files are synced to persistent storage if
433
possible when writing finishes, to reduce the risk of problems caused by
434
a machine crash or similar problem. This can be turned off through the
435
``dirstate.fdatasync`` and ``repository.fdatasync`` options, which can
436
be set in ``locations.conf`` or ``bazaar.conf``. (Martin Pool,
442
* Display a proper error message when a config file content cannot be
443
decoded as UTF-8 or when it cannot be parsed.
444
(Vincent Ladeuil, #502060, #688677, #797246)
446
* Generate a single conflict (instead of two) when merging a branch
447
modifying and renaming a file in a branch that deleted it (or vice-versa).
448
(Vincent Ladeuil, #688101)
450
* Give a more helpful message when the bzr executable doesn't match the
451
library. (This typically happens because of a misconfigured PYTHONPATH
452
or half-installed bzr.)
453
(Martin Pool, #804553)
455
* Properly load utf8-encoded config files. (Vincent Ladeuil, #799212)
457
* ``GraphThunkIdsToKeys.merge_sort`` now properly returns
458
keys rather than ids. (Jelmer Vernooij, #799677)
460
* ``TreeTransformBase.fixup_new_roots`` can now check that a tree root
461
is present. (Jelmer Vernooij, #801257)
466
* New attributes ``WorkingTreeFormat.supports_versioned_directories`` and
467
``RepositoryFormat.supports_versioned_directories``.
468
(Jelmer Vernooij, #765815)
470
* The "revno" field type when using the python version-info format is now
471
a string (to handle dotted revnos) (Benoît Pierre, #796259)
476
* Start implementing localization, starting with command help text (but not
477
the command options themselves). This will allow bootstrapping the bzr
478
internationalization process. (Inada Naoki)
483
* Fix test failures when running as a homeless user (debian buildd). Tests
484
leaking into ``${HOME}/.bzr.log`` should be detected properly now.
485
(Vincent Ladeuil, #798698)
492
This is the fourth beta of the 2.4 series, leading to a 2.4.0 release in
493
August 2011. Beta releases are suitable for everyday use but may cause some
494
incompatibilities with plugins.
496
This release includes all bug fixed in previous series known at the time of
500
External Compatibility Breaks
501
*****************************
503
.. These may require users to change the way they use Bazaar.
505
* Do not treat configuration option 'check_signatures = require' as if
506
it were 'create_signatures = always' (Jonathan Riddell)
511
.. New commands, options, etc that users may wish to try out.
513
* Hooks have been added for config stacks: ``get``, ``set`` and ``remove``
514
are called when an option is respectively read, modified or deleted. Also
515
added ``load`` and ``save`` hooks for config stores, called when the
516
stores are loaded or saved. (Vincent Ladeuil)
518
* New hook server_exception in bzrlib.smart.server to catch any
519
exception caused while running bzr serve.
520
(Jonathan Riddell, #274578)
522
* New hook set_commit_message in bzrlib.msgeditor to set a commit message
523
and revision properties. (Jonathan Riddell, #274578)
525
* Support ``-S`` as an alias for ``--short`` for the ``log`` and
526
``missing`` commands. (Martin von Gagern, #38655)
531
.. Improvements to existing commands, especially improved performance
532
or memory usage, or better results.
534
* ``bzr annotate`` can be run without setting whoami data first.
535
(Jonathan Riddell, #667408)
540
.. Fixes for situations where bzr would previously crash or give incorrect
541
or undesirable results.
543
* Bazaar can now detect when a lock file is held by a dead process
544
originating from the same machine, and steal the lock after printing a
545
message to the user. This is off by default, for safety, but can be
546
turned on by setting the configuration variable ``locks.steal_dead`` to
548
(Martin Pool, #220464)
550
* ``bzr version-info`` now works when the tree is on a dotted revno.
551
(Benoît Pierre, #796259)
553
* Credentials in the log output produced by ``-Dhttp`` are masked so users
554
can more freely post them in bug reports. (Vincent Ladeuil, #723074)
556
* Fix a race condition for ``server_started`` hooks leading to a spurious
557
test failure. (Vincent Ladeuil, #789167)
559
* Fix exporting subdirectory with ``--per-file-timestamps``.
560
(Szilveszter Farkas, #795557)
562
* Handle files that get created but don't get used during TreeTransform.
563
``open()`` can create a file, and still raise an exception before it
564
returns. So anything we might have created, make sure we destroy during
565
``finalize()``. (Martin [gz], #597686)
567
* ``pack_repo`` now uses ``Transport.move`` instead of
568
``Transport.rename``, deleting any existing targets even on SFTP.
569
(Martin von Gagern, #421776)
571
* Pass the ``build_mo`` command to the rest of the setup() calls in
572
setup.py. The ``bdist_wininst`` and ``py2exe`` code paths were failing
573
because ``build_mo`` became a required step that they didn't know about.
574
(John Arbash Meinel, #787122)
576
* Preserve existing ``root-id`` when merging an unrelated branch.
577
(Aaron Bentley, #806356)
579
* Properly avoid re-adding a file after it changes case on CICP
580
filesystems. (John Arbash Meinel, #798130)
582
* Reports the original error when an InvalidHttpResponse exception is
583
encountered to facilitate debug. (Vincent Ladeuil, #788530)
585
* Reports a non-existent file error when trying to merge in a file
586
that does not exist. (Jonathan Riddell, #330063)
588
* ``UIFactory.prompt``, ``UIFactory.get_username``,
589
``UIFactory.get_password`` and ``UIFactory.get_boolean`` now require a
590
unicode prompt to be passed in. (Jelmer Vernooij, #592083)
592
* Support merging into the empty tree. (Aaron Bentley, #595328)
597
.. Improved or updated documentation.
599
* Improve documentation of ``bzr merge --force``.
600
(Neil Martinsen-Burrell, #767307)
602
* Make docs for configuration options for digital signatures match
603
reality. (Jonathan Riddell)
605
* Add user-guide page on GPG signatures. (Jonathan Riddell)
610
.. Changes that may require updates in plugins or other code that uses
613
* Checking for a file id in a `Tree` or `Inventory` using ``in`` is now
614
deprecated. Instead, use `has_id`.
617
* Exporters are now all exposed as generators, rather than as single-call
618
functions, so that calling code can take stream the output.
621
* Information about held lockdir locks returned from eg `LockDir.peek` is
622
now represented as a `LockHeldInfo` object, rather than a plain
626
* Remove `file_status` function.
629
* ``Repository.iter_reverse_revision_history`` is now deprecated.
630
Use ``Graph.iter_lefthand_ancestry`` instead.
631
(Jelmer Vernooij, #739481)
633
* ``Repository.get_ancestry`` has been deprecated. Use
634
``Graph.iter_ancestry`` instead.
635
(Jelmer Vernooij, #784511)
640
.. Major internal changes, unlikely to be visible to users or plugin
641
developers, but interesting for bzr developers.
643
* ``tools/check-newsbugs.py`` accepts a ``--browser`` option to open
644
corresponding launchpad pages in a browser. (Vincent Ladeuil)
649
.. Fixes and changes that are only relevant to bzr's test framework and
650
suite. This can include new facilities for writing tests, fixes to
651
spurious test failures and changes to the way things should be tested.
653
* A `ImportTariffTestCase` base class has been added in
654
``bzrlib.tests.test_import_tariff``, which can be used for import tariff
655
tests in plugins. (Jelmer Vernooij, #793465)
657
* Fix deadlock in `TestImportTariffs.test_simple_serve` when stderr gets
658
more output than fits in the default buffer. This was happening on the
659
Windows buildslave, and could easily happen in other circumstances where
660
the default OS buffer size for pipes is small or the ``python -v``
661
output is large. (Andrew Bennetts, #784802)
663
* Fix spurious test failure on OSX for WorkingTreeFormat2.
664
(Vincent Ladeuil, #787942)
666
* Re-target ``bb.test_merge.TestMerge.test_merge_reversed_revision_range``
667
and rewrite it as a parametrized test to avoid unrelated failures.
668
(Vincent Ladeuil, #795456)
670
* Show log file contents from subprocesses started by
671
`start_bzr_subprocess` in test failure details. This may help diagnose
672
strange hangs and failures involving subprocesses. (Andrew Bennetts)
674
* Skip ``utextwrap`` tests when ``sphinx`` breaks text_wrap by an hostile
675
monkey-patch to textwrap.TextWrapper.wordsep_re.
676
(Vincent Ladeuil, #785098)
678
* Multiple ``selftest --exclude`` options are now combined instead of
679
overriding each other. (Vincent Ladeuil, #746991)
681
* Restore some ``FTPTransport`` test coverage by allowing ``pyftpdlib
682
0.6.0`` to be used. Also restore ``medusa`` support while leaving it
683
disabled to make it easier to use if/when we can in the future.
684
(Vincent Ladeuil, #781140)
686
* `TestImportTariffs` no longer uses the real ``$HOME``. This prevents it
687
from polluting ``$HOME/.bzr.log`` or being accidentally influenced by
688
user configuration such as aliases. It still runs with all the user's
689
plugins enabled, as intended.
690
(Vincent Ladeuil, Andrew Bennetts, #789505)
698
This is the third beta of the 2.4 series, leading to a 2.4.0 release in
699
August 2011. Beta releases are suitable for everyday use but may cause some
700
incompatibilities with plugins.
702
This release includes all bug fixed in previous series known at the time of
706
External Compatibility Breaks
707
*****************************
709
.. These may require users to change the way they use Bazaar.
711
* ``bzr-2.4`` has officially dropped support for python2.4 and python2.5.
712
We will continue to maintain ``bzr-2.3`` for people who still need to
713
use those versions of python. (John Arbash Meinel)
718
.. New commands, options, etc that users may wish to try out.
720
* The text compressor used for 2a repositories now has a tweakable
721
parameter that can be set in bazaar.conf.
722
``bzr.groupcompress.max_entries_per_source`` default of 65536.
723
When doing compression, we build up an index of locations to match
724
against. Setting this higher will result in slightly better compression,
725
at a cost of more memory. Note that a value of 65k represents fully
726
sampling a 1MB file. So this only has an effect when compressing texts
727
larger than N*16 bytes. (John Arbash Meinel, #602614)
732
.. Improvements to existing commands, especially improved performance
733
or memory usage, or better results.
735
* ``bzr branch --stacked`` from a smart server uses the network a little
736
more efficiently. For a simple branch it reduces the number of
737
round-trips by about 20%. (Andrew Bennetts)
739
* ``bzr log --line`` scales the width of the author field with the size of
740
the line. This means that the full author name is shown when the
741
environment variable BZR_COLUMNS=0. (Neil Martinsen-Burrell)
743
* ``bzr pull`` now properly triggers the fast
744
``CHKInventory.iter_changes`` rather than the slow generic
745
inter-Inventory changes. It used to use a ``DirStateRevisionTree`` as
746
one of the source trees, which is faster when we have to read the whole
747
inventory anyway, but much slower when we can get just the delta out of
748
the repository. On a 70k record tree, this changes ``bzr pull`` from 28s
749
down to 17s. (John Arbash Meinel, #780677)
751
* Slightly reduced memory consumption when fetching into a 2a repository
752
by reusing existing caching a little better. (Andrew Bennetts)
754
* Speed up ``bzr status`` by a little bit when there are a couple of
755
modified files. We now track how many files we have seen that need
756
updating, and only rewrite the dirstate file if enough of them have
757
changed. The default is 10, and can be overridden by setting the branch
758
option "``bzr.workingtree.worth_saving_limit``".
759
(Ian Clatworthy, John Arbash Meinel, #380202)
761
* Speed up ``bzr uncommit``. Instead of resetting the dirstate from
762
scratch, use ``update_basis_by_delta``, computing the delta from the
763
repository. (John Arbash Meinel, #780544)
768
.. Fixes for situations where bzr would previously crash or give incorrect
769
or undesirable results.
771
* All Tree types can now be exported as tar.*, zip or directories.
774
* ``bzr merge --no-remember location`` never sets ``submit_branch``.
775
(Vincent Ladeuil, #782169)
777
* ``bzr pull --no-remember location`` never sets
778
``parent_location``. ``bzr push --no-remember location`` never
779
sets ``push_location``. ``bzr send --no-remember
780
submit_location public_location`` never sets ``submit_branch``
781
nor ``public_branch``. (Vincent Ladeuil)
783
* Conflicts involving non-ascii filenames are now properly reported rather
784
than failing with a UnicodeEncodeError. (Martin [GZ], #686161)
786
* Correct parent is now set when using 'switch -b' with bound branches.
787
(A. S. Budden, #513709)
789
* Fix `bzr plugins` regression in bzr 2.4 which resulted in a traceback
790
from writelines on ckj terminals. (Martin [GZ], #754082)
792
* ``WT.inventory`` and ``WT.iter_entries_by_dir()`` was not correctly
793
reporting subdirectories that were tree references (in formats that
794
supported them). (John Arbash Meinel, #764677)
796
* Merging into empty branches now gives an error as this is currently
797
not supported. (Jonathan Riddell, #242175)
799
* Do not show exception to user on pointless commit error.
800
(Jonathan Riddell #317357)
802
* ``WT.update_basis_by_delta`` no longer requires that the deltas match
803
the current WT state. This allows ``update_basis_by_delta`` to be used
804
by more commands than just commit. Updating with a delta allows us to
805
not load the whole inventory, which can take 10+s with large trees.
806
(Jonathan Riddell, John Arbash Meinel, #781168)
808
* ``bzr mv --after old_name new_name`` now works if "new_name" is newly
809
added. (Benoît Pierre)
815
.. Improved or updated documentation.
817
* Restore the workaround for option names including dots (--1.14) which was
818
disabled when we stopped listing --1.9 as a format.
819
(Vincent Ladeuil, #782289)
824
.. Changes that may require updates in plugins or other code that uses
827
* ``annotate_file`` has been deprecated in favor of
828
``annotate_file_revision_tree``. (Jelmer Vernooij, #775598)
830
* ``Branch.fetch`` now takes an optional ``limit`` argument.
831
(Andrew Bennetts, Jelmer Vernooij, #750175)
833
* ``Inter.get`` now raises ``NoCompatibleInter`` if there are no
834
compatible optimisers rather than an instance of the class it is called
835
on. (Jelmer Vernooij)
837
* ``Branch.push`` now takes a ``lossy`` argument.
838
``Branch.lossy_push`` has been removed.
841
* New method ``Repository.get_file_graph`` which can return the
842
per-file revision graph. (Jelmer Vernooij, #775578)
844
* The default implementation of ``Branch`` is now oriented to
845
storing the branch tip. Branch implementations which store the full
846
history should now subclass ``FullHistoryBzrBranch``.
847
``Branch._last_revision_info`` has been renamed to
848
``Branch._read_last_revision_info`` (Jelmer Vernooij)
850
* ``Tree.__iter__`` has been deprecated; use ``Tree.all_file_ids``
851
instead. (Jelmer Vernooij)
853
* ``Tree.get_symlink_target`` now takes an optional ``path``
854
argument. (Jelmer Vernooij)
859
.. Major internal changes, unlikely to be visible to users or plugin
860
developers, but interesting for bzr developers.
862
* ``MutableTree.smart_add`` now uses inventory deltas.
863
(Jelmer Vernooij, #146165)
865
* Removed ``bzrlib.branch._run_with_write_locked_target`` as
866
``bzrlib.cleanup`` provides the same functionality in a more general
867
way. (Andrew Bennetts)
872
.. Fixes and changes that are only relevant to bzr's test framework and
873
suite. This can include new facilities for writing tests, fixes to
874
spurious test failures and changes to the way things should be tested.
876
* A test that was expected to fail but passes instead now counts as a failure
877
catching up with new testtools and subunit handling. (Martin [GZ], #654474)
879
* Make it easier for plugins to reuse the per_workingtree scenarios by
880
restoring the wt_scenarios helper that was accidentally deleted.
881
(Vincent Ladeuil, #783472)
883
* Removed ``test_breakin`` tests that were excessively prone to hanging,
884
did not work on Wine, and partly already disabled.
885
(Martin Pool, #408814, #746985)
887
* Windows locations are different and should be tested accordingly.
888
(Vincent Ladeuil, #788131)
895
This is the second beta of the 2.4 series, leading to a 2.4.0 release in
896
August 2011. Beta releases are suitable for everyday use but may cause some
897
incompatibilities with plugins.
899
This release includes all bug fixed in previous series known at the time of
903
External Compatibility Breaks
904
*****************************
906
.. These may require users to change the way they use Bazaar.
908
* Two command synonyms for ``bzr branch`` have been deprecated, to avoid
909
confusion and to allow the names to later be reused. The removed names
910
are: ``get`` and ``clone``. (Martin Pool, #506265)
915
.. New commands, options, etc that users may wish to try out.
917
* ``bzr commit`` now supports a ``--lossy`` argument that can be used
918
to discard any data that can not be natively represented when committing
919
to a foreign VCS. (Jelmer Vernooij, #587721)
924
.. Improvements to existing commands, especially improved performance
925
or memory usage, or better results.
927
* ``bzr merge`` in large trees is now significantly faster. On a 70k entry
928
tree, the time went from ~3min down to 30s. This also effects ``bzr pull``
929
and ``bzr update`` since they use the same merge logic to update the
930
WorkingTree. (John Arbash Meinel, #759091)
932
* ``bzr revert`` now properly uses ``bzr status``'s optimized
933
``iter_changes``. This can be a significant performance difference (33s
934
to 5s on large trees). (John Arbash Meinel, #759096)
936
* Resolve ``lp:FOO`` urls locally rather than doing an XMLRPC request if
937
the user has done ``bzr launchpad-login``. The bzr+ssh URLs were already
938
being handed off to the remote server anyway (xmlrpc has been mapping
939
``lp:bzr`` to ``bzr+ssh://bazaar.launchpad.net/+branch/bzr``, rather
940
than ``bzr+ssh://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev`` for a few
941
months now.) By doing it ourselves, we can cut out substantial startup
942
time. From Netherlands to London it was taking 368ms to do the XMLRPC
943
call as much as 2s from Sydney. You can test the local logic by using
944
``-Dlaunchpad``. (John Arbash Meinel, #397739)
946
* When building a new WorkingTree (such as during ``bzr co`` or
947
``bzr branch``) we now properly store the stat and hash of files that
948
are old enough. This saves a fair amount of time on the first
949
``bzr status`` (on a 500MB tree, it saves about 30+s).
950
(John Arbash Meinel, #740932)
956
.. Fixes for situations where bzr would previously crash or give incorrect
957
or undesirable results.
959
* Arguments that can't be decoded to unicode in the current posix locale give
960
a clearer error message without a traceback. (Martin [gz], #745712)
962
* ``bzrlib.log._DEFAULT_REQUEST_PARAMS`` is no longer accidentally
963
mutated by ``bzrlib.log._apply_log_request_defaults``. In practice
964
these default values aren't relied on very often so this probably
965
wasn't causing any trouble. (Andrew Bennetts)
967
* ``bzr log`` now works on revisions which are not in the current branch.
968
(Matt Giuca, #241998)
970
* Don't rewrite the dirstate file when non-interesting changes have
971
occurred. This can significantly improve 'bzr status' times when there
972
are only small changes to a large tree.
973
(Ian Clatworthy, John Arbash Meinel, #380202)
975
* Lazy hooks are now reset between test runs. (Jelmer Vernooij, #745566)
977
* ``bzrlib.merge.Merge`` now calls ``iter_changes`` without
978
``include_unversioned=True``. This makes it significantly faster in many
979
cases, because it only looks at modified files, rather than building
980
information about all files. This can cause failures in other
981
TreeTransform code, because it had been expecting to know the names of
982
things which had not changed (such as parent directories). All cases we
983
know about so far have been fixed, but there may be fallout for edge
984
cases that we are missing. (John Arbash Meinel, #759091)
986
* ``SFTPTransport`` is more pro-active about closing file-handles. This
987
reduces the chance of having threads fail from async requests while
988
running the test suite. (John Arbash Meinel, #656170)
990
* Standalone bzr.exe installation on Windows: user can put additional python
991
libraries into ``site-packages`` subdirectory of the installation directory,
992
this might be required for "installing" extra dependencies for some plugins.
993
(Alexander Belchenko, #743256)
995
* ``transform.revert()`` has been updated to use
996
``wt.iter_changes(basis_tree)`` rather than
997
``basis_tree.iter_changes(wt)``. This allows the optimized code path to
998
kick in, improving ``bzr revert`` times significantly (33s to 4s on
999
large trees, 0.7s to 0.3s on small trees.) (John Arbash Meinel, #759096)
1001
* ``TreeTransform.create_file/new_file`` can now take an optional ``sha1``
1002
parameter. If supplied, when the transform is applied, it will then call
1003
``self._tree._observed_sha1`` for those files. This lets us update the
1004
hash-cache for content that we create, preventing us from re-reading the
1005
content in the next ``bzr status``. (John Arbash Meinel, #740932)
1010
* Added a section about using a shared SSH account on a server for bzr+ssh
1011
access. (Russell Smith)
1013
* The documentation now recommends using SSH rather than SFTP in the
1014
tutorials and the examples, because that will generally be much faster
1015
and better in cases where it can be used. SFTP is still available and
1016
mentioned as an alternative. (Martin Pool, #636712)
1021
.. Changes that may require updates in plugins or other code that uses
1024
* ``Branch.update_revisions`` has been made private and should no
1025
longer be used by external users. Use ``Branch.pull`` or ``Branch.push``
1026
instead. (Jelmer Vernooij, #771765)
1028
* Commands now have an `invoked_as` attribute, showing the name under
1029
which they were called before alias expansion.
1032
* ``Hooks.create_hook`` is now deprecated in favour of ``Hooks.add_hook``.
1035
* If you call `bzrlib.initialize` but forget to enter the resulting object
1036
as a context manager, bzrlib will now be initialized anyhow.
1037
(Previously simple programs calling bzrlib might find the library was
1038
mysteriously silent.)
1041
* Inventory-specific functionality has been split out of ``Tree`` into
1042
a new ``InventoryTree`` class. Tree instances no longer
1043
necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
1045
* Inventory-specific functionality has been split out of ``RevisionTree``
1046
into a new ``InventoryRevisionTree`` class. RevisionTree instances no
1047
longer necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
1049
* New method ``Hooks.uninstall_named_hook``. (Jelmer Vernooij, #301472)
1051
* ``revision_graph_can_have_wrong_parents`` is now an attribute
1052
on ``RepositoryFormat`` rather than a method on ``Repository``.
1055
* ``Testament`` now takes a ``tree`` rather than an
1056
``inventory``. (Jelmer Vernooij, #762608)
1058
* ``TestCase.failUnlessExists`` and ``failIfExists`` are deprecated in
1059
favour of ``assertPathExists`` and ``assertPathDoesNotExist``
1063
* The ``revno`` parameter of ``log.LogRevision`` may now be None,
1064
representing a revision which is not in the current branch.
1065
(Matt Giuca, #241998)
1067
* The various knit pack repository format classes have been moved
1068
from ``bzrlib.repofmt.pack_repo`` to
1069
``bzrlib.repofmt.knitpack_repo``. (Jelmer Vernooij)
1071
* ``RevisionTree`` now has a new method ``get_file_revision``.
1074
* ``WorkingTree`` no longer provides an ``inventory``. Instead,
1075
all inventory-related functionality is now on the subclass
1076
``InventoryWorkingTree`` that all native Bazaar working tree
1077
implementations derive from. (Jelmer Vernooij)
1082
.. Major internal changes, unlikely to be visible to users or plugin
1083
developers, but interesting for bzr developers.
1085
* Added ``osutils.lstat`` and ``osutils.fstat``. These are just the ``os``
1086
functions on Linux, but they are wrapped on Windows so that fstat
1087
matches lstat results across all python versions.
1088
(John Arbash Meinel)
1090
* ``WorkingTree._observed_sha1`` also updates the 'size' column. It
1091
happened to be updated as a side-effect of commit, but if we start using
1092
the function elsewhere we might as well do it directly.
1093
(John Arbash Meinel)
1098
.. Fixes and changes that are only relevant to bzr's test framework and
1099
suite. This can include new facilities for writing tests, fixes to
1100
spurious test failures and changes to the way things should be tested.
1102
* Stop using `failIf`, `failUnless`, `failIfEqual`, etc, that give
1103
`PendingDeprecationWarnings` on Python2.7.
1104
(Martin Pool, #760435)
1112
This is the first beta of the 2.4 series, leading up to a 2.4.0
1113
release in August 2011. Beta releases are suitable for everyday use
1114
but may cause some incompatibilities with plugins. Some plugins may need
1115
small updates to work with 2.4b1.
1117
External Compatibility Breaks
1118
*****************************
1125
* Added ``changelog_merge`` plugin for merging changes to ``Changelog`` files
1126
in GNU format. See ``bzr help changelog_merge`` for details.
1129
* Configuration options can now use references to other options in the same
1130
file by enclosing them with curly brackets (``{other_opt}``). This makes it
1131
possible to use, for example,
1132
``push_location=lp:~vila/bzr/config-{nickname}`` in ``branch.conf`` when
1133
using a loom. During the beta period, the default behaviour is to disable
1134
this feature. It can be activated by declaring ``bzr.config.expand = True``
1135
in ``bazaar.conf``. (Vincent Ladeuil)
1137
* External merge tools can now be configured in bazaar.conf. See
1138
``bzr help configuration`` for more information. (Gordon Tyler, #489915)
1140
* The ``lp:`` directory service now supports Launchpad's QA staging.
1141
(Jelmer Vernooij, #667483)
1146
* A new hidden command ``bzr repair-workingtree``. This is a way to force
1147
the dirstate file to be rebuilt, rather than using a ``bzr checkout``
1148
workaround. (John Arbash Meinel)
1150
* Added a ``Branch.heads_to_fetch`` RPC to the smart server protocol.
1151
This allows formats from plugins (such as looms) to efficiently tell the
1152
client which revisions need to be fetched. (Andrew Bennetts)
1154
* Branching, merging and pulling a branch now copies revisions named in
1155
tags, not just the tag metadata. (Andrew Bennetts, #309682)
1157
* ``bzr cat-revision`` no longer requires a working tree.
1158
(Jelmer Vernooij, #704405)
1160
* ``bzr export --per-file-timestamps`` for .tar.gz files will now
1161
override the mtime for trees exported on Python 2.7 and later, which
1162
expose the 'mtime' field in gzip files. This makes the output of
1163
``bzr export --per-file-timestamps`` for a particular tree
1164
deterministic. (Jelmer Vernooij, #711226)
1166
* ``bzr export --format=zip`` can now export to standard output,
1167
like the other exporters can. (Jelmer Vernooij, #513752)
1169
* ``bzr export`` can now create ``.tar.xz`` and ``.tar.lzma`` files.
1170
(Jelmer Vernooij, #551714)
1172
* Getting all entries from ``CHKInventory.iter_entries_by_dir()`` has been
1173
sped up dramatically for large trees. Iterating by dir is not the best
1174
way to load data from a CHK inventory, so it preloads all the items in
1175
the correct order. (With the gcc-tree, this changes it (re)reading 8GB
1176
of CHK data, down to just 150MB.) This has noticeable affects for things
1177
like building checkouts, etc. (John Arbash Meinel, #737234)
1182
* A MemoryError thrown on the server during a remote operation will now be
1183
usefully reported, and other unexpected errors will include the class name.
1184
(Martin [gz], #722416)
1186
* ``bzr annotate -r-1 file`` will now properly annotate a deleted file.
1187
(Andrew King, #537442)
1189
* ``bzr export`` to zip files will now set a mode on directories.
1190
(Jelmer Vernooij, #207253)
1192
* ``bzr export`` to tgz files will only write out the basename of the
1193
tarfile to the gzip file. (Jelmer Vernooij, #102234)
1195
* ``bzr push --overwrite`` with an older revision specified will now correctly
1196
roll back the target branch. (Jelmer Vernooij, #386576)
1198
* ``bzr lp-propose`` can now propose merges against packaging branches on
1199
Launchpad without requiring the target branch to be specified.
1200
(Jelmer Vernooij, #704647)
1202
* ``bzr lp-propose`` no longer requires a reviewer to be specified. It will
1203
instead leave setting the reviewer up to Launchpad if it was not specified.
1204
(Jelmer Vernooij, #583772)
1206
* ``bzr pull`` will now exit with exit code 1 if there were tag conflicts.
1207
(Jelmer Vernooij, #213185)
1209
* ``bzr mv`` user errors no longer throw UnicodeEncodeError with non-ascii
1210
paths, however they may still print junk if not on a UTF-8 terminal.
1211
(Martin [gz], #707954)
1213
* ``bzr reconfigure --unstacked`` now copies revisions (and their
1214
ancestors) named in tags into the unstacked repository, not just the
1215
ancestry of the branch's tip. (Andrew Bennetts, #401646)
1217
* ``bzr serve`` no longer crashes when a server_started hook is installed and
1218
IPv6 support is available on the system. (Jelmer Vernooij, #293697)
1220
* ``bzr status`` will not rewrite the dirstate file if it only has
1221
'trivial' changes. (Currently limited to dir updates and newly-added
1222
files changing state.) This saves a bit of time for regular operations.
1223
eg. ``bzr status`` in a 100k tree takes 1.4s to compute the status, but 1s
1224
to re-save the dirstate file. (John Arbash Meinel, #765881)
1226
* ``bzr tags`` will no longer choke on branches with ghost revisions in
1227
their mainline and tags on revisions not in the branch ancestry.
1228
(Jelmer Vernooij, #397556)
1230
* ``bzr whoami`` will now display an error if both a new identity and
1231
``--email`` were specified. (Jelmer Vernooij, #680449)
1233
* ``launchpadlib`` doesn't provide the ``uris`` module in some old versions.
1234
(Vincent Ladeuil, #706835)
1236
* Empty entries in the ``NO_PROXY`` variable are no longer treated as matching
1238
(Martin Pool, #586341)
1240
* Plugins incompatible with the current version of bzr no longer produce a
1241
warning on every command invocation. Instead, a message is shown by
1242
``bzr plugins`` and in crash reports.
1243
(#704195, Martin Pool)
1245
* The "pretty" version of ``needs_read_lock`` and ``needs_write_lock`` now
1246
preserves the identity of default parameter values.
1247
(Andrew Bennetts, #718569)
1249
* ``bzr dump-btree --raw`` no longer tracebacks on a B-Tree file
1250
containing no rows. (Eric Siegerman, #715508)
1252
* Fix ``bzr lp-mirror`` to work on command line branch URLs and branches
1253
without an explicit public location. (Max Bowsher)
1255
* On Python 2.6 and higher, use multiprocessing.cpu_count() to retrieve the
1256
number of available processors. (Jelmer Vernooij, #693140)
1261
* Added ``Branch.heads_to_fetch`` method. Implementations of the Branch API
1262
must now inherit or implement this method. (Andrew Bennetts, #721328)
1264
* Added ``bzrlib.mergetools`` module with helper functions for working with
1265
the list of external merge tools. (Gordon Tyler, #489915)
1267
* All methods and arguments that were deprecated before 2.0
1268
have been removed. (Jelmer Vernooij)
1270
* Branch formats should now be registered on the format registry
1271
(``bzrlib.branch.format_registry``) rather than using the class
1272
methods on ``BranchFormat``. (Jelmer Vernooij, #714729)
1274
* ``Branch.set_revision_history`` is now deprecated.
1277
* ``BranchFormat.supports_leaving_lock()`` and
1278
``RepositoryFormat.supports_leaving_lock`` flags have been added.
1281
* ``Branch.fetch`` implementations must now accept an optional
1282
``fetch_tags`` keyword argument. (Andrew Bennetts)
1284
* ``Branch.import_last_revision_info`` is deprecated. Use the
1285
``import_last_revision_info_and_tags`` method instead.
1288
* Because it was too specific to BzrDir implementations,
1289
``ControlDir.sprout`` no longer has a default implementation; it now
1290
raises ``NotImplementedError``. (Jelmer Vernooij, #717937)
1292
* ``bzrlib.deprecated_graph`` has been removed. ``bzrlib.graph``
1293
scales better tree and should be used instead.
1294
(Jelmer Vernooij, #733612)
1296
* ``ControlDirFormat.register_format`` has been removed. Instead,
1297
``Prober`` implementations should now implement a ``known_formats``
1298
method. (Jelmer Vernooij)
1300
* ControlDirFormats can now provide a ``check_status`` method and
1301
raise a custom exception or warning when an unsupported or deprecated
1302
format is being opened. (Jelmer Vernooij, #731311)
1304
* ``bzrlib.revionspec.dwim_revspecs`` is deprecated.
1305
Use ``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_revspec`` and
1306
``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_lazy_revspec``
1307
instead. (Jelmer Vernooij, #721971)
1309
* ``BzrDirFormat`` has a new attribute ``fixed_components`` that
1310
indicates whether the components of the bzrdir can be upgraded
1311
independent of the ``BzrDir``. (Jelmer Vernooij)
1313
* ``BzrProber.register_format`` and ``BzrProber.unregister_format`` are
1314
now deprecated in favour of the ``BzrProber.formats`` format registry.
1317
* ``ControlDir`` implementations no longer have to provide the
1318
``get_branch_transport``, ``get_workingtree_transport`` and
1319
``get_repository_transport`` methods. (Jelmer Vernooij, #730325)
1321
* ``Converter`` has been moved from ``bzrlib.bzrdir`` to
1322
``bzrlib.controldir``. (Jelmer Vernooij)
1324
* Repository formats can now provide
1325
``_get_extra_interrepo_test_combinations`` in the same module
1326
to provide extra test combinations for ``bzrlib.tests.per_repository``.
1329
* Repository formats should now be registered on the format registry
1330
(``bzrlib.repository.format_registry``) rather than using the class
1331
methods on ``RepositoryFormat``. (Jelmer Vernooij)
1333
* Repository formats can now indicate they do not support the full
1334
VersionedFiles API by setting the ``supports_full_versioned_files``
1335
attribute to False. A subset of the VersionedFiles API
1336
(signatures and text graphs) still needs to be supported.
1339
* Repository formats have a new method ``is_deprecated`` that
1340
implementations can override to return True to trigger a deprecation
1341
warning. (Jelmer Vernooij)
1343
* The ``revision_id`` parameter of
1344
``Repository.search_missing_revision_ids`` and
1345
``InterRepository.search_missing_revision_ids`` is deprecated. It is
1346
replaced by the ``revision_ids`` parameter. (Andrew Bennetts)
1348
* Working tree formats should now be registered on the format registry
1349
(``bzrlib.working_tree.format_registry``) rather than using the class
1350
methods on ``WorkingTreeFormat``. (Jelmer Vernooij, #714730)
1352
* Exporting may now be done with a generator
1353
(``bzrlib.export.get_export_generator``) (Geoff/xaav, #791005)
1358
* ``CatchingExceptionThread`` (formerly ThreadWithException) has been moved
1359
out of the ``bzrlib.tests`` hierarchy to make it clearer that it can be used
1360
outside of tests. This class makes it easier to track exceptions in threads
1361
by catching them so they can be re-raised in the controlling thread. It's
1362
available in the ``bzrlib.cethread`` module. (Vincent Ladeuil)
1364
* Correctly propagate malloc failures from diff-delta.c code as MemoryError
1365
so OOM conditions during groupcompress are clearly reported. This entailed a
1366
change to several function signatures. (Martin [gz], #633336)
1368
* ``HookPoint.lazy_hook`` and ``Hooks.install_named_lazy_hook`` can install
1369
hooks for which the callable is loaded lazily. (Jelmer Vernooij)
1374
* The Range parsing for HTTP requests will correctly parse incomplete ranges.
1375
(Vincent Ladeuil, #731240)
1378
vim: tw=74 ft=rst ff=unix