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 an infinite loop when creating a repo at the root of the filesystem,
36
i.e. "/", due to posixpath.normpath() not collapsing 2 leading slashes into
37
one, thus respecting the POSIX standard, but making relpath() loop infinitely.
38
(Florian Vichot, #861008)
40
* Fixed loading of external merge tools from config to properly decode
41
command-lines which contain embedded quotes. (Gordon Tyler, #828803)
43
* Include declaration of 'changed' to avoid an UnboundLocalError in dirstate
44
pyrex code with new Cython versions. (Denys Duchier, #837221)
46
* Prevent several kinds of OverflowError and other fallout from failing to fit
47
stat fields into four bytes in dirstate pack_stat implementations.
48
(Martin Packman, #683191 #706957)
50
* Return early from create_delta_index_from_delta given tiny inputs. This
51
avoids raising a spurious MemoryError on certain platforms such as AIX.
52
(John Arbash Meinel, #856731)
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)
145
.. Changes that may require updates in plugins or other code that uses
151
.. Major internal changes, unlikely to be visible to users or plugin
152
developers, but interesting for bzr developers.
157
.. Fixes and changes that are only relevant to bzr's test framework and
158
suite. This can include new facilities for writing tests, fixes to
159
spurious test failures and changes to the way things should be tested.
161
* The test suite should now be able to run under weird environments where
162
``/etc/passwd`` doesn't contain the ``uid`` for the user running selftest
163
or where ``fakeroot`` is used but ``/root`` is inacessible.
164
(Vincent Ladeuil, #825027)
171
This release marks the start of a new long-term-stable series. From here, we
172
will only make bugfix releases on the 2.4 series (2.4.1, etc, and support it
173
until February 2013), while 2.5 will become our new development series.
175
This is a bugfix and polish release over the 2.3 series, with a large number
176
of bugs fixed (>150 for the 2.4 series alone), and some performance
177
improvements. Support for python 2.4 and 2.5 has been dropped, many large
178
working tree operations have been optimized as well as some stacked branches
181
Only bugfixes from other stables series have been included since 2.4b5 so
182
all known fixed bugs are included here.
184
Users are encouraged to upgrade from the other stable series.
187
External Compatibility Breaks
188
*****************************
190
.. These may require users to change the way they use Bazaar.
195
.. New commands, options, etc that users may wish to try out.
200
.. Improvements to existing commands, especially improved performance
201
or memory usage, or better results.
206
.. Fixes for situations where bzr would previously crash or give incorrect
207
or undesirable results.
209
* A call to CHKInventory's filter-method will not result in a
210
DuplicateFileId error, if you move a subfolder and change a file in
212
(Bastian Bowe, #809901)
214
* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
215
checks to see if the most recent published source package version for
216
that project is present in the branch tags. This should help developers
217
trust whether the packaging branch is up-to-date and can be used for new
218
changes. The level of verbosity is controlled by the config item
219
``launchpad.packaging_verbosity``. It can be set to one of
226
only display if the branch is out-of-date
229
also display single-line up-to-date and missing,
233
(default) display multi-line content for all states
236
(John Arbash Meinel, #609187, #812928)
238
* Cope with not all Python versions having a ``clear`` method on
239
``TestCase._type_equality_funcs``.
240
(Martin [gz], Jelmer Vernooij, #809048)
242
* Fetching tags when fetching the tip revision of a branch is now
243
controlled by the config setting ``branch.fetch_tags``. The behavior has
244
been reverted to 2.3's not-fetching tagged revisions by default.
245
(John Arbash Meinel, #771184)
247
* The fix for bug #513709 caused us to open a new connection when
248
switching a lightweight checkout that was pointing at a bound branch.
249
This isn't necessary because we know the master URL without opening it,
250
avoiding an extra SSH connection, etc.
251
(John Arbash Meinel, #812285)
257
.. Improved or updated documentation.
262
.. Changes that may require updates in plugins or other code that uses
268
.. Major internal changes, unlikely to be visible to users or plugin
269
developers, but interesting for bzr developers.
274
.. Fixes and changes that are only relevant to bzr's test framework and
275
suite. This can include new facilities for writing tests, fixes to
276
spurious test failures and changes to the way things should be tested.
278
* `BranchBuilder.build_snapshot` now supports a "flush" action. This
279
cleanly and reliably allows tests using `BranchBuilder` to construct
280
branches that e.g. rename files out of a directory and unversion that
281
directory in the same revision. Previously some changes were impossible
282
due to the order that `build_snapshot` performs its actions.
285
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
286
just compares the bytes in the dirstate file to its pristine state,
287
rather than opening the WorkingTree and calling ``last_revision()``.
288
This reduces the overall test suite time by about 10% on my laptop.
297
This is the fifth (and last) beta of the 2.4 series leading to
298
2.4.0 release in August 2011. Beta releases are suitable for
299
everyday use but may cause some incompatibilities with plugins.
301
This release includes all bug fixed in previous series known at
302
the time of this release.
304
External Compatibility Breaks
305
*****************************
312
* New command ``verify-signatures`` to check if all commits or specified commits
313
have digital signatures from trusted keys. Requires python-gpgme to be
316
* New option ``--signatures`` for ``bzr log`` to display digital signature
317
verification results for each commit.
319
* Config option acceptable_keys to list which GPG keys are verified as trusted.
321
* Config option validate_signatures_in_log to always show signatures in
327
* ``Branch.open`` is now about 3x faster (about 2ms instead of 6.5ms).
330
* Pack, dirstate, and index files are synced to persistent storage if
331
possible when writing finishes, to reduce the risk of problems caused by
332
a machine crash or similar problem. This can be turned off through the
333
``dirstate.fdatasync`` and ``repository.fdatasync`` options, which can
334
be set in ``locations.conf`` or ``bazaar.conf``. (Martin Pool,
340
* Display a proper error message when a config file content cannot be
341
decoded as UTF-8 or when it cannot be parsed.
342
(Vincent Ladeuil, #502060, #688677, #797246)
344
* Generate a single conflict (instead of two) when merging a branch
345
modifying and renaming a file in a branch that deleted it (or vice-versa).
346
(Vincent Ladeuil, #688101)
348
* Give a more helpful message when the bzr executable doesn't match the
349
library. (This typically happens because of a misconfigured PYTHONPATH
350
or half-installed bzr.)
351
(Martin Pool, #804553)
353
* Properly load utf8-encoded config files. (Vincent Ladeuil, #799212)
355
* ``GraphThunkIdsToKeys.merge_sort`` now properly returns
356
keys rather than ids. (Jelmer Vernooij, #799677)
358
* ``TreeTransformBase.fixup_new_roots`` can now check that a tree root
359
is present. (Jelmer Vernooij, #801257)
364
* New attributes ``WorkingTreeFormat.supports_versioned_directories`` and
365
``RepositoryFormat.supports_versioned_directories``.
366
(Jelmer Vernooij, #765815)
368
* The "revno" field type when using the python version-info format is now
369
a string (to handle dotted revnos) (Benoît Pierre, #796259)
374
* Start implementing localization, starting with command help text (but not
375
the command options themselves). This will allow bootstrapping the bzr
376
internationalization process. (Inada Naoki)
381
* Fix test failures when running as a homeless user (debian buildd). Tests
382
leaking into ``${HOME}/.bzr.log`` should be detected properly now.
383
(Vincent Ladeuil, #798698)
390
This is the fourth beta of the 2.4 series, leading to a 2.4.0 release in
391
August 2011. Beta releases are suitable for everyday use but may cause some
392
incompatibilities with plugins.
394
This release includes all bug fixed in previous series known at the time of
398
External Compatibility Breaks
399
*****************************
401
.. These may require users to change the way they use Bazaar.
403
* Do not treat configuration option 'check_signatures = require' as if
404
it were 'create_signatures = always' (Jonathan Riddell)
409
.. New commands, options, etc that users may wish to try out.
411
* Hooks have been added for config stacks: ``get``, ``set`` and ``remove``
412
are called when an option is respectively read, modified or deleted. Also
413
added ``load`` and ``save`` hooks for config stores, called when the
414
stores are loaded or saved. (Vincent Ladeuil)
416
* New hook server_exception in bzrlib.smart.server to catch any
417
exception caused while running bzr serve.
418
(Jonathan Riddell, #274578)
420
* New hook set_commit_message in bzrlib.msgeditor to set a commit message
421
and revision properties. (Jonathan Riddell, #274578)
423
* Support ``-S`` as an alias for ``--short`` for the ``log`` and
424
``missing`` commands. (Martin von Gagern, #38655)
429
.. Improvements to existing commands, especially improved performance
430
or memory usage, or better results.
432
* ``bzr annotate`` can be run without setting whoami data first.
433
(Jonathan Riddell, #667408)
438
.. Fixes for situations where bzr would previously crash or give incorrect
439
or undesirable results.
441
* Bazaar can now detect when a lock file is held by a dead process
442
originating from the same machine, and steal the lock after printing a
443
message to the user. This is off by default, for safety, but can be
444
turned on by setting the configuration variable ``locks.steal_dead`` to
446
(Martin Pool, #220464)
448
* ``bzr version-info`` now works when the tree is on a dotted revno.
449
(Benoît Pierre, #796259)
451
* Credentials in the log output produced by ``-Dhttp`` are masked so users
452
can more freely post them in bug reports. (Vincent Ladeuil, #723074)
454
* Fix a race condition for ``server_started`` hooks leading to a spurious
455
test failure. (Vincent Ladeuil, #789167)
457
* Fix exporting subdirectory with ``--per-file-timestamps``.
458
(Szilveszter Farkas, #795557)
460
* Handle files that get created but don't get used during TreeTransform.
461
``open()`` can create a file, and still raise an exception before it
462
returns. So anything we might have created, make sure we destroy during
463
``finalize()``. (Martin [gz], #597686)
465
* ``pack_repo`` now uses ``Transport.move`` instead of
466
``Transport.rename``, deleting any existing targets even on SFTP.
467
(Martin von Gagern, #421776)
469
* Pass the ``build_mo`` command to the rest of the setup() calls in
470
setup.py. The ``bdist_wininst`` and ``py2exe`` code paths were failing
471
because ``build_mo`` became a required step that they didn't know about.
472
(John Arbash Meinel, #787122)
474
* Preserve existing ``root-id`` when merging an unrelated branch.
475
(Aaron Bentley, #806356)
477
* Properly avoid re-adding a file after it changes case on CICP
478
filesystems. (John Arbash Meinel, #798130)
480
* Reports the original error when an InvalidHttpResponse exception is
481
encountered to facilitate debug. (Vincent Ladeuil, #788530)
483
* Reports a non-existent file error when trying to merge in a file
484
that does not exist. (Jonathan Riddell, #330063)
486
* ``UIFactory.prompt``, ``UIFactory.get_username``,
487
``UIFactory.get_password`` and ``UIFactory.get_boolean`` now require a
488
unicode prompt to be passed in. (Jelmer Vernooij, #592083)
490
* Support merging into the empty tree. (Aaron Bentley, #595328)
495
.. Improved or updated documentation.
497
* Improve documentation of ``bzr merge --force``.
498
(Neil Martinsen-Burrell, #767307)
500
* Make docs for configuration options for digital signatures match
501
reality. (Jonathan Riddell)
503
* Add user-guide page on GPG signatures. (Jonathan Riddell)
508
.. Changes that may require updates in plugins or other code that uses
511
* Checking for a file id in a `Tree` or `Inventory` using ``in`` is now
512
deprecated. Instead, use `has_id`.
515
* Exporters are now all exposed as generators, rather than as single-call
516
functions, so that calling code can take stream the output.
519
* Information about held lockdir locks returned from eg `LockDir.peek` is
520
now represented as a `LockHeldInfo` object, rather than a plain
524
* Remove `file_status` function.
527
* ``Repository.iter_reverse_revision_history`` is now deprecated.
528
Use ``Graph.iter_lefthand_ancestry`` instead.
529
(Jelmer Vernooij, #739481)
531
* ``Repository.get_ancestry`` has been deprecated. Use
532
``Graph.iter_ancestry`` instead.
533
(Jelmer Vernooij, #784511)
538
.. Major internal changes, unlikely to be visible to users or plugin
539
developers, but interesting for bzr developers.
541
* ``tools/check-newsbugs.py`` accepts a ``--browser`` option to open
542
corresponding launchpad pages in a browser. (Vincent Ladeuil)
547
.. Fixes and changes that are only relevant to bzr's test framework and
548
suite. This can include new facilities for writing tests, fixes to
549
spurious test failures and changes to the way things should be tested.
551
* A `ImportTariffTestCase` base class has been added in
552
``bzrlib.tests.test_import_tariff``, which can be used for import tariff
553
tests in plugins. (Jelmer Vernooij, #793465)
555
* Fix deadlock in `TestImportTariffs.test_simple_serve` when stderr gets
556
more output than fits in the default buffer. This was happening on the
557
Windows buildslave, and could easily happen in other circumstances where
558
the default OS buffer size for pipes is small or the ``python -v``
559
output is large. (Andrew Bennetts, #784802)
561
* Fix spurious test failure on OSX for WorkingTreeFormat2.
562
(Vincent Ladeuil, #787942)
564
* Re-target ``bb.test_merge.TestMerge.test_merge_reversed_revision_range``
565
and rewrite it as a parametrized test to avoid unrelated failures.
566
(Vincent Ladeuil, #795456)
568
* Show log file contents from subprocesses started by
569
`start_bzr_subprocess` in test failure details. This may help diagnose
570
strange hangs and failures involving subprocesses. (Andrew Bennetts)
572
* Skip ``utextwrap`` tests when ``sphinx`` breaks text_wrap by an hostile
573
monkey-patch to textwrap.TextWrapper.wordsep_re.
574
(Vincent Ladeuil, #785098)
576
* Multiple ``selftest --exclude`` options are now combined instead of
577
overriding each other. (Vincent Ladeuil, #746991)
579
* Restore some ``FTPTransport`` test coverage by allowing ``pyftpdlib
580
0.6.0`` to be used. Also restore ``medusa`` support while leaving it
581
disabled to make it easier to use if/when we can in the future.
582
(Vincent Ladeuil, #781140)
584
* `TestImportTariffs` no longer uses the real ``$HOME``. This prevents it
585
from polluting ``$HOME/.bzr.log`` or being accidentally influenced by
586
user configuration such as aliases. It still runs with all the user's
587
plugins enabled, as intended.
588
(Vincent Ladeuil, Andrew Bennetts, #789505)
596
This is the third beta of the 2.4 series, leading to a 2.4.0 release in
597
August 2011. Beta releases are suitable for everyday use but may cause some
598
incompatibilities with plugins.
600
This release includes all bug fixed in previous series known at the time of
604
External Compatibility Breaks
605
*****************************
607
.. These may require users to change the way they use Bazaar.
609
* ``bzr-2.4`` has officially dropped support for python2.4 and python2.5.
610
We will continue to maintain ``bzr-2.3`` for people who still need to
611
use those versions of python. (John Arbash Meinel)
616
.. New commands, options, etc that users may wish to try out.
618
* The text compressor used for 2a repositories now has a tweakable
619
parameter that can be set in bazaar.conf.
620
``bzr.groupcompress.max_entries_per_source`` default of 65536.
621
When doing compression, we build up an index of locations to match
622
against. Setting this higher will result in slightly better compression,
623
at a cost of more memory. Note that a value of 65k represents fully
624
sampling a 1MB file. So this only has an effect when compressing texts
625
larger than N*16 bytes. (John Arbash Meinel, #602614)
630
.. Improvements to existing commands, especially improved performance
631
or memory usage, or better results.
633
* ``bzr branch --stacked`` from a smart server uses the network a little
634
more efficiently. For a simple branch it reduces the number of
635
round-trips by about 20%. (Andrew Bennetts)
637
* ``bzr log --line`` scales the width of the author field with the size of
638
the line. This means that the full author name is shown when the
639
environment variable BZR_COLUMNS=0. (Neil Martinsen-Burrell)
641
* ``bzr pull`` now properly triggers the fast
642
``CHKInventory.iter_changes`` rather than the slow generic
643
inter-Inventory changes. It used to use a ``DirStateRevisionTree`` as
644
one of the source trees, which is faster when we have to read the whole
645
inventory anyway, but much slower when we can get just the delta out of
646
the repository. On a 70k record tree, this changes ``bzr pull`` from 28s
647
down to 17s. (John Arbash Meinel, #780677)
649
* Slightly reduced memory consumption when fetching into a 2a repository
650
by reusing existing caching a little better. (Andrew Bennetts)
652
* Speed up ``bzr status`` by a little bit when there are a couple of
653
modified files. We now track how many files we have seen that need
654
updating, and only rewrite the dirstate file if enough of them have
655
changed. The default is 10, and can be overridden by setting the branch
656
option "``bzr.workingtree.worth_saving_limit``".
657
(Ian Clatworthy, John Arbash Meinel, #380202)
659
* Speed up ``bzr uncommit``. Instead of resetting the dirstate from
660
scratch, use ``update_basis_by_delta``, computing the delta from the
661
repository. (John Arbash Meinel, #780544)
666
.. Fixes for situations where bzr would previously crash or give incorrect
667
or undesirable results.
669
* All Tree types can now be exported as tar.*, zip or directories.
672
* ``bzr merge --no-remember location`` never sets ``submit_branch``.
673
(Vincent Ladeuil, #782169)
675
* ``bzr pull --no-remember location`` never sets
676
``parent_location``. ``bzr push --no-remember location`` never
677
sets ``push_location``. ``bzr send --no-remember
678
submit_location public_location`` never sets ``submit_branch``
679
nor ``public_branch``. (Vincent Ladeuil)
681
* Conflicts involving non-ascii filenames are now properly reported rather
682
than failing with a UnicodeEncodeError. (Martin [GZ], #686161)
684
* Correct parent is now set when using 'switch -b' with bound branches.
685
(A. S. Budden, #513709)
687
* Fix `bzr plugins` regression in bzr 2.4 which resulted in a traceback
688
from writelines on ckj terminals. (Martin [GZ], #754082)
690
* ``WT.inventory`` and ``WT.iter_entries_by_dir()`` was not correctly
691
reporting subdirectories that were tree references (in formats that
692
supported them). (John Arbash Meinel, #764677)
694
* Merging into empty branches now gives an error as this is currently
695
not supported. (Jonathan Riddell, #242175)
697
* Do not show exception to user on pointless commit error.
698
(Jonathan Riddell #317357)
700
* ``WT.update_basis_by_delta`` no longer requires that the deltas match
701
the current WT state. This allows ``update_basis_by_delta`` to be used
702
by more commands than just commit. Updating with a delta allows us to
703
not load the whole inventory, which can take 10+s with large trees.
704
(Jonathan Riddell, John Arbash Meinel, #781168)
706
* ``bzr mv --after old_name new_name`` now works if "new_name" is newly
707
added. (Benoît Pierre)
713
.. Improved or updated documentation.
715
* Restore the workaround for option names including dots (--1.14) which was
716
disabled when we stopped listing --1.9 as a format.
717
(Vincent Ladeuil, #782289)
722
.. Changes that may require updates in plugins or other code that uses
725
* ``annotate_file`` has been deprecated in favor of
726
``annotate_file_revision_tree``. (Jelmer Vernooij, #775598)
728
* ``Branch.fetch`` now takes an optional ``limit`` argument.
729
(Andrew Bennetts, Jelmer Vernooij, #750175)
731
* ``Inter.get`` now raises ``NoCompatibleInter`` if there are no
732
compatible optimisers rather than an instance of the class it is called
733
on. (Jelmer Vernooij)
735
* ``Branch.push`` now takes a ``lossy`` argument.
736
``Branch.lossy_push`` has been removed.
739
* New method ``Repository.get_file_graph`` which can return the
740
per-file revision graph. (Jelmer Vernooij, #775578)
742
* The default implementation of ``Branch`` is now oriented to
743
storing the branch tip. Branch implementations which store the full
744
history should now subclass ``FullHistoryBzrBranch``.
745
``Branch._last_revision_info`` has been renamed to
746
``Branch._read_last_revision_info`` (Jelmer Vernooij)
748
* ``Tree.__iter__`` has been deprecated; use ``Tree.all_file_ids``
749
instead. (Jelmer Vernooij)
751
* ``Tree.get_symlink_target`` now takes an optional ``path``
752
argument. (Jelmer Vernooij)
757
.. Major internal changes, unlikely to be visible to users or plugin
758
developers, but interesting for bzr developers.
760
* ``MutableTree.smart_add`` now uses inventory deltas.
761
(Jelmer Vernooij, #146165)
763
* Removed ``bzrlib.branch._run_with_write_locked_target`` as
764
``bzrlib.cleanup`` provides the same functionality in a more general
765
way. (Andrew Bennetts)
770
.. Fixes and changes that are only relevant to bzr's test framework and
771
suite. This can include new facilities for writing tests, fixes to
772
spurious test failures and changes to the way things should be tested.
774
* A test that was expected to fail but passes instead now counts as a failure
775
catching up with new testtools and subunit handling. (Martin [GZ], #654474)
777
* Make it easier for plugins to reuse the per_workingtree scenarios by
778
restoring the wt_scenarios helper that was accidentally deleted.
779
(Vincent Ladeuil, #783472)
781
* Removed ``test_breakin`` tests that were excessively prone to hanging,
782
did not work on Wine, and partly already disabled.
783
(Martin Pool, #408814, #746985)
785
* Windows locations are different and should be tested accordingly.
786
(Vincent Ladeuil, #788131)
793
This is the second beta of the 2.4 series, leading to a 2.4.0 release in
794
August 2011. Beta releases are suitable for everyday use but may cause some
795
incompatibilities with plugins.
797
This release includes all bug fixed in previous series known at the time of
801
External Compatibility Breaks
802
*****************************
804
.. These may require users to change the way they use Bazaar.
806
* Two command synonyms for ``bzr branch`` have been deprecated, to avoid
807
confusion and to allow the names to later be reused. The removed names
808
are: ``get`` and ``clone``. (Martin Pool, #506265)
813
.. New commands, options, etc that users may wish to try out.
815
* ``bzr commit`` now supports a ``--lossy`` argument that can be used
816
to discard any data that can not be natively represented when committing
817
to a foreign VCS. (Jelmer Vernooij, #587721)
822
.. Improvements to existing commands, especially improved performance
823
or memory usage, or better results.
825
* ``bzr merge`` in large trees is now significantly faster. On a 70k entry
826
tree, the time went from ~3min down to 30s. This also effects ``bzr pull``
827
and ``bzr update`` since they use the same merge logic to update the
828
WorkingTree. (John Arbash Meinel, #759091)
830
* ``bzr revert`` now properly uses ``bzr status``'s optimized
831
``iter_changes``. This can be a significant performance difference (33s
832
to 5s on large trees). (John Arbash Meinel, #759096)
834
* Resolve ``lp:FOO`` urls locally rather than doing an XMLRPC request if
835
the user has done ``bzr launchpad-login``. The bzr+ssh URLs were already
836
being handed off to the remote server anyway (xmlrpc has been mapping
837
``lp:bzr`` to ``bzr+ssh://bazaar.launchpad.net/+branch/bzr``, rather
838
than ``bzr+ssh://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev`` for a few
839
months now.) By doing it ourselves, we can cut out substantial startup
840
time. From Netherlands to London it was taking 368ms to do the XMLRPC
841
call as much as 2s from Sydney. You can test the local logic by using
842
``-Dlaunchpad``. (John Arbash Meinel, #397739)
844
* When building a new WorkingTree (such as during ``bzr co`` or
845
``bzr branch``) we now properly store the stat and hash of files that
846
are old enough. This saves a fair amount of time on the first
847
``bzr status`` (on a 500MB tree, it saves about 30+s).
848
(John Arbash Meinel, #740932)
854
.. Fixes for situations where bzr would previously crash or give incorrect
855
or undesirable results.
857
* Arguments that can't be decoded to unicode in the current posix locale give
858
a clearer error message without a traceback. (Martin [gz], #745712)
860
* ``bzrlib.log._DEFAULT_REQUEST_PARAMS`` is no longer accidentally
861
mutated by ``bzrlib.log._apply_log_request_defaults``. In practice
862
these default values aren't relied on very often so this probably
863
wasn't causing any trouble. (Andrew Bennetts)
865
* ``bzr log`` now works on revisions which are not in the current branch.
866
(Matt Giuca, #241998)
868
* Don't rewrite the dirstate file when non-interesting changes have
869
occurred. This can significantly improve 'bzr status' times when there
870
are only small changes to a large tree.
871
(Ian Clatworthy, John Arbash Meinel, #380202)
873
* Lazy hooks are now reset between test runs. (Jelmer Vernooij, #745566)
875
* ``bzrlib.merge.Merge`` now calls ``iter_changes`` without
876
``include_unversioned=True``. This makes it significantly faster in many
877
cases, because it only looks at modified files, rather than building
878
information about all files. This can cause failures in other
879
TreeTransform code, because it had been expecting to know the names of
880
things which had not changed (such as parent directories). All cases we
881
know about so far have been fixed, but there may be fallout for edge
882
cases that we are missing. (John Arbash Meinel, #759091)
884
* ``SFTPTransport`` is more pro-active about closing file-handles. This
885
reduces the chance of having threads fail from async requests while
886
running the test suite. (John Arbash Meinel, #656170)
888
* Standalone bzr.exe installation on Windows: user can put additional python
889
libraries into ``site-packages`` subdirectory of the installation directory,
890
this might be required for "installing" extra dependencies for some plugins.
891
(Alexander Belchenko, #743256)
893
* ``transform.revert()`` has been updated to use
894
``wt.iter_changes(basis_tree)`` rather than
895
``basis_tree.iter_changes(wt)``. This allows the optimized code path to
896
kick in, improving ``bzr revert`` times significantly (33s to 4s on
897
large trees, 0.7s to 0.3s on small trees.) (John Arbash Meinel, #759096)
899
* ``TreeTransform.create_file/new_file`` can now take an optional ``sha1``
900
parameter. If supplied, when the transform is applied, it will then call
901
``self._tree._observed_sha1`` for those files. This lets us update the
902
hash-cache for content that we create, preventing us from re-reading the
903
content in the next ``bzr status``. (John Arbash Meinel, #740932)
908
* Added a section about using a shared SSH account on a server for bzr+ssh
909
access. (Russell Smith)
911
* The documentation now recommends using SSH rather than SFTP in the
912
tutorials and the examples, because that will generally be much faster
913
and better in cases where it can be used. SFTP is still available and
914
mentioned as an alternative. (Martin Pool, #636712)
919
.. Changes that may require updates in plugins or other code that uses
922
* ``Branch.update_revisions`` has been made private and should no
923
longer be used by external users. Use ``Branch.pull`` or ``Branch.push``
924
instead. (Jelmer Vernooij, #771765)
926
* Commands now have an `invoked_as` attribute, showing the name under
927
which they were called before alias expansion.
930
* ``Hooks.create_hook`` is now deprecated in favour of ``Hooks.add_hook``.
933
* If you call `bzrlib.initialize` but forget to enter the resulting object
934
as a context manager, bzrlib will now be initialized anyhow.
935
(Previously simple programs calling bzrlib might find the library was
936
mysteriously silent.)
939
* Inventory-specific functionality has been split out of ``Tree`` into
940
a new ``InventoryTree`` class. Tree instances no longer
941
necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
943
* Inventory-specific functionality has been split out of ``RevisionTree``
944
into a new ``InventoryRevisionTree`` class. RevisionTree instances no
945
longer necessarily provide an ``inventory`` attribute. (Jelmer Vernooij)
947
* New method ``Hooks.uninstall_named_hook``. (Jelmer Vernooij, #301472)
949
* ``revision_graph_can_have_wrong_parents`` is now an attribute
950
on ``RepositoryFormat`` rather than a method on ``Repository``.
953
* ``Testament`` now takes a ``tree`` rather than an
954
``inventory``. (Jelmer Vernooij, #762608)
956
* ``TestCase.failUnlessExists`` and ``failIfExists`` are deprecated in
957
favour of ``assertPathExists`` and ``assertPathDoesNotExist``
961
* The ``revno`` parameter of ``log.LogRevision`` may now be None,
962
representing a revision which is not in the current branch.
963
(Matt Giuca, #241998)
965
* The various knit pack repository format classes have been moved
966
from ``bzrlib.repofmt.pack_repo`` to
967
``bzrlib.repofmt.knitpack_repo``. (Jelmer Vernooij)
969
* ``RevisionTree`` now has a new method ``get_file_revision``.
972
* ``WorkingTree`` no longer provides an ``inventory``. Instead,
973
all inventory-related functionality is now on the subclass
974
``InventoryWorkingTree`` that all native Bazaar working tree
975
implementations derive from. (Jelmer Vernooij)
980
.. Major internal changes, unlikely to be visible to users or plugin
981
developers, but interesting for bzr developers.
983
* Added ``osutils.lstat`` and ``osutils.fstat``. These are just the ``os``
984
functions on Linux, but they are wrapped on Windows so that fstat
985
matches lstat results across all python versions.
988
* ``WorkingTree._observed_sha1`` also updates the 'size' column. It
989
happened to be updated as a side-effect of commit, but if we start using
990
the function elsewhere we might as well do it directly.
996
.. Fixes and changes that are only relevant to bzr's test framework and
997
suite. This can include new facilities for writing tests, fixes to
998
spurious test failures and changes to the way things should be tested.
1000
* Stop using `failIf`, `failUnless`, `failIfEqual`, etc, that give
1001
`PendingDeprecationWarnings` on Python2.7.
1002
(Martin Pool, #760435)
1010
This is the first beta of the 2.4 series, leading up to a 2.4.0
1011
release in August 2011. Beta releases are suitable for everyday use
1012
but may cause some incompatibilities with plugins. Some plugins may need
1013
small updates to work with 2.4b1.
1015
External Compatibility Breaks
1016
*****************************
1023
* Added ``changelog_merge`` plugin for merging changes to ``Changelog`` files
1024
in GNU format. See ``bzr help changelog_merge`` for details.
1027
* Configuration options can now use references to other options in the same
1028
file by enclosing them with curly brackets (``{other_opt}``). This makes it
1029
possible to use, for example,
1030
``push_location=lp:~vila/bzr/config-{nickname}`` in ``branch.conf`` when
1031
using a loom. During the beta period, the default behaviour is to disable
1032
this feature. It can be activated by declaring ``bzr.config.expand = True``
1033
in ``bazaar.conf``. (Vincent Ladeuil)
1035
* External merge tools can now be configured in bazaar.conf. See
1036
``bzr help configuration`` for more information. (Gordon Tyler, #489915)
1038
* The ``lp:`` directory service now supports Launchpad's QA staging.
1039
(Jelmer Vernooij, #667483)
1044
* A new hidden command ``bzr repair-workingtree``. This is a way to force
1045
the dirstate file to be rebuilt, rather than using a ``bzr checkout``
1046
workaround. (John Arbash Meinel)
1048
* Added a ``Branch.heads_to_fetch`` RPC to the smart server protocol.
1049
This allows formats from plugins (such as looms) to efficiently tell the
1050
client which revisions need to be fetched. (Andrew Bennetts)
1052
* Branching, merging and pulling a branch now copies revisions named in
1053
tags, not just the tag metadata. (Andrew Bennetts, #309682)
1055
* ``bzr cat-revision`` no longer requires a working tree.
1056
(Jelmer Vernooij, #704405)
1058
* ``bzr export --per-file-timestamps`` for .tar.gz files will now
1059
override the mtime for trees exported on Python 2.7 and later, which
1060
expose the 'mtime' field in gzip files. This makes the output of
1061
``bzr export --per-file-timestamps`` for a particular tree
1062
deterministic. (Jelmer Vernooij, #711226)
1064
* ``bzr export --format=zip`` can now export to standard output,
1065
like the other exporters can. (Jelmer Vernooij, #513752)
1067
* ``bzr export`` can now create ``.tar.xz`` and ``.tar.lzma`` files.
1068
(Jelmer Vernooij, #551714)
1070
* Getting all entries from ``CHKInventory.iter_entries_by_dir()`` has been
1071
sped up dramatically for large trees. Iterating by dir is not the best
1072
way to load data from a CHK inventory, so it preloads all the items in
1073
the correct order. (With the gcc-tree, this changes it (re)reading 8GB
1074
of CHK data, down to just 150MB.) This has noticeable affects for things
1075
like building checkouts, etc. (John Arbash Meinel, #737234)
1080
* A MemoryError thrown on the server during a remote operation will now be
1081
usefully reported, and other unexpected errors will include the class name.
1082
(Martin [gz], #722416)
1084
* ``bzr annotate -r-1 file`` will now properly annotate a deleted file.
1085
(Andrew King, #537442)
1087
* ``bzr export`` to zip files will now set a mode on directories.
1088
(Jelmer Vernooij, #207253)
1090
* ``bzr export`` to tgz files will only write out the basename of the
1091
tarfile to the gzip file. (Jelmer Vernooij, #102234)
1093
* ``bzr push --overwrite`` with an older revision specified will now correctly
1094
roll back the target branch. (Jelmer Vernooij, #386576)
1096
* ``bzr lp-propose`` can now propose merges against packaging branches on
1097
Launchpad without requiring the target branch to be specified.
1098
(Jelmer Vernooij, #704647)
1100
* ``bzr lp-propose`` no longer requires a reviewer to be specified. It will
1101
instead leave setting the reviewer up to Launchpad if it was not specified.
1102
(Jelmer Vernooij, #583772)
1104
* ``bzr pull`` will now exit with exit code 1 if there were tag conflicts.
1105
(Jelmer Vernooij, #213185)
1107
* ``bzr mv`` user errors no longer throw UnicodeEncodeError with non-ascii
1108
paths, however they may still print junk if not on a UTF-8 terminal.
1109
(Martin [gz], #707954)
1111
* ``bzr reconfigure --unstacked`` now copies revisions (and their
1112
ancestors) named in tags into the unstacked repository, not just the
1113
ancestry of the branch's tip. (Andrew Bennetts, #401646)
1115
* ``bzr serve`` no longer crashes when a server_started hook is installed and
1116
IPv6 support is available on the system. (Jelmer Vernooij, #293697)
1118
* ``bzr status`` will not rewrite the dirstate file if it only has
1119
'trivial' changes. (Currently limited to dir updates and newly-added
1120
files changing state.) This saves a bit of time for regular operations.
1121
eg. ``bzr status`` in a 100k tree takes 1.4s to compute the status, but 1s
1122
to re-save the dirstate file. (John Arbash Meinel, #765881)
1124
* ``bzr tags`` will no longer choke on branches with ghost revisions in
1125
their mainline and tags on revisions not in the branch ancestry.
1126
(Jelmer Vernooij, #397556)
1128
* ``bzr whoami`` will now display an error if both a new identity and
1129
``--email`` were specified. (Jelmer Vernooij, #680449)
1131
* ``launchpadlib`` doesn't provide the ``uris`` module in some old versions.
1132
(Vincent Ladeuil, #706835)
1134
* Empty entries in the ``NO_PROXY`` variable are no longer treated as matching
1136
(Martin Pool, #586341)
1138
* Plugins incompatible with the current version of bzr no longer produce a
1139
warning on every command invocation. Instead, a message is shown by
1140
``bzr plugins`` and in crash reports.
1141
(#704195, Martin Pool)
1143
* The "pretty" version of ``needs_read_lock`` and ``needs_write_lock`` now
1144
preserves the identity of default parameter values.
1145
(Andrew Bennetts, #718569)
1147
* ``bzr dump-btree --raw`` no longer tracebacks on a B-Tree file
1148
containing no rows. (Eric Siegerman, #715508)
1150
* Fix ``bzr lp-mirror`` to work on command line branch URLs and branches
1151
without an explicit public location. (Max Bowsher)
1153
* On Python 2.6 and higher, use multiprocessing.cpu_count() to retrieve the
1154
number of available processors. (Jelmer Vernooij, #693140)
1159
* Added ``Branch.heads_to_fetch`` method. Implementations of the Branch API
1160
must now inherit or implement this method. (Andrew Bennetts, #721328)
1162
* Added ``bzrlib.mergetools`` module with helper functions for working with
1163
the list of external merge tools. (Gordon Tyler, #489915)
1165
* All methods and arguments that were deprecated before 2.0
1166
have been removed. (Jelmer Vernooij)
1168
* Branch formats should now be registered on the format registry
1169
(``bzrlib.branch.format_registry``) rather than using the class
1170
methods on ``BranchFormat``. (Jelmer Vernooij, #714729)
1172
* ``Branch.set_revision_history`` is now deprecated.
1175
* ``BranchFormat.supports_leaving_lock()`` and
1176
``RepositoryFormat.supports_leaving_lock`` flags have been added.
1179
* ``Branch.fetch`` implementations must now accept an optional
1180
``fetch_tags`` keyword argument. (Andrew Bennetts)
1182
* ``Branch.import_last_revision_info`` is deprecated. Use the
1183
``import_last_revision_info_and_tags`` method instead.
1186
* Because it was too specific to BzrDir implementations,
1187
``ControlDir.sprout`` no longer has a default implementation; it now
1188
raises ``NotImplementedError``. (Jelmer Vernooij, #717937)
1190
* ``bzrlib.deprecated_graph`` has been removed. ``bzrlib.graph``
1191
scales better tree and should be used instead.
1192
(Jelmer Vernooij, #733612)
1194
* ``ControlDirFormat.register_format`` has been removed. Instead,
1195
``Prober`` implementations should now implement a ``known_formats``
1196
method. (Jelmer Vernooij)
1198
* ControlDirFormats can now provide a ``check_status`` method and
1199
raise a custom exception or warning when an unsupported or deprecated
1200
format is being opened. (Jelmer Vernooij, #731311)
1202
* ``bzrlib.revionspec.dwim_revspecs`` is deprecated.
1203
Use ``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_revspec`` and
1204
``bzrlib.revisionspec.RevisionSpec_dwim.append_possible_lazy_revspec``
1205
instead. (Jelmer Vernooij, #721971)
1207
* ``BzrDirFormat`` has a new attribute ``fixed_components`` that
1208
indicates whether the components of the bzrdir can be upgraded
1209
independent of the ``BzrDir``. (Jelmer Vernooij)
1211
* ``BzrProber.register_format`` and ``BzrProber.unregister_format`` are
1212
now deprecated in favour of the ``BzrProber.formats`` format registry.
1215
* ``ControlDir`` implementations no longer have to provide the
1216
``get_branch_transport``, ``get_workingtree_transport`` and
1217
``get_repository_transport`` methods. (Jelmer Vernooij, #730325)
1219
* ``Converter`` has been moved from ``bzrlib.bzrdir`` to
1220
``bzrlib.controldir``. (Jelmer Vernooij)
1222
* Repository formats can now provide
1223
``_get_extra_interrepo_test_combinations`` in the same module
1224
to provide extra test combinations for ``bzrlib.tests.per_repository``.
1227
* Repository formats should now be registered on the format registry
1228
(``bzrlib.repository.format_registry``) rather than using the class
1229
methods on ``RepositoryFormat``. (Jelmer Vernooij)
1231
* Repository formats can now indicate they do not support the full
1232
VersionedFiles API by setting the ``supports_full_versioned_files``
1233
attribute to False. A subset of the VersionedFiles API
1234
(signatures and text graphs) still needs to be supported.
1237
* Repository formats have a new method ``is_deprecated`` that
1238
implementations can override to return True to trigger a deprecation
1239
warning. (Jelmer Vernooij)
1241
* The ``revision_id`` parameter of
1242
``Repository.search_missing_revision_ids`` and
1243
``InterRepository.search_missing_revision_ids`` is deprecated. It is
1244
replaced by the ``revision_ids`` parameter. (Andrew Bennetts)
1246
* Working tree formats should now be registered on the format registry
1247
(``bzrlib.working_tree.format_registry``) rather than using the class
1248
methods on ``WorkingTreeFormat``. (Jelmer Vernooij, #714730)
1250
* Exporting may now be done with a generator
1251
(``bzrlib.export.get_export_generator``) (Geoff/xaav, #791005)
1256
* ``CatchingExceptionThread`` (formerly ThreadWithException) has been moved
1257
out of the ``bzrlib.tests`` hierarchy to make it clearer that it can be used
1258
outside of tests. This class makes it easier to track exceptions in threads
1259
by catching them so they can be re-raised in the controlling thread. It's
1260
available in the ``bzrlib.cethread`` module. (Vincent Ladeuil)
1262
* Correctly propagate malloc failures from diff-delta.c code as MemoryError
1263
so OOM conditions during groupcompress are clearly reported. This entailed a
1264
change to several function signatures. (Martin [gz], #633336)
1266
* ``HookPoint.lazy_hook`` and ``Hooks.install_named_lazy_hook`` can install
1267
hooks for which the callable is loaded lazily. (Jelmer Vernooij)
1272
* The Range parsing for HTTP requests will correctly parse incomplete ranges.
1273
(Vincent Ladeuil, #731240)
1276
vim: tw=74 ft=rst ff=unix