11
:2.4.3: NOT RELEASED YET
13
External Compatibility Breaks
14
*****************************
16
.. These may require users to change the way they use Bazaar.
21
.. New commands, options, etc that users may wish to try out.
26
.. Improvements to existing commands, especially improved performance
27
or memory usage, or better results.
32
.. Fixes for situations where bzr would previously crash or give incorrect
33
or undesirable results.
35
* Cope with Unix filesystems, such as smbfs, where chmod gives 'permission
36
denied'. (Martin Pool, #606537)
38
* When the ``limbo`` or ``pending-deletion`` directories exist, typically
39
because of an interrupted tree update, but are empty, bzr no longer
40
errors out, because there is nothing for the user to clean up. Also,
41
errors in creation of these directories are no longer squelched.
42
(Martin Pool, #427773)
44
* During merges, when two entries end up using the same path for two
45
different file-ids (the same file being 'bzr added' in two different
46
branches) , 'duplicate' conflicts are created instead of 'content'
47
ones. This was previously leading to a 'Malformed tramsform' exception.
48
(Vincent Ladeuil, #880701)
50
* 'Malformed transform' exceptions are now recognized as internal errors
51
instead of user errors and report a traceback. This will reduce user
52
confusion as there is generally nothing users can do about them.
53
(Vincent Ladeuil, #880701)
55
* Prevent a traceback being printed to stderr when logging has problems and
56
accept utf-8 byte string without breaking. (Martin Packman, #714449)
58
* _Win32Stat object provides members st_uid and st_gid, those are present
59
in Python's os.stat object. These members required for external tools like
60
bzr-git and dulwich. (Alexander Belchenko, #967060)
65
.. Improved or updated documentation.
70
.. Changes that may require updates in plugins or other code that uses
76
.. Major internal changes, unlikely to be visible to users or plugin
77
developers, but interesting for bzr developers.
82
.. Fixes and changes that are only relevant to bzr's test framework and
83
suite. This can include new facilities for writing tests, fixes to
84
spurious test failures and changes to the way things should be tested.
86
* Account for slightly improved compression with newer versions of zlib in
87
``bt.test_btree_index`` tests. (Martin Packman, #940453)
95
This is a bugfix release. Most of the bugs dealt with portability
96
issues. Upgrading is recommended for all users of earlier 2.4 releases.
98
External Compatibility Breaks
99
*****************************
111
* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
112
every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
117
* Fixed an infinite loop when creating a repo at the root of the filesystem,
118
i.e. "/", due to posixpath.normpath() not collapsing 2 leading slashes into
119
one, thus respecting the POSIX standard, but making relpath() loop infinitely.
120
(Florian Vichot, #861008)
122
* Fixed loading of external merge tools from config to properly decode
123
command-lines which contain embedded quotes. (Gordon Tyler, #828803)
125
* Include declaration of 'changed' to avoid an UnboundLocalError in dirstate
126
pyrex code with new Cython versions. (Denys Duchier, #837221)
128
* Prevent several kinds of OverflowError and other fallout from failing to fit
129
stat fields into four bytes in dirstate pack_stat implementations.
130
(Martin Packman, #683191 #706957)
132
* Return early from create_delta_index_from_delta given tiny inputs. This
133
avoids raising a spurious MemoryError on certain platforms such as AIX.
134
(John Arbash Meinel, #856731)
139
* Corrected documentation for ``bzr serve`` in the Admin Guide.
140
(Morten Bøgeskov, Martin Pool, #832576)
155
* Accept both old and new style testtools output in selftest tests.
156
(Jelmer Vernooij, Martin Packman, #815423)
158
* Fix the race for TestingThreadingTCPServer in
159
test_server_crash_while_responding. (Vincent Ladeuil, #869366)
161
* Really corrupt the pack file without depending on a special length or value.
162
(Vincent Ladeuil, #807032)
170
This is a bugfix release. Upgrading is recommended for all users of earlier
173
It includes fixes from previous stable releases and address some issues with
177
External Compatibility Breaks
178
*****************************
180
.. These may require users to change the way they use Bazaar.
185
.. New commands, options, etc that users may wish to try out.
190
.. Improvements to existing commands, especially improved performance
191
or memory usage, or better results.
196
.. Fixes for situations where bzr would previously crash or give incorrect
197
or undesirable results.
199
* ``config.LocationMatcher`` properly excludes unrelated sections.
200
(Vincent Ladeuil, #829237)
202
* ``dirstate.fdatasync`` and ``repository.fdatasync`` can now properly be
203
disabled. (Vincent Ladeuil, #824513)
205
* Disable ``os.fsync`` and ``os.fdatasync`` by default when running
206
``bzr selftest``. You can use ``--sync`` to re-enable them.
207
(John Arbash Meinel, #837293)
209
* Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
211
* Avoid UnicodeDecode error when reporting EINVAL from transports.
212
(IWATA Hidetaka, #829237)
217
.. Improved or updated documentation.
219
* Corrected documentation for BZR_PROGRESS_BAR.
220
(Dennis Benzinger, #735417)
225
.. Changes that may require updates in plugins or other code that uses
231
.. Major internal changes, unlikely to be visible to users or plugin
232
developers, but interesting for bzr developers.
237
.. Fixes and changes that are only relevant to bzr's test framework and
238
suite. This can include new facilities for writing tests, fixes to
239
spurious test failures and changes to the way things should be tested.
241
* The test suite should now be able to run under weird environments where
242
``/etc/passwd`` doesn't contain the ``uid`` for the user running selftest
243
or where ``fakeroot`` is used but ``/root`` is inacessible.
244
(Vincent Ladeuil, #825027)
251
This release marks the start of a new long-term-stable series. From here, we
252
will only make bugfix releases on the 2.4 series (2.4.1, etc, and support it
253
until February 2013), while 2.5 will become our new development series.
255
This is a bugfix and polish release over the 2.3 series, with a large number
256
of bugs fixed (>150 for the 2.4 series alone), and some performance
257
improvements. Support for python 2.4 and 2.5 has been dropped, many large
258
working tree operations have been optimized as well as some stacked branches
261
Only bugfixes from other stables series have been included since 2.4b5 so
262
all known fixed bugs are included here.
264
Users are encouraged to upgrade from the other stable series.
267
External Compatibility Breaks
268
*****************************
270
.. These may require users to change the way they use Bazaar.
275
.. New commands, options, etc that users may wish to try out.
280
.. Improvements to existing commands, especially improved performance
281
or memory usage, or better results.
286
.. Fixes for situations where bzr would previously crash or give incorrect
287
or undesirable results.
289
* A call to CHKInventory's filter-method will not result in a
290
DuplicateFileId error, if you move a subfolder and change a file in
292
(Bastian Bowe, #809901)
294
* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
295
checks to see if the most recent published source package version for
296
that project is present in the branch tags. This should help developers
297
trust whether the packaging branch is up-to-date and can be used for new
298
changes. The level of verbosity is controlled by the config item
299
``launchpad.packaging_verbosity``. It can be set to one of
306
only display if the branch is out-of-date
309
also display single-line up-to-date and missing,
313
(default) display multi-line content for all states
316
(John Arbash Meinel, #609187, #812928)
318
* Cope with not all Python versions having a ``clear`` method on
319
``TestCase._type_equality_funcs``.
320
(Martin [gz], Jelmer Vernooij, #809048)
322
* Fetching tags when fetching the tip revision of a branch is now
323
controlled by the config setting ``branch.fetch_tags``. The behavior has
324
been reverted to 2.3's not-fetching tagged revisions by default.
325
(John Arbash Meinel, #771184)
327
* The fix for bug #513709 caused us to open a new connection when
328
switching a lightweight checkout that was pointing at a bound branch.
329
This isn't necessary because we know the master URL without opening it,
330
avoiding an extra SSH connection, etc.
331
(John Arbash Meinel, #812285)
337
.. Improved or updated documentation.
342
.. Changes that may require updates in plugins or other code that uses
348
.. Major internal changes, unlikely to be visible to users or plugin
349
developers, but interesting for bzr developers.
354
.. Fixes and changes that are only relevant to bzr's test framework and
355
suite. This can include new facilities for writing tests, fixes to
356
spurious test failures and changes to the way things should be tested.
358
* `BranchBuilder.build_snapshot` now supports a "flush" action. This
359
cleanly and reliably allows tests using `BranchBuilder` to construct
360
branches that e.g. rename files out of a directory and unversion that
361
directory in the same revision. Previously some changes were impossible
362
due to the order that `build_snapshot` performs its actions.
365
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
366
just compares the bytes in the dirstate file to its pristine state,
367
rather than opening the WorkingTree and calling ``last_revision()``.
368
This reduces the overall test suite time by about 10% on my laptop.
377
This is the fifth (and last) beta of the 2.4 series leading to
378
2.4.0 release in August 2011. Beta releases are suitable for
379
everyday use but may cause some incompatibilities with plugins.
381
This release includes all bug fixed in previous series known at
382
the time of this release.
384
External Compatibility Breaks
385
*****************************
392
* New command ``verify-signatures`` to check if all commits or specified commits
393
have digital signatures from trusted keys. Requires python-gpgme to be
396
* New option ``--signatures`` for ``bzr log`` to display digital signature
397
verification results for each commit.
399
* Config option acceptable_keys to list which GPG keys are verified as trusted.
401
* Config option validate_signatures_in_log to always show signatures in
407
* ``Branch.open`` is now about 3x faster (about 2ms instead of 6.5ms).
410
* Pack, dirstate, and index files are synced to persistent storage if
411
possible when writing finishes, to reduce the risk of problems caused by
412
a machine crash or similar problem. This can be turned off through the
413
``dirstate.fdatasync`` and ``repository.fdatasync`` options, which can
414
be set in ``locations.conf`` or ``bazaar.conf``. (Martin Pool,
420
* Display a proper error message when a config file content cannot be
421
decoded as UTF-8 or when it cannot be parsed.
422
(Vincent Ladeuil, #502060, #688677, #797246)
424
* Generate a single conflict (instead of two) when merging a branch
425
modifying and renaming a file in a branch that deleted it (or vice-versa).
426
(Vincent Ladeuil, #688101)
428
* Give a more helpful message when the bzr executable doesn't match the
429
library. (This typically happens because of a misconfigured PYTHONPATH
430
or half-installed bzr.)
431
(Martin Pool, #804553)
433
* Properly load utf8-encoded config files. (Vincent Ladeuil, #799212)
435
* ``GraphThunkIdsToKeys.merge_sort`` now properly returns
436
keys rather than ids. (Jelmer Vernooij, #799677)
438
* ``TreeTransformBase.fixup_new_roots`` can now check that a tree root
439
is present. (Jelmer Vernooij, #801257)
444
* New attributes ``WorkingTreeFormat.supports_versioned_directories`` and
445
``RepositoryFormat.supports_versioned_directories``.
446
(Jelmer Vernooij, #765815)
448
* The "revno" field type when using the python version-info format is now
449
a string (to handle dotted revnos) (Benoît Pierre, #796259)
454
* Start implementing localization, starting with command help text (but not
455
the command options themselves). This will allow bootstrapping the bzr
456
internationalization process. (Inada Naoki)
461
* Fix test failures when running as a homeless user (debian buildd). Tests
462
leaking into ``${HOME}/.bzr.log`` should be detected properly now.
463
(Vincent Ladeuil, #798698)
470
This is the fourth beta of the 2.4 series, leading to a 2.4.0 release in
471
August 2011. Beta releases are suitable for everyday use but may cause some
472
incompatibilities with plugins.
474
This release includes all bug fixed in previous series known at the time of
478
External Compatibility Breaks
479
*****************************
481
.. These may require users to change the way they use Bazaar.
483
* Do not treat configuration option 'check_signatures = require' as if
484
it were 'create_signatures = always' (Jonathan Riddell)
489
.. New commands, options, etc that users may wish to try out.
491
* Hooks have been added for config stacks: ``get``, ``set`` and ``remove``
492
are called when an option is respectively read, modified or deleted. Also
493
added ``load`` and ``save`` hooks for config stores, called when the
494
stores are loaded or saved. (Vincent Ladeuil)
496
* New hook server_exception in bzrlib.smart.server to catch any
497
exception caused while running bzr serve.
498
(Jonathan Riddell, #274578)
500
* New hook set_commit_message in bzrlib.msgeditor to set a commit message
501
and revision properties. (Jonathan Riddell, #274578)
503
* Support ``-S`` as an alias for ``--short`` for the ``log`` and
504
``missing`` commands. (Martin von Gagern, #38655)
509
.. Improvements to existing commands, especially improved performance
510
or memory usage, or better results.
512
* ``bzr annotate`` can be run without setting whoami data first.
513
(Jonathan Riddell, #667408)
518
.. Fixes for situations where bzr would previously crash or give incorrect
519
or undesirable results.
521
* Bazaar can now detect when a lock file is held by a dead process
522
originating from the same machine, and steal the lock after printing a
523
message to the user. This is off by default, for safety, but can be
524
turned on by setting the configuration variable ``locks.steal_dead`` to
526
(Martin Pool, #220464)
528
* ``bzr version-info`` now works when the tree is on a dotted revno.
529
(Benoît Pierre, #796259)
531
* Credentials in the log output produced by ``-Dhttp`` are masked so users
532
can more freely post them in bug reports. (Vincent Ladeuil, #723074)
534
* Fix a race condition for ``server_started`` hooks leading to a spurious
535
test failure. (Vincent Ladeuil, #789167)
537
* Fix exporting subdirectory with ``--per-file-timestamps``.
538
(Szilveszter Farkas, #795557)
540
* Handle files that get created but don't get used during TreeTransform.
541
``open()`` can create a file, and still raise an exception before it
542
returns. So anything we might have created, make sure we destroy during
543
``finalize()``. (Martin [gz], #597686)
545
* ``pack_repo`` now uses ``Transport.move`` instead of
546
``Transport.rename``, deleting any existing targets even on SFTP.
547
(Martin von Gagern, #421776)
549
* Pass the ``build_mo`` command to the rest of the setup() calls in
550
setup.py. The ``bdist_wininst`` and ``py2exe`` code paths were failing
551
because ``build_mo`` became a required step that they didn't know about.
552
(John Arbash Meinel, #787122)
554
* Preserve existing ``root-id`` when merging an unrelated branch.
555
(Aaron Bentley, #806356)
557
* Properly avoid re-adding a file after it changes case on CICP
558
filesystems. (John Arbash Meinel, #798130)
560
* Reports the original error when an InvalidHttpResponse exception is
561
encountered to facilitate debug. (Vincent Ladeuil, #788530)
563
* Reports a non-existent file error when trying to merge in a file
564
that does not exist. (Jonathan Riddell, #330063)
566
* ``UIFactory.prompt``, ``UIFactory.get_username``,
567
``UIFactory.get_password`` and ``UIFactory.get_boolean`` now require a
568
unicode prompt to be passed in. (Jelmer Vernooij, #592083)
570
* Support merging into the empty tree. (Aaron Bentley, #595328)
575
.. Improved or updated documentation.
577
* Improve documentation of ``bzr merge --force``.
578
(Neil Martinsen-Burrell, #767307)
580
* Make docs for configuration options for digital signatures match
581
reality. (Jonathan Riddell)
583
* Add user-guide page on GPG signatures. (Jonathan Riddell)
588
.. Changes that may require updates in plugins or other code that uses
591
* Checking for a file id in a `Tree` or `Inventory` using ``in`` is now
592
deprecated. Instead, use `has_id`.
595
* Exporters are now all exposed as generators, rather than as single-call
596
functions, so that calling code can take stream the output.
599
* Information about held lockdir locks returned from eg `LockDir.peek` is
600
now represented as a `LockHeldInfo` object, rather than a plain
604
* Remove `file_status` function.
607
* ``Repository.iter_reverse_revision_history`` is now deprecated.
608
Use ``Graph.iter_lefthand_ancestry`` instead.
609
(Jelmer Vernooij, #739481)
611
* ``Repository.get_ancestry`` has been deprecated. Use
612
``Graph.iter_ancestry`` instead.
613
(Jelmer Vernooij, #784511)
618
.. Major internal changes, unlikely to be visible to users or plugin
619
developers, but interesting for bzr developers.
621
* ``tools/check-newsbugs.py`` accepts a ``--browser`` option to open
622
corresponding launchpad pages in a browser. (Vincent Ladeuil)
627
.. Fixes and changes that are only relevant to bzr's test framework and
628
suite. This can include new facilities for writing tests, fixes to
629
spurious test failures and changes to the way things should be tested.
631
* A `ImportTariffTestCase` base class has been added in
632
``bzrlib.tests.test_import_tariff``, which can be used for import tariff
633
tests in plugins. (Jelmer Vernooij, #793465)
635
* Fix deadlock in `TestImportTariffs.test_simple_serve` when stderr gets
636
more output than fits in the default buffer. This was happening on the
637
Windows buildslave, and could easily happen in other circumstances where
638
the default OS buffer size for pipes is small or the ``python -v``
639
output is large. (Andrew Bennetts, #784802)
641
* Fix spurious test failure on OSX for WorkingTreeFormat2.
642
(Vincent Ladeuil, #787942)
644
* Re-target ``bb.test_merge.TestMerge.test_merge_reversed_revision_range``
645
and rewrite it as a parametrized test to avoid unrelated failures.
646
(Vincent Ladeuil, #795456)
648
* Show log file contents from subprocesses started by
649
`start_bzr_subprocess` in test failure details. This may help diagnose
650
strange hangs and failures involving subprocesses. (Andrew Bennetts)
652
* Skip ``utextwrap`` tests when ``sphinx`` breaks text_wrap by an hostile
653
monkey-patch to textwrap.TextWrapper.wordsep_re.
654
(Vincent Ladeuil, #785098)
656
* Multiple ``selftest --exclude`` options are now combined instead of
657
overriding each other. (Vincent Ladeuil, #746991)
659
* Restore some ``FTPTransport`` test coverage by allowing ``pyftpdlib
660
0.6.0`` to be used. Also restore ``medusa`` support while leaving it
661
disabled to make it easier to use if/when we can in the future.
662
(Vincent Ladeuil, #781140)
664
* `TestImportTariffs` no longer uses the real ``$HOME``. This prevents it
665
from polluting ``$HOME/.bzr.log`` or being accidentally influenced by
666
user configuration such as aliases. It still runs with all the user's
667
plugins enabled, as intended.
668
(Vincent Ladeuil, Andrew Bennetts, #789505)
676
This is the third beta of the 2.4 series, leading to a 2.4.0 release in
677
August 2011. Beta releases are suitable for everyday use but may cause some
678
incompatibilities with plugins.
680
This release includes all bug fixed in previous series known at the time of
684
External Compatibility Breaks
685
*****************************
687
.. These may require users to change the way they use Bazaar.
689
* ``bzr-2.4`` has officially dropped support for python2.4 and python2.5.
690
We will continue to maintain ``bzr-2.3`` for people who still need to
691
use those versions of python. (John Arbash Meinel)
696
.. New commands, options, etc that users may wish to try out.
698
* The text compressor used for 2a repositories now has a tweakable
699
parameter that can be set in bazaar.conf.
700
``bzr.groupcompress.max_entries_per_source`` default of 65536.
701
When doing compression, we build up an index of locations to match
702
against. Setting this higher will result in slightly better compression,
703
at a cost of more memory. Note that a value of 65k represents fully
704
sampling a 1MB file. So this only has an effect when compressing texts
705
larger than N*16 bytes. (John Arbash Meinel, #602614)
710
.. Improvements to existing commands, especially improved performance
711
or memory usage, or better results.
713
* ``bzr branch --stacked`` from a smart server uses the network a little
714
more efficiently. For a simple branch it reduces the number of
715
round-trips by about 20%. (Andrew Bennetts)
717
* ``bzr log --line`` scales the width of the author field with the size of
718
the line. This means that the full author name is shown when the
719
environment variable BZR_COLUMNS=0. (Neil Martinsen-Burrell)
721
* ``bzr pull`` now properly triggers the fast
722
``CHKInventory.iter_changes`` rather than the slow generic
723
inter-Inventory changes. It used to use a ``DirStateRevisionTree`` as
724
one of the source trees, which is faster when we have to read the whole
725
inventory anyway, but much slower when we can get just the delta out of
726
the repository. On a 70k record tree, this changes ``bzr pull`` from 28s
727
down to 17s. (John Arbash Meinel, #780677)
729
* Slightly reduced memory consumption when fetching into a 2a repository
730
by reusing existing caching a little better. (Andrew Bennetts)
732
* Speed up ``bzr status`` by a little bit when there are a couple of
733
modified files. We now track how many files we have seen that need
734
updating, and only rewrite the dirstate file if enough of them have
735
changed. The default is 10, and can be overridden by setting the branch
736
option "``bzr.workingtree.worth_saving_limit``".
737
(Ian Clatworthy, John Arbash Meinel, #380202)
739
* Speed up ``bzr uncommit``. Instead of resetting the dirstate from
740
scratch, use ``update_basis_by_delta``, computing the delta from the
741
repository. (John Arbash Meinel, #780544)
746
.. Fixes for situations where bzr would previously crash or give incorrect
747
or undesirable results.
749
* All Tree types can now be exported as tar.*, zip or directories.
752
* ``bzr merge --no-remember location`` never sets ``submit_branch``.
753
(Vincent Ladeuil, #782169)
755
* ``bzr pull --no-remember location`` never sets
756
``parent_location``. ``bzr push --no-remember location`` never
757
sets ``push_location``. ``bzr send --no-remember
758
submit_location public_location`` never sets ``submit_branch``
759
nor ``public_branch``. (Vincent Ladeuil)
761
* Conflicts involving non-ascii filenames are now properly reported rather
762
than failing with a UnicodeEncodeError. (Martin [GZ], #686161)
764
* Correct parent is now set when using 'switch -b' with bound branches.
765
(A. S. Budden, #513709)
767
* Fix `bzr plugins` regression in bzr 2.4 which resulted in a traceback
768
from writelines on ckj terminals. (Martin [GZ], #754082)
770
* ``WT.inventory`` and ``WT.iter_entries_by_dir()`` was not correctly
771
reporting subdirectories that were tree references (in formats that
772
supported them). (John Arbash Meinel, #764677)
774
* Merging into empty branches now gives an error as this is currently
775
not supported. (Jonathan Riddell, #242175)
777
* Do not show exception to user on pointless commit error.
778
(Jonathan Riddell #317357)
780
* ``WT.update_basis_by_delta`` no longer requires that the deltas match
781
the current WT state. This allows ``update_basis_by_delta`` to be used
782
by more commands than just commit. Updating with a delta allows us to
783
not load the whole inventory, which can take 10+s with large trees.
784
(Jonathan Riddell, John Arbash Meinel, #781168)
786
* ``bzr mv --after old_name new_name`` now works if "new_name" is newly
787
added. (Benoît Pierre)
793
.. Improved or updated documentation.
795
* Restore the workaround for option names including dots (--1.14) which was
796
disabled when we stopped listing --1.9 as a format.
797
(Vincent Ladeuil, #782289)
802
.. Changes that may require updates in plugins or other code that uses
805
* ``annotate_file`` has been deprecated in favor of
806
``annotate_file_revision_tree``. (Jelmer Vernooij, #775598)
808
* ``Branch.fetch`` now takes an optional ``limit`` argument.
809
(Andrew Bennetts, Jelmer Vernooij, #750175)
811
* ``Inter.get`` now raises ``NoCompatibleInter`` if there are no
812
compatible optimisers rather than an instance of the class it is called
813
on. (Jelmer Vernooij)
815
* ``Branch.push`` now takes a ``lossy`` argument.
816
``Branch.lossy_push`` has been removed.
819
* New method ``Repository.get_file_graph`` which can return the
820
per-file revision graph. (Jelmer Vernooij, #775578)
822
* The default implementation of ``Branch`` is now oriented to
823
storing the branch tip. Branch implementations which store the full
824
history should now subclass ``FullHistoryBzrBranch``.
825
``Branch._last_revision_info`` has been renamed to
826
``Branch._read_last_revision_info`` (Jelmer Vernooij)
828
* ``Tree.__iter__`` has been deprecated; use ``Tree.all_file_ids``
829
instead. (Jelmer Vernooij)
831
* ``Tree.get_symlink_target`` now takes an optional ``path``
832
argument. (Jelmer Vernooij)
837
.. Major internal changes, unlikely to be visible to users or plugin
838
developers, but interesting for bzr developers.
840
* ``MutableTree.smart_add`` now uses inventory deltas.
841
(Jelmer Vernooij, #146165)
843
* Removed ``bzrlib.branch._run_with_write_locked_target`` as
844
``bzrlib.cleanup`` provides the same functionality in a more general
845
way. (Andrew Bennetts)
850
.. Fixes and changes that are only relevant to bzr's test framework and
851
suite. This can include new facilities for writing tests, fixes to
852
spurious test failures and changes to the way things should be tested.
854
* A test that was expected to fail but passes instead now counts as a failure
855
catching up with new testtools and subunit handling. (Martin [GZ], #654474)
857
* Make it easier for plugins to reuse the per_workingtree scenarios by
858
restoring the wt_scenarios helper that was accidentally deleted.
859
(Vincent Ladeuil, #783472)
861
* Removed ``test_breakin`` tests that were excessively prone to hanging,
862
did not work on Wine, and partly already disabled.
863
(Martin Pool, #408814, #746985)
865
* Windows locations are different and should be tested accordingly.
866
(Vincent Ladeuil, #788131)
873
This is the second beta of the 2.4 series, leading to a 2.4.0 release in
874
August 2011. Beta releases are suitable for everyday use but may cause some
875
incompatibilities with plugins.
877
This release includes all bug fixed in previous series known at the time of
881
External Compatibility Breaks
882
*****************************
884
.. These may require users to change the way they use Bazaar.
886
* Two command synonyms for ``bzr branch`` have been deprecated, to avoid
887
confusion and to allow the names to later be reused. The removed names
888
are: ``get`` and ``clone``. (Martin Pool, #506265)
893
.. New commands, options, etc that users may wish to try out.
895
* ``bzr commit`` now supports a ``--lossy`` argument that can be used
896
to discard any data that can not be natively represented when committing
897
to a foreign VCS. (Jelmer Vernooij, #587721)
902
.. Improvements to existing commands, especially improved performance
903
or memory usage, or better results.
905
* ``bzr merge`` in large trees is now significantly faster. On a 70k entry
906
tree, the time went from ~3min down to 30s. This also effects ``bzr pull``
907
and ``bzr update`` since they use the same merge logic to update the
908
WorkingTree. (John Arbash Meinel, #759091)
910
* ``bzr revert`` now properly uses ``bzr status``'s optimized
911
``iter_changes``. This can be a significant performance difference (33s
912
to 5s on large trees). (John Arbash Meinel, #759096)
914
* Resolve ``lp:FOO`` urls locally rather than doing an XMLRPC request if
915
the user has done ``bzr launchpad-login``. The bzr+ssh URLs were already
916
being handed off to the remote server anyway (xmlrpc has been mapping
917
``lp:bzr`` to ``bzr+ssh://bazaar.launchpad.net/+branch/bzr``, rather
918
than ``bzr+ssh://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev`` for a few
919
months now.) By doing it ourselves, we can cut out substantial startup
920
time. From Netherlands to London it was taking 368ms to do the XMLRPC
921
call as much as 2s from Sydney. You can test the local logic by using
922
``-Dlaunchpad``. (John Arbash Meinel, #397739)
924
* When building a new WorkingTree (such as during ``bzr co`` or
925
``bzr branch``) we now properly store the stat and hash of files that
926
are old enough. This saves a fair amount of time on the first
927
``bzr status`` (on a 500MB tree, it saves about 30+s).
928
(John Arbash Meinel, #740932)
934
.. Fixes for situations where bzr would previously crash or give incorrect
935
or undesirable results.
937
* Arguments that can't be decoded to unicode in the current posix locale give
938
a clearer error message without a traceback. (Martin [gz], #745712)
940
* ``bzrlib.log._DEFAULT_REQUEST_PARAMS`` is no longer accidentally
941
mutated by ``bzrlib.log._apply_log_request_defaults``. In practice
942
these default values aren't relied on very often so this probably
943
wasn't causing any trouble. (Andrew Bennetts)
945
* ``bzr log`` now works on revisions which are not in the current branch.
946
(Matt Giuca, #241998)
948
* Don't rewrite the dirstate file when non-interesting changes have
949
occurred. This can significantly improve 'bzr status' times when there
950
are only small changes to a large tree.
951
(Ian Clatworthy, John Arbash Meinel, #380202)
953
* Lazy hooks are now reset between test runs. (Jelmer Vernooij, #745566)
955
* ``bzrlib.merge.Merge`` now calls ``iter_changes`` without
956
``include_unversioned=True``. This makes it significantly faster in many
957
cases, because it only looks at modified files, rather than building
958
information about all files. This can cause failures in other
959
TreeTransform code, because it had been expecting to know the names of
960
things which had not changed (such as parent directories). All cases we
961
know about so far have been fixed, but there may be fallout for edge
962
cases that we are missing. (John Arbash Meinel, #759091)
964
* ``SFTPTransport`` is more pro-active about closing file-handles. This
965
reduces the chance of having threads fail from async requests while
966
running the test suite. (John Arbash Meinel, #656170)
968
* Standalone bzr.exe installation on Windows: user can put additional python
969
libraries into ``site-packages`` subdirectory of the installation directory,
970
this might be required for "installing" extra dependencies for some plugins.
971
(Alexander Belchenko, #743256)
973
* ``transform.revert()`` has been updated to use
974
``wt.iter_changes(basis_tree)`` rather than
975
``basis_tree.iter_changes(wt)``. This allows the optimized code path to
976
kick in, improving ``bzr revert`` times significantly (33s to 4s on
977
large trees, 0.7s to 0.3s on small trees.) (John Arbash Meinel, #759096)
979
* ``TreeTransform.create_file/new_file`` can now take an optional ``sha1``
980
parameter. If supplied, when the transform is applied, it will then call
981
``self._tree._observed_sha1`` for those files. This lets us update the
982
hash-cache for content that we create, preventing us from re-reading the
983
content in the next ``bzr status``. (John Arbash Meinel, #740932)
988
* Added a section about using a shared SSH account on a server for bzr+ssh
989
access. (Russell Smith)
991
* The documentation now recommends using SSH rather than SFTP in the
992
tutorials and the examples, because that will generally be much faster
993
and better in cases where it can be used. SFTP is still available and
994
mentioned as an alternative. (Martin Pool, #636712)
999
.. Changes that may require updates in plugins or other code that uses
1002
* ``Branch.update_revisions`` has been made private and should no
1003
longer be used by external users. Use ``Branch.pull`` or ``Branch.push``
1004
instead. (Jelmer Vernooij, #771765)
1006
* Commands now have an `invoked_as` attribute, showing the name under
1007
which they were called before alias expansion.
1010
* ``Hooks.create_hook`` is now deprecated in favour of ``Hooks.add_hook``.
1013
* If you call `bzrlib.initialize` but forget to enter the resulting object
1014
as a context manager, bzrlib will now be initialized anyhow.
1015
(Previously simple programs calling bzrlib might find the library was
1016
mysteriously silent.)
1019
* Inventory-specific functionality has been split out of ``Tree`` into
1020
a new ``InventoryTree`` class. Tree instances no longer
1021
necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
1023
* Inventory-specific functionality has been split out of ``RevisionTree``
1024
into a new ``InventoryRevisionTree`` class. RevisionTree instances no
1025
longer necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
1027
* New method ``Hooks.uninstall_named_hook``. (Jelmer Vernooij, #301472)
1029
* ``revision_graph_can_have_wrong_parents`` is now an attribute
1030
on ``RepositoryFormat`` rather than a method on ``Repository``.
1033
* ``Testament`` now takes a ``tree`` rather than an
1034
``inventory``. (Jelmer Vernooij, #762608)
1036
* ``TestCase.failUnlessExists`` and ``failIfExists`` are deprecated in
1037
favour of ``assertPathExists`` and ``assertPathDoesNotExist``
1041
* The ``revno`` parameter of ``log.LogRevision`` may now be None,
1042
representing a revision which is not in the current branch.
1043
(Matt Giuca, #241998)
1045
* The various knit pack repository format classes have been moved
1046
from ``bzrlib.repofmt.pack_repo`` to
1047
``bzrlib.repofmt.knitpack_repo``. (Jelmer Vernooij)
1049
* ``RevisionTree`` now has a new method ``get_file_revision``.
1052
* ``WorkingTree`` no longer provides an ``inventory``. Instead,
1053
all inventory-related functionality is now on the subclass
1054
``InventoryWorkingTree`` that all native Bazaar working tree
1055
implementations derive from. (Jelmer Vernooij)
1060
.. Major internal changes, unlikely to be visible to users or plugin
1061
developers, but interesting for bzr developers.
1063
* Added ``osutils.lstat`` and ``osutils.fstat``. These are just the ``os``
1064
functions on Linux, but they are wrapped on Windows so that fstat
1065
matches lstat results across all python versions.
1066
(John Arbash Meinel)
1068
* ``WorkingTree._observed_sha1`` also updates the 'size' column. It
1069
happened to be updated as a side-effect of commit, but if we start using
1070
the function elsewhere we might as well do it directly.
1071
(John Arbash Meinel)
1076
.. Fixes and changes that are only relevant to bzr's test framework and
1077
suite. This can include new facilities for writing tests, fixes to
1078
spurious test failures and changes to the way things should be tested.
1080
* Stop using `failIf`, `failUnless`, `failIfEqual`, etc, that give
1081
`PendingDeprecationWarnings` on Python2.7.
1082
(Martin Pool, #760435)
1090
This is the first beta of the 2.4 series, leading up to a 2.4.0
1091
release in August 2011. Beta releases are suitable for everyday use
1092
but may cause some incompatibilities with plugins. Some plugins may need
1093
small updates to work with 2.4b1.
1095
External Compatibility Breaks
1096
*****************************
1103
* Added ``changelog_merge`` plugin for merging changes to ``Changelog`` files
1104
in GNU format. See ``bzr help changelog_merge`` for details.
1107
* Configuration options can now use references to other options in the same
1108
file by enclosing them with curly brackets (``{other_opt}``). This makes it
1109
possible to use, for example,
1110
``push_location=lp:~vila/bzr/config-{nickname}`` in ``branch.conf`` when
1111
using a loom. During the beta period, the default behaviour is to disable
1112
this feature. It can be activated by declaring ``bzr.config.expand = True``
1113
in ``bazaar.conf``. (Vincent Ladeuil)
1115
* External merge tools can now be configured in bazaar.conf. See
1116
``bzr help configuration`` for more information. (Gordon Tyler, #489915)
1118
* The ``lp:`` directory service now supports Launchpad's QA staging.
1119
(Jelmer Vernooij, #667483)
1124
* A new hidden command ``bzr repair-workingtree``. This is a way to force
1125
the dirstate file to be rebuilt, rather than using a ``bzr checkout``
1126
workaround. (John Arbash Meinel)
1128
* Added a ``Branch.heads_to_fetch`` RPC to the smart server protocol.
1129
This allows formats from plugins (such as looms) to efficiently tell the
1130
client which revisions need to be fetched. (Andrew Bennetts)
1132
* Branching, merging and pulling a branch now copies revisions named in
1133
tags, not just the tag metadata. (Andrew Bennetts, #309682)
1135
* ``bzr cat-revision`` no longer requires a working tree.
1136
(Jelmer Vernooij, #704405)
1138
* ``bzr export --per-file-timestamps`` for .tar.gz files will now
1139
override the mtime for trees exported on Python 2.7 and later, which
1140
expose the 'mtime' field in gzip files. This makes the output of
1141
``bzr export --per-file-timestamps`` for a particular tree
1142
deterministic. (Jelmer Vernooij, #711226)
1144
* ``bzr export --format=zip`` can now export to standard output,
1145
like the other exporters can. (Jelmer Vernooij, #513752)
1147
* ``bzr export`` can now create ``.tar.xz`` and ``.tar.lzma`` files.
1148
(Jelmer Vernooij, #551714)
1150
* Getting all entries from ``CHKInventory.iter_entries_by_dir()`` has been
1151
sped up dramatically for large trees. Iterating by dir is not the best
1152
way to load data from a CHK inventory, so it preloads all the items in
1153
the correct order. (With the gcc-tree, this changes it (re)reading 8GB
1154
of CHK data, down to just 150MB.) This has noticeable affects for things
1155
like building checkouts, etc. (John Arbash Meinel, #737234)
1160
* A MemoryError thrown on the server during a remote operation will now be
1161
usefully reported, and other unexpected errors will include the class name.
1162
(Martin [gz], #722416)
1164
* ``bzr annotate -r-1 file`` will now properly annotate a deleted file.
1165
(Andrew King, #537442)
1167
* ``bzr export`` to zip files will now set a mode on directories.
1168
(Jelmer Vernooij, #207253)
1170
* ``bzr export`` to tgz files will only write out the basename of the
1171
tarfile to the gzip file. (Jelmer Vernooij, #102234)
1173
* ``bzr push --overwrite`` with an older revision specified will now correctly
1174
roll back the target branch. (Jelmer Vernooij, #386576)
1176
* ``bzr lp-propose`` can now propose merges against packaging branches on
1177
Launchpad without requiring the target branch to be specified.
1178
(Jelmer Vernooij, #704647)
1180
* ``bzr lp-propose`` no longer requires a reviewer to be specified. It will
1181
instead leave setting the reviewer up to Launchpad if it was not specified.
1182
(Jelmer Vernooij, #583772)
1184
* ``bzr pull`` will now exit with exit code 1 if there were tag conflicts.
1185
(Jelmer Vernooij, #213185)
1187
* ``bzr mv`` user errors no longer throw UnicodeEncodeError with non-ascii
1188
paths, however they may still print junk if not on a UTF-8 terminal.
1189
(Martin [gz], #707954)
1191
* ``bzr reconfigure --unstacked`` now copies revisions (and their
1192
ancestors) named in tags into the unstacked repository, not just the
1193
ancestry of the branch's tip. (Andrew Bennetts, #401646)
1195
* ``bzr serve`` no longer crashes when a server_started hook is installed and
1196
IPv6 support is available on the system. (Jelmer Vernooij, #293697)
1198
* ``bzr status`` will not rewrite the dirstate file if it only has
1199
'trivial' changes. (Currently limited to dir updates and newly-added
1200
files changing state.) This saves a bit of time for regular operations.
1201
eg. ``bzr status`` in a 100k tree takes 1.4s to compute the status, but 1s
1202
to re-save the dirstate file. (John Arbash Meinel, #765881)
1204
* ``bzr tags`` will no longer choke on branches with ghost revisions in
1205
their mainline and tags on revisions not in the branch ancestry.
1206
(Jelmer Vernooij, #397556)
1208
* ``bzr whoami`` will now display an error if both a new identity and
1209
``--email`` were specified. (Jelmer Vernooij, #680449)
1211
* ``launchpadlib`` doesn't provide the ``uris`` module in some old versions.
1212
(Vincent Ladeuil, #706835)
1214
* Empty entries in the ``NO_PROXY`` variable are no longer treated as matching
1216
(Martin Pool, #586341)
1218
* Plugins incompatible with the current version of bzr no longer produce a
1219
warning on every command invocation. Instead, a message is shown by
1220
``bzr plugins`` and in crash reports.
1221
(#704195, Martin Pool)
1223
* The "pretty" version of ``needs_read_lock`` and ``needs_write_lock`` now
1224
preserves the identity of default parameter values.
1225
(Andrew Bennetts, #718569)
1227
* ``bzr dump-btree --raw`` no longer tracebacks on a B-Tree file
1228
containing no rows. (Eric Siegerman, #715508)
1230
* Fix ``bzr lp-mirror`` to work on command line branch URLs and branches
1231
without an explicit public location. (Max Bowsher)
1233
* On Python 2.6 and higher, use multiprocessing.cpu_count() to retrieve the
1234
number of available processors. (Jelmer Vernooij, #693140)
1239
* Added ``Branch.heads_to_fetch`` method. Implementations of the Branch API
1240
must now inherit or implement this method. (Andrew Bennetts, #721328)
1242
* Added ``bzrlib.mergetools`` module with helper functions for working with
1243
the list of external merge tools. (Gordon Tyler, #489915)
1245
* All methods and arguments that were deprecated before 2.0
1246
have been removed. (Jelmer Vernooij)
1248
* Branch formats should now be registered on the format registry
1249
(``bzrlib.branch.format_registry``) rather than using the class
1250
methods on ``BranchFormat``. (Jelmer Vernooij, #714729)
1252
* ``Branch.set_revision_history`` is now deprecated.
1255
* ``BranchFormat.supports_leaving_lock()`` and
1256
``RepositoryFormat.supports_leaving_lock`` flags have been added.
1259
* ``Branch.fetch`` implementations must now accept an optional
1260
``fetch_tags`` keyword argument. (Andrew Bennetts)
1262
* ``Branch.import_last_revision_info`` is deprecated. Use the
1263
``import_last_revision_info_and_tags`` method instead.
1266
* Because it was too specific to BzrDir implementations,
1267
``ControlDir.sprout`` no longer has a default implementation; it now
1268
raises ``NotImplementedError``. (Jelmer Vernooij, #717937)
1270
* ``bzrlib.deprecated_graph`` has been removed. ``bzrlib.graph``
1271
scales better tree and should be used instead.
1272
(Jelmer Vernooij, #733612)
1274
* ``ControlDirFormat.register_format`` has been removed. Instead,
1275
``Prober`` implementations should now implement a ``known_formats``
1276
method. (Jelmer Vernooij)
1278
* ControlDirFormats can now provide a ``check_status`` method and
1279
raise a custom exception or warning when an unsupported or deprecated
1280
format is being opened. (Jelmer Vernooij, #731311)
1282
* ``bzrlib.revionspec.dwim_revspecs`` is deprecated.
1283
Use ``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_revspec`` and
1284
``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_lazy_revspec``
1285
instead. (Jelmer Vernooij, #721971)
1287
* ``BzrDirFormat`` has a new attribute ``fixed_components`` that
1288
indicates whether the components of the bzrdir can be upgraded
1289
independent of the ``BzrDir``. (Jelmer Vernooij)
1291
* ``BzrProber.register_format`` and ``BzrProber.unregister_format`` are
1292
now deprecated in favour of the ``BzrProber.formats`` format registry.
1295
* ``ControlDir`` implementations no longer have to provide the
1296
``get_branch_transport``, ``get_workingtree_transport`` and
1297
``get_repository_transport`` methods. (Jelmer Vernooij, #730325)
1299
* ``Converter`` has been moved from ``bzrlib.bzrdir`` to
1300
``bzrlib.controldir``. (Jelmer Vernooij)
1302
* Repository formats can now provide
1303
``_get_extra_interrepo_test_combinations`` in the same module
1304
to provide extra test combinations for ``bzrlib.tests.per_repository``.
1307
* Repository formats should now be registered on the format registry
1308
(``bzrlib.repository.format_registry``) rather than using the class
1309
methods on ``RepositoryFormat``. (Jelmer Vernooij)
1311
* Repository formats can now indicate they do not support the full
1312
VersionedFiles API by setting the ``supports_full_versioned_files``
1313
attribute to False. A subset of the VersionedFiles API
1314
(signatures and text graphs) still needs to be supported.
1317
* Repository formats have a new method ``is_deprecated`` that
1318
implementations can override to return True to trigger a deprecation
1319
warning. (Jelmer Vernooij)
1321
* The ``revision_id`` parameter of
1322
``Repository.search_missing_revision_ids`` and
1323
``InterRepository.search_missing_revision_ids`` is deprecated. It is
1324
replaced by the ``revision_ids`` parameter. (Andrew Bennetts)
1326
* Working tree formats should now be registered on the format registry
1327
(``bzrlib.working_tree.format_registry``) rather than using the class
1328
methods on ``WorkingTreeFormat``. (Jelmer Vernooij, #714730)
1330
* Exporting may now be done with a generator
1331
(``bzrlib.export.get_export_generator``) (Geoff/xaav, #791005)
1336
* ``CatchingExceptionThread`` (formerly ThreadWithException) has been moved
1337
out of the ``bzrlib.tests`` hierarchy to make it clearer that it can be used
1338
outside of tests. This class makes it easier to track exceptions in threads
1339
by catching them so they can be re-raised in the controlling thread. It's
1340
available in the ``bzrlib.cethread`` module. (Vincent Ladeuil)
1342
* Correctly propagate malloc failures from diff-delta.c code as MemoryError
1343
so OOM conditions during groupcompress are clearly reported. This entailed a
1344
change to several function signatures. (Martin [gz], #633336)
1346
* ``HookPoint.lazy_hook`` and ``Hooks.install_named_lazy_hook`` can install
1347
hooks for which the callable is loaded lazily. (Jelmer Vernooij)
1352
* The Range parsing for HTTP requests will correctly parse incomplete ranges.
1353
(Vincent Ladeuil, #731240)
1356
vim: tw=74 ft=rst ff=unix