11
:2.4.2: NOT RELEASED YET
13
External Compatibility Breaks
14
*****************************
16
.. These may require users to change the way they use Bazaar.
21
.. New commands, options, etc that users may wish to try out.
26
.. Improvements to existing commands, especially improved performance
27
or memory usage, or better results.
29
* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
30
every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
35
* Fixed loading of external merge tools from config to properly decode
36
command-lines which contain embedded quotes. (Gordon Tyler, #828803)
38
* Include declaration of 'changed' to avoid an UnboundLocalError in dirstate
39
pyrex code with new Cython versions. (Denys Duchier, #837221)
41
* Prevent several kinds of OverflowError and other fallout from failing to fit
42
stat fields into four bytes in dirstate pack_stat implementations.
43
(Martin Packman, #683191 #706957)
45
* Return early from create_delta_index_from_delta given tiny inputs. This
46
avoids raising a spurious MemoryError on certain platforms such as AIX.
47
(John Arbash Meinel, #856731)
49
* Fixed an infinite loop when creating a repo at the root of the filesystem,
50
i.e. "/", due to posixpath.normpath() not collapsing 2 leading slashes into
51
one, thus respecting the POSIX standard, but making relpath() loop infinitely.
52
(Florian Vichot, #861008)
57
.. Improved or updated documentation.
62
.. Changes that may require updates in plugins or other code that uses
68
.. Major internal changes, unlikely to be visible to users or plugin
69
developers, but interesting for bzr developers.
74
.. Fixes and changes that are only relevant to bzr's test framework and
75
suite. This can include new facilities for writing tests, fixes to
76
spurious test failures and changes to the way things should be tested.
78
* Fix the race for TestingThreadingTCPServer in
79
test_server_crash_while_responding. (Vincent Ladeuil, #869366)
81
* Really corrupt the pack file without depending on a special length or value.
82
(Vincent Ladeuil, #807032)
90
This is a bugfix release. Upgrading is recommended for all users of earlier
93
It includes fixes from previous stable releases and address some issues with
97
External Compatibility Breaks
98
*****************************
100
.. These may require users to change the way they use Bazaar.
105
.. New commands, options, etc that users may wish to try out.
110
.. Improvements to existing commands, especially improved performance
111
or memory usage, or better results.
116
.. Fixes for situations where bzr would previously crash or give incorrect
117
or undesirable results.
119
* ``config.LocationMatcher`` properly excludes unrelated sections.
120
(Vincent Ladeuil, #829237)
122
* ``dirstate.fdatasync`` and ``repository.fdatasync`` can now properly be
123
disabled. (Vincent Ladeuil, #824513)
125
* Disable ``os.fsync`` and ``os.fdatasync`` by default when running
126
``bzr selftest``. You can use ``--sync`` to re-enable them.
127
(John Arbash Meinel, #837293)
129
* Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
131
* Avoid UnicodeDecode error when reporting EINVAL from transports.
132
(IWATA Hidetaka, #829237)
137
.. Improved or updated documentation.
139
* Corrected documentation for BZR_PROGRESS_BAR.
140
(Dennis Benzinger, #735417)
142
* Corrected documentation for ``bzr serve`` in the Admin Guide.
143
(Morten Bøgeskov, Martin Pool, #832576)
148
.. Changes that may require updates in plugins or other code that uses
154
.. Major internal changes, unlikely to be visible to users or plugin
155
developers, but interesting for bzr developers.
160
.. Fixes and changes that are only relevant to bzr's test framework and
161
suite. This can include new facilities for writing tests, fixes to
162
spurious test failures and changes to the way things should be tested.
164
* The test suite should now be able to run under weird environments where
165
``/etc/passwd`` doesn't contain the ``uid`` for the user running selftest
166
or where ``fakeroot`` is used but ``/root`` is inacessible.
167
(Vincent Ladeuil, #825027)
174
This release marks the start of a new long-term-stable series. From here, we
175
will only make bugfix releases on the 2.4 series (2.4.1, etc, and support it
176
until February 2013), while 2.5 will become our new development series.
178
This is a bugfix and polish release over the 2.3 series, with a large number
179
of bugs fixed (>150 for the 2.4 series alone), and some performance
180
improvements. Support for python 2.4 and 2.5 has been dropped, many large
181
working tree operations have been optimized as well as some stacked branches
184
Only bugfixes from other stables series have been included since 2.4b5 so
185
all known fixed bugs are included here.
187
Users are encouraged to upgrade from the other stable series.
190
External Compatibility Breaks
191
*****************************
193
.. These may require users to change the way they use Bazaar.
198
.. New commands, options, etc that users may wish to try out.
203
.. Improvements to existing commands, especially improved performance
204
or memory usage, or better results.
209
.. Fixes for situations where bzr would previously crash or give incorrect
210
or undesirable results.
212
* A call to CHKInventory's filter-method will not result in a
213
DuplicateFileId error, if you move a subfolder and change a file in
215
(Bastian Bowe, #809901)
217
* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
218
checks to see if the most recent published source package version for
219
that project is present in the branch tags. This should help developers
220
trust whether the packaging branch is up-to-date and can be used for new
221
changes. The level of verbosity is controlled by the config item
222
``launchpad.packaging_verbosity``. It can be set to one of
229
only display if the branch is out-of-date
232
also display single-line up-to-date and missing,
236
(default) display multi-line content for all states
239
(John Arbash Meinel, #609187, #812928)
241
* Cope with not all Python versions having a ``clear`` method on
242
``TestCase._type_equality_funcs``.
243
(Martin [gz], Jelmer Vernooij, #809048)
245
* Fetching tags when fetching the tip revision of a branch is now
246
controlled by the config setting ``branch.fetch_tags``. The behavior has
247
been reverted to 2.3's not-fetching tagged revisions by default.
248
(John Arbash Meinel, #771184)
250
* The fix for bug #513709 caused us to open a new connection when
251
switching a lightweight checkout that was pointing at a bound branch.
252
This isn't necessary because we know the master URL without opening it,
253
avoiding an extra SSH connection, etc.
254
(John Arbash Meinel, #812285)
260
.. Improved or updated documentation.
265
.. Changes that may require updates in plugins or other code that uses
271
.. Major internal changes, unlikely to be visible to users or plugin
272
developers, but interesting for bzr developers.
277
.. Fixes and changes that are only relevant to bzr's test framework and
278
suite. This can include new facilities for writing tests, fixes to
279
spurious test failures and changes to the way things should be tested.
281
* `BranchBuilder.build_snapshot` now supports a "flush" action. This
282
cleanly and reliably allows tests using `BranchBuilder` to construct
283
branches that e.g. rename files out of a directory and unversion that
284
directory in the same revision. Previously some changes were impossible
285
due to the order that `build_snapshot` performs its actions.
288
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
289
just compares the bytes in the dirstate file to its pristine state,
290
rather than opening the WorkingTree and calling ``last_revision()``.
291
This reduces the overall test suite time by about 10% on my laptop.
300
This is the fifth (and last) beta of the 2.4 series leading to
301
2.4.0 release in August 2011. Beta releases are suitable for
302
everyday use but may cause some incompatibilities with plugins.
304
This release includes all bug fixed in previous series known at
305
the time of this release.
307
External Compatibility Breaks
308
*****************************
315
* New command ``verify-signatures`` to check if all commits or specified commits
316
have digital signatures from trusted keys. Requires python-gpgme to be
319
* New option ``--signatures`` for ``bzr log`` to display digital signature
320
verification results for each commit.
322
* Config option acceptable_keys to list which GPG keys are verified as trusted.
324
* Config option validate_signatures_in_log to always show signatures in
330
* ``Branch.open`` is now about 3x faster (about 2ms instead of 6.5ms).
333
* Pack, dirstate, and index files are synced to persistent storage if
334
possible when writing finishes, to reduce the risk of problems caused by
335
a machine crash or similar problem. This can be turned off through the
336
``dirstate.fdatasync`` and ``repository.fdatasync`` options, which can
337
be set in ``locations.conf`` or ``bazaar.conf``. (Martin Pool,
343
* Display a proper error message when a config file content cannot be
344
decoded as UTF-8 or when it cannot be parsed.
345
(Vincent Ladeuil, #502060, #688677, #797246)
347
* Generate a single conflict (instead of two) when merging a branch
348
modifying and renaming a file in a branch that deleted it (or vice-versa).
349
(Vincent Ladeuil, #688101)
351
* Give a more helpful message when the bzr executable doesn't match the
352
library. (This typically happens because of a misconfigured PYTHONPATH
353
or half-installed bzr.)
354
(Martin Pool, #804553)
356
* Properly load utf8-encoded config files. (Vincent Ladeuil, #799212)
358
* ``GraphThunkIdsToKeys.merge_sort`` now properly returns
359
keys rather than ids. (Jelmer Vernooij, #799677)
361
* ``TreeTransformBase.fixup_new_roots`` can now check that a tree root
362
is present. (Jelmer Vernooij, #801257)
367
* New attributes ``WorkingTreeFormat.supports_versioned_directories`` and
368
``RepositoryFormat.supports_versioned_directories``.
369
(Jelmer Vernooij, #765815)
371
* The "revno" field type when using the python version-info format is now
372
a string (to handle dotted revnos) (Benoît Pierre, #796259)
377
* Start implementing localization, starting with command help text (but not
378
the command options themselves). This will allow bootstrapping the bzr
379
internationalization process. (Inada Naoki)
384
* Fix test failures when running as a homeless user (debian buildd). Tests
385
leaking into ``${HOME}/.bzr.log`` should be detected properly now.
386
(Vincent Ladeuil, #798698)
393
This is the fourth beta of the 2.4 series, leading to a 2.4.0 release in
394
August 2011. Beta releases are suitable for everyday use but may cause some
395
incompatibilities with plugins.
397
This release includes all bug fixed in previous series known at the time of
401
External Compatibility Breaks
402
*****************************
404
.. These may require users to change the way they use Bazaar.
406
* Do not treat configuration option 'check_signatures = require' as if
407
it were 'create_signatures = always' (Jonathan Riddell)
412
.. New commands, options, etc that users may wish to try out.
414
* Hooks have been added for config stacks: ``get``, ``set`` and ``remove``
415
are called when an option is respectively read, modified or deleted. Also
416
added ``load`` and ``save`` hooks for config stores, called when the
417
stores are loaded or saved. (Vincent Ladeuil)
419
* New hook server_exception in bzrlib.smart.server to catch any
420
exception caused while running bzr serve.
421
(Jonathan Riddell, #274578)
423
* New hook set_commit_message in bzrlib.msgeditor to set a commit message
424
and revision properties. (Jonathan Riddell, #274578)
426
* Support ``-S`` as an alias for ``--short`` for the ``log`` and
427
``missing`` commands. (Martin von Gagern, #38655)
432
.. Improvements to existing commands, especially improved performance
433
or memory usage, or better results.
435
* ``bzr annotate`` can be run without setting whoami data first.
436
(Jonathan Riddell, #667408)
441
.. Fixes for situations where bzr would previously crash or give incorrect
442
or undesirable results.
444
* Bazaar can now detect when a lock file is held by a dead process
445
originating from the same machine, and steal the lock after printing a
446
message to the user. This is off by default, for safety, but can be
447
turned on by setting the configuration variable ``locks.steal_dead`` to
449
(Martin Pool, #220464)
451
* ``bzr version-info`` now works when the tree is on a dotted revno.
452
(Benoît Pierre, #796259)
454
* Credentials in the log output produced by ``-Dhttp`` are masked so users
455
can more freely post them in bug reports. (Vincent Ladeuil, #723074)
457
* Fix a race condition for ``server_started`` hooks leading to a spurious
458
test failure. (Vincent Ladeuil, #789167)
460
* Fix exporting subdirectory with ``--per-file-timestamps``.
461
(Szilveszter Farkas, #795557)
463
* Handle files that get created but don't get used during TreeTransform.
464
``open()`` can create a file, and still raise an exception before it
465
returns. So anything we might have created, make sure we destroy during
466
``finalize()``. (Martin [gz], #597686)
468
* ``pack_repo`` now uses ``Transport.move`` instead of
469
``Transport.rename``, deleting any existing targets even on SFTP.
470
(Martin von Gagern, #421776)
472
* Pass the ``build_mo`` command to the rest of the setup() calls in
473
setup.py. The ``bdist_wininst`` and ``py2exe`` code paths were failing
474
because ``build_mo`` became a required step that they didn't know about.
475
(John Arbash Meinel, #787122)
477
* Preserve existing ``root-id`` when merging an unrelated branch.
478
(Aaron Bentley, #806356)
480
* Properly avoid re-adding a file after it changes case on CICP
481
filesystems. (John Arbash Meinel, #798130)
483
* Reports the original error when an InvalidHttpResponse exception is
484
encountered to facilitate debug. (Vincent Ladeuil, #788530)
486
* Reports a non-existent file error when trying to merge in a file
487
that does not exist. (Jonathan Riddell, #330063)
489
* ``UIFactory.prompt``, ``UIFactory.get_username``,
490
``UIFactory.get_password`` and ``UIFactory.get_boolean`` now require a
491
unicode prompt to be passed in. (Jelmer Vernooij, #592083)
493
* Support merging into the empty tree. (Aaron Bentley, #595328)
498
.. Improved or updated documentation.
500
* Improve documentation of ``bzr merge --force``.
501
(Neil Martinsen-Burrell, #767307)
503
* Make docs for configuration options for digital signatures match
504
reality. (Jonathan Riddell)
506
* Add user-guide page on GPG signatures. (Jonathan Riddell)
511
.. Changes that may require updates in plugins or other code that uses
514
* Checking for a file id in a `Tree` or `Inventory` using ``in`` is now
515
deprecated. Instead, use `has_id`.
518
* Exporters are now all exposed as generators, rather than as single-call
519
functions, so that calling code can take stream the output.
522
* Information about held lockdir locks returned from eg `LockDir.peek` is
523
now represented as a `LockHeldInfo` object, rather than a plain
527
* Remove `file_status` function.
530
* ``Repository.iter_reverse_revision_history`` is now deprecated.
531
Use ``Graph.iter_lefthand_ancestry`` instead.
532
(Jelmer Vernooij, #739481)
534
* ``Repository.get_ancestry`` has been deprecated. Use
535
``Graph.iter_ancestry`` instead.
536
(Jelmer Vernooij, #784511)
541
.. Major internal changes, unlikely to be visible to users or plugin
542
developers, but interesting for bzr developers.
544
* ``tools/check-newsbugs.py`` accepts a ``--browser`` option to open
545
corresponding launchpad pages in a browser. (Vincent Ladeuil)
550
.. Fixes and changes that are only relevant to bzr's test framework and
551
suite. This can include new facilities for writing tests, fixes to
552
spurious test failures and changes to the way things should be tested.
554
* A `ImportTariffTestCase` base class has been added in
555
``bzrlib.tests.test_import_tariff``, which can be used for import tariff
556
tests in plugins. (Jelmer Vernooij, #793465)
558
* Fix deadlock in `TestImportTariffs.test_simple_serve` when stderr gets
559
more output than fits in the default buffer. This was happening on the
560
Windows buildslave, and could easily happen in other circumstances where
561
the default OS buffer size for pipes is small or the ``python -v``
562
output is large. (Andrew Bennetts, #784802)
564
* Fix spurious test failure on OSX for WorkingTreeFormat2.
565
(Vincent Ladeuil, #787942)
567
* Re-target ``bb.test_merge.TestMerge.test_merge_reversed_revision_range``
568
and rewrite it as a parametrized test to avoid unrelated failures.
569
(Vincent Ladeuil, #795456)
571
* Show log file contents from subprocesses started by
572
`start_bzr_subprocess` in test failure details. This may help diagnose
573
strange hangs and failures involving subprocesses. (Andrew Bennetts)
575
* Skip ``utextwrap`` tests when ``sphinx`` breaks text_wrap by an hostile
576
monkey-patch to textwrap.TextWrapper.wordsep_re.
577
(Vincent Ladeuil, #785098)
579
* Multiple ``selftest --exclude`` options are now combined instead of
580
overriding each other. (Vincent Ladeuil, #746991)
582
* Restore some ``FTPTransport`` test coverage by allowing ``pyftpdlib
583
0.6.0`` to be used. Also restore ``medusa`` support while leaving it
584
disabled to make it easier to use if/when we can in the future.
585
(Vincent Ladeuil, #781140)
587
* `TestImportTariffs` no longer uses the real ``$HOME``. This prevents it
588
from polluting ``$HOME/.bzr.log`` or being accidentally influenced by
589
user configuration such as aliases. It still runs with all the user's
590
plugins enabled, as intended.
591
(Vincent Ladeuil, Andrew Bennetts, #789505)
599
This is the third beta of the 2.4 series, leading to a 2.4.0 release in
600
August 2011. Beta releases are suitable for everyday use but may cause some
601
incompatibilities with plugins.
603
This release includes all bug fixed in previous series known at the time of
607
External Compatibility Breaks
608
*****************************
610
.. These may require users to change the way they use Bazaar.
612
* ``bzr-2.4`` has officially dropped support for python2.4 and python2.5.
613
We will continue to maintain ``bzr-2.3`` for people who still need to
614
use those versions of python. (John Arbash Meinel)
619
.. New commands, options, etc that users may wish to try out.
621
* The text compressor used for 2a repositories now has a tweakable
622
parameter that can be set in bazaar.conf.
623
``bzr.groupcompress.max_entries_per_source`` default of 65536.
624
When doing compression, we build up an index of locations to match
625
against. Setting this higher will result in slightly better compression,
626
at a cost of more memory. Note that a value of 65k represents fully
627
sampling a 1MB file. So this only has an effect when compressing texts
628
larger than N*16 bytes. (John Arbash Meinel, #602614)
633
.. Improvements to existing commands, especially improved performance
634
or memory usage, or better results.
636
* ``bzr branch --stacked`` from a smart server uses the network a little
637
more efficiently. For a simple branch it reduces the number of
638
round-trips by about 20%. (Andrew Bennetts)
640
* ``bzr log --line`` scales the width of the author field with the size of
641
the line. This means that the full author name is shown when the
642
environment variable BZR_COLUMNS=0. (Neil Martinsen-Burrell)
644
* ``bzr pull`` now properly triggers the fast
645
``CHKInventory.iter_changes`` rather than the slow generic
646
inter-Inventory changes. It used to use a ``DirStateRevisionTree`` as
647
one of the source trees, which is faster when we have to read the whole
648
inventory anyway, but much slower when we can get just the delta out of
649
the repository. On a 70k record tree, this changes ``bzr pull`` from 28s
650
down to 17s. (John Arbash Meinel, #780677)
652
* Slightly reduced memory consumption when fetching into a 2a repository
653
by reusing existing caching a little better. (Andrew Bennetts)
655
* Speed up ``bzr status`` by a little bit when there are a couple of
656
modified files. We now track how many files we have seen that need
657
updating, and only rewrite the dirstate file if enough of them have
658
changed. The default is 10, and can be overridden by setting the branch
659
option "``bzr.workingtree.worth_saving_limit``".
660
(Ian Clatworthy, John Arbash Meinel, #380202)
662
* Speed up ``bzr uncommit``. Instead of resetting the dirstate from
663
scratch, use ``update_basis_by_delta``, computing the delta from the
664
repository. (John Arbash Meinel, #780544)
669
.. Fixes for situations where bzr would previously crash or give incorrect
670
or undesirable results.
672
* All Tree types can now be exported as tar.*, zip or directories.
675
* ``bzr merge --no-remember location`` never sets ``submit_branch``.
676
(Vincent Ladeuil, #782169)
678
* ``bzr pull --no-remember location`` never sets
679
``parent_location``. ``bzr push --no-remember location`` never
680
sets ``push_location``. ``bzr send --no-remember
681
submit_location public_location`` never sets ``submit_branch``
682
nor ``public_branch``. (Vincent Ladeuil)
684
* Conflicts involving non-ascii filenames are now properly reported rather
685
than failing with a UnicodeEncodeError. (Martin [GZ], #686161)
687
* Correct parent is now set when using 'switch -b' with bound branches.
688
(A. S. Budden, #513709)
690
* Fix `bzr plugins` regression in bzr 2.4 which resulted in a traceback
691
from writelines on ckj terminals. (Martin [GZ], #754082)
693
* ``WT.inventory`` and ``WT.iter_entries_by_dir()`` was not correctly
694
reporting subdirectories that were tree references (in formats that
695
supported them). (John Arbash Meinel, #764677)
697
* Merging into empty branches now gives an error as this is currently
698
not supported. (Jonathan Riddell, #242175)
700
* Do not show exception to user on pointless commit error.
701
(Jonathan Riddell #317357)
703
* ``WT.update_basis_by_delta`` no longer requires that the deltas match
704
the current WT state. This allows ``update_basis_by_delta`` to be used
705
by more commands than just commit. Updating with a delta allows us to
706
not load the whole inventory, which can take 10+s with large trees.
707
(Jonathan Riddell, John Arbash Meinel, #781168)
709
* ``bzr mv --after old_name new_name`` now works if "new_name" is newly
710
added. (Benoît Pierre)
716
.. Improved or updated documentation.
718
* Restore the workaround for option names including dots (--1.14) which was
719
disabled when we stopped listing --1.9 as a format.
720
(Vincent Ladeuil, #782289)
725
.. Changes that may require updates in plugins or other code that uses
728
* ``annotate_file`` has been deprecated in favor of
729
``annotate_file_revision_tree``. (Jelmer Vernooij, #775598)
731
* ``Branch.fetch`` now takes an optional ``limit`` argument.
732
(Andrew Bennetts, Jelmer Vernooij, #750175)
734
* ``Inter.get`` now raises ``NoCompatibleInter`` if there are no
735
compatible optimisers rather than an instance of the class it is called
736
on. (Jelmer Vernooij)
738
* ``Branch.push`` now takes a ``lossy`` argument.
739
``Branch.lossy_push`` has been removed.
742
* New method ``Repository.get_file_graph`` which can return the
743
per-file revision graph. (Jelmer Vernooij, #775578)
745
* The default implementation of ``Branch`` is now oriented to
746
storing the branch tip. Branch implementations which store the full
747
history should now subclass ``FullHistoryBzrBranch``.
748
``Branch._last_revision_info`` has been renamed to
749
``Branch._read_last_revision_info`` (Jelmer Vernooij)
751
* ``Tree.__iter__`` has been deprecated; use ``Tree.all_file_ids``
752
instead. (Jelmer Vernooij)
754
* ``Tree.get_symlink_target`` now takes an optional ``path``
755
argument. (Jelmer Vernooij)
760
.. Major internal changes, unlikely to be visible to users or plugin
761
developers, but interesting for bzr developers.
763
* ``MutableTree.smart_add`` now uses inventory deltas.
764
(Jelmer Vernooij, #146165)
766
* Removed ``bzrlib.branch._run_with_write_locked_target`` as
767
``bzrlib.cleanup`` provides the same functionality in a more general
768
way. (Andrew Bennetts)
773
.. Fixes and changes that are only relevant to bzr's test framework and
774
suite. This can include new facilities for writing tests, fixes to
775
spurious test failures and changes to the way things should be tested.
777
* A test that was expected to fail but passes instead now counts as a failure
778
catching up with new testtools and subunit handling. (Martin [GZ], #654474)
780
* Make it easier for plugins to reuse the per_workingtree scenarios by
781
restoring the wt_scenarios helper that was accidentally deleted.
782
(Vincent Ladeuil, #783472)
784
* Removed ``test_breakin`` tests that were excessively prone to hanging,
785
did not work on Wine, and partly already disabled.
786
(Martin Pool, #408814, #746985)
788
* Windows locations are different and should be tested accordingly.
789
(Vincent Ladeuil, #788131)
796
This is the second beta of the 2.4 series, leading to a 2.4.0 release in
797
August 2011. Beta releases are suitable for everyday use but may cause some
798
incompatibilities with plugins.
800
This release includes all bug fixed in previous series known at the time of
804
External Compatibility Breaks
805
*****************************
807
.. These may require users to change the way they use Bazaar.
809
* Two command synonyms for ``bzr branch`` have been deprecated, to avoid
810
confusion and to allow the names to later be reused. The removed names
811
are: ``get`` and ``clone``. (Martin Pool, #506265)
816
.. New commands, options, etc that users may wish to try out.
818
* ``bzr commit`` now supports a ``--lossy`` argument that can be used
819
to discard any data that can not be natively represented when committing
820
to a foreign VCS. (Jelmer Vernooij, #587721)
825
.. Improvements to existing commands, especially improved performance
826
or memory usage, or better results.
828
* ``bzr merge`` in large trees is now significantly faster. On a 70k entry
829
tree, the time went from ~3min down to 30s. This also effects ``bzr pull``
830
and ``bzr update`` since they use the same merge logic to update the
831
WorkingTree. (John Arbash Meinel, #759091)
833
* ``bzr revert`` now properly uses ``bzr status``'s optimized
834
``iter_changes``. This can be a significant performance difference (33s
835
to 5s on large trees). (John Arbash Meinel, #759096)
837
* Resolve ``lp:FOO`` urls locally rather than doing an XMLRPC request if
838
the user has done ``bzr launchpad-login``. The bzr+ssh URLs were already
839
being handed off to the remote server anyway (xmlrpc has been mapping
840
``lp:bzr`` to ``bzr+ssh://bazaar.launchpad.net/+branch/bzr``, rather
841
than ``bzr+ssh://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev`` for a few
842
months now.) By doing it ourselves, we can cut out substantial startup
843
time. From Netherlands to London it was taking 368ms to do the XMLRPC
844
call as much as 2s from Sydney. You can test the local logic by using
845
``-Dlaunchpad``. (John Arbash Meinel, #397739)
847
* When building a new WorkingTree (such as during ``bzr co`` or
848
``bzr branch``) we now properly store the stat and hash of files that
849
are old enough. This saves a fair amount of time on the first
850
``bzr status`` (on a 500MB tree, it saves about 30+s).
851
(John Arbash Meinel, #740932)
857
.. Fixes for situations where bzr would previously crash or give incorrect
858
or undesirable results.
860
* Arguments that can't be decoded to unicode in the current posix locale give
861
a clearer error message without a traceback. (Martin [gz], #745712)
863
* ``bzrlib.log._DEFAULT_REQUEST_PARAMS`` is no longer accidentally
864
mutated by ``bzrlib.log._apply_log_request_defaults``. In practice
865
these default values aren't relied on very often so this probably
866
wasn't causing any trouble. (Andrew Bennetts)
868
* ``bzr log`` now works on revisions which are not in the current branch.
869
(Matt Giuca, #241998)
871
* Don't rewrite the dirstate file when non-interesting changes have
872
occurred. This can significantly improve 'bzr status' times when there
873
are only small changes to a large tree.
874
(Ian Clatworthy, John Arbash Meinel, #380202)
876
* Lazy hooks are now reset between test runs. (Jelmer Vernooij, #745566)
878
* ``bzrlib.merge.Merge`` now calls ``iter_changes`` without
879
``include_unversioned=True``. This makes it significantly faster in many
880
cases, because it only looks at modified files, rather than building
881
information about all files. This can cause failures in other
882
TreeTransform code, because it had been expecting to know the names of
883
things which had not changed (such as parent directories). All cases we
884
know about so far have been fixed, but there may be fallout for edge
885
cases that we are missing. (John Arbash Meinel, #759091)
887
* ``SFTPTransport`` is more pro-active about closing file-handles. This
888
reduces the chance of having threads fail from async requests while
889
running the test suite. (John Arbash Meinel, #656170)
891
* Standalone bzr.exe installation on Windows: user can put additional python
892
libraries into ``site-packages`` subdirectory of the installation directory,
893
this might be required for "installing" extra dependencies for some plugins.
894
(Alexander Belchenko, #743256)
896
* ``transform.revert()`` has been updated to use
897
``wt.iter_changes(basis_tree)`` rather than
898
``basis_tree.iter_changes(wt)``. This allows the optimized code path to
899
kick in, improving ``bzr revert`` times significantly (33s to 4s on
900
large trees, 0.7s to 0.3s on small trees.) (John Arbash Meinel, #759096)
902
* ``TreeTransform.create_file/new_file`` can now take an optional ``sha1``
903
parameter. If supplied, when the transform is applied, it will then call
904
``self._tree._observed_sha1`` for those files. This lets us update the
905
hash-cache for content that we create, preventing us from re-reading the
906
content in the next ``bzr status``. (John Arbash Meinel, #740932)
911
* Added a section about using a shared SSH account on a server for bzr+ssh
912
access. (Russell Smith)
914
* The documentation now recommends using SSH rather than SFTP in the
915
tutorials and the examples, because that will generally be much faster
916
and better in cases where it can be used. SFTP is still available and
917
mentioned as an alternative. (Martin Pool, #636712)
922
.. Changes that may require updates in plugins or other code that uses
925
* ``Branch.update_revisions`` has been made private and should no
926
longer be used by external users. Use ``Branch.pull`` or ``Branch.push``
927
instead. (Jelmer Vernooij, #771765)
929
* Commands now have an `invoked_as` attribute, showing the name under
930
which they were called before alias expansion.
933
* ``Hooks.create_hook`` is now deprecated in favour of ``Hooks.add_hook``.
936
* If you call `bzrlib.initialize` but forget to enter the resulting object
937
as a context manager, bzrlib will now be initialized anyhow.
938
(Previously simple programs calling bzrlib might find the library was
939
mysteriously silent.)
942
* Inventory-specific functionality has been split out of ``Tree`` into
943
a new ``InventoryTree`` class. Tree instances no longer
944
necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
946
* Inventory-specific functionality has been split out of ``RevisionTree``
947
into a new ``InventoryRevisionTree`` class. RevisionTree instances no
948
longer necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
950
* New method ``Hooks.uninstall_named_hook``. (Jelmer Vernooij, #301472)
952
* ``revision_graph_can_have_wrong_parents`` is now an attribute
953
on ``RepositoryFormat`` rather than a method on ``Repository``.
956
* ``Testament`` now takes a ``tree`` rather than an
957
``inventory``. (Jelmer Vernooij, #762608)
959
* ``TestCase.failUnlessExists`` and ``failIfExists`` are deprecated in
960
favour of ``assertPathExists`` and ``assertPathDoesNotExist``
964
* The ``revno`` parameter of ``log.LogRevision`` may now be None,
965
representing a revision which is not in the current branch.
966
(Matt Giuca, #241998)
968
* The various knit pack repository format classes have been moved
969
from ``bzrlib.repofmt.pack_repo`` to
970
``bzrlib.repofmt.knitpack_repo``. (Jelmer Vernooij)
972
* ``RevisionTree`` now has a new method ``get_file_revision``.
975
* ``WorkingTree`` no longer provides an ``inventory``. Instead,
976
all inventory-related functionality is now on the subclass
977
``InventoryWorkingTree`` that all native Bazaar working tree
978
implementations derive from. (Jelmer Vernooij)
983
.. Major internal changes, unlikely to be visible to users or plugin
984
developers, but interesting for bzr developers.
986
* Added ``osutils.lstat`` and ``osutils.fstat``. These are just the ``os``
987
functions on Linux, but they are wrapped on Windows so that fstat
988
matches lstat results across all python versions.
991
* ``WorkingTree._observed_sha1`` also updates the 'size' column. It
992
happened to be updated as a side-effect of commit, but if we start using
993
the function elsewhere we might as well do it directly.
999
.. Fixes and changes that are only relevant to bzr's test framework and
1000
suite. This can include new facilities for writing tests, fixes to
1001
spurious test failures and changes to the way things should be tested.
1003
* Stop using `failIf`, `failUnless`, `failIfEqual`, etc, that give
1004
`PendingDeprecationWarnings` on Python2.7.
1005
(Martin Pool, #760435)
1013
This is the first beta of the 2.4 series, leading up to a 2.4.0
1014
release in August 2011. Beta releases are suitable for everyday use
1015
but may cause some incompatibilities with plugins. Some plugins may need
1016
small updates to work with 2.4b1.
1018
External Compatibility Breaks
1019
*****************************
1026
* Added ``changelog_merge`` plugin for merging changes to ``Changelog`` files
1027
in GNU format. See ``bzr help changelog_merge`` for details.
1030
* Configuration options can now use references to other options in the same
1031
file by enclosing them with curly brackets (``{other_opt}``). This makes it
1032
possible to use, for example,
1033
``push_location=lp:~vila/bzr/config-{nickname}`` in ``branch.conf`` when
1034
using a loom. During the beta period, the default behaviour is to disable
1035
this feature. It can be activated by declaring ``bzr.config.expand = True``
1036
in ``bazaar.conf``. (Vincent Ladeuil)
1038
* External merge tools can now be configured in bazaar.conf. See
1039
``bzr help configuration`` for more information. (Gordon Tyler, #489915)
1041
* The ``lp:`` directory service now supports Launchpad's QA staging.
1042
(Jelmer Vernooij, #667483)
1047
* A new hidden command ``bzr repair-workingtree``. This is a way to force
1048
the dirstate file to be rebuilt, rather than using a ``bzr checkout``
1049
workaround. (John Arbash Meinel)
1051
* Added a ``Branch.heads_to_fetch`` RPC to the smart server protocol.
1052
This allows formats from plugins (such as looms) to efficiently tell the
1053
client which revisions need to be fetched. (Andrew Bennetts)
1055
* Branching, merging and pulling a branch now copies revisions named in
1056
tags, not just the tag metadata. (Andrew Bennetts, #309682)
1058
* ``bzr cat-revision`` no longer requires a working tree.
1059
(Jelmer Vernooij, #704405)
1061
* ``bzr export --per-file-timestamps`` for .tar.gz files will now
1062
override the mtime for trees exported on Python 2.7 and later, which
1063
expose the 'mtime' field in gzip files. This makes the output of
1064
``bzr export --per-file-timestamps`` for a particular tree
1065
deterministic. (Jelmer Vernooij, #711226)
1067
* ``bzr export --format=zip`` can now export to standard output,
1068
like the other exporters can. (Jelmer Vernooij, #513752)
1070
* ``bzr export`` can now create ``.tar.xz`` and ``.tar.lzma`` files.
1071
(Jelmer Vernooij, #551714)
1073
* Getting all entries from ``CHKInventory.iter_entries_by_dir()`` has been
1074
sped up dramatically for large trees. Iterating by dir is not the best
1075
way to load data from a CHK inventory, so it preloads all the items in
1076
the correct order. (With the gcc-tree, this changes it (re)reading 8GB
1077
of CHK data, down to just 150MB.) This has noticeable affects for things
1078
like building checkouts, etc. (John Arbash Meinel, #737234)
1083
* A MemoryError thrown on the server during a remote operation will now be
1084
usefully reported, and other unexpected errors will include the class name.
1085
(Martin [gz], #722416)
1087
* ``bzr annotate -r-1 file`` will now properly annotate a deleted file.
1088
(Andrew King, #537442)
1090
* ``bzr export`` to zip files will now set a mode on directories.
1091
(Jelmer Vernooij, #207253)
1093
* ``bzr export`` to tgz files will only write out the basename of the
1094
tarfile to the gzip file. (Jelmer Vernooij, #102234)
1096
* ``bzr push --overwrite`` with an older revision specified will now correctly
1097
roll back the target branch. (Jelmer Vernooij, #386576)
1099
* ``bzr lp-propose`` can now propose merges against packaging branches on
1100
Launchpad without requiring the target branch to be specified.
1101
(Jelmer Vernooij, #704647)
1103
* ``bzr lp-propose`` no longer requires a reviewer to be specified. It will
1104
instead leave setting the reviewer up to Launchpad if it was not specified.
1105
(Jelmer Vernooij, #583772)
1107
* ``bzr pull`` will now exit with exit code 1 if there were tag conflicts.
1108
(Jelmer Vernooij, #213185)
1110
* ``bzr mv`` user errors no longer throw UnicodeEncodeError with non-ascii
1111
paths, however they may still print junk if not on a UTF-8 terminal.
1112
(Martin [gz], #707954)
1114
* ``bzr reconfigure --unstacked`` now copies revisions (and their
1115
ancestors) named in tags into the unstacked repository, not just the
1116
ancestry of the branch's tip. (Andrew Bennetts, #401646)
1118
* ``bzr serve`` no longer crashes when a server_started hook is installed and
1119
IPv6 support is available on the system. (Jelmer Vernooij, #293697)
1121
* ``bzr status`` will not rewrite the dirstate file if it only has
1122
'trivial' changes. (Currently limited to dir updates and newly-added
1123
files changing state.) This saves a bit of time for regular operations.
1124
eg. ``bzr status`` in a 100k tree takes 1.4s to compute the status, but 1s
1125
to re-save the dirstate file. (John Arbash Meinel, #765881)
1127
* ``bzr tags`` will no longer choke on branches with ghost revisions in
1128
their mainline and tags on revisions not in the branch ancestry.
1129
(Jelmer Vernooij, #397556)
1131
* ``bzr whoami`` will now display an error if both a new identity and
1132
``--email`` were specified. (Jelmer Vernooij, #680449)
1134
* ``launchpadlib`` doesn't provide the ``uris`` module in some old versions.
1135
(Vincent Ladeuil, #706835)
1137
* Empty entries in the ``NO_PROXY`` variable are no longer treated as matching
1139
(Martin Pool, #586341)
1141
* Plugins incompatible with the current version of bzr no longer produce a
1142
warning on every command invocation. Instead, a message is shown by
1143
``bzr plugins`` and in crash reports.
1144
(#704195, Martin Pool)
1146
* The "pretty" version of ``needs_read_lock`` and ``needs_write_lock`` now
1147
preserves the identity of default parameter values.
1148
(Andrew Bennetts, #718569)
1150
* ``bzr dump-btree --raw`` no longer tracebacks on a B-Tree file
1151
containing no rows. (Eric Siegerman, #715508)
1153
* Fix ``bzr lp-mirror`` to work on command line branch URLs and branches
1154
without an explicit public location. (Max Bowsher)
1156
* On Python 2.6 and higher, use multiprocessing.cpu_count() to retrieve the
1157
number of available processors. (Jelmer Vernooij, #693140)
1162
* Added ``Branch.heads_to_fetch`` method. Implementations of the Branch API
1163
must now inherit or implement this method. (Andrew Bennetts, #721328)
1165
* Added ``bzrlib.mergetools`` module with helper functions for working with
1166
the list of external merge tools. (Gordon Tyler, #489915)
1168
* All methods and arguments that were deprecated before 2.0
1169
have been removed. (Jelmer Vernooij)
1171
* Branch formats should now be registered on the format registry
1172
(``bzrlib.branch.format_registry``) rather than using the class
1173
methods on ``BranchFormat``. (Jelmer Vernooij, #714729)
1175
* ``Branch.set_revision_history`` is now deprecated.
1178
* ``BranchFormat.supports_leaving_lock()`` and
1179
``RepositoryFormat.supports_leaving_lock`` flags have been added.
1182
* ``Branch.fetch`` implementations must now accept an optional
1183
``fetch_tags`` keyword argument. (Andrew Bennetts)
1185
* ``Branch.import_last_revision_info`` is deprecated. Use the
1186
``import_last_revision_info_and_tags`` method instead.
1189
* Because it was too specific to BzrDir implementations,
1190
``ControlDir.sprout`` no longer has a default implementation; it now
1191
raises ``NotImplementedError``. (Jelmer Vernooij, #717937)
1193
* ``bzrlib.deprecated_graph`` has been removed. ``bzrlib.graph``
1194
scales better tree and should be used instead.
1195
(Jelmer Vernooij, #733612)
1197
* ``ControlDirFormat.register_format`` has been removed. Instead,
1198
``Prober`` implementations should now implement a ``known_formats``
1199
method. (Jelmer Vernooij)
1201
* ControlDirFormats can now provide a ``check_status`` method and
1202
raise a custom exception or warning when an unsupported or deprecated
1203
format is being opened. (Jelmer Vernooij, #731311)
1205
* ``bzrlib.revionspec.dwim_revspecs`` is deprecated.
1206
Use ``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_revspec`` and
1207
``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_lazy_revspec``
1208
instead. (Jelmer Vernooij, #721971)
1210
* ``BzrDirFormat`` has a new attribute ``fixed_components`` that
1211
indicates whether the components of the bzrdir can be upgraded
1212
independent of the ``BzrDir``. (Jelmer Vernooij)
1214
* ``BzrProber.register_format`` and ``BzrProber.unregister_format`` are
1215
now deprecated in favour of the ``BzrProber.formats`` format registry.
1218
* ``ControlDir`` implementations no longer have to provide the
1219
``get_branch_transport``, ``get_workingtree_transport`` and
1220
``get_repository_transport`` methods. (Jelmer Vernooij, #730325)
1222
* ``Converter`` has been moved from ``bzrlib.bzrdir`` to
1223
``bzrlib.controldir``. (Jelmer Vernooij)
1225
* Repository formats can now provide
1226
``_get_extra_interrepo_test_combinations`` in the same module
1227
to provide extra test combinations for ``bzrlib.tests.per_repository``.
1230
* Repository formats should now be registered on the format registry
1231
(``bzrlib.repository.format_registry``) rather than using the class
1232
methods on ``RepositoryFormat``. (Jelmer Vernooij)
1234
* Repository formats can now indicate they do not support the full
1235
VersionedFiles API by setting the ``supports_full_versioned_files``
1236
attribute to False. A subset of the VersionedFiles API
1237
(signatures and text graphs) still needs to be supported.
1240
* Repository formats have a new method ``is_deprecated`` that
1241
implementations can override to return True to trigger a deprecation
1242
warning. (Jelmer Vernooij)
1244
* The ``revision_id`` parameter of
1245
``Repository.search_missing_revision_ids`` and
1246
``InterRepository.search_missing_revision_ids`` is deprecated. It is
1247
replaced by the ``revision_ids`` parameter. (Andrew Bennetts)
1249
* Working tree formats should now be registered on the format registry
1250
(``bzrlib.working_tree.format_registry``) rather than using the class
1251
methods on ``WorkingTreeFormat``. (Jelmer Vernooij, #714730)
1253
* Exporting may now be done with a generator
1254
(``bzrlib.export.get_export_generator``) (Geoff/xaav, #791005)
1259
* ``CatchingExceptionThread`` (formerly ThreadWithException) has been moved
1260
out of the ``bzrlib.tests`` hierarchy to make it clearer that it can be used
1261
outside of tests. This class makes it easier to track exceptions in threads
1262
by catching them so they can be re-raised in the controlling thread. It's
1263
available in the ``bzrlib.cethread`` module. (Vincent Ladeuil)
1265
* Correctly propagate malloc failures from diff-delta.c code as MemoryError
1266
so OOM conditions during groupcompress are clearly reported. This entailed a
1267
change to several function signatures. (Martin [gz], #633336)
1269
* ``HookPoint.lazy_hook`` and ``Hooks.install_named_lazy_hook`` can install
1270
hooks for which the callable is loaded lazily. (Jelmer Vernooij)
1275
* The Range parsing for HTTP requests will correctly parse incomplete ranges.
1276
(Vincent Ladeuil, #731240)
1279
vim: tw=74 ft=rst ff=unix
added
removed
doc/en/release-notes/bzr-2.4.txt
