5
6
.. contents:: List of Releases
11
:2.2b3: NOT RELEASED YET
19
* ``bzr commit`` accepts ``-p`` (for "patch") as a shorter name for
21
(Parth Malwankar, #571467)
23
* ``bzr ignore`` now supports a ``--default-rules`` option that displays
24
the default ignore rules used by bzr. The flag ``--old-default-rules``
25
is no longer supported by ``ignore``.
26
(Parth Malwankar, #538703)
28
* ``bzr pack`` now supports a ``--clean-obsolete-packs`` option that
29
can save disk space by deleting obsolete pack files created during the
31
(Parth Malwankar, #304320)
36
* ``.bazaar``, ``.bazaar/bazaar.conf`` and ``.bzr.log`` inherit user and
37
group ownership from the containing directory. This allow bzr to work
39
(Martin <gzlist@googlemail.com>, Parth Malwankar, #376388)
41
* ``bzr log --exclude-common-ancestry -r X..Y`` displays the revisions that
42
are part of Y ancestry but not part of X ancestry (aka the graph
44
(Vincent Ladeuil, #320119)
46
* ``bzr selftest --parallel=fork`` wait for its children avoiding zombies.
47
(Vincent Ladeuil, #566670)
49
* ``bzr selftest`` should not use ui.note() since it's not unicode safe.
50
(Vincent Ladeuil, #563997)
52
* Don't mention --no-strict when we just issue the warning about unclean trees.
53
(Vincent Ladeuil, #401599)
55
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
57
(Andrew Bennetts, #528041)
59
* Reduce peak memory by one copy of compressed text.
60
(John Arbash Meinel, #566940)
62
* Show the filenames when a file rename fails so that the error will be
64
(Martin Pool, #491763)
69
* ``append_revisions_only`` will now be interpreted as a boolean and a
70
warning emitted if illegal values are used. Note that for projects
71
that needs to maintain compatibility with previsous bzr versions,
72
only 'True' and 'False' strings must be used (previous versions of
73
bzr will interpret all strings differing from 'True'
74
(case-sensitive) as false.
75
(Brian de Alwis, Vincent Ladeuil)
77
* ``Config.get_user_option_as_bool`` will now warn if a value cannot
78
be interpreted as a boolean.
87
* Added ``bzrlib.merge.PerFileMerger``, a more convenient way to write
88
some kinds of ``merge_file_content`` hook functions.
91
* `BzrDir`, `Branch`, `Repository` and `WorkingTree` now all support `user_url`,
92
`user_transport`, `control_url` and `control_transport` members pointing
93
respectively to the directory containing the ``.bzr`` control directory,
94
and to the directory within ``.bzr`` used for the particular component.
95
All of them inherit from `ControlComponent` which provides default
99
* Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
100
expected to return an object which can be used to unlock them. This reduces
101
duplicate code when using cleanups. The previous 'tokens's returned by
102
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
103
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
104
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)
109
* ``log._get_info_for_log_files`` now takes an add_cleanup callable.
112
* ``_remember_remote_is_before`` no longer raises AssertionError when
113
suboptimal network behaviour is noticed; instead it just mutters to the
114
log file (and warns the user if they have set the ``hpss`` debug flag).
115
This was causing unnecessary aborts for performance bugs that are minor
117
(Andrew Bennetts, #528041)
119
* Permit bzr to run under ``python -OO`` which reduces the size of bytecode
120
files loaded from disk. To ensure docstrings needed for help are never
121
stripped, the prefix ``__doc__ =`` should now be used.
122
(Martin <gzlist@googlemail.com>)
127
* Added ``bzrlib.tests.matchers`` as a place to put matchers, along with
128
our first in-tree matcher. See the module docstring for details.
131
* ``bzr selftest --parallel=subprocess`` now works correctly on win32.
132
(Gordon Tyler, #551332)
134
* Workaround ``Crypto.Random`` check leading to spurious test
135
failures on Lucid, FreeBSD and gentoo.
136
(Vincent Ladeuil, #528436)
143
This is a somewhat early second beta of the 2.2 series, to fix a python2.4
144
incompatibility in the 2.2b1 release. It also includes a swag of
145
performance, usability and correctness improvements: test feedback on all
146
of these would be welcome.
152
* ``bzr diff`` now supports a --format option, which can be used to
153
select alternative diff formats. (Jelmer Vernooij, #555994)
158
* ``bzr dpush``, ``bzr push`` and ``bzr send`` will now issue a warning
159
instead of failing when dirty trees are involved. The corresponding
160
``dpush_strict``, ``push_strict`` and ``send_strict`` should be set to
161
True explicitly to get the previous behaviour.
162
(Vincent Ladeuil, #519319)
164
* ``bzr export`` to tar file does not fail if any parent directory
165
contains unicode characters. This works around upstream Python bug
166
http://bugs.python.org/issue8396 .
167
(Parth Malwankar, #413406)
169
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
170
(Aaron Bentley, #559436)
172
* ``bzr update`` when a pending merge in the working tree has been merged
173
into the master branch will no longer claim that old commits have become
174
pending merges. (Robert Collins, #562079)
176
* ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
177
config as in previous versions of bzrlib. (Robert Collins)
179
* Fix glitch in the warning about unclean trees display.
180
(Vincent Ladeuil, #562665)
182
* Fixed Python2.4 incompatibilities in the bzr2.2b1 source tarball.
185
* Help messages generated by ``RegistryOption.from_kwargs`` list the
186
switches in alphabetical order, rather than in an undefined order.
187
(Martin von Gagern, #559409)
189
* Make sure the ``ExecutablePath`` and ``InterpreterPath`` are set in
190
Apport crash reports, to avoid "This problem report applies to a program
191
which is not installed any more" error.
192
(Martin Pool, James Westby, #528114)
194
* Reset ``siginterrupt`` flag to False every time we handle a signal
195
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
196
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
197
errors after two window resizes.
200
* When invoked with a range revision, ``bzr log`` doesn't show revisions
201
that are not part of the Y revisions ancestry anymore when invoked with
203
(Vincent Ladeuil, #474807)
205
* Properly handle ``param_name`` attribute for ``ListOption``.
206
(Martin von Gagern, 387117)
211
* ``bzr commit`` will prompt before using a commit message that was
212
generated by a template and not edited by the user.
213
(Robert Collins, #530265)
215
* ``bzr diff`` read-locks the trees and branches only once, saving about
216
10-20ms on ``bzr diff`` in a bzr.dev tree.
219
* ``bzr missing`` read-locks the branches only once.
222
* ``bzr pull`` locks the branches and tree only once.
225
* Index lookups in pack repositories search recently hit pack files first.
226
In repositories with many pack files this can greatly reduce the
227
number of files accessed, the number of bytes read, and the number of
228
read calls. An incremental pull via plain HTTP takes half the time and
229
bytes for a moderately large repository. (Andrew Bennetts)
231
* Index lookups only re-order the indexes when the hit files aren't
232
already first. Reduces the cost of reordering
233
(John Arbash Meinel, #562429)
235
* Less code is loaded at startup. (Cold-cache start time is about 10-20%
237
(Martin Pool, #553017)
242
* ``bzrlib.diff.get_trees_and_branches_to_diff`` is deprecated. Use
243
``get_trees_and_branches_to_diff_locked`` instead.
249
* ``bzrlib.commands.Command.run_direct`` is no longer needed - the pre
250
2.1 method of calling run() to perform testing or direct use via the API
251
is now possible again. As part of this, the _operation attribute on
252
Command is now transient and only exists for the duration of ``run()``.
263
* BTreeGraphIndex can now take an offset to indicate that the data starts
264
somewhere other than then beginning of the file. (John Arbash Meinel)
266
* Deleted very old hidden commands ``versionedfile-list``,
267
``weave-plan-merge``, ``weave-merge-text``.
270
* ``Repository.get_inventory_sha1()`` and ``Repository.get_revision_xml()``
271
have been removed. (Jelmer Vernooij)
273
* ``Repository.get_revision_inventory()`` has been removed in favor of
274
``Repository.get_inventory()``. (Jelmer Vernooij)
276
* All test servers have been moved out of the bzrlib.transport hierarchy to
277
bzrlib.tests.test_server *except* for MemoryServer, ChrootServer and
278
PathFilteringServer. ``bzrlib`` users may encounter test failures that can
279
be fixed by updating the related imports from ``bzrlib.transport.xxx`` to
280
``bzrlib.tests.test_server``.
283
* ``BranchReferenceFormat.initialize()`` now takes an optional name argument
284
as its second parameter, for consistency with the initialize() method of
285
other formats. (Jelmer Vernooij)
290
* Added ``bzr remove-branch`` command that can remove a local or remote
291
branch. (Jelmer Vernooij, #276295)
293
* ``bzr export`` now takes an optional argument ``--per-file-timestamps``
294
to set file mtimes to the last timestamp of the last revision in which
295
they were changed rather than the current time. (Jelmer Vernooij)
297
* If the Apport crash-reporting tool is available, bzr crashes are now
298
stored into the ``/var/crash`` apport spool directory, and the user is
299
invited to report them to the developers from there, either
300
automatically or by running ``apport-bug``. No information is sent
301
without specific permission from the user. (Martin Pool, #515052)
303
* Parsing of command lines, for example in ``diff --using``, no longer
304
treats backslash as an escape character on Windows. (Gordon Tyler,
307
* Plugins can be disabled by defining ``BZR_DISABLE_PLUGINS`` as
308
a list of plugin names separated by ':' (';' on windows).
309
(Vincent Ladeuil, #411413)
311
* Plugins can be loaded from arbitrary locations by defining
312
``BZR_PLUGINS_AT`` as a list of name@path separated by ':' (';' on
313
windows). This takes precedence over ``BZR_PLUGIN_PATH`` for the
314
specified plugins. This is targeted at plugin developers for punctual
315
needs and *not* intended to replace ``BZR_PLUGIN_PATH``.
316
(Vincent Ladeuil, #82693)
318
* Tag names can now be determined automatically by ``automatic_tag_name``
319
hooks on ``Branch`` if they are not specified on the command line.
322
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
323
``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
324
as resolved is still accessible via the ``--done`` default action.
327
* Merges can be proposed on Launchpad with the new lp-propose-merge command.
328
(Aaron Bentley, Jonathan Lange)
333
* Added docstring for ``Tree.iter_changes``
334
(John Arbash Meinel, #304182)
336
* Allow additional arguments to
337
``RemoteRepository.add_inventory_by_delta()``. (Jelmer Vernooij, #532631)
339
* Allow exporting a single file using ``bzr export``.
340
(Michal Junák, #511987)
342
* Allow syscalls to automatically restart when ``TextUIFactory``'s
343
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
344
IO, which are often poorly handled by Python's libraries and parts of
345
bzrlib. (Andrew Bennetts, #496813)
347
* Avoid infinite recursion when probing for apport.
348
(Vincent Ladeuil, #516934)
350
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
351
(Martin Pool, #331095)
353
* Avoid truncating svn URLs.
354
(Martin Pool, Martin von Gagern, #545185)
356
* ``bzr add`` will not add conflict related files unless explicitly required.
357
(Vincent Ladeuil, #322767, #414589)
359
* ``bzr dump-btree`` now works on ``*.cix`` and ``*.six`` files. Those
360
indices do not have reference lists, so ``dump-btree`` will simply show
361
``None`` instead. (Andrew Bennetts, #488607)
363
* ``bzr help`` will no longer trigger the get_missing_command hook when
364
doing a topic lookup. This avoids prompting (like 'no command plugins/loom,
365
did you mean log?') when getting help. In future we may trigger the hook
366
deliberately when no help topics match from any help index.
367
(Robert Collins, #396261)
369
* ``bzr log -n0 -r..A.B.C`` should not crash but just consider the None
370
revspec as representing the first revision of the branch.
371
(Vincent Ladeuil, #519862)
373
* ``bzr remove-tree`` can now remove multiple working trees.
374
(Jared Hance, Andrew Bennetts, #253137)
376
* ``bzr resolve --take-this`` and ``--take-other`` now correctly renames
377
the kept file on content conflicts where one side deleted the file.
378
(Vincent Ladeuil, #529968)
380
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
381
permissions as ``.bzr`` directory on a POSIX OS.
382
(Parth Malwankar, #262450)
384
* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
385
of ``backup.bzr``. This directory is ignored by bzr commands such as
387
(Parth Malwankar, #335033, #300001)
389
* Cope with non-utf8 characters inside ``.bzrignore``.
390
(Jason Spashett, #183504)
392
* Correctly interpret "451 Rename/move failure: Directory not empty" from
393
ftp servers while trying to take a lock.
394
(Martin Pool, #528722)
396
* DirStateRevisionTree.kind() was returning wrong result when 'kind'
397
changes occured between the workingtree and one of its parents.
398
(Vincent Ladeuil, #535547)
400
* Fix ``log`` to better check ancestors even if merged revisions are involved.
401
(Vincent Ladeuil, #476293)
403
* Loading a plugin from a given path with ``BZR_PLUGINS_AT`` doesn't depend
404
on os.lisdir() order and is now reliable.
405
(Vincent Ladeuil, #552922).
407
* Many IO operations that returned ``EINTR`` were retried even if it
408
wasn't safe to do so via careless use of ``until_no_eintr``. Bazaar now
409
only retries operations that are safe to retry, and in some cases has
410
switched to operations that can be retried (e.g. ``sock.send`` rather than
412
(Andrew Bennetts, Martin <gzlist@googlemail.com>, #496813)
414
* Path conflicts now support --take-this and --take-other even when a
415
deletion is involved.
416
(Vincent Ladeuil, #531967)
418
* Network transfer amounts and rates are now displayed in SI units according
419
to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
420
(Gordon Tyler, #514399)
422
* Support kind markers for socket and fifo filesystem objects. This
423
prevents ``bzr status --short`` from crashing when those files are
424
present. (John Arbash Meinel, #303275)
426
* ``bzr mkdir DIR`` will not create DIR unless DIR's parent is a versioned
427
directory. (Parth Malwankar, #138600)
429
* SSH child processes will now ignore SIGQUIT on nix systems so breaking into
430
the debugger won't kill the session.
431
(Martin <gzlist@googlemail.com>, #162502)
433
* Tolerate patches with leading noise in ``bzr-handle-patch``.
434
(Toshio Kuratomi, Martin Pool, #502076)
436
* ``update -r`` now supports updating to revisions that are not on
437
mainline (i.e. it supports dotted revisions).
438
(Parth Malwankar, #517800)
440
* Use first apparent author not committer in GNU Changelog format.
441
(Martin von Gagern, #513322)
446
* ``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
447
``bzrlib.merge_directive.BaseMergeDirective`` and is now public.
450
* ``BranchFormat.initialize`` now takes an optional ``name`` of the colocated
451
branch to create. (Jelmer Vernooij)
453
* ``BzrDir.get_branch_transport`` now takes an optional ``name`` of the
454
colocated branch to open. (Jelmer Vernooij)
456
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
457
can set a signal handler and call ``signal.siginterrupt(signum,
458
False)`` for it, if the platform and Python version supports it.
459
(Andrew Bennetts, #496813)
461
* New ``bzrlib.initialize`` is recommended for programs using bzrlib to
462
run when starting up; it sets up several things that previously needed
463
to be done separately.
464
(Martin Pool, #507710)
466
* Exporters now support a ``per_file_timestamps`` argument to write out the
467
timestamp of the commit in which a file revision was introduced.
470
* New method ``BzrDir.list_branches()`` that returns a sequence of branches
471
present in a control directory. (Jelmer Vernooij)
473
* New method ``Repository.get_known_graph_ancestry()``.
474
(Jelmer Vernooij, #495502)
476
* New transport methods ``readlink``, ``symlink`` and ``hardlink``.
479
* Remove unused ``CommandFailed`` exception.
485
* ``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
486
``message_callback`` in the same way that commit does. (Robert Collins)
488
* ``bzrlib.builtins.Commit.run`` raises ``bzrlib.errors.BoundBranchOutOfDate``
489
rather than ``bzrlib.errors.BzrCommandError`` when the bound branch is out
490
of date. (Gary van der Merwe)
492
* ``bzrlib.commands.run_bzr`` is more extensible: callers can supply the
493
functions to load or disable plugins if they wish to use a different
494
plugin mechanism; the --help, --version and no-command name code paths
495
now use the generic pluggable command lookup infrastructure.
498
* ``bzrlib.errors.BoundBranchOutOfDate`` has a new field ``extra_help``
499
which can be set to add extra help to the error. (Gary van der Merwe)
501
* New method ``Branch.automatic_tag_name`` that can be used to find the
502
tag name for a particular revision automatically. (Jelmer Vernooij)
504
* The methods ``BzrDir.create_branch()``, ``BzrDir.destroy_branch()`` and
505
``BzrDir.open_branch()`` now take an optional ``name`` argument.
511
* bzr now has a ``.testr.conf`` file in its source tree configured
512
appropriately for running tests with Testrepository
513
(``https://launchpad.net/testrepository``). (Robert Collins)
515
* Documentation about testing with ``subunit`` has been tweaked.
518
* Known failures has been added for resolve --take-other on ParentLoop
519
conflicts. This reflects bug #537956 without fixing it.
522
* New ``bzrlib.tests.test_import_tariff`` can make assertions about what
523
Python modules are loaded, to guard against startup time or library
524
dependency regressions.
527
* PQM will now run with subunit output. To analyze a PQM error use
528
tribunal, or cat log | subunit-filter | subunit2pyunit. (Robert Collins)
530
* Stop sending apport crash files to ``.cache`` in the directory from
531
which ``bzr selftest`` was run. (Martin Pool, #422350)
533
* Tests no longer fail if "close() called during concurrent
534
operation on the same file object" occurs when closing the log file
535
(which can happen if a thread tries to write to the log file at the
536
wrong moment). An warning will be written to ``stderr`` when this
537
happens, and another warning will be written if the log file could not
538
be closed after retrying 100 times. (Andrew Bennetts, #531746)
543
:2.1.2: NOT RELEASED YET
548
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
549
(Aaron Bentley, #559436)
551
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
553
(Andrew Bennetts, #528041)
555
* Reset ``siginterrupt`` flag to False every time we handle a signal
556
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
557
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
558
errors after two window resizes.
564
* ``_remember_remote_is_before`` no longer raises AssertionError when
565
suboptimal network behaviour is noticed; instead it just mutters to the
566
log file (and warns the user if they have set the ``hpss`` debug flag).
567
This was causing unnecessary aborts for performance bugs that are minor
569
(Andrew Bennetts, #528041)
577
This is a small bugfix release. Upgrading is recommended for anyone
578
running 2.1.0 or earlier.
583
* Allow syscalls to automatically restart when ``TextUIFactory``'s
584
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
585
IO, which are often poorly handled by Python's libraries and parts of
586
bzrlib. (Andrew Bennetts, #496813)
588
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
589
(Martin Pool, #331095)
591
* Fix plugin packaging on Windows. (Ian Clatworthy, #524162)
593
* Fix stub sftp test server to call os.getcwdu().
594
(Vincent Ladeuil, #526221, #526353)
596
* Fixed CHM generation by moving the NEWS section template into
597
a separate file. (Ian Clatworthy, #524184)
599
* Merge correctly when this_tree is not a WorkingTree. (Aaron Bentley)
601
* Register SIGWINCH handler only when creating a ``TextUIFactory``; avoids
602
problems importing bzrlib from a non-main thread.
603
(Elliot Murphy, #521989)
605
* Repositories accessed via a smart server now reject being stacked on a
606
repository in an incompatible format, as is the case when accessing them
607
via other methods. This was causing fetches from those repositories via
608
a smart server (e.g. using ``bzr branch``) to receive invalid data.
609
(Andrew Bennetts, #562380)
611
* Standardize the error handling when creating a new ``StaticTuple``
612
(problems will raise TypeError). (Matt Nordhoff, #457979)
614
* Warn if pyrex is too old to compile the new ``SimpleSet`` and
615
``StaticTuple`` extensions, rather than having the build fail randomly.
616
(John Arbash Meinel, #449776)
621
* Added a link to the Desktop Guide. (Ian Clatworthy)
623
* Added What's New in Bazaar 2.1 document. (Ian Clatworthy)
625
* Drop Google Analytics from the core docs as they caused problems
626
in the CHM files. (Ian Clatworthy, #502010)
631
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
632
can set a signal handler and call ``signal.siginterrupt(signum,
633
False)`` for it, if the platform and Python version supports it.
634
(Andrew Bennetts, #496813)
640
:Codename: Strasbourg
643
This release marks our second long-term-stable series. The Bazaar team
644
has decided that we will continue to make bugfix-only 2.0.x and 2.1.x
645
releases, along with 2.2 development releases.
647
This is a fairly incremental update, focusing on polish and bugfixing.
648
There are no changes for supported disk formats. Key updates include
649
reduced memory consumption for many operations, a new per-file merge
650
hook, ignore patterns can now include '!' to exclude files, globbing
651
support for all commands on Windows, and support for addressing home
652
directories via ``bzr+ssh://host/~/`` syntax.
654
Users are encouraged to upgrade from the 2.0 stable series.
659
* Don't require testtools to use sftp.
660
(Vincent Ladeuil, #516183)
662
* Fix "AttributeError in Inter1and2Helper" during fetch.
663
(Martin Pool, #513432)
665
* ``bzr update`` performs the two merges in a more logical order and will stop
666
when it encounters conflicts.
667
(Gerard Krol, #113809)
669
* Give a better error message when doing ``bzr bind`` in an already bound
670
branch. (Neil Martinsen-Burrell, #513063)
672
* Ignore ``KeyError`` from ``remove_index`` during ``_abort_write_group``
673
in a pack repository, which can happen harmlessly if the abort occurs during
674
finishing the write group. Also use ``bzrlib.cleanup`` so that any
675
other errors that occur while aborting the individual packs won't be
676
hidden by secondary failures when removing the corresponding indices.
677
(Andrew Bennetts, #423015)
679
* Set the mtime of files exported to a directory by ``bzr export`` all to
680
the same value to avoid confusing ``make`` and other date-based build
681
systems. (Robert Collins, #515631)
686
* Fetching into experimental formats will now print a warning. (Jelmer
692
* ``Repository.deserialise_inventory`` has been renamed to
693
``Repository._deserialise_inventory`` to indicate it is private.
696
* ``Repository.get_inventory_xml`` has been renamed to
697
``Repository._get_inventory_xml`` to indicate it is private.
700
* ``Repository.serialise_inventory`` has been renamed to
701
``Repository._serialise_inventory`` to indicate it is private.
703
* Using the ``bzrlib.chk_map`` module from within multiple threads at the
704
same time was broken due to race conditions with a module level page
705
cache. This shows up as a KeyError in the ``bzrlib.lru_cache`` code with
706
``bzrlib.chk_map`` in the backtrace, and can be triggered without using
707
the same high level objects such as ``bzrlib.repository.Repository``
708
from different threads. chk_map now uses a thread local cache which may
709
increase memory pressure on processes using threads.
710
(Robert Collins, John Arbash Meinel, #514090)
712
* The new ``merge_file_content`` should now be ok with tests to avoid
714
(Vincent Ladeuil, #515597)
719
* Use ``bzrlib.cleanup`` rather than less robust ``try``/``finally``
720
blocks in several places in ``bzrlib.merge``. This avoids masking prior
721
errors when errors like ``ImmortalPendingDeletion`` occur during cleanup
723
(Andrew Bennetts, #517275)
728
* The ``remove_index`` method of
729
``bzrlib.repofmt.pack_repo.AggregateIndex`` no longer takes a ``pack``
730
argument. This argument was always ignored.
731
(Andrew Bennetts, #423015)
736
:Codename: after the bubbles
737
:2.1.0rc2: 2010-01-29
739
This is a quick-turn-around to update a small issue with our new per-file
740
merge hook. We expect no major changes from this to the final 2.1.0.
745
* The new ``merge_file_content`` hook point has been altered to provide a
746
better API where state for extensions can be stored rather than the
747
too-simple function based approach. This fixes a performance regression
748
where branch configuration would be parsed per-file during merge. As
749
part of this the included news_merger has been refactored into a base
750
helper class ``bzrlib.merge.ConfigurableFileMerger``.
751
(Robert Collins, John Arbash Meinel, #513822)
757
:Codename: the 'new' stable
758
:2.1.0rc1: 2009-01-21
760
This is the first stable release candidate for Bazaar's 2.1 series. From
761
this point onwards, the 2.1 series will be considered stable (as the 2.0
762
series) and only bugfixes are expected to be incorporated. The dozen or so
763
bugfixes in the 2.0.4 release are also included in this release (along
764
with more than 15 more bugfixes). Some of the interesting features are
765
support for per-file merge hooks, ``bzr unshelve --preview``, support
766
for using ! in ignore files to exclude files from being ignored, a small
767
memory leak was squashed, and many ``ObjectNotLocked`` errors were fixed.
768
This looks to be a very good start for a new stable series.
774
* Add bug information to log output when available.
775
(Neil Martinsen-Burrell, Guillermo Gonzalez, #251729)
777
* Added ``merge_file_content`` hook point to ``Merger``, allowing plugins
778
to register custom merge logic, e.g. to provide smarter merging for
781
* Bazaar now includes the ``news_merge`` plugin. It is disabled by
782
default, to enable it add a ``news_merge_files`` option to your
783
configuration. Consult ``bzr help news_merge`` for more information.
786
* ``bzr branch`` now takes a ``--bind`` option. This lets you
787
branch and bind all in one command. (Ian Clatworthy)
789
* ``bzr switch`` now takes a ``--revision`` option, to allow switching to
790
a specific revision of a branch. (Daniel Watkins, #183559)
792
* ``bzr unshelve --preview`` can now be used to show how a patch on the
793
shelf would be applied to the working tree.
794
(Guilherme Salgado, #308122)
796
* ``bzr update`` now takes a ``--revision`` argument. This lets you
797
change the revision of the working tree to any revision in the
798
ancestry of the current or master branch. (Matthieu Moy, Mark Hammond,
801
* ``-Dbytes`` can now be used to display the total number of bytes
802
transferred for the current command. This information is always logged
803
to ``.bzr.log`` for later inspection. (John Arbash Meinel)
805
* New ignore patterns. Patterns prefixed with '!' are exceptions to
806
ignore patterns and take precedence over regular ignores. Such
807
exceptions are used to specify files that should be versioned which
808
would otherwise be ignored. Patterns prefixed with '!!' act as regular
809
ignore patterns, but have highest precedence, even over the '!'
810
exception patterns. (John Whitley, #428031)
812
* The ``supress_warnings`` configuration option has been introduced to disable
813
various warnings (it currently only supports the ``format_deprecation``
814
warning). The new option can be set in any of the following locations:
815
``bazaar.conf``, ``locations.conf`` and/or ``branch.conf``.
816
(Ted Gould, Matthew Fuller, Vincent Ladeuil)
821
* Always show a message if an OS error occurs while trying to run a
822
user-specified commit message editor.
823
(Martin Pool, #504842)
825
* ``bzr diff`` will now use the epoch when it is unable to determine
826
the timestamp of a file, if the revision it was introduced in is a
827
ghost. (Jelmer Vernooij, #295611)
829
* ``bzr switch -b`` can now create branches that are located using directory
830
services such as ``lp:``, even when the branch name doesn't contain a
831
'/'. (Neil Martinsen-Burrell, #495263)
833
* ``bzr unshelve`` has improved messages about what it is doing.
834
(Neil Martinsen-Burrell, #496917)
836
* Concurrent autopacking is more resilient to already-renamed pack files.
837
If we find that a file we are about to obsolete is already obsoleted, we
838
do not try to rename it, and we leave the file in ``obsolete_packs``.
839
The code is also fault tolerant if a file goes missing, assuming that
840
another process already removed the file.
841
(John Arbash Meinel, Gareth White, #507557)
843
* Fix "Too many concurrent requests" in reconcile when network connection
844
fails. (Andrew Bennetts, #503878)
846
* Fixed a side effect mutation of ``RemoteBzrDirFormat._network_name``
847
that caused some tests to fail when run in a non-default order.
848
Probably no user impact. (Martin Pool, #504102)
850
* Fixed ``ObjectNotLocked`` error in ``bzr cat -rbranch:../foo FILE``.
851
(Andrew Bennetts, #506274)
853
* FTP transports support Unicode paths by encoding/decoding them as utf8.
854
(Vincent Ladeuil, #472161)
856
* Listen to the SIGWINCH signal to update the terminal width.
857
(Vincent Ladeuil, #316357)
859
* Progress bars are now hidden when ``--quiet`` is given.
860
(Martin Pool, #320035)
862
* ``SilentUIFactory`` now supports ``make_output_stream`` and discards
863
whatever is written to it. This un-breaks some plugin tests that
864
depended on this behaviour.
865
(Martin Pool, #499757)
867
* When operations update the working tree, all affected files should end
868
up with the same mtime. (eg. when versioning a generated file, if you
869
update the source and the generated file together, the generated file
870
should appear up-to-date.)
871
(John Arbash Meinel, Martin <gzlist>, #488724)
876
* Added ``add_cleanup`` and ``cleanup_now`` to ``bzrlib.command.Command``.
877
All the builtin commands now use ``add_cleanup`` rather than
878
``try``/``finally`` blocks where applicable as it is simpler and more
879
robust. (Andrew Bennetts)
881
* All except a small number of storage formats are now hidden, making
882
the help for numerous commands far more digestible. (Ian Clatworthy)
884
* Attempts to open a shared repository as a branch (e.g. ``bzr branch
885
path/to/repo``) will now include "location is a repository" as a hint in
886
the error message. (Brian de Alwis, Andrew Bennetts, #440952)
888
* Push will now inform the user when they are trying to push to a foreign
889
VCS for which roundtripping is not supported, and will suggest them to
890
use dpush. (Jelmer Vernooij)
892
* The version of bzr being run is now written to the log file.
895
* Transport network activity indicator is shown more of the time when
896
Bazaar is doing network IO.
902
* Add documentation on creating merges with more than one parent.
903
(Neil Martinsen-Burrell, #481526)
905
* Better explain the --uncommitted option of merge.
906
(Neil Martinsen-Burrell, #505088)
908
* Improve discussion of pending merges in the documentation for
909
``revert``. (Neil Martinsen-Burrell, #505093)
911
* Improved help for ``bzr send``.
912
(Martin Pool, Bojan Nikolic)
914
* There is a System Administrator's Guide in ``doc/en/admin-guide``,
915
including discussions of installation, relevant plugins, security and
916
backup. (Neil Martinsen-Burrell)
918
* The ``conflicts`` help topic has been renamed to ``conflict-types``.
921
* The User Reference is now presented as a series of topics.
922
Many of the included topics have link and format tweaks applied.
928
* Added ``cachedproperty`` decorator to ``bzrlib.decorators``.
931
* Many test features were renamed from ``FooFeature`` to ``foo_feature``
932
to be consistent with instances being lower case and classes being
933
CamelCase. For the features that were more likely to be used, we added a
934
deprecation thunk, but not all. (John Arbash Meinel)
936
* Merger classes (such as ``Merge3Merger``) now expect a ``this_branch``
937
parameter in their constructors, and provide ``this_branch`` as an
938
attribute. (Andrew Bennetts)
940
* The Branch hooks pre_change_branch_tip no longer masks exceptions raised
941
by plugins - the original exceptions are now preserved. (Robert Collins)
943
* The Transport ``Server.tearDown`` method is now renamed to
944
``stop_server`` and ``setUp`` to ``start_server`` for consistency with
945
our normal naming pattern, and to avoid confusion with Python's
946
``TestCase.tearDown``. (Martin Pool)
948
* ``WorkingTree.update`` implementations must now accept a ``revision``
954
* Added ``BzrDir.open_branchV3`` smart server request, which can receive
955
a string of details (such as "location is a repository") as part of a
956
``nobranch`` response. (Andrew Bennetts, #440952)
958
* New helper osutils.UnicodeOrBytesToBytesWriter which encodes unicode
959
objects but passes str objects straight through. This is used for
960
selftest but may be useful for diff and other operations that generate
961
mixed output. (Robert Collins)
963
* New exception ``NoRoundtrippingSupport``, for use by foreign branch
964
plugins. (Jelmer Vernooij)
969
* ``bzrlib.tests.permute_for_extension`` is a helper that simplifies
970
running all tests in the current module, once against a pure python
971
implementation, and once against an extension (pyrex/C) implementation.
972
It can be used to dramatically simplify the implementation of
973
``load_tests``. (John Arbash Meinel)
975
* ``bzrlib.tests.TestCase`` now subclasses ``testtools.testcase.TestCase``.
976
This permits features in testtools such as getUniqueInteger and
977
getUniqueString to be used. Because of this, testtools version 0.9.2 or
978
newer is now a dependency to run bzr selftest. Running with versions of
979
testtools less than 0.9.2 will cause bzr to error while loading the test
980
suite. (Robert Collins)
982
* Shell-like tests now support the command "mv" for moving files. The
983
syntax for ``mv file1 file2``, ``mv dir1 dir2`` and ``mv file dir`` is
984
supported. (Neil Martinsen-Burrell)
986
* The test progress bar no longer distinguishes tests that 'errored' from
987
tests that 'failed' - they're all just failures.
993
:2.0.6: NOT RELEASED YET
998
* Additional merges after an unrelated branch has been merged with its
999
history no longer crash when deleted files are involved.
1000
(Vincent Ladeuil, John Arbash Meinel, #375898)
1002
* ``bzr revert`` now only takes write lock on working tree, instead of on
1003
both working tree and branch.
1004
(Danny van Heumen, #498409)
1006
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
1007
permissions as ``.bzr`` directory on a POSIX OS.
1008
(Parth Malwankar, #262450)
1010
* Repositories accessed via a smart server now reject being stacked on a
1011
repository in an incompatible format, as is the case when accessing them
1012
via other methods. This was causing fetches from those repositories via
1013
a smart server (e.g. using ``bzr branch``) to receive invalid data.
1014
(Andrew Bennetts, #562380)
1021
This fifth release in our 2.0 series addresses several user-inconvenience
1022
bugs. None are critical, but upgrading is recommended for all users on
1023
earlier 2.0 releases.
1028
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
1029
(Martin Pool, #331095)
1031
* Concurrent autopacking is more resilient to already-renamed pack files.
1032
If we find that a file we are about to obsolete is already obsoleted, we
1033
do not try to rename it, and we leave the file in ``obsolete_packs``.
1034
The code is also fault tolerant if a file goes missing, assuming that
1035
another process already removed the file.
1036
(John Arbash Meinel, Gareth White, #507557)
1038
* Cope with the lockdir ``held/info`` file being empty, which seems to
1039
happen fairly often if the process is suddenly interrupted while taking
1041
(Martin Pool, #185103)
1043
* Give the warning about potentially slow cross-format fetches much
1044
earlier on in the fetch operation. Don't show this message during
1045
upgrades, and show the correct format indication for remote
1047
(Martin Pool, #456077, #515356, #513157)
1049
* Handle renames correctly when there are files or directories that
1050
differ only in case. (Chris Jones, Martin Pool, #368931)
1052
* If ``bzr push --create-prefix`` triggers an unexpected ``NoSuchFile``
1053
error, report that error rather than failing with an unhelpful
1054
``UnboundLocalError``.
1055
(Andrew Bennetts, #423563)
1057
* Running ``bzr`` command without any arguments now shows bzr
1058
version number along with rest of the help text.
1059
(Parth Malwankar, #369501)
1061
* Use osutils.O_NOINHERIT for some files on win32 to avoid PermissionDenied
1063
(Inada Naoki, #524560)
1068
* Added ``location-alias`` help topic.
1069
(Andrew Bennetts, #337834)
1071
* Fixed CHM generation by moving the NEWS section template into
1072
a separate file. (Ian Clatworthy, #524184)
1078
:Codename: smooth sailing
1081
The fourth bugfix-only release in the 2.0 series contains more than a
1082
dozen bugfixes relative to 2.0.3. The primary focus is on handling
1083
interruptions and concurrent operations more cleanly, there is also a fair
1084
improvement to ``bzr export`` when exporting a remote branch.
1090
* ``bzr annotate`` on another branch with ``-r branch:...`` no longer
1091
fails with an ``ObjectNotLocked`` error. (Andrew Bennetts, #496590)
1093
* ``bzr export dir`` now requests all file content as a record stream,
1094
rather than requsting the file content one file-at-a-time. This can make
1095
exporting over the network significantly faster (54min => 9min in one
1096
case). (John Arbash Meinel, #343218)
1098
* ``bzr serve`` no longer slowly leaks memory. The compiled
1099
``bzrlib.bencode.Encoder()`` class was using ``__del__`` to cleanup and
1100
free resources, and it should have been using ``__dealloc__``.
1101
This will likely have an impact on any other process that is serving for
1102
an extended period of time. (John Arbash Meinel, #494406)
1104
* Check for SIGINT (Ctrl-C) and other signals immediately if ``readdir``
1105
returns ``EINTR`` by calling ``PyErr_CheckSignals``. This affected the
1106
optional ``_readdir_pyx`` extension. (Andrew Bennetts, #495023)
1108
* Concurrent autopacks will no longer lose a newly created pack file.
1109
There was a race condition, where if the reload happened at the right
1110
time, the second packer would forget the name of the newly added pack
1111
file. (John Arbash Meinel, Gareth White, #507566)
1113
* Give a clearer message if the lockdir disappears after being apparently
1114
successfully taken. (Martin Pool, #498378)
1116
* Give a warning when fetching between repositories (local or remote) with
1117
sufficiently different formats that the content will need to be
1118
serialized (ie ``InterDifferingSerializer`` or ``inventory-deltas``), so
1119
the user has a clue that upgrading could make it faster.
1120
(Martin Pool, #456077)
1122
* If we fail to open ``~/.bzr.log`` write a clear message to stderr rather
1123
than using ``warning()``. The log file is opened before logging is set
1124
up, and it leads to very confusing: 'no handlers for "bzr"' messages for
1125
users, rather than something nicer.
1126
(John Arbash Meinel, Barry Warsaw, #503886)
1128
* Refuse to build with any Pyrex 0.9.4 release, as they have known bugs.
1129
(Martin Pool, John Arbash Meinel, #449372)
1131
* ``setup.py bdist_rpm`` now properly finds extra files needed for the
1132
build. (there is still the distutils bug
1133
http://bugs.python.org/issue644744) (Joe Julian, #175839)
1135
* The 2a format wasn't properly restarting autopacks when something
1136
changed underneath it (like another autopack). Now concurrent
1137
autopackers will properly succeed. (John Arbash Meinel, #495000)
1139
* ``TreeTransform`` can now handle when a delta says that the file id for
1140
the tree root changes. Rather than trying to rename your working
1141
directory, or failing early saying that you can't have multiple
1142
tree roots. This also fixes revert, update, and pull when the root id
1143
changes. (John Arbash Meinel, #494269, #504390)
1145
* ``_update_current_block`` no longer suppresses exceptions, so ^C at just
1146
the right time will get propagated, rather than silently failing to move
1147
the block pointer. (John Arbash Meinel, Gareth White, #495023)
1152
* We have a new ``test_source`` that ensures all pyrex ``cdef`` functions
1153
handle exceptions somehow. (Possibly by setting ``# cannot_raise``
1154
rather than an ``except ?:`` clause.) This should help prevent bugs like
1155
bug #495023. (John Arbash Meinel)
1161
:Codename: san francisco airport
1162
:2.1.0b4: 2009-12-14
1164
The fourth beta release in the 2.1 series brings with it a significant
1165
number of bugfixes (~20). The test suite is once again (finally) "green"
1166
on Windows, and should remain that way for future releases. There are a
1167
few performance related updates (faster upgrade and log), and several UI
1168
tweaks. There has also been a significant number of tweaks to the runtime
1169
documentation. 2.1.0b4 include everything from the 2.0.3 release.
1172
Compatibility Breaks
1173
********************
1175
* The BZR_SSH environmental variable may now be set to the path of a secure
1176
shell client. If currently set to the value ``ssh`` it will now guess the
1177
vendor of the program with that name, to restore the old behaviour that
1178
indicated the SSH Corporation client use ``sshcorp`` instead as the magic
1179
string. (Martin <gzlist@googlemail.com>, #176292)
1184
* ``bzr commit`` now has a ``--commit-time`` option.
1185
(Alexander Sack, #459276)
1187
* ``-Dhpss`` now increases logging done when run on the bzr server,
1188
similarly to how it works on the client. (John Arbash Meinel)
1190
* New option ``bzr unshelve --keep`` applies the changes and leaves them
1191
on the shelf. (Martin Pool, Oscar Fuentes, #492091)
1193
* The ``BZR_COLUMNS`` envrionment variable can be set to force bzr to
1194
respect a given terminal width. This can be useful when output is
1195
redirected or in obscure cases where the default value is not
1196
appropriate. Pagers can use it to get a better control of the line
1200
* The new command ``bzr lp-mirror`` will request that Launchpad update its
1201
mirror of a local branch. This command will only function if launchpadlib
1209
* After renaming a file, the dirstate could accidentally reference
1210
``source\\path`` rather than ``source/path`` on Windows. This might be a
1211
source of some dirstate-related failures. (John Arbash Meinel)
1213
* ``bzr commit`` now detects commit messages that looks like file names
1214
and issues a warning.
1215
(Gioele Barabucci, #73073)
1217
* ``bzr ignore /`` no longer causes an IndexError. (Gorden Tyler, #456036)
1219
* ``bzr log -n0 -rN`` should not return revisions beyond its merged revisions.
1220
(#325618, #484109, Marius Kruger)
1222
* ``bzr merge --weave`` and ``--lca`` will now create ``.BASE`` files for
1223
files with conflicts (similar to ``--merge3``). The contents of the file
1224
is a synthesis of all bases used for the merge.
1225
(John Arbash Meinel, #40412)
1227
* ``bzr mv --quiet`` really is quiet now. (Gordon Tyler, #271790)
1229
* ``bzr serve`` is more clear about the risk of supplying --allow-writes.
1230
(Robert Collins, #84659)
1232
* ``bzr serve --quiet`` really is quiet now. (Gordon Tyler, #252834)
1234
* Fix bug with redirected URLs over authenticated HTTP.
1235
(Glen Mailer, Neil Martinsen-Burrell, Vincent Ladeuil, #395714)
1237
* Interactive merge doesn't leave branch locks behind. (Aaron Bentley)
1239
* Lots of bugfixes for the test suite on Windows. We should once again
1240
have a test suite with no failures on Windows. (John Arbash Meinel)
1242
* ``osutils.terminal_width()`` obeys the BZR_COLUMNS environment
1243
variable but returns None if the terminal is not a tty (when output is
1244
redirected for example). Also fixes its usage under OSes that doesn't
1245
provide termios.TIOCGWINSZ. Make sure the corresponding tests runs on
1247
(Joke de Buhr, Vincent Ladeuil, #353370, #62539)
1248
(John Arbash Meinel, Vincent Ladeuil, #492561)
1250
* Terminate ssh subprocesses when no references to them remain, fixing
1251
subprocess and file descriptor leaks. (Andrew Bennetts, #426662)
1253
* The ``--hardlink`` option of ``bzr branch`` and ``bzr checkout`` now
1254
works for 2a format trees. Only files unaffected by content filters
1255
will be hardlinked. (Andrew Bennetts, #408193)
1257
* The new glob expansion on Windows would replace all ``\`` characters
1258
with ``/`` even if it there wasn't a glob to expand, the arg was quoted,
1259
etc. Now only change slashes if there is something being glob expanded.
1260
(John Arbash Meinel, #485771)
1262
* Use our faster ``KnownGraph.heads()`` functionality when computing the
1263
new rich-root heads. This can cut a conversion time in half (mysql from
1264
13.5h => 6.2h) (John Arbash Meinel, #487632)
1266
* When launching a external diff tool via bzr diff --using, temporary files
1267
are no longer created, rather, the path to the file in the working tree is
1268
passed to the external diff tool. This allows the file to be edited if the
1269
diff tool provides for this. (Gary van der Merwe, #490738)
1271
* The launchpad-open command can now be used from a subdirectory of a
1272
branch, not just from the root of the branch.
1273
(Neil Martinsen-Burrell, #489102)
1279
* ``bzr log`` is now faster. (Ian Clatworthy)
1281
* ``bzr update`` provides feedback on which branch it is up to date with.
1282
(Neil Martinsen-Burrell)
1284
* ``bzr upgrade`` from pre-2a to 2a can be significantly faster (4x).
1285
For details see the xml8 patch and heads() improvements.
1286
(John Arbash Meinel)
1288
* ``bzrlib.urlutils.local_path_from_url`` now accepts
1289
'file://localhost/' as well as 'file:///' URLs on POSIX. (Michael
1292
* The progress bar now shows only a spinner and per-operation counts,
1293
not an overall progress bar. The previous bar was often not correlated
1294
with real overall operation progress, either because the operations take
1295
nonlinear time, or because at the start of the operation Bazaar couldn't
1296
estimate how much work there was to do. (Martin Pool)
1301
* Lots of documentation tweaks for inline help topics and command help
1307
* ``bzrlib.textui`` (vestigial module) removed. (Martin Pool)
1309
* The Launchpad plugin now has a function ``login`` which will log in to
1310
Launchpad with launchpadlib, and ``load_branch`` which will return the
1311
Launchpad Branch object corresponding to a given Bazaar Branch object.
1317
* New test Feature: ``ModuleAvailableFeature``. It is designed to make it
1318
easier to handle what tests you want to run based on what modules can be
1319
imported. (Rather than lots of custom-implemented features that were
1320
basically copy-and-pasted.) (John Arbash Meinel)
1322
* ``osutils.timer_func()`` can be used to get either ``time.time()`` or
1323
``time.clock()`` when you want to do performance timing.
1324
``time.time()`` is limited to 15ms resolution on Windows, but
1325
``time.clock()`` gives CPU and not wall-clock time on other platforms.
1326
(John Arbash Meinel)
1328
* Several code paths that were calling ``Transport.get().read()`` have
1329
been changed to the equalivent ``Transport.get_bytes()``. The main
1330
difference is that the latter will explicitly call ``file.close()``,
1331
rather than expecting the garbage collector to handle it. This helps
1332
with some race conditions on Windows during the test suite and sftp
1333
tests. (John Arbash Meinel)
1338
* TestCaseWithMemoryTransport no longer sets $HOME and $BZR_HOME to
1339
unicode strings. (Michael Hudson, #464174)
1345
:Codename: little italy
1349
The third stable release of Bazaar has a small handful of bugfixes. As
1350
expected, this has no internal or external compatibility changes versus
1356
* ``bzr push --use-existing-dir`` no longer crashes if the directory
1357
exists but contains an invalid ``.bzr`` directory.
1358
(Andrew Bennetts, #423563)
1360
* Content filters are now applied correctly after pull, merge and switch.
1361
(Ian Clatworthy, #385879)
1363
* Fix a potential segfault in the groupcompress hash map handling code.
1364
When inserting new entries, if the final hash bucket was empty, we could
1365
end up trying to access if ``(last_entry+1)->ptr == NULL``.
1366
(John Arbash Meinel, #490228)
1368
* Improve "Binary files differ" hunk handling. (Aaron Bentley, #436325)
1374
:Codename: after sprint recovery
1375
:2.1.0b3: 2009-11-16
1377
This release was pushed up from its normal release cycle due to a
1378
regression in python 2.4 compatibility in 2.1.0b2. Since this regression
1379
was caught before 2.1.0b2 was officially announced, the full changelog
1380
includes both 2.1.0b3 and 2.1.0b2 changes.
1382
Highlights of 2.1.0b3 are: new globbing code for all commands on Windows,
1383
the test suite now conforms to python's trunk enhanced semantics (skip,
1384
etc.), and ``bzr info -v`` will now report the correct branch and repo
1385
formats for Remote objects.
1391
* Users can define a shelve editor to provide shelf functionality at a
1392
granularity finer than per-patch-hunk. (Aaron Bentley)
1397
* Fix for shell completion and short options. (Benoît PIERRE)
1399
* Fix ``bzr --profile-imports`` with Python 2.6. (Martin Pool)
1401
* Hooks daughter classes should always call the base constructor.
1402
(Alexander Belchenko, Vincent Ladeuil, #389648)
1404
* Improve "Binary files differ" hunk handling. (Aaron Bentley, #436325)
1406
* On Windows, do glob expansion at the command-line level (as is usually
1407
done in bash, etc.) This means that *all* commands get glob expansion
1408
(bzr status, bzr add, bzr mv, etc). It uses a custom command line
1409
parser, which allows us to know if a given section was quoted. It means
1410
you can now do ``bzr ignore "*.py"``.
1411
(John Arbash Meinel, #425510, #426410, #194450)
1413
* Sanitize commit messages that come in from the '-m' flag. We translate
1414
'\r\n' => '\n' and a plain '\r' => '\n'. The storage layer doesn't
1415
allow those because XML store silently translate it anyway. (The parser
1416
auto-translates \r\n => \n in ways that are hard for us to catch.)
1418
* Show correct branch and repository format descriptions in
1419
``bzr info -v`` on a smart server location. (Andrew Bennetts, #196080)
1421
* The fix for bug #186920 accidentally broke compatibility with python
1422
2.4. (Vincent Ladeuil, #475585)
1424
* Using ``Repository.get_commit_builder().record_iter_changes()`` now
1425
correctly sets ``self.inv_sha1`` to a sha1 string and
1426
``self.new_inventory`` to an Inventory instance after calling
1427
``self.finish_inventory()``. (Previously it accidently set both values
1428
as a tuple on ``self.inv_sha1``. This was missed because
1429
``repo.add_revision`` ignores the supplied inventory sha1 and recomputes
1430
the sha1 from the repo directly. (John Arbash Meinel)
1432
* Shelve command refuse to run if there is no real terminal.
1433
(Alexander Belchenko)
1435
* Avoid unnecessarily flushing of trace file; it's now unbuffered at the
1436
Python level. (Martin Pool)
1441
* Include Japanese translations for documentation (Inada Naoki)
1443
* New API ``ui_factory.make_output_stream`` to be used for sending bulk
1444
(rather than user-interaction) data to stdout. This automatically
1445
coordinates with progress bars or other terminal activity, and can be
1447
(Martin Pool, 493944)
1452
* Some of the core groupcompress functionality now releases the GIL before
1453
operation. Similar to how zlib and bz2 operate without the GIL in the
1454
core compression and decompression routines. (John Arbash Meinel)
1459
* -Dhpssvfs will now trigger on ``RemoteBzrDir._ensure_real``, providing
1460
more debugging of VFS access triggers. (Robert Collins)
1462
* KnownFailure is now signalled to ``ExtendedTestResult`` using the same
1463
method that Python 2.7 uses - ``addExpectedFailure``. (Robert Collins)
1465
* ``--parallel=fork`` is now compatible with --subunit.
1466
(Robert Collins, Vincent Ladeuil, #419776)
1468
* Reporting of failures shows test ids not descriptions and thus shows
1469
parameterised tests correctly. (Robert Collins)
1471
* TestNotApplicable is now handled within the TestCase.run method rather
1472
than being looked for within ``ExtendedTestResult.addError``. This
1473
provides better handling with other ``TestResult`` objects, degrading to
1474
sucess rather than error. (Robert Collins)
1476
* The private method ``_testConcluded`` on ``ExtendedTestResult`` has been
1477
removed - it was empty and unused. (Robert Collins)
1479
* UnavailableFeature is now handled within the TestCase.run method rather
1480
than being looked for within addError. If the Result object does not
1481
have an addNotSupported method, addSkip is attempted instead, and
1482
failing that addSuccess. (Robert Collins)
1484
* When a TestResult does not have an addSkip method, skipped tests are now
1485
reported as successful tests, rather than as errors. This change is
1486
to make it possible to get a clean test run with a less capable
1487
TestResult. (Robert Collins)
1494
:Codename: a load off my mind
1495
:2.1.0b2: 2009-11-02
1497
This is our second feature-filled release since 2.0, pushing us down the
1498
path to a 2.1.0. Once again, all bugfixes in 2.0.2 are present in 2.1.0b2.
1500
Key highlights in this release are: improved handling of
1501
failures-during-cleanup for commit, fixing a long-standing bug with
1502
``bzr+http`` and shared repositories, all ``lp:`` urls to be resolved
1503
behind proxies, and a new StaticTuple datatype, allowing us to reduce
1504
memory consumption (50%) and garbage collector overhead (40% faster) for
1507
* A new ``--concurrency`` option has been added as well as an associated
1508
BZR_CONCURRENCY environment variable to specify the number of
1509
processes that can be run concurrently when running ``bzr selftest``. The
1510
command-line option overrides the environment variable if both are
1511
specified. If none is specified. the number of processes is obtained
1512
from the OS as before. (Matt Nordhoff, Vincent Ladeuil)
1517
* ``bzr+http`` servers no longer give spurious jail break errors when
1518
serving branches inside a shared repository. (Andrew Bennetts, #348308)
1520
* Errors during commit are handled more robustly so that knock-on errors
1521
are less likely to occur, and will not obscure the original error if
1522
they do occur. This fixes some causes of ``TooManyConcurrentRequests``
1523
and similar errors. (Andrew Bennetts, #429747, #243391)
1525
* Launchpad urls can now be resolved from behind proxies.
1526
(Gordon Tyler, Vincent Ladeuil, #186920)
1528
* Reduce the strictness for StaticTuple, instead add a debug flag
1529
``-Dstatic_tuple`` which will change apis to be strict and raise errors.
1530
This way, most users won't see failures, but developers can improve
1531
internals. (John Arbash Meinel, #471193)
1533
* TreeTransform.adjust_path updates the limbo paths of descendants of adjusted
1534
files. (Aaron Bentley)
1536
* Unicode paths are now handled correctly and consistently by the smart
1537
server. (Andrew Bennetts, Michael Hudson, #458762)
1542
* When reading index files, we now use a ``StaticTuple`` rather than a
1543
plain ``tuple`` object. This generally gives a 20% decrease in peak
1544
memory, and can give a performance boost up to 40% on large projects.
1545
(John Arbash Meinel)
1547
* Peak memory under certain operations has been reduced significantly.
1548
(eg, 'bzr branch launchpad standalone' is cut in half)
1549
(John Arbash Meinel)
1554
* Filtered views user documentation upgraded to refer to format 2a
1555
instead of pre-2.0 formats. (Ian Clatworthy)
1560
* Remove deprecated ``CLIUIFactory``. (Martin Pool)
1562
* ``UIFactory`` now has new ``show_error``, ``show_message`` and
1563
``show_warning`` methods, which can be hooked by non-text UIs.
1569
* Added ``bzrlib._simple_set_pyx``. This is a hybrid between a Set and a
1570
Dict (it only holds keys, but you can lookup the object located at a
1571
given key). It has significantly reduced memory consumption versus the
1572
builtin objects (1/2 the size of Set, 1/3rd the size of Dict). This is
1573
used as the interning structure for StaticTuple objects.
1574
(John Arbash Meinel)
1576
* ``bzrlib._static_tuple_c.StaticTuple`` is now available and used by
1577
the btree index parser and the chk map parser. This class functions
1578
similarly to ``tuple`` objects. However, it can only point to a limited
1579
collection of types. (Currently StaticTuple, str, unicode, None, bool,
1580
int, long, float, but not subclasses). This allows us to remove it from
1581
the garbage collector (it cannot be in a cycle), it also allows us to
1582
intern the objects. In testing, this can reduce peak memory by 20-40%,
1583
and significantly improve performance by removing objects from being
1584
inspected by the garbage collector. (John Arbash Meinel)
1586
* ``GroupCompressBlock._ensure_content()`` will now release the
1587
``zlib.decompressobj()`` when the first request is for all of the
1588
content. (Previously it would only be released if you made a request for
1589
part of the content, and then all of it later.) This turns out to be a
1590
significant memory savings, as a ``zstream`` carries around approx 260kB
1591
of internal state and buffers. (For branching bzr.dev this drops peak
1592
memory from 382MB => 345MB.) (John Arbash Meinel)
1594
* When streaming content between ``2a`` format repositories, we now clear
1595
caches from earlier versioned files. (So 'revisions' is cleared when we
1596
start reading 'inventories', etc.) This can have a significant impact on
1597
peak memory for initial copies (~200MB). (John Arbash Meinel)
1603
:Codename: after the scare
1606
The second in our "let's keep the stable bugfixes flowing" series. As
1607
expected this has a few (~9) bugfixes relative to 2.0.1, and no major api
1608
changes or features.
1613
* Avoid "NoneType has no attribute st_mode" error when files disappear
1614
from a directory while it's being read. (Martin Pool, #446033)
1616
* Content filters are now applied correctly after revert.
1619
* Diff parsing handles "Binary files differ" hunks. (Aaron Bentley, #436325)
1621
* Fetching from stacked pre-2a repository via a smart server no longer
1622
fails intermittently with "second push failed to complete".
1623
(Andrew Bennetts, #437626)
1625
* Fix typos left after test_selftest refactoring.
1626
(Vincent Ladeuil, Matt Nordhoff, #461149)
1628
* Fixed ``ObjectNotLocked`` errors during ``bzr log -r NNN somefile``.
1629
(Andrew Bennetts, #445171)
1631
* PreviewTree file names are not limited by the encoding of the temp
1632
directory's filesystem. (Aaron Bentley, #436794)
1637
* ``bzr log`` now read-locks branches exactly once, so makes better use of
1638
data caches. (Andrew Bennetts)
1643
* Filtered views user documentation upgraded to refer to format 2a
1644
instead of pre-2.0 formats. (Ian Clatworthy)
1650
:Codename: While the cat is away
1651
:2.1.0b1: 2009-10-14
1653
This is the first development release in the new split "stable" and
1654
"development" series. As such, the release is a snapshot of bzr.dev
1655
without creating a release candidate first. This release includes a
1656
fair amount of internal changes, with deprecated code being removed,
1657
and several new feature developments. People looking for a stable code
1658
base with only bugfixes should focus on the 2.0.1 release. All bugfixes
1659
present in 2.0.1 are present in 2.1.0b1.
1661
Highlights include support for ``bzr+ssh://host/~/homedir`` style urls,
1662
finer control over the plugin search path via extended BZR_PLUGIN_PATH
1663
syntax, visible warnings when extension modules fail to load, and improved
1664
error handling during unlocking.
1670
* Bazaar can now send mail through Apple OS X Mail.app.
1673
* ``bzr+ssh`` and ``bzr`` paths can now be relative to home directories
1674
specified in the URL. Paths starting with a path segment of ``~`` are
1675
relative to the home directory of the user running the server, and paths
1676
starting with ``~user`` are relative to the home directory of the named
1677
user. For example, for a user "bob" with a home directory of
1678
``/home/bob``, these URLs are all equivalent:
1680
* ``bzr+ssh://bob@host/~/repo``
1681
* ``bzr+ssh://bob@host/~bob/repo``
1682
* ``bzr+ssh://bob@host/home/bob/repo``
1684
If ``bzr serve`` was invoked with a ``--directory`` argument, then no
1685
home directories outside that directory will be accessible via this
1688
This is a feature of ``bzr serve``, so pre-2.1 clients will
1689
automatically benefit from this feature when ``bzr`` on the server is
1690
upgraded. (Andrew Bennetts, #109143)
1692
* Extensions can now be compiled if either Cython or Pyrex is available.
1693
Currently Pyrex is preferred, but that may change in the future.
1696
* Give more control on BZR_PLUGIN_PATH by providing a way to refer to or
1697
disable the user, site and core plugin directories.
1698
(Vincent Ladeuil, #412930, #316192, #145612)
1703
* Bazaar's native protocol code now correctly handles EINTR, which most
1704
noticeably occurs if you break in to the debugger while connected to a
1705
bzr+ssh server. You can now can continue from the debugger (by typing
1706
'c') and the process continues. However, note that pressing C-\ in the
1707
shell may still kill the SSH process, which is bug 162509, so you must
1708
sent a signal to the bzr process specifically, for example by typing
1709
``kill -QUIT PID`` in another shell. (Martin Pool, #341535)
1711
* ``bzr add`` in a tree that has files with ``\r`` or ``\n`` in the
1712
filename will issue a warning and skip over those files.
1713
(Robert Collins, #3918)
1715
* ``bzr dpush`` now aborts if uncommitted changes (including pending merges)
1716
are present in the working tree. The configuration option ``dpush_strict``
1717
can be used to set the default for this behavior.
1718
(Vincent Ladeuil, #438158)
1720
* ``bzr merge`` and ``bzr remove-tree`` now requires --force if pending
1721
merges are present in the working tree.
1722
(Vincent Ladeuil, #426344)
1724
* Clearer message when Bazaar runs out of memory, instead of a ``MemoryError``
1725
traceback. (Martin Pool, #109115)
1727
* Don't give a warning on Windows when failing to import ``_readdir_pyx``
1728
as it is never built. (John Arbash Meinel, #430645)
1730
* Don't restrict the command name used to run the test suite.
1731
(Vincent Ladeuil, #419950)
1733
* ftp transports were built differently when the kerberos python module was
1734
present leading to obscure failures related to ASCII/BINARY modes.
1735
(Vincent Ladeuil, #443041)
1737
* Network streams now decode adjacent records of the same type into a
1738
single stream, reducing layering churn. (Robert Collins)
1740
* PreviewTree behaves correctly when get_file_mtime is invoked on an unmodified
1741
file. (Aaron Bentley, #251532)
1743
* Registry objects should not use iteritems() when asked to use items().
1744
(Vincent Ladeuil, #430510)
1746
* Weave based repositories couldn't be cloned when committers were using
1747
domains or user ids embedding '.sig'. Now they can.
1748
(Matthew Fuller, Vincent Ladeuil, #430868)
1753
* Revision specifiers can now be given in a more DWIM form, without
1754
needing explicit prefixes for specifiers like tags or revision id's.
1755
See ``bzr help revisionspec`` for full details. (Matthew Fuller)
1757
* Bazaar gives a warning before exiting, and writes into ``.bzr.log``, if
1758
compiled extensions can't be loaded. This typically indicates a
1759
packaging or installation problem. In this case Bazaar will keep
1760
running using pure-Python versions, but this may be substantially
1761
slower. The warning can be disabled by setting
1762
``ignore_missing_extensions = True`` in ``bazaar.conf``.
1763
See also <https://answers.launchpad.net/bzr/+faq/703>.
1764
(Martin Pool, #406113, #430529)
1766
* Secondary errors that occur during Branch.unlock and Repository.unlock
1767
no longer obscure the original error. These methods now use a new
1768
decorator, ``only_raises``. This fixes many causes of
1769
``TooManyConcurrentRequests`` and similar errors.
1770
(Andrew Bennetts, #429747)
1775
* Describe the new shell-like test feature. (Vincent Ladeuil)
1777
* Help on hooks no longer says 'Not deprecated' for hooks that are
1778
currently supported. (Ian Clatworthy, #422415)
1783
* ``bzrlib.user_encoding`` has been removed; use
1784
``bzrlib.osutils.get_user_encoding`` instead. (Martin Pool)
1786
* ``bzrlib.tests`` now uses ``stopTestRun`` for its ``TestResult``
1787
subclasses - the same as python's unittest module. (Robert Collins)
1789
* ``diff._get_trees_to_diff`` has been renamed to
1790
``diff.get_trees_and_branches_to_diff``. It is now a public API, and it
1791
returns the old and new branches. (Gary van der Merwe)
1793
* ``bzrlib.trace.log_error``, ``error`` and ``info`` have been deprecated.
1796
* ``MutableTree.has_changes()`` does not require a tree parameter anymore. It
1797
now defaults to comparing to the basis tree. It now checks for pending
1798
merges too. ``Merger.check_basis`` has been deprecated and replaced by the
1799
corresponding has_changes() calls. ``Merge.compare_basis``,
1800
``Merger.file_revisions`` and ``Merger.ensure_revision_trees`` have also
1802
(Vincent Ladeuil, #440631)
1804
* ``ProgressTask.note`` is deprecated.
1810
* Added ``-Drelock`` debug flag. It will ``note`` a message every time a
1811
repository or branch object is unlocked then relocked the same way.
1814
* ``BTreeLeafParser.extract_key`` has been tweaked slightly to reduce
1815
mallocs while parsing the index (approx 3=>1 mallocs per key read).
1816
This results in a 10% speedup while reading an index.
1817
(John Arbash Meinel)
1819
* The ``bzrlib.lsprof`` module has a new class ``BzrProfiler`` which makes
1820
profiling in some situations like callbacks and generators easier.
1826
* Passing ``--lsprof-tests -v`` to bzr selftest will cause lsprof output to
1827
be output for every test. Note that this is very verbose! (Robert Collins)
1829
* Setting ``BZR_TEST_PDB=1`` when running selftest will cause a pdb
1830
post_mortem to be triggered when a test failure occurs. (Robert Collins)
1832
* Shell-like tests can now be written. Code in ``bzrlib/tests/script.py`` ,
1833
documentation in ``developers/testing.txt`` for details.
1836
* Some tests could end up with the same id, that was dormant for
1838
(Vincent Ladeuil, #442980)
1840
* Stop showing the number of tests due to missing features in the test
1841
progress bar. (Martin Pool)
1843
* Test parameterisation now does a shallow copy, not a deep copy of the test
1844
to be parameterised. This is not expected to break external use of test
1845
parameterisation, and is substantially faster. (Robert Collins)
1847
* Tests that try to open a bzr dir on an arbitrary transport will now
1848
fail unless they have explicitly permitted the transport via
1849
``self.permit_url``. The standard test factories such as ``self.get_url``
1850
will permit the urls they provide automatically, so only exceptional
1851
tests should need to do this. (Robert Collins)
1853
* The break-in test no longer cares about clean shutdown of the child,
1854
instead it is happy if the debugger starts up. (Robert Collins)
1856
* The full test suite is expected to pass when the C extensions are not
1857
present. (Vincent Ladeuil, #430749)
1863
:Codename: Stability First
1866
The first of our new ongoing bugfix-only stable releases has arrived. It
1867
includes a collection of 12 bugfixes applied to bzr 2.0.0, but does not
1868
include any of the feature development in the 2.1.0 series.
1874
* ``bzr add`` in a tree that has files with ``\r`` or ``\n`` in the
1875
filename will issue a warning and skip over those files.
1876
(Robert Collins, #3918)
1878
* bzr will attempt to authenticate with SSH servers that support
1879
``keyboard-interactive`` auth but not ``password`` auth when using
1880
Paramiko. (Andrew Bennetts, #433846)
1882
* Fixed fetches from a stacked branch on a smart server that were failing
1883
with some combinations of remote and local formats. This was causing
1884
"unknown object type identifier 60" errors. (Andrew Bennetts, #427736)
1886
* Fixed ``ObjectNotLocked`` errors when doing some log and diff operations
1887
on branches via a smart server. (Andrew Bennetts, #389413)
1889
* Handle things like ``bzr add foo`` and ``bzr rm foo`` when the tree is
1890
at the root of a drive. ``osutils._cicp_canonical_relpath`` always
1891
assumed that ``abspath()`` returned a path that did not have a trailing
1892
``/``, but that is not true when working at the root of the filesystem.
1893
(John Arbash Meinel, Jason Spashett, #322807)
1895
* Hide deprecation warnings for 'final' releases for python2.6.
1896
(John Arbash Meinel, #440062)
1898
* Improve the time for ``bzr log DIR`` for 2a format repositories.
1899
We had been using the same code path as for <2a formats, which required
1900
iterating over all objects in all revisions.
1901
(John Arbash Meinel, #374730)
1903
* Make sure that we unlock the tree if we fail to create a TreeTransform
1904
object when doing a merge, and there is limbo, or pending-deletions
1905
directory. (Gary van der Merwe, #427773)
1907
* Occasional IndexError on renamed files have been fixed. Operations that
1908
set a full inventory in the working tree will now go via the
1909
apply_inventory_delta code path which is simpler and easier to
1910
understand than dirstates set_state_from_inventory method. This may
1911
have a small performance impact on operations built on _write_inventory,
1912
but such operations are already doing full tree scans, so no radical
1913
performance change should be observed. (Robert Collins, #403322)
1915
* Retrieving file text or mtime from a _PreviewTree has good performance when
1916
there are many changes. (Aaron Bentley)
1918
* The CHK index pages now use an unlimited cache size. With a limited
1919
cache and a large project, the random access of chk pages could cause us
1920
to download the entire cix file many times.
1921
(John Arbash Meinel, #402623)
1923
* When a file kind becomes unversionable after being added, a sensible
1924
error will be shown instead of a traceback. (Robert Collins, #438569)
1929
* Improved README. (Ian Clatworthy)
1931
* Improved upgrade documentation for Launchpad branches.
1939
:Codename: Instant Karma
1941
This release of Bazaar makes the 2a (previously 'brisbane-core') format
1942
the default when new branches or repositories are created. This format is
1943
substantially smaller and faster for many operations. Most of the work in
1944
this release focuses on bug fixes and stabilization, covering both 2a and
1945
previous formats. (See the Upgrade Guide for information on migrating
1948
This release also improves the documentation content and presentation,
1949
including adding Windows HtmlHelp manuals.
1951
The Bazaar team decided that 2.0 will be a long-term supported release,
1952
with bugfix-only 2.0.x releases based on it, continuing for at least six
1953
months or until the following stable release.
1955
Changes from 2.0.0rc2 to final
1956
******************************
1958
* Officially branded as 2.0.0 rather than 2.0 to clarify between things
1959
that "want to happen on the 2.0.x stable series" versus things that want
1960
to "land in 2.0.0". (Changes how bzrlib._format_version_tuple() handles
1961
micro = 0.) (John Arbash Meinel)
1967
:2.0.0rc2: 2009-09-10
1972
* Added post_commit hook for mutable trees. This allows the keywords
1973
plugin to expand keywords on files changed by the commit.
1974
(Ian Clatworthy, #408841)
1979
* Bazaar's native protocol code now correctly handles EINTR, which most
1980
noticeably occurs if you break in to the debugger while connected to a
1981
bzr+ssh server. You can now can continue from the debugger (by typing
1982
'c') and the process continues. However, note that pressing C-\ in the
1983
shell may still kill the SSH process, which is bug 162509, so you must
1984
sent a signal to the bzr process specifically, for example by typing
1985
``kill -QUIT PID`` in another shell. (Martin Pool, #341535)
1987
* ``bzr check`` in pack-0.92, 1.6 and 1.9 format repositories will no
1988
longer report incorrect errors about ``Missing inventory ('TREE_ROOT', ...)``
1989
(Robert Collins, #416732)
1991
* ``bzr info -v`` on a 2a format still claimed that it was a "Development
1992
format" (John Arbash Meinel, #424392)
1994
* ``bzr log stacked-branch`` shows the full log including
1995
revisions that are in the fallback repository. (Regressed in 2.0rc1).
1996
(John Arbash Meinel, #419241)
1998
* Clearer message when Bazaar runs out of memory, instead of a ``MemoryError``
1999
traceback. (Martin Pool, #109115)
2001
* Conversion to 2a will create a single pack for all the new revisions (as
2002
long as it ran without interruption). This improves both ``bzr upgrade``
2003
and ``bzr pull`` or ``bzr merge`` from local branches in older formats.
2004
The autopack logic that occurs every 100 revisions during local
2005
conversions was not returning that pack's identifier, which resulted in
2006
the partial packs created during the conversion not being consolidated
2007
at the end of the conversion process. (Robert Collins, #423818)
2009
* Fetches from 2a to 2a are now again requested in 'groupcompress' order.
2010
Groups that are seen as 'underutilized' will be repacked on-the-fly.
2011
This means that when the source is fully packed, there is minimal
2012
overhead during the fetch, but if the source is poorly packed the result
2013
is a fairly well packed repository (not as good as 'bzr pack' but
2014
good-enough.) (Robert Collins, John Arbash Meinel, #402652)
2016
* Fix a potential segmentation fault when doing 'log' of a branch that had
2017
ghosts in its mainline. (Evaluating None as a tuple is bad.)
2018
(John Arbash Meinel, #419241)
2020
* ``groupcompress`` sort order is now more stable, rather than relying on
2021
``topo_sort`` ordering. The implementation is now
2022
``KnownGraph.gc_sort``. (John Arbash Meinel)
2024
* Local data conversion will generate correct deltas. This is a critical
2025
bugfix vs 2.0rc1, and all 2.0rc1 users should upgrade to 2.0rc2 before
2026
converting repositories. (Robert Collins, #422849)
2028
* Network streams now decode adjacent records of the same type into a
2029
single stream, reducing layering churn. (Robert Collins)
2031
* Prevent some kinds of incomplete data from being committed to a 2a
2032
repository, such as revisions without inventories, a missing chk_bytes
2033
record for an inventory, or a missing text referenced by an inventory.
2034
(Andrew Bennetts, #423506, #406687)
2039
* Fix assertion error about "_remember_remote_is_before" when pushing to
2040
older smart servers.
2041
(Andrew Bennetts, #418931)
2043
* Help on hooks no longer says 'Not deprecated' for hooks that are
2044
currently supported. (Ian Clatworthy, #422415)
2046
* PDF and CHM (Windows HtmlHelp) formats are now supported for the
2047
user documentation. The HTML documentation is better broken up into
2048
topics. (Ian Clatworthy)
2050
* The developer and foreign language documents are now separated
2051
out so that searching in the HTML and CHM files produces more
2052
useful results. (Ian Clatworthy)
2054
* The main table of contents now provides links to the new Migration Docs
2055
and Plugins Guide. (Ian Clatworthy)
2061
:Codename: no worries
2062
:2.0.0rc1: 2009-08-26
2064
Compatibility Breaks
2065
********************
2067
* The default format for bzr is now ``2a``. This format brings many
2068
significant performance and size improvements. bzr can pull from
2069
any existing repository into a ``2a`` one, but can only transfer
2070
from ``2a`` into ``rich-root`` repositories. The Upgrade guide
2071
has more information about this change. (Robert Collins)
2073
* On Windows auto-detection of Putty's plink.exe is disabled.
2074
Default SSH client for Windows is paramiko. User still can force
2075
usage of plink if explicitly set environment variable BZR_SSH=plink.
2076
(#414743, Alexander Belchenko)
2081
* ``bzr branch --switch`` can now switch the checkout in the current directory
2082
to the newly created branch. (Lukáš Lalinský)
2087
* Further tweaks to handling of ``bzr add`` messages about ignored files.
2088
(Jason Spashett, #76616)
2090
* Fetches were being requested in 'groupcompress' order, but weren't
2091
recombining the groups. Thus they would 'fragment' to get the correct
2092
order, but not 'recombine' to actually benefit from it. Until we get
2093
recombining to work, switching to 'unordered' fetches avoids the
2094
fragmentation. (John Arbash Meinel, #402645)
2096
* Fix a pycurl related test failure on karmic by recognizing an error
2097
raised by newer versions of pycurl.
2098
(Vincent Ladeuil, #306264)
2100
* Fix a test failure on karmic by making a locale test more robust.
2101
(Vincent Ladeuil, #413514)
2103
* Fix IndexError printing CannotBindAddress errors.
2104
(Martin Pool, #286871)
2106
* Fix "Revision ... not present" errors when upgrading stacked branches,
2107
or when doing fetches from a stacked source to a stacked target.
2108
(Andrew Bennetts, #399140)
2110
* ``bzr branch`` of 2a repositories over HTTP is much faster. bzr now
2111
batches together small fetches from 2a repositories, rather than
2112
fetching only a few hundred bytes at a time.
2113
(Andrew Bennetts, #402657)
2118
* A better description of the platform is shown in crash tracebacks, ``bzr
2119
--version`` and ``bzr selftest``.
2120
(Martin Pool, #409137)
2122
* bzr can now (again) capture crash data through the apport library,
2123
so that a single human-readable file can be attached to bug reports.
2124
This can be disabled by using ``-Dno_apport`` on the command line, or by
2125
putting ``no_apport`` into the ``debug_flags`` section of
2127
(Martin Pool, Robert Collins, #389328)
2129
* ``bzr push`` locally on windows will no longer give a locking error with
2130
dirstate based formats. (Robert Collins)
2132
* ``bzr shelve`` and ``bzr unshelve`` now work on windows.
2133
(Robert Collins, #305006)
2135
* Commit of specific files no longer prevents using the iter_changes
2136
codepath. On 2a repositories, commit of specific files should now be as
2137
fast, or slightly faster, than a full commit. (Robert Collins)
2139
* The internal core code that handles specific file operations like
2140
``bzr st FILENAME`` or ``bzr commit FILENAME`` has been changed to
2141
include the parent directories if they have altered, and when a
2142
directory stops being a directory its children are always included. This
2143
fixes a number of causes for ``InconsistentDelta`` errors, and permits
2144
faster commit of specific paths. (Robert Collins, #347649)
2149
* New developer documentation for content filtering.
2155
* ``bzrlib.shelf_ui`` has had the ``from_args`` convenience methods of its
2156
classes changed to manage lock lifetime of the trees they open in a way
2157
consistent with reader-exclusive locks. (Robert Collins, #305006)
2165
:Codename: nein nein nein!
2168
This release fixes two small but worthwhile bugs relevant to users on
2169
Microsoft Windows: some commands that failed on with locking errors will
2170
now work, and a bug that caused poor performance after committing a file
2171
with line-ending conversion has now been fixed. It also fixes a bug in
2172
pushing to older servers.
2177
* Fixed a problem where using content filtering and especially end-of-line
2178
conversion will commit too many copies a file.
2179
(Martin Pool, #415508)
2181
* Fix assertion error about ``_remember_remote_is_before`` in
2182
``set_tags_bytes`` when pushing to older smart servers.
2183
(Andrew Bennetts, Alexander Belchenko, #418931)
2188
* ``bzr push`` locally on Windows will no longer give a locking error with
2189
dirstate based formats. (Robert Collins)
2191
* ``bzr shelve`` and ``bzr unshelve`` now work on Windows.
2192
(Robert Collins, #305006)
2197
* ``bzrlib.shelf_ui`` has had the ``from_args`` convenience methods of its
2198
classes changed to manage lock lifetime of the trees they open in a way
2199
consistent with reader-exclusive locks. (Robert Collins, #305006)
2201
* ``Tree.path_content_summary`` may return a size of None, when called on
2202
a tree with content filtering where the size of the canonical form
2203
cannot be cheaply determined. (Martin Pool)
2205
* When manually creating transport servers in test cases, a new helper
2206
``TestCase.start_server`` that registers a cleanup and starts the server
2207
should be used. (Robert Collins)
2212
Compatibility Breaks
2213
********************
2215
* Committing directly to a stacked branch from a lightweight checkout will
2216
no longer work. In previous versions this would appear to work but would
2217
generate repositories with insufficient data to create deltas, leading
2218
to later errors when branching or reading from the repository.
2219
(Robert Collins, bug #375013)
2227
* Fetching from 2a branches from a version-2 bzr protocol would fail to
2228
copy the internal inventory pages from the CHK store. This cannot happen
2229
in normal use as all 2a compatible clients and servers support the
2230
version-3 protocol, but it does cause test suite failures when testing
2231
downlevel protocol behaviour. (Robert Collins)
2233
* Fix a test failure on karmic by making a locale test more robust.
2234
(Vincent Ladeuil, #413514)
2236
* Fixed "Pack ... already exists" error when running ``bzr pack`` on a
2237
fully packed 2a repository. (Andrew Bennetts, #382463)
2239
* Further tweaks to handling of ``bzr add`` messages about ignored files.
2240
(Jason Spashett, #76616)
2242
* Properly handle fetching into a stacked branch while converting the
2243
data, especially when there are also ghosts. The code was filling in
2244
parent inventories incorrectly, and also not handling when one of the
2245
parents was a ghost. (John Arbash Meinel, #402778, #412198)
2247
* ``RemoteStreamSource.get_stream_for_missing_keys`` will fetch CHK
2248
inventory pages when appropriate (by falling back to the vfs stream
2249
source). (Andrew Bennetts, #406686)
2251
* StreamSource generates rich roots from non-rich root sources correctly
2252
now. (Andrew Bennetts, #368921)
2254
* When deciding whether a repository was compatible for upgrading or
2255
fetching, we previously incorrectly checked the default repository
2256
format for the bzrdir format, rather than the format that was actually
2257
present on disk. (Martin Pool, #408824)
2262
* A better description of the platform is shown in crash tracebacks, ``bzr
2263
--version`` and ``bzr selftest``.
2264
(Martin Pool, #409137)
2266
* Cross-format fetches (such as between 1.9-rich-root and 2a) via the
2267
smart server are more efficient now. They send inventory deltas rather
2268
than full inventories. The smart server has two new requests,
2269
``Repository.get_stream_1.19`` and ``Repository.insert_stream_1.19`` to
2270
support this. (Andrew Bennetts, #374738, #385826)
2272
* Extracting the full ancestry and computing the ``merge_sort`` is now
2273
significantly faster. This effects things like ``bzr log -n0``. (For
2274
example, ``bzr log -r -10..-1 -n0 bzr.dev`` is 2.5s down to 1.0s.
2275
(John Arbash Meinel)
2286
* ``-Dstrict_locks`` can now be used to check that read and write locks
2287
are treated properly w.r.t. exclusivity. (We don't try to take an OS
2288
read lock on a file that we already have an OS write lock on.) This is
2289
now set by default for all tests, if you have a test which cannot be
2290
fixed, you can use ``self.thisFailsStrictLockCheck()`` as a
2291
compatibility knob. (John Arbash Meinel)
2293
* InterDifferingSerializer is now only used locally. Other fetches that
2294
would have used InterDifferingSerializer now use the more network
2295
friendly StreamSource, which now automatically does the same
2296
transformations as InterDifferingSerializer. (Andrew Bennetts)
2298
* ``KnownGraph`` now has a ``.topo_sort`` and ``.merge_sort`` member which
2299
are implemented in pyrex and significantly faster. This is exposed along
2300
with ``CombinedGraphIndex.find_ancestry()`` as
2301
``VersionedFiles.get_known_graph_ancestry(keys)``.
2302
(John Arbash Meinel)
2304
* RemoteBranch.open now honours ignore_fallbacks correctly on bzr-v2
2305
protocols. (Robert Collins)
2307
* The index code now has some specialized routines to extract the full
2308
ancestry of a key in a more efficient manner.
2309
``CombinedGraphIndex.find_ancestry()``. (Time to get ancestry for
2310
bzr.dev drops from 1.5s down to 300ms. For OOo from 33s => 10.5s) (John
2316
* Install the test ssl certificate and key so that installed bzr
2317
can run the https tests. (Denys Duchier, #392401)
2323
:Codename: little traveller
2325
:1.18rc1: 2009-08-10
2327
This release of Bazaar marches on towards the 2.0 release in which the 2a
2328
'brisbane-core' format becomes generally recommended. Most of the work in
2329
this release now focusses on bug fixes and stabilization, covering both 2a
2330
and previous formats. There is a new text-mode interactive merge feature,
2331
a new guide to migration to 2a format in the user documentation, and
2332
pushing branches to a smart server is now much faster.
2334
The Bazaar team decided that 2.0 will be a long-term supported release,
2335
with bugfix-only releases based on it continuing for at least six months
2336
or until the following stable release.
2338
There are no changes from 1.18rc1 to 1.18.
2343
* ``bzr merge --interactive`` applies a user-selected portion of the
2344
merge. The UI is similar to ``shelve``. (Aaron Bentley)
2346
* ``bzr reconfigure`` now takes options ``--stacked-on URL`` and
2347
``--unstacked`` to change stacking of a branch.
2348
(Martin Pool, #391411)
2353
* Annotating on a stacked branch will now succeed in simple scenarios.
2354
There are still some complex scenarios where it will fail (bug #399884)
2355
(John Arbash Meinel, #393366)
2357
* A progress bar is no longer left dangling when ``bzr selftest``
2358
completes, and the progress bar updates with zero latency so the
2359
displayed test name is always the one that's actually running.
2360
(Martin Pool, #123688)
2362
* Authenticating against an ssh server now uses ``auth_none`` to determine
2363
if password authentication is even supported. This fixes a bug where
2364
users would be prompted for a launchpad password, even though launchpad
2365
only supports publickey authentication. (John Arbash Meinel, #375867)
2367
* BranchBuilder now accepts timezone to avoid test failures in countries far
2368
from GMT. (Vincent Ladeuil, #397716)
2370
* ``bzr commit`` no longer saves the unversioning of missing files until
2371
the commit has completed on the branch. This means that aborting a
2372
commit that found a missing file will leave the tree unedited.
2373
(Robert Collins, #282402)
2375
* ``bzr mv`` no longer takes out branch locks, which allows it to work
2376
when the branch is readonly. (Robert Collins, #216541)
2378
* ``bzr revert .`` no longer generates an InconsistentDelta error when
2379
there are missing subtrees. (Robert Collins, #367632)
2381
* ``bzr send`` now generates valid bundles with ``--2a`` formats. However,
2382
do to internal changes necessary to support this, older clients will
2383
fail when trying to insert them. For newer clients, the bundle can be
2384
used to apply the changes to any rich-root compatible format.
2385
(John Arbash Meinel, #393349)
2387
* Cope with FTP servers that don't support restart/append by falling back
2388
to reading and then rewriting the whole file, such as TahoeLAFS. (This
2389
fallback may be slow for some access patterns.) (Nils Durner, #294709)
2391
* Encode the paths in ``mbcs`` encoding on Windows when spawning an
2392
external diff client. This at least allows supporting filenames that are
2393
not ascii, but are present in the current locale. Ideally we would be
2394
able to pass the Unicode path, but that would be client dependent.
2395
(John Arbash Meinel, #382709)
2397
* Fix a compile bug on Solaris having to do with const and
2398
pointer-to-pointers. (John Arbash Meinel, #408441)
2400
* Fixed a NameError that occurs when merging or pulling from a URL that
2401
causes a redirection loop when bzr tries to read a URL as a bundle.
2402
(Andrew Bennetts, #400847)
2404
* Fix ``AttributeError: 'TestUIFactory' object has no attribute 'tick'``
2405
running send and similar commands on 2a formats.
2406
(Martin Pool, #408201)
2408
* Fix crash in some invocations of ``bzr status`` in format 2a.
2409
(Martin Pool, #403523)
2411
* Fixed export to existing directory: if directory is empty then export
2412
will succeed, otherwise it fails with error.
2413
(Alexander Belchenko, #406174)
2415
* Fixed spurious "Source branch does not support stacking" warning when
2416
pushing. (Andrew Bennetts, #388908)
2418
* Fixed spurious transport activity indicator appearing while tests are
2419
running. (Martin Pool, #343532)
2421
* Merge now correctly handles empty right-hand revision specs.
2422
(Aaron Bentley, #333961)
2424
* Renames to lexographically lower basenames in trees that have never been
2425
committed to will no longer corrupt the dirstate. This was caused by an
2426
bug in the dirstate update_minimal method. (Robert Collins, #395556)
2428
* Requests for unknown methods no longer cause the smart server to log
2429
lots of backtraces about ``UnknownSmartMethod``, ``do_chunk`` or
2430
``do_end``. (Andrew Bennetts, #338561)
2432
* Shelve will not shelve the initial add of the tree root. (Aaron Bentley)
2434
* Streaming from bzr servers where there is a chain of stacked branches
2435
(A stacked on B stacked on C) will now work. (Robert Collins, #406597)
2437
* The environment variable ``BZR_PROGRESS_BAR`` set to either ``text`` or ``none``
2438
always forces progress bars either on or off respectively. Otherwise,
2439
they're turned on if ``TERM`` is not ``dumb`` and stderr is a terminal.
2440
bzr always uses the 'text' user interface when run as a command, so
2441
``BZR_USE_TEXT_UI`` is no longer needed.
2442
(Martin Pool, #339385, #387717)
2444
* The optional ``_knit_load_data_pyx`` C extension was never being
2445
imported. This caused significant slowdowns when reading data from
2446
repositories. (Andrew Bennetts, #405653)
2448
* The ``--hardlink`` option to ``branch`` and ``checkout`` is not
2449
supported at the moment on workingtree formats that can do content
2450
filtering. (See <https://bugs.edge.launchpad.net/bzr/+bug/408193>.)
2451
bzr now says so, rather than just ignoring the option. (Martin Pool)
2453
* There was a bug in ``osutils.relpath`` that was only triggered on
2454
Windows. Essentially if you were at the root of a drive, and did
2455
something to a branch/repo on another drive, we would go into an
2456
infinite loop while trying to find a 'relative path'.
2457
(John Arbash Meinel, #394227)
2459
* ``WorkingTree4.unversion`` will no longer fail to unversion ids which
2460
were present in a parent tree but renamed in the working tree.
2461
(Robert Collins, #187207)
2466
* Can now rename/move files even if they have been removed from the inventory.
2469
* Pushing branches with tags via ``bzr://`` and ``bzr+ssh://`` is much
2470
faster, using a new ``Branch.set_tags_bytes`` smart server verb rather
2471
than VFS methods. For example, pushes of small branches with tags take
2472
11 rather than 18 smart server requests. (Andrew Bennetts, #398608)
2474
* Sending Ctrl-Break on Windows will now drop you into the debugger, in
2475
the same way that sending Ctrl-\\ does on other platforms.
2476
(John Arbash Meinel)
2481
* Added Bazaar 2.0 Upgrade Guide. (Ian Clatworthy)
2486
* ``CLIUIFactory`` is deprecated; use ``TextUIFactory`` instead if you
2487
need to subclass or create a specific class, or better yet the existing
2488
``make_ui_for_terminal``. ``SilentUIFactory`` is clarified to do no
2489
user interaction at all, rather than trying to read from stdin but not
2490
writing any output, which would be strange if reading prompts or
2491
passwords. (Martin Pool)
2493
* New TransformPreview.commit() allows committing without a working tree.
2496
* ``pb`` parameter to ``TextTestResult`` is deprecated and ignored.
2499
* ProgressTasks now prefer to talk direct to their ProgressView not to the
2503
* ``WorkingTree._check`` now requires a references dict with keys matching
2504
those returned by ``WorkingTree._get_check_refs``. (Robert Collins)
2509
* ``CHKInventory.path2id`` uses the parent_id to basename hash to avoid
2510
reading the entries along the path, reducing work to lookup ids from
2511
paths. (Robert Collins)
2513
* ``CHKMap.apply_delta`` now raises ``InconsistentDelta`` if a delta adds
2514
as new a key which was already mapped. (Robert Collins)
2516
* Inventory delta application catches more cases of corruption and can
2517
prevent corrupt deltas from affecting consistency of data structures on
2518
disk. (Robert Collins)
2520
* --subunit support now adds timestamps if the subunit version supports
2521
it. (Robert Collins)
2523
* The Windows all-in-one installer now bundles the PyQt image format
2524
plugins, which allows previewing more images as part of 'qdiff'.
2525
(Alexander Belchenko)
2531
* Merge directive cherrypick tests must use the same root id.
2532
(Martin Pool, #409684)
2534
* Spurious failure in ``check`` tests on rich-root formats fixed.
2535
(Martin Pool, #408199)
2537
* The ``bzrlib.tests.TextTestRunner`` will no longer call
2538
``countTestsCases`` on the test being run. Progress information is
2539
instead handled by having the test passed in call ``result.progress``
2540
before running its contents. This improves the behaviour when using
2541
``TextTestRunner`` with test suites that don't support
2542
``countTestsCases``. (Robert Collins)
2545
bzr 1.17.1 (unreleased)
2546
#######################
2551
* The optional ``_knit_load_data_pyx`` C extension was never being
2552
imported. This caused significant slowdowns when reading data from
2553
knit format repositories. (Andrew Bennetts, #405653)
2558
:Codename: so-late-its-brunch
2559
:1.17rc1: 2009-07-13
2563
Bazaar continues to blaze a straight and shining path to the 2.0 release and
2564
the elevation of the ``2a`` beta format to the full glory of "supported and
2567
Highlights in this release include greatly reduced memory consumption during
2568
commits, faster ``ls``, faster ``annotate``, faster network operations if
2569
you're specifying a revision number and the final destruction of those
2570
annoying progress bar artifacts.
2573
Changes from 1.17rc1 to 1.17final
2574
*********************************
2576
* Change an extension to call the python ``frozenset()`` rather than the C
2577
api ``PyFrozenSet_New``. It turns out that python2.4 did not expose the
2578
C api. (John Arbash Meinel, #399366)
2580
* Fixes for the Makefile and the rename of ``generate_docs.py`` to
2581
``tools/generate_docs.py`` to allow everything to be built on Windows.
2582
(John Arbash Meinel, #399356)
2584
* ``bzr serve`` once again applies a ``ChrootServer`` to the given
2585
directory before serving it. (Andrew Bennetts, #400535)
2588
Compatibility Breaks
2589
********************
2591
* ``bzr register-branch`` from the Launchpad plugin now refers to "project"
2592
instead of "product" which is the correct Launchpad terminology. The
2593
--product option is deprecated and users should switch to using --project.
2594
(Neil Martinsen-Burrell, #238764)
2600
* ``bzr push`` now aborts if uncommitted changes (including pending merges)
2601
are present in the working tree (if one is present) and no revision is
2602
specified. The configuration option ``push_strict`` can be used to set the
2603
default for this behavior. (Vincent Ladeuil, #284038, #322808, #65286)
2605
* ``bzr revno`` and ``bzr revision-info`` now have a ``--tree`` option to
2606
show revision info for the working tree instead of the branch.
2607
(Matthew Fuller, John Arbash Meinel)
2609
* ``bzr send`` now aborts if uncommitted changes (including pending merges)
2610
are present in the working tree and no revision is specified. The
2611
configuration option ``send_strict`` can be used to set the default for this
2613
(Vincent Ladeuil, #206577)
2615
* ``bzr switch --create-branch/-b`` can now be used to create and switch
2616
to a new branch. Supplying a name without a ``/`` will create the branch
2617
relative to the existing branch. (similar to how ``bzr switch name``
2618
works when the branch already exists.) (John Arbash Meinel)
2624
* Accept uppercase "Y/N" to prompts such as from break lock.
2625
(#335182, Tim Powell, Martin Pool)
2627
* Add documentation about diverged branches and how to fix them in the
2628
centralized workflow with local commits. Mention ``bzr help
2629
diverged-branches`` when a push fails because the branches have
2630
diverged. (Neil Martinsen-Burrell, #269477)
2632
* Annotate would sometimes 'latch on' to trivial lines, causing important
2633
lines to be incorrectly annotated. (John Arbash Meinel, #387952)
2635
* Automatic format upgrades triggered by default stacking policies on a
2636
1.16rc1 (or later) smart server work again.
2637
(Andrew Bennetts, #388675)
2639
* Avoid progress bar artifacts being left behind on the screen.
2640
(Martin Pool, #321935)
2642
* Better message in ``bzr split`` error suggesting a rich root format.
2643
(Neil Martinsen-Burrell, #220067)
2645
* ``Branch.set_append_revisions_only`` now works with branches on a smart
2646
server. (Andrew Bennetts, #365865)
2648
* By default, ``bzr branch`` will fail if the target directory exists, but
2649
does not already have a control directory. The flag ``--use-existing-dir``
2650
will allow operation to proceed. (Alexander Belchenko, #307554)
2652
* ``bzr ls DIR --from-root`` now shows only things in DIR, not everything.
2655
* Fetch between repositories does not error if they have inconsistent data
2656
that should be irrelevant to the fetch operation. (Aaron Bentley)
2658
* Fix ``AttributeError`` exception when reconfiguring lightweight checkout
2659
of a remote repository.
2660
(Jelmer Vernooij, #332194)
2662
* Fix bug in decoding v3 smart server messages when receiving multiple
2663
lots of excess bytes after an end-of-message.
2666
* Force deletion of readonly files during merge, update and other tree
2668
(Craig Hewetson, Martin Pool, #218206)
2670
* Force socket shutdown in threaded http test servers to avoid client hangs
2671
(pycurl). (Vincent Ladeuil, #383920).
2673
* ``LRUCache`` will maintain the linked list pointers even if a nodes
2674
cleanup function raises an exception. (John Arbash Meinel, #396838)
2676
* Progress bars are now suppressed again when the environment variable
2677
``BZR_PROGRESS_BAR`` is set to ``none``.
2678
(Martin Pool, #339385)
2680
* Reduced memory consumption during ``bzr commit`` of large files. For
2681
pre 2a formats, should be down to ~3x the size of a file.
2682
For ``--2a`` format repositories, it is down to the size of the file
2683
content plus the size of the compressed text. Related to bug #109114.
2684
(John Arbash Meinel)
2686
* Set hidden attribute on .bzr directory below unicode path should never
2687
fail with error. The operation should succeed even if bzr unable to set
2688
the attribute. (Alexander Belchenko, related to bug #335362).
2690
* Stacking will no longer accept requests to stack on the same
2691
branch/repository. Existing branches that incorrectly reference the same
2692
repository in a stacking configuration will now raise
2693
UnstackableLocationError when the branch is opened. This can be fixed by
2694
removing the stacking location inside ``.bzr/branch``.
2695
(Robert Collins, #376243)
2697
* The ``log+`` decorator, useful in debugging or profiling, could cause
2698
"AttributeError: 'list' object has no attribute 'next'". This is now
2699
fixed. The log decorator no longer shows the elapsed time or transfer
2700
rate because they're available in the log prefixes and the transport
2701
activity display respectively.
2702
(Martin Pool, #340347)
2704
* Unshelve works correctly when multiple zero-length files are present on
2705
the shelf. (Aaron Bentley, #363444)
2707
* Progress bars no longer show the network transport scheme or direction.
2710
* launchpad-login now respects the 'verbose' option.
2711
(Jonathan Lange, #217031)
2717
* ``bzrlib.user_encoding`` is now officially deprecated. It is not
2718
possible to write a deprecation wrapper, but the variable will be
2719
removed in the near future. Use ``bzrlib.osutils.get_user_encoding()``
2720
instead. (Alexander Belchenko)
2722
* Command lookup has had hooks added. ``bzrlib.Command.hooks`` has
2723
three new hook points: ``get_command``, ``get_missing_command`` and
2724
``list_commands``, which allow just-in-time command name provision
2725
rather than requiring all command names be known a-priori.
2728
* ``get_app_path`` from win32utils.py now supports REG_EXPAND_SZ data type
2729
and can read path to wordpad.exe. (Alexander Belchenko, #392046)
2731
* ``graph.KnownGraph`` has been added. This is a class that can give
2732
answers to ``heads()`` very quickly. However, it has the assumption that
2733
the whole graph has already been loaded. This is true during
2734
``annotate`` so it is used there with good success (as much as 2x faster
2735
for files with long ancestry and 'cherrypicked' changes.)
2736
(John Arbash Meinel, Vincent Ladeuil)
2738
* OS file locks are now taken out using ``CreateFile`` rather than
2739
``LockFileEx`` on Windows. The locking remains exclusive with
2740
``LockFileEx`` but now it also works on older versions of Windows (such
2741
as Win98). (Martin <gzlist>)
2743
* pack <=> pack fetching is now done via a ``PackStreamSource`` rather
2744
than the ``Packer`` code. The user visible change is that we now
2745
properly fetch the minimum number of texts for non-smart fetching.
2746
(John Arbash Meinel)
2749
* ``VersionedFiles._add_text`` is a new api that lets us insert text into
2750
the repository as a single string, rather than a list of lines. This can
2751
improve memory overhead and performance of committing large files.
2752
(Currently a private api, used only by commit). (John Arbash Meinel)
2758
* ``bzr annotate`` can now be significantly faster. The time for
2759
``bzr annotate NEWS`` is down to 7s from 22s in 1.16. Files with long
2760
histories and lots of 'duplicate insertions' will be improved more than
2761
others. (John Arbash Meinel, Vincent Ladeuil)
2763
* ``bzr ls`` is now faster. On OpenOffice.org, the time drops from 2.4
2764
to 1.1 seconds. The improvement for ``bzr ls -r-1`` is more
2765
substantial dropping from 54.3 to 1.1 seconds. (Ian Clatworthy)
2767
* Improve "Path(s) are not versioned" error reporting for some commands.
2770
* Initial commit performance in ``--2a`` repositories has been improved by
2771
making it cheaper to build the initial CHKMap. (John Arbash Meinel)
2773
* Resolving a revno to a revision id on a branch accessed via ``bzr://``
2774
or ``bzr+ssh://`` is now much faster and involves no VFS operations.
2775
This speeds up commands like ``bzr pull -r 123``. (Andrew Bennetts)
2777
* ``revision-info`` now properly aligns the revnos/revids in the output
2778
and doesn't traceback when given revisions not in the current branch.
2779
Performance is also significantly improved when requesting multiple revs
2780
at once. (Matthew Fuller, John Arbash Meinel)
2782
* Tildes are no longer escaped by Transports. (Andy Kilner)
2788
* Avoid bad text wrapping in generated documentation. Slightly better
2789
formatting in the user reference.
2790
(Martin Pool, #249908)
2792
* Minor clarifications to the help for End-Of-Line conversions.
2798
* Removed overspecific error class ``InvalidProgressBarType``.
2801
* The method ``ProgressView._show_transport_activity`` is now
2802
``show_transport_activity`` because it's part of the contract between
2803
this class and the UI. (Martin Pool)
2809
:Released: 2009-06-26
2811
End user testing of the 2a format revealed two serious bugs. The first,
2812
#365615, caused bzr to raise AbsentContentFactory errors when autopacking.
2813
This meant that commits or pushes to 2a-format repositories failed
2816
The second bug, #390563, caused the smart server to raise AbsentContentFactory
2817
when streaming 2a stacked 2a-format branches. This particularly affected
2818
branches stored on Launchpad in the 2a format.
2820
Both of these bugs cause command failures only, neither of them cause data
2821
corruption or data loss. And, of course, both of these bugs are now fixed.
2826
* We now properly request a more minimal set of file texts when fetching
2827
multiple revisions. (Robert Collins, John Arbash Meinel, #390563)
2829
* Repositories using CHK pages (which includes the new 2a format) will no
2830
longer error during commit or push operations when an autopack operation
2831
is triggered. (Robert Collins, #365615)
2833
* ``chk_map.iter_interesting_nodes`` now properly uses the *intersection*
2834
of referenced nodes rather than the *union* to determine what
2835
uninteresting pages we still need to look at. Prior to this,
2836
incrementally pushing to stacked branch would push the minimal data, but
2837
fetching everything would request extra texts. There are some unhandled
2838
cases wrt trees of different depths, but this fixes the common cases.
2839
(Robert Collins, John Arbash Meinel, #390563)
2841
* ``GroupCompress`` repositories now take advantage of the pack hints
2842
parameter to permit cross-format fetching to incrementally pack the
2843
converted data. (Robert Collins)
2845
* ``Repository.commit_write_group`` now returns opaque data about what
2846
was committed, for passing to the ``Repository.pack``. Repositories
2847
without atomic commits will still return None. (Robert Collins)
2849
* ``Repository.pack`` now takes an optional ``hint`` parameter
2850
which will support doing partial packs for repositories that can do
2851
that. (Robert Collins)
2853
* RepositoryFormat has a new attribute 'pack_compresses' which is True
2854
when doing a pack operation changes the compression of content in the
2855
repository. (Robert Collins)
2857
* ``StreamSink`` and ``InterDifferingSerialiser`` will call
2858
``Repository.pack`` with the hint returned by
2859
``Repository.commit_write_group`` if the formats were different and the
2860
repository can increase compression by doing a pack operation.
2861
(Robert Collins, #376748)
2866
:Codename: yesterday-in-california
2867
:1.16rc1: 2009-06-11
2870
This version of Bazaar contains the beta release of the new ``2a`` repository
2871
format, suitable for testing by fearless, advanced users. This format or an
2872
updated version of it will become the default format in Bazaar 2.0. Please
2873
read the NEWS entry before even thinking about upgrading to the new format.
2875
Also included are speedups for many operations on huge projects, a bug fix for
2876
pushing stacked new stacked branches to smart servers and the usual bevy of
2877
bug fixes and improvements.
2880
Changes from 1.16rc1 to 1.16final
2881
*********************************
2883
* Fix the nested tree flag check so that upgrade from development formats to
2884
2a can work correctly.
2885
(Jelmer Vernooij, #388727)
2887
* Automatic format upgrades triggered by default stacking policies on a
2888
1.16rc1 (or later) smart server work again.
2889
(Andrew Bennetts, #388675)
2892
Compatibility Breaks
2893
********************
2895
* Display prompt on stderr (instead of stdout) when querying users so
2896
that the output of commands can be safely redirected.
2897
(Vincent Ladeuil, #376582)
2903
* A new repository format ``2a`` has been added. This is a beta release
2904
of the brisbane-core (aka group-compress) project. This format now
2905
suitable for wider testing by advanced users willing to deal with some
2906
bugs. We would appreciate test reports, either positive or negative.
2907
Format 2a is substantially smaller and faster for many operations on
2908
many trees. This format or an updated version will become the default
2911
This is a rich-root format, so this repository format can be used with
2912
bzr-svn. Bazaar branches in previous non-rich-root formats can be
2913
converted (including by merge, push and pull) to format 2a, but not vice
2914
versa. We recommend upgrading previous development formats to 2a.
2916
Upgrading to this format can take considerable time because it expands
2917
and more concisely repacks the full history.
2919
If you use stacked branches, you must upgrade the stacked branches
2920
before the stacked-on branches. (See <https://bugs.launchpad.net/bugs/374735>)
2922
* ``--development7-rich-root`` is a new dev format, similar to ``--dev6``
2923
but using a Revision serializer using bencode rather than XML.
2924
(Jelmer Vernooij, John Arbash Meinel)
2926
* mail_client=claws now supports --body (and message body hooks). Also uses
2927
configured from address. (Barry Warsaw)
2933
* ``--development6-rich-root`` can now stack. (Modulo some smart-server
2934
bugs with stacking and non default formats.)
2935
(John Arbash Meinel, #373455)
2937
* ``--development6-rich-root`` delays generating a delta index for the
2938
first object inserted into a group. This has a beneficial impact on
2939
``bzr commit`` since each committed texts goes to its own group. For
2940
committing a 90MB file, it drops peak memory by about 200MB, and speeds
2941
up commit from 7s => 4s. (John Arbash Meinel)
2943
* Numerous operations are now faster for huge projects, i.e. those
2944
with a large number of files and/or a large number of revisions,
2945
particularly when the latest development format is used. These
2946
operations (and improvements on OpenOffice.org) include:
2948
* branch in a shared repository (2X faster)
2949
* branch --no-tree (100X faster)
2955
* Pyrex version of ``bencode`` support. This provides optimized support
2956
for both encoding and decoding, and is now found at ``bzrlib.bencode``.
2957
``bzrlib.utils.bencode`` is now deprecated.
2958
(Alexander Belchenko, Jelmer Vernooij, John Arbash Meinel)
2964
* Bazaar can now pass attachment files to the mutt email client.
2965
(Edwin Grubbs, #384158)
2967
* Better message in ``bzr add`` output suggesting using ``bzr ignored`` to
2968
see which files can also be added. (Jason Spashett, #76616)
2970
* ``bzr pull -r 123`` from a stacked branch on a smart server no longer fails.
2971
Also, the ``Branch.revision_history()`` API now works in the same
2972
situation. (Andrew Bennetts, #380314)
2974
* ``bzr serve`` on Windows no longer displays a traceback simply because a
2975
TCP client disconnected. (Andrew Bennetts)
2977
* Clarify the rules for locking and fallback repositories. Fix bugs in how
2978
``RemoteRepository`` was handling fallbacks along with the
2979
``_real_repository``. (Andrew Bennetts, John Arbash Meinel, #375496)
2981
* Fix a small bug with fetching revisions w/ ghosts into a new stacked
2982
branch. Not often triggered, because it required ghosts to be part of
2983
the fetched revisions, not in the stacked-on ancestry.
2984
(John Arbash Meinel)
2986
* Fix status and commit to work with content filtered trees, addressing
2987
numerous bad bugs with line-ending support. (Ian Clatworthy, #362030)
2989
* Fix problem of "directory not empty" when contending for a lock over
2990
sftp. (Martin Pool, #340352)
2992
* Fix rule handling so that eol is optional, not mandatory.
2993
(Ian Clatworthy, #379370)
2995
* Pushing a new stacked branch to a 1.15 smart server was broken due to a
2996
bug in the ``BzrDirFormat.initialize_ex`` smart verb. This is fixed in
2997
1.16, but required changes to the network protocol, so the
2998
``BzrDirFormat.initialize_ex`` verb has been removed and replaced with a
2999
corrected ``BzrDirFormat.initialize_ex_1.16`` verb. 1.15 clients will
3000
still work with a 1.16 server as they will fallback to slower (and
3002
(Jonathan Lange, Robert Collins, Andrew Bennetts, #385132)
3004
* Reconcile can now deal with text revisions that originated in revisions
3005
that are ghosts. (Jelmer Vernooij, #336749)
3007
* Support cloning of branches with ghosts in the left hand side history.
3008
(Jelmer Vernooij, #248540)
3010
* The ''bzr diff'' now catches OSError from osutils.rmtree and logs a
3011
helpful message to the trace file, unless the temp directory really was
3012
removed (which would be very strange). Since the diff operation has
3013
succeeded from the user's perspective, no output is written to stderr
3014
or stdout. (Maritza Mendez, #363837)
3016
* Translate errors received from a smart server in response to a
3017
``BzrDirFormat.initialize`` or ``BzrDirFormat.initialize_ex`` request.
3018
This was causing tracebacks even for mundane errors like
3019
``PermissionDenied``. (Andrew Bennetts, #381329)
3024
* Added directory structure and started translation of docs in Russian.
3025
(Alexey Shtokalo, Alexander Iljin, Alexander Belchenko, Dmitry Vasiliev,
3026
Volodymyr Kotulskyi)
3031
* Added osutils.parent_directories(). (Ian Clatworthy)
3033
* ``bzrlib.progress.ProgressBar``, ``ChildProgress``, ``DotsProgressBar``,
3034
``TTYProgressBar`` and ``child_progress`` are now deprecated; use
3035
``ui_factory.nested_progress_bar`` instead. (Martin Pool)
3037
* ``graph.StackedParentsProvider`` is now a public API, replacing
3038
``graph._StackedParentsProvider``. The api is now considered stable and ready
3039
for external users. (Gary van der Merwe)
3041
* ``bzrlib.user_encoding`` is deprecated in favor of
3042
``get_user_encoding``. (Alexander Belchenko)
3044
* TreeTransformBase no longer assumes that limbo is provided via disk.
3045
DiskTreeTransform now provides disk functionality. (Aaron Bentley)
3050
* Remove ``weave.py`` script for accessing internals of old weave-format
3051
repositories. (Martin Pool)
3056
* ``make check`` no longer repeats the test run in ``LANG=C``.
3057
(Martin Pool, #386180)
3059
* The number of cores is now correctly detected on OSX. (John Szakmeister)
3061
* The number of cores is also detected on Solaris and win32. (Vincent Ladeuil)
3063
* The number of cores is also detected on FreeBSD. (Matthew Fuller)
3068
:1.15rc1: 2009-05-16
3072
The smart server will no longer raise 'NoSuchRevision' when streaming content
3073
with a size mismatch in a reconstructed graph search. New command ``bzr
3074
dpush``. Plugins can now define their own annotation tie-breaker when two
3075
revisions introduce the exact same line.
3077
Changes from 1.15.1 to 1.15.2
3078
*****************************
3080
* Use zdll on Windows to build ``_chk_map_pyx`` extension.
3081
(Alexander Belchenko)
3083
Changes from 1.15final to 1.15.1
3084
*********************************
3086
* Translate errors received from a smart server in response to a
3087
``BzrDirFormat.initialize`` or ``BzrDirFormat.initialize_ex`` request.
3088
This was causing tracebacks even for mundane errors like
3089
``PermissionDenied``. (Andrew Bennetts, #381329)
3091
Changes from 1.15rc1 to 1.15final
3092
*********************************
3096
Compatibility Breaks
3097
********************
3099
* ``bzr ls`` is no longer recursive by default. To recurse, use the
3100
new ``-R`` option. The old ``--non-recursive`` option has been removed.
3101
If you alias ``ls`` to ``ls -R``, you can disable recursion using
3102
``--no-recursive`` instead. (Ian Clatworthy)
3107
* New command ``bzr dpush`` that can push changes to foreign
3108
branches (svn, git) without setting custom bzr-specific metadata.
3111
* The new development format ``--development6-rich-root`` now supports
3112
stacking. We chose not to use a new format marker, since old clients
3113
will just fail to open stacked branches, the same as if we used a new
3114
format flag. (John Arbash Meinel, #373455)
3116
* Plugins can now define their own annotation tie-breaker when two revisions
3117
introduce the exact same line. See ``bzrlib.annotate._break_annotation_tie``
3118
Be aware though that this is temporary, private (as indicated by the leading
3119
'_') and a first step to address the problem. (Vincent Ladeuil, #348459)
3121
* New command ``bzr dpush`` that can push changes to foreign
3122
branches (svn, git) without setting custom bzr-specific metadata.
3125
* ``bzr send`` will now check the ``child_submit_format`` setting in
3126
the submit branch to determine what format to use, if none was
3127
specified on the command-line. (Jelmer Vernooij)
3132
* -Dhpss output now includes the number of VFS calls made to the remote
3133
server. (Jonathan Lange)
3135
* ``--coverage`` works for code running in threads too.
3136
(Andrew Bennets, Vincent Ladeuil)
3138
* ``bzr pull`` now has a ``--local`` option to only make changes to the
3139
local branch, and not the bound master branch.
3140
(Gary van der Merwe, #194716)
3142
* ``bzr rm *`` is now as fast as ``bzr rm * --keep``. (Johan Walles, #180116)
3147
* Adding now works properly when path contains a symbolic link.
3148
(Geoff Bache, #183831)
3150
* An error is now raised for unknown eol values. (Brian de Alwis, #358199)
3152
* ``bzr merge --weave`` will now generate a conflict if one side deletes a
3153
line, and the other side modifies the line. (John Arbash Meinel, #328171)
3155
* ``bzr reconfigure --standalone`` no longer raises IncompatibleRepositories.
3156
(Martin von Gagern, #248932)
3158
* ``bzr send`` works to send emails again using MAPI.
3159
(Neil Martinsen-Burrell, #346998)
3161
* Check for missing parent inventories in StreamSink. This prevents
3162
incomplete stacked branches being created by 1.13 bzr:// and
3163
bzr+ssh:// clients (which have bug #354036). Instead, the server now
3164
causes those clients to send the missing records. (Andrew Bennetts)
3166
* Correctly handle http servers proposing multiple authentication schemes.
3167
(Vincent Ladeuil, #366107)
3169
* End-Of-Line content filters are now loaded correctly.
3170
(Ian Clatworthy, Brian de Alwis, #355280)
3172
* Fix a bug in the pure-python ``GroupCompress`` code when handling copies
3173
longer than 64KiB. (John Arbash Meinel, #364900)
3175
* Fix TypeError in running ``bzr break-lock`` on some URLs.
3176
(Alexander Belchenko, Martin Pool, #365891)
3178
* Non-recursive ``bzr ls`` now works properly when a path is specified.
3179
(Jelmer Vernooij, #357863)
3181
* ssh usernames (defined in ~/.ssh/config) are honoured for bzr+ssh connections.
3182
(Vincent Ladeuil, #367726)
3184
* Several bugs related to unicode symlinks have been fixed and the test suite
3185
enhanced to better catch regressions for them. (Vincent Ladeuil)
3187
* The smart server will no longer raise 'NoSuchRevision' when streaming
3188
content with a size mismatch in a reconstructed graph search: it assumes
3189
that the client will make sure it is happy with what it got, and this
3190
sort of mismatch is normal for stacked environments.
3191
bzr 1.13.0/1 will stream from unstacked branches only - in that case not
3192
getting all the content expected would be a bug. However the graph
3193
search is how we figured out what we wanted, so a mismatch is both odd
3194
and unrecoverable without starting over, and starting over will end up
3195
with the same data as if we just permitted the mismatch. If data is
3196
gc'd, doing a new search will find only the truncated data, so sending
3197
only the truncated data seems reasonable. bzr versions newer than this
3198
will stream from stacked branches and check the stream to find missing
3199
content in the stacked-on branch, and thus will handle the situation
3200
implicitly. (Robert Collins, #360791)
3202
* Upgrading to, or fetching into a 'rich-root' format will now correctly
3203
set the root data the same way that reconcile does.
3204
(Robert Collins, #368921)
3206
* Using unicode Windows API to obtain command-line arguments.
3207
(Alexander Belchenko, #375934)
3215
* ``InterPackRepo.fetch`` and ``RepoFetcher`` now raise ``NoSuchRevision``
3216
instead of ``InstallFailed`` when they detect a missing revision.
3217
``InstallFailed`` itself has been deleted. (Jonathan Lange)
3219
* Not passing arguments to ``bzrlib.commands.main()`` will now grab the
3220
arguments from ``osutils.get_unicode_argv()`` which has proper support
3221
for unicode arguments on windows. Further, the supplied arguments are now
3222
required to be unicode strings, rather than user_encoded strings.
3223
(Alexander Belchenko)
3228
* ``bzrlib.branch.Branch.set_parent`` is now present on the base branch
3229
class and will call ``_set_parent_location`` after doing unicode
3230
encoding. (Robert Collins)
3232
* ``bzrlib.remote.RemoteBranch._set_parent_location`` will use a new verb
3233
``Branch.set_parent_location`` removing further VFS operations.
3236
* ``bzrlib.bzrdir.BzrDir._get_config`` now returns a ``TransportConfig``
3237
or similar when the dir supports configuration settings. The base class
3238
defaults to None. There is a matching new server verb
3239
``BzrDir.get-config_file`` to reduce roundtrips for getting BzrDir
3240
configuration. (Robert Collins)
3242
* ``bzrlib.tests.ExtendedTestResult`` has new methods ``startTests``
3243
called before the first test is started, ``done`` called after the last
3244
test completes, and a new parameter ``strict``. (Robert Collins)
3246
* ``-Dhpss`` when passed to bzr will cause a backtrace to be printed when
3247
VFS operations are started on a smart server repository. This should not
3248
occur on regular push and pull operations, and is a key indicator for
3249
performance regressions. (Robert Collins)
3251
* ``-Dlock`` when passed to the selftest (e.g. ``bzr -Dlock selftest``) will
3252
cause mismatched physical locks to cause test errors rather than just
3253
reporting to the screen. (Robert Collins)
3255
* -Dprogress will cause pdb to start up if a progress view jumps
3256
backwards. (Robert Collins)
3258
* Fallback ``CredentialStore`` instances registered with ``fallback=True``
3259
are now be able to provide credentials if obtaining credentials
3260
via ~/.bazaar/authentication.conf fails. (Jelmer Vernooij,
3261
Vincent Ladeuil, #321918)
3263
* New hook ``Lock.lock_broken`` which runs when a lock is
3264
broken. This is mainly for testing that lock/unlock are
3265
balanced in tests. (Vincent Ladeuil)
3267
* New MergeDirective hook 'merge_request_body' allows hooks to supply or
3268
alter a body for the message produced by ``bzr send``.
3270
* New smart server verb ``BzrDir.initialize_ex`` which implements a
3271
refactoring to the core of clone allowing less round trips on new
3272
branches. (Robert Collins)
3274
* New method ``Tags.rename_revisions`` that can rename revision ids tags
3275
are pointing at. (Jelmer Vernooij)
3277
* Updated the bundled ``ConfigObj`` library to 4.6.0 (Matt Nordhoff)
3282
* ``bzr selftest`` will now fail if lock/unlock are not correctly balanced in
3283
tests. Using ``-Dlock`` will turn the related failures into warnings.
3284
(Vincent Ladeuil, Robert Collins)
3288
:Codename: brisbane-core
3289
:1.14rc1: 2009-04-06
3290
:1.14rc2: 2009-04-19
3294
New formats 1.14 and 1.14-rich-root supporting End-Of-Line (EOL) conversions,
3295
keyword templating (via the bzr-keywords plugin) and generic content filtering.
3296
End-of-line conversion is now supported for formats supporting content
3299
Changes from 1.14final to 1.14.1
3300
********************************
3302
* Change api_minimum_version back to api_minimum_version = (1, 13, 0)
3304
Changes from 1.14rc2 to 1.14final
3305
*********************************
3307
* Fix a bug in the pure-python ``GroupCompress`` code when handling copies
3308
longer than 64KiB. (John Arbash Meinel, #364900)
3310
Changes from 1.14rc1 to 1.14rc2
3311
*******************************
3313
* Fix for bug 358037 Revision not in
3314
bzrlib.groupcompress.GroupCompressVersionedFiles (Brian de Alwis,
3317
* Fix for bug 354036 ErrorFromSmartServer - AbsentContentFactory object has no
3318
attribute 'get_bytes_as' exception while pulling from Launchpad
3319
(Jean-Francois Roy, Andrew Bennetts, Robert Collins)
3321
* Fix for bug 355280 eol content filters are never loaded and thus never
3322
applied (Brian de Alwis, Ian Clatworthy)
3324
* bzr.dev -r4280 Change _fetch_uses_deltas = False for CHK repos until we can
3325
write a better fix. (John Arbash Meinel, Robert Collins)
3327
* Fix for bug 361574 uncommit recommends undefined --levels and -n options
3328
(Marius Kruger, Ian Clatworthy)
3330
* bzr.dev r4289 as cherrypicked at lp:~spiv/bzr/stacking-cherrypick-1.14
3331
(Andrew Bennetts, Robert Collins)
3333
Compatibility Breaks
3334
********************
3336
* A previously disabled code path to accelerate getting configuration
3337
settings from a smart server has been reinstated. We think this *may*
3338
cause a incompatibility with servers older than bzr 0.15. We intend
3339
to issue a point release to address this if it turns out to be a
3340
problem. (Robert Collins, Andrew Bennetts)
3342
15
* bzr no longer autodetects nested trees as 'tree-references'. They
3343
16
must now be explicitly added tree references. At the commandline, use