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
102
* ``_remember_remote_is_before`` no longer raises AssertionError when
103
suboptimal network behaviour is noticed; instead it just mutters to the
104
log file (and warns the user if they have set the ``hpss`` debug flag).
105
This was causing unnecessary aborts for performance bugs that are minor
107
(Andrew Bennetts, #528041)
109
* Permit bzr to run under ``python -OO`` which reduces the size of bytecode
110
files loaded from disk. To ensure docstrings needed for help are never
111
stripped, the prefix ``__doc__ =`` should now be used.
112
(Martin <gzlist@googlemail.com>)
117
* Added ``bzrlib.tests.matchers`` as a place to put matchers, along with
118
our first in-tree matcher. See the module docstring for details.
121
* ``bzr selftest --parallel=subprocess`` now works correctly on win32.
122
(Gordon Tyler, #551332)
124
* Workaround ``Crypto.Random`` check leading to spurious test
125
failures on Lucid, FreeBSD and gentoo.
126
(Vincent Ladeuil, #528436)
133
This is a somewhat early second beta of the 2.2 series, to fix a python2.4
134
incompatibility in the 2.2b1 release. It also includes a swag of
135
performance, usability and correctness improvements: test feedback on all
136
of these would be welcome.
142
* ``bzr diff`` now supports a --format option, which can be used to
143
select alternative diff formats. (Jelmer Vernooij, #555994)
148
* ``bzr dpush``, ``bzr push`` and ``bzr send`` will now issue a warning
149
instead of failing when dirty trees are involved. The corresponding
150
``dpush_strict``, ``push_strict`` and ``send_strict`` should be set to
151
True explicitly to get the previous behaviour.
152
(Vincent Ladeuil, #519319)
154
* ``bzr export`` to tar file does not fail if any parent directory
155
contains unicode characters. This works around upstream Python bug
156
http://bugs.python.org/issue8396 .
157
(Parth Malwankar, #413406)
159
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
160
(Aaron Bentley, #559436)
162
* ``bzr update`` when a pending merge in the working tree has been merged
163
into the master branch will no longer claim that old commits have become
164
pending merges. (Robert Collins, #562079)
166
* ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
167
config as in previous versions of bzrlib. (Robert Collins)
169
* Fix glitch in the warning about unclean trees display.
170
(Vincent Ladeuil, #562665)
172
* Fixed Python2.4 incompatibilities in the bzr2.2b1 source tarball.
175
* Help messages generated by ``RegistryOption.from_kwargs`` list the
176
switches in alphabetical order, rather than in an undefined order.
177
(Martin von Gagern, #559409)
179
* Make sure the ``ExecutablePath`` and ``InterpreterPath`` are set in
180
Apport crash reports, to avoid "This problem report applies to a program
181
which is not installed any more" error.
182
(Martin Pool, James Westby, #528114)
184
* Reset ``siginterrupt`` flag to False every time we handle a signal
185
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
186
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
187
errors after two window resizes.
190
* When invoked with a range revision, ``bzr log`` doesn't show revisions
191
that are not part of the Y revisions ancestry anymore when invoked with
193
(Vincent Ladeuil, #474807)
195
* Properly handle ``param_name`` attribute for ``ListOption``.
196
(Martin von Gagern, 387117)
201
* ``bzr commit`` will prompt before using a commit message that was
202
generated by a template and not edited by the user.
203
(Robert Collins, #530265)
205
* ``bzr diff`` read-locks the trees and branches only once, saving about
206
10-20ms on ``bzr diff`` in a bzr.dev tree.
209
* ``bzr missing`` read-locks the branches only once.
212
* ``bzr pull`` locks the branches and tree only once.
215
* Index lookups in pack repositories search recently hit pack files first.
216
In repositories with many pack files this can greatly reduce the
217
number of files accessed, the number of bytes read, and the number of
218
read calls. An incremental pull via plain HTTP takes half the time and
219
bytes for a moderately large repository. (Andrew Bennetts)
221
* Index lookups only re-order the indexes when the hit files aren't
222
already first. Reduces the cost of reordering
223
(John Arbash Meinel, #562429)
225
* Less code is loaded at startup. (Cold-cache start time is about 10-20%
227
(Martin Pool, #553017)
232
* ``bzrlib.diff.get_trees_and_branches_to_diff`` is deprecated. Use
233
``get_trees_and_branches_to_diff_locked`` instead.
239
* ``bzrlib.commands.Command.run_direct`` is no longer needed - the pre
240
2.1 method of calling run() to perform testing or direct use via the API
241
is now possible again. As part of this, the _operation attribute on
242
Command is now transient and only exists for the duration of ``run()``.
253
* BTreeGraphIndex can now take an offset to indicate that the data starts
254
somewhere other than then beginning of the file. (John Arbash Meinel)
256
* Deleted very old hidden commands ``versionedfile-list``,
257
``weave-plan-merge``, ``weave-merge-text``.
260
* ``Repository.get_inventory_sha1()`` and ``Repository.get_revision_xml()``
261
have been removed. (Jelmer Vernooij)
263
* ``Repository.get_revision_inventory()`` has been removed in favor of
264
``Repository.get_inventory()``. (Jelmer Vernooij)
266
* All test servers have been moved out of the bzrlib.transport hierarchy to
267
bzrlib.tests.test_server *except* for MemoryServer, ChrootServer and
268
PathFilteringServer. ``bzrlib`` users may encounter test failures that can
269
be fixed by updating the related imports from ``bzrlib.transport.xxx`` to
270
``bzrlib.tests.test_server``.
273
* ``BranchReferenceFormat.initialize()`` now takes an optional name argument
274
as its second parameter, for consistency with the initialize() method of
275
other formats. (Jelmer Vernooij)
280
* Added ``bzr remove-branch`` command that can remove a local or remote
281
branch. (Jelmer Vernooij, #276295)
283
* ``bzr export`` now takes an optional argument ``--per-file-timestamps``
284
to set file mtimes to the last timestamp of the last revision in which
285
they were changed rather than the current time. (Jelmer Vernooij)
287
* If the Apport crash-reporting tool is available, bzr crashes are now
288
stored into the ``/var/crash`` apport spool directory, and the user is
289
invited to report them to the developers from there, either
290
automatically or by running ``apport-bug``. No information is sent
291
without specific permission from the user. (Martin Pool, #515052)
293
* Parsing of command lines, for example in ``diff --using``, no longer
294
treats backslash as an escape character on Windows. (Gordon Tyler,
297
* Plugins can be disabled by defining ``BZR_DISABLE_PLUGINS`` as
298
a list of plugin names separated by ':' (';' on windows).
299
(Vincent Ladeuil, #411413)
301
* Plugins can be loaded from arbitrary locations by defining
302
``BZR_PLUGINS_AT`` as a list of name@path separated by ':' (';' on
303
windows). This takes precedence over ``BZR_PLUGIN_PATH`` for the
304
specified plugins. This is targeted at plugin developers for punctual
305
needs and *not* intended to replace ``BZR_PLUGIN_PATH``.
306
(Vincent Ladeuil, #82693)
308
* Tag names can now be determined automatically by ``automatic_tag_name``
309
hooks on ``Branch`` if they are not specified on the command line.
312
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
313
``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
314
as resolved is still accessible via the ``--done`` default action.
317
* Merges can be proposed on Launchpad with the new lp-propose-merge command.
318
(Aaron Bentley, Jonathan Lange)
323
* Added docstring for ``Tree.iter_changes``
324
(John Arbash Meinel, #304182)
326
* Allow additional arguments to
327
``RemoteRepository.add_inventory_by_delta()``. (Jelmer Vernooij, #532631)
329
* Allow exporting a single file using ``bzr export``.
330
(Michal Junák, #511987)
332
* Allow syscalls to automatically restart when ``TextUIFactory``'s
333
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
334
IO, which are often poorly handled by Python's libraries and parts of
335
bzrlib. (Andrew Bennetts, #496813)
337
* Avoid infinite recursion when probing for apport.
338
(Vincent Ladeuil, #516934)
340
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
341
(Martin Pool, #331095)
343
* Avoid truncating svn URLs.
344
(Martin Pool, Martin von Gagern, #545185)
346
* ``bzr add`` will not add conflict related files unless explicitly required.
347
(Vincent Ladeuil, #322767, #414589)
349
* ``bzr dump-btree`` now works on ``*.cix`` and ``*.six`` files. Those
350
indices do not have reference lists, so ``dump-btree`` will simply show
351
``None`` instead. (Andrew Bennetts, #488607)
353
* ``bzr help`` will no longer trigger the get_missing_command hook when
354
doing a topic lookup. This avoids prompting (like 'no command plugins/loom,
355
did you mean log?') when getting help. In future we may trigger the hook
356
deliberately when no help topics match from any help index.
357
(Robert Collins, #396261)
359
* ``bzr log -n0 -r..A.B.C`` should not crash but just consider the None
360
revspec as representing the first revision of the branch.
361
(Vincent Ladeuil, #519862)
363
* ``bzr remove-tree`` can now remove multiple working trees.
364
(Jared Hance, Andrew Bennetts, #253137)
366
* ``bzr resolve --take-this`` and ``--take-other`` now correctly renames
367
the kept file on content conflicts where one side deleted the file.
368
(Vincent Ladeuil, #529968)
370
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
371
permissions as ``.bzr`` directory on a POSIX OS.
372
(Parth Malwankar, #262450)
374
* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
375
of ``backup.bzr``. This directory is ignored by bzr commands such as
377
(Parth Malwankar, #335033, #300001)
379
* Cope with non-utf8 characters inside ``.bzrignore``.
380
(Jason Spashett, #183504)
382
* Correctly interpret "451 Rename/move failure: Directory not empty" from
383
ftp servers while trying to take a lock.
384
(Martin Pool, #528722)
386
* DirStateRevisionTree.kind() was returning wrong result when 'kind'
387
changes occured between the workingtree and one of its parents.
388
(Vincent Ladeuil, #535547)
390
* Fix ``log`` to better check ancestors even if merged revisions are involved.
391
(Vincent Ladeuil, #476293)
393
* Loading a plugin from a given path with ``BZR_PLUGINS_AT`` doesn't depend
394
on os.lisdir() order and is now reliable.
395
(Vincent Ladeuil, #552922).
397
* Many IO operations that returned ``EINTR`` were retried even if it
398
wasn't safe to do so via careless use of ``until_no_eintr``. Bazaar now
399
only retries operations that are safe to retry, and in some cases has
400
switched to operations that can be retried (e.g. ``sock.send`` rather than
402
(Andrew Bennetts, Martin <gzlist@googlemail.com>, #496813)
404
* Path conflicts now support --take-this and --take-other even when a
405
deletion is involved.
406
(Vincent Ladeuil, #531967)
408
* Network transfer amounts and rates are now displayed in SI units according
409
to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
410
(Gordon Tyler, #514399)
412
* Support kind markers for socket and fifo filesystem objects. This
413
prevents ``bzr status --short`` from crashing when those files are
414
present. (John Arbash Meinel, #303275)
416
* ``bzr mkdir DIR`` will not create DIR unless DIR's parent is a versioned
417
directory. (Parth Malwankar, #138600)
419
* SSH child processes will now ignore SIGQUIT on nix systems so breaking into
420
the debugger won't kill the session.
421
(Martin <gzlist@googlemail.com>, #162502)
423
* Tolerate patches with leading noise in ``bzr-handle-patch``.
424
(Toshio Kuratomi, Martin Pool, #502076)
426
* ``update -r`` now supports updating to revisions that are not on
427
mainline (i.e. it supports dotted revisions).
428
(Parth Malwankar, #517800)
430
* Use first apparent author not committer in GNU Changelog format.
431
(Martin von Gagern, #513322)
436
* ``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
437
``bzrlib.merge_directive.BaseMergeDirective`` and is now public.
440
* ``BranchFormat.initialize`` now takes an optional ``name`` of the colocated
441
branch to create. (Jelmer Vernooij)
443
* ``BzrDir.get_branch_transport`` now takes an optional ``name`` of the
444
colocated branch to open. (Jelmer Vernooij)
446
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
447
can set a signal handler and call ``signal.siginterrupt(signum,
448
False)`` for it, if the platform and Python version supports it.
449
(Andrew Bennetts, #496813)
451
* New ``bzrlib.initialize`` is recommended for programs using bzrlib to
452
run when starting up; it sets up several things that previously needed
453
to be done separately.
454
(Martin Pool, #507710)
456
* Exporters now support a ``per_file_timestamps`` argument to write out the
457
timestamp of the commit in which a file revision was introduced.
460
* New method ``BzrDir.list_branches()`` that returns a sequence of branches
461
present in a control directory. (Jelmer Vernooij)
463
* New method ``Repository.get_known_graph_ancestry()``.
464
(Jelmer Vernooij, #495502)
466
* New transport methods ``readlink``, ``symlink`` and ``hardlink``.
469
* Remove unused ``CommandFailed`` exception.
475
* ``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
476
``message_callback`` in the same way that commit does. (Robert Collins)
478
* ``bzrlib.builtins.Commit.run`` raises ``bzrlib.errors.BoundBranchOutOfDate``
479
rather than ``bzrlib.errors.BzrCommandError`` when the bound branch is out
480
of date. (Gary van der Merwe)
482
* ``bzrlib.commands.run_bzr`` is more extensible: callers can supply the
483
functions to load or disable plugins if they wish to use a different
484
plugin mechanism; the --help, --version and no-command name code paths
485
now use the generic pluggable command lookup infrastructure.
488
* ``bzrlib.errors.BoundBranchOutOfDate`` has a new field ``extra_help``
489
which can be set to add extra help to the error. (Gary van der Merwe)
491
* New method ``Branch.automatic_tag_name`` that can be used to find the
492
tag name for a particular revision automatically. (Jelmer Vernooij)
494
* The methods ``BzrDir.create_branch()``, ``BzrDir.destroy_branch()`` and
495
``BzrDir.open_branch()`` now take an optional ``name`` argument.
501
* bzr now has a ``.testr.conf`` file in its source tree configured
502
appropriately for running tests with Testrepository
503
(``https://launchpad.net/testrepository``). (Robert Collins)
505
* Documentation about testing with ``subunit`` has been tweaked.
508
* Known failures has been added for resolve --take-other on ParentLoop
509
conflicts. This reflects bug #537956 without fixing it.
512
* New ``bzrlib.tests.test_import_tariff`` can make assertions about what
513
Python modules are loaded, to guard against startup time or library
514
dependency regressions.
517
* PQM will now run with subunit output. To analyze a PQM error use
518
tribunal, or cat log | subunit-filter | subunit2pyunit. (Robert Collins)
520
* Stop sending apport crash files to ``.cache`` in the directory from
521
which ``bzr selftest`` was run. (Martin Pool, #422350)
523
* Tests no longer fail if "close() called during concurrent
524
operation on the same file object" occurs when closing the log file
525
(which can happen if a thread tries to write to the log file at the
526
wrong moment). An warning will be written to ``stderr`` when this
527
happens, and another warning will be written if the log file could not
528
be closed after retrying 100 times. (Andrew Bennetts, #531746)
533
:2.1.2: NOT RELEASED YET
538
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
539
(Aaron Bentley, #559436)
541
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
543
(Andrew Bennetts, #528041)
545
* Reset ``siginterrupt`` flag to False every time we handle a signal
546
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
547
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
548
errors after two window resizes.
554
* ``_remember_remote_is_before`` no longer raises AssertionError when
555
suboptimal network behaviour is noticed; instead it just mutters to the
556
log file (and warns the user if they have set the ``hpss`` debug flag).
557
This was causing unnecessary aborts for performance bugs that are minor
559
(Andrew Bennetts, #528041)
567
This is a small bugfix release. Upgrading is recommended for anyone
568
running 2.1.0 or earlier.
573
* Allow syscalls to automatically restart when ``TextUIFactory``'s
574
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
575
IO, which are often poorly handled by Python's libraries and parts of
576
bzrlib. (Andrew Bennetts, #496813)
578
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
579
(Martin Pool, #331095)
581
* Fix plugin packaging on Windows. (Ian Clatworthy, #524162)
583
* Fix stub sftp test server to call os.getcwdu().
584
(Vincent Ladeuil, #526221, #526353)
586
* Fixed CHM generation by moving the NEWS section template into
587
a separate file. (Ian Clatworthy, #524184)
589
* Merge correctly when this_tree is not a WorkingTree. (Aaron Bentley)
591
* Register SIGWINCH handler only when creating a ``TextUIFactory``; avoids
592
problems importing bzrlib from a non-main thread.
593
(Elliot Murphy, #521989)
595
* Repositories accessed via a smart server now reject being stacked on a
596
repository in an incompatible format, as is the case when accessing them
597
via other methods. This was causing fetches from those repositories via
598
a smart server (e.g. using ``bzr branch``) to receive invalid data.
599
(Andrew Bennetts, #562380)
601
* Standardize the error handling when creating a new ``StaticTuple``
602
(problems will raise TypeError). (Matt Nordhoff, #457979)
604
* Warn if pyrex is too old to compile the new ``SimpleSet`` and
605
``StaticTuple`` extensions, rather than having the build fail randomly.
606
(John Arbash Meinel, #449776)
611
* Added a link to the Desktop Guide. (Ian Clatworthy)
613
* Added What's New in Bazaar 2.1 document. (Ian Clatworthy)
615
* Drop Google Analytics from the core docs as they caused problems
616
in the CHM files. (Ian Clatworthy, #502010)
621
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
622
can set a signal handler and call ``signal.siginterrupt(signum,
623
False)`` for it, if the platform and Python version supports it.
624
(Andrew Bennetts, #496813)
630
:Codename: Strasbourg
633
This release marks our second long-term-stable series. The Bazaar team
634
has decided that we will continue to make bugfix-only 2.0.x and 2.1.x
635
releases, along with 2.2 development releases.
637
This is a fairly incremental update, focusing on polish and bugfixing.
638
There are no changes for supported disk formats. Key updates include
639
reduced memory consumption for many operations, a new per-file merge
640
hook, ignore patterns can now include '!' to exclude files, globbing
641
support for all commands on Windows, and support for addressing home
642
directories via ``bzr+ssh://host/~/`` syntax.
644
Users are encouraged to upgrade from the 2.0 stable series.
649
* Don't require testtools to use sftp.
650
(Vincent Ladeuil, #516183)
652
* Fix "AttributeError in Inter1and2Helper" during fetch.
653
(Martin Pool, #513432)
655
* ``bzr update`` performs the two merges in a more logical order and will stop
656
when it encounters conflicts.
657
(Gerard Krol, #113809)
659
* Give a better error message when doing ``bzr bind`` in an already bound
660
branch. (Neil Martinsen-Burrell, #513063)
662
* Ignore ``KeyError`` from ``remove_index`` during ``_abort_write_group``
663
in a pack repository, which can happen harmlessly if the abort occurs during
664
finishing the write group. Also use ``bzrlib.cleanup`` so that any
665
other errors that occur while aborting the individual packs won't be
666
hidden by secondary failures when removing the corresponding indices.
667
(Andrew Bennetts, #423015)
669
* Set the mtime of files exported to a directory by ``bzr export`` all to
670
the same value to avoid confusing ``make`` and other date-based build
671
systems. (Robert Collins, #515631)
676
* Fetching into experimental formats will now print a warning. (Jelmer
682
* ``Repository.deserialise_inventory`` has been renamed to
683
``Repository._deserialise_inventory`` to indicate it is private.
686
* ``Repository.get_inventory_xml`` has been renamed to
687
``Repository._get_inventory_xml`` to indicate it is private.
690
* ``Repository.serialise_inventory`` has been renamed to
691
``Repository._serialise_inventory`` to indicate it is private.
693
* Using the ``bzrlib.chk_map`` module from within multiple threads at the
694
same time was broken due to race conditions with a module level page
695
cache. This shows up as a KeyError in the ``bzrlib.lru_cache`` code with
696
``bzrlib.chk_map`` in the backtrace, and can be triggered without using
697
the same high level objects such as ``bzrlib.repository.Repository``
698
from different threads. chk_map now uses a thread local cache which may
699
increase memory pressure on processes using threads.
700
(Robert Collins, John Arbash Meinel, #514090)
702
* The new ``merge_file_content`` should now be ok with tests to avoid
704
(Vincent Ladeuil, #515597)
709
* Use ``bzrlib.cleanup`` rather than less robust ``try``/``finally``
710
blocks in several places in ``bzrlib.merge``. This avoids masking prior
711
errors when errors like ``ImmortalPendingDeletion`` occur during cleanup
713
(Andrew Bennetts, #517275)
718
* The ``remove_index`` method of
719
``bzrlib.repofmt.pack_repo.AggregateIndex`` no longer takes a ``pack``
720
argument. This argument was always ignored.
721
(Andrew Bennetts, #423015)
726
:Codename: after the bubbles
727
:2.1.0rc2: 2010-01-29
729
This is a quick-turn-around to update a small issue with our new per-file
730
merge hook. We expect no major changes from this to the final 2.1.0.
735
* The new ``merge_file_content`` hook point has been altered to provide a
736
better API where state for extensions can be stored rather than the
737
too-simple function based approach. This fixes a performance regression
738
where branch configuration would be parsed per-file during merge. As
739
part of this the included news_merger has been refactored into a base
740
helper class ``bzrlib.merge.ConfigurableFileMerger``.
741
(Robert Collins, John Arbash Meinel, #513822)
747
:Codename: the 'new' stable
748
:2.1.0rc1: 2009-01-21
750
This is the first stable release candidate for Bazaar's 2.1 series. From
751
this point onwards, the 2.1 series will be considered stable (as the 2.0
752
series) and only bugfixes are expected to be incorporated. The dozen or so
753
bugfixes in the 2.0.4 release are also included in this release (along
754
with more than 15 more bugfixes). Some of the interesting features are
755
support for per-file merge hooks, ``bzr unshelve --preview``, support
756
for using ! in ignore files to exclude files from being ignored, a small
757
memory leak was squashed, and many ``ObjectNotLocked`` errors were fixed.
758
This looks to be a very good start for a new stable series.
764
* Add bug information to log output when available.
765
(Neil Martinsen-Burrell, Guillermo Gonzalez, #251729)
767
* Added ``merge_file_content`` hook point to ``Merger``, allowing plugins
768
to register custom merge logic, e.g. to provide smarter merging for
771
* Bazaar now includes the ``news_merge`` plugin. It is disabled by
772
default, to enable it add a ``news_merge_files`` option to your
773
configuration. Consult ``bzr help news_merge`` for more information.
776
* ``bzr branch`` now takes a ``--bind`` option. This lets you
777
branch and bind all in one command. (Ian Clatworthy)
779
* ``bzr switch`` now takes a ``--revision`` option, to allow switching to
780
a specific revision of a branch. (Daniel Watkins, #183559)
782
* ``bzr unshelve --preview`` can now be used to show how a patch on the
783
shelf would be applied to the working tree.
784
(Guilherme Salgado, #308122)
786
* ``bzr update`` now takes a ``--revision`` argument. This lets you
787
change the revision of the working tree to any revision in the
788
ancestry of the current or master branch. (Matthieu Moy, Mark Hammond,
791
* ``-Dbytes`` can now be used to display the total number of bytes
792
transferred for the current command. This information is always logged
793
to ``.bzr.log`` for later inspection. (John Arbash Meinel)
795
* New ignore patterns. Patterns prefixed with '!' are exceptions to
796
ignore patterns and take precedence over regular ignores. Such
797
exceptions are used to specify files that should be versioned which
798
would otherwise be ignored. Patterns prefixed with '!!' act as regular
799
ignore patterns, but have highest precedence, even over the '!'
800
exception patterns. (John Whitley, #428031)
802
* The ``supress_warnings`` configuration option has been introduced to disable
803
various warnings (it currently only supports the ``format_deprecation``
804
warning). The new option can be set in any of the following locations:
805
``bazaar.conf``, ``locations.conf`` and/or ``branch.conf``.
806
(Ted Gould, Matthew Fuller, Vincent Ladeuil)
811
* Always show a message if an OS error occurs while trying to run a
812
user-specified commit message editor.
813
(Martin Pool, #504842)
815
* ``bzr diff`` will now use the epoch when it is unable to determine
816
the timestamp of a file, if the revision it was introduced in is a
817
ghost. (Jelmer Vernooij, #295611)
819
* ``bzr switch -b`` can now create branches that are located using directory
820
services such as ``lp:``, even when the branch name doesn't contain a
821
'/'. (Neil Martinsen-Burrell, #495263)
823
* ``bzr unshelve`` has improved messages about what it is doing.
824
(Neil Martinsen-Burrell, #496917)
826
* Concurrent autopacking is more resilient to already-renamed pack files.
827
If we find that a file we are about to obsolete is already obsoleted, we
828
do not try to rename it, and we leave the file in ``obsolete_packs``.
829
The code is also fault tolerant if a file goes missing, assuming that
830
another process already removed the file.
831
(John Arbash Meinel, Gareth White, #507557)
833
* Fix "Too many concurrent requests" in reconcile when network connection
834
fails. (Andrew Bennetts, #503878)
836
* Fixed a side effect mutation of ``RemoteBzrDirFormat._network_name``
837
that caused some tests to fail when run in a non-default order.
838
Probably no user impact. (Martin Pool, #504102)
840
* Fixed ``ObjectNotLocked`` error in ``bzr cat -rbranch:../foo FILE``.
841
(Andrew Bennetts, #506274)
843
* FTP transports support Unicode paths by encoding/decoding them as utf8.
844
(Vincent Ladeuil, #472161)
846
* Listen to the SIGWINCH signal to update the terminal width.
847
(Vincent Ladeuil, #316357)
849
* Progress bars are now hidden when ``--quiet`` is given.
850
(Martin Pool, #320035)
852
* ``SilentUIFactory`` now supports ``make_output_stream`` and discards
853
whatever is written to it. This un-breaks some plugin tests that
854
depended on this behaviour.
855
(Martin Pool, #499757)
857
* When operations update the working tree, all affected files should end
858
up with the same mtime. (eg. when versioning a generated file, if you
859
update the source and the generated file together, the generated file
860
should appear up-to-date.)
861
(John Arbash Meinel, Martin <gzlist>, #488724)
866
* Added ``add_cleanup`` and ``cleanup_now`` to ``bzrlib.command.Command``.
867
All the builtin commands now use ``add_cleanup`` rather than
868
``try``/``finally`` blocks where applicable as it is simpler and more
869
robust. (Andrew Bennetts)
871
* All except a small number of storage formats are now hidden, making
872
the help for numerous commands far more digestible. (Ian Clatworthy)
874
* Attempts to open a shared repository as a branch (e.g. ``bzr branch
875
path/to/repo``) will now include "location is a repository" as a hint in
876
the error message. (Brian de Alwis, Andrew Bennetts, #440952)
878
* Push will now inform the user when they are trying to push to a foreign
879
VCS for which roundtripping is not supported, and will suggest them to
880
use dpush. (Jelmer Vernooij)
882
* The version of bzr being run is now written to the log file.
885
* Transport network activity indicator is shown more of the time when
886
Bazaar is doing network IO.
892
* Add documentation on creating merges with more than one parent.
893
(Neil Martinsen-Burrell, #481526)
895
* Better explain the --uncommitted option of merge.
896
(Neil Martinsen-Burrell, #505088)
898
* Improve discussion of pending merges in the documentation for
899
``revert``. (Neil Martinsen-Burrell, #505093)
901
* Improved help for ``bzr send``.
902
(Martin Pool, Bojan Nikolic)
904
* There is a System Administrator's Guide in ``doc/en/admin-guide``,
905
including discussions of installation, relevant plugins, security and
906
backup. (Neil Martinsen-Burrell)
908
* The ``conflicts`` help topic has been renamed to ``conflict-types``.
911
* The User Reference is now presented as a series of topics.
912
Many of the included topics have link and format tweaks applied.
918
* Added ``cachedproperty`` decorator to ``bzrlib.decorators``.
921
* Many test features were renamed from ``FooFeature`` to ``foo_feature``
922
to be consistent with instances being lower case and classes being
923
CamelCase. For the features that were more likely to be used, we added a
924
deprecation thunk, but not all. (John Arbash Meinel)
926
* Merger classes (such as ``Merge3Merger``) now expect a ``this_branch``
927
parameter in their constructors, and provide ``this_branch`` as an
928
attribute. (Andrew Bennetts)
930
* The Branch hooks pre_change_branch_tip no longer masks exceptions raised
931
by plugins - the original exceptions are now preserved. (Robert Collins)
933
* The Transport ``Server.tearDown`` method is now renamed to
934
``stop_server`` and ``setUp`` to ``start_server`` for consistency with
935
our normal naming pattern, and to avoid confusion with Python's
936
``TestCase.tearDown``. (Martin Pool)
938
* ``WorkingTree.update`` implementations must now accept a ``revision``
944
* Added ``BzrDir.open_branchV3`` smart server request, which can receive
945
a string of details (such as "location is a repository") as part of a
946
``nobranch`` response. (Andrew Bennetts, #440952)
948
* New helper osutils.UnicodeOrBytesToBytesWriter which encodes unicode
949
objects but passes str objects straight through. This is used for
950
selftest but may be useful for diff and other operations that generate
951
mixed output. (Robert Collins)
953
* New exception ``NoRoundtrippingSupport``, for use by foreign branch
954
plugins. (Jelmer Vernooij)
959
* ``bzrlib.tests.permute_for_extension`` is a helper that simplifies
960
running all tests in the current module, once against a pure python
961
implementation, and once against an extension (pyrex/C) implementation.
962
It can be used to dramatically simplify the implementation of
963
``load_tests``. (John Arbash Meinel)
965
* ``bzrlib.tests.TestCase`` now subclasses ``testtools.testcase.TestCase``.
966
This permits features in testtools such as getUniqueInteger and
967
getUniqueString to be used. Because of this, testtools version 0.9.2 or
968
newer is now a dependency to run bzr selftest. Running with versions of
969
testtools less than 0.9.2 will cause bzr to error while loading the test
970
suite. (Robert Collins)
972
* Shell-like tests now support the command "mv" for moving files. The
973
syntax for ``mv file1 file2``, ``mv dir1 dir2`` and ``mv file dir`` is
974
supported. (Neil Martinsen-Burrell)
976
* The test progress bar no longer distinguishes tests that 'errored' from
977
tests that 'failed' - they're all just failures.
983
:2.0.6: NOT RELEASED YET
988
* Additional merges after an unrelated branch has been merged with its
989
history no longer crash when deleted files are involved.
990
(Vincent Ladeuil, John Arbash Meinel, #375898)
992
* ``bzr revert`` now only takes write lock on working tree, instead of on
993
both working tree and branch.
994
(Danny van Heumen, #498409)
996
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
997
permissions as ``.bzr`` directory on a POSIX OS.
998
(Parth Malwankar, #262450)
1000
* Repositories accessed via a smart server now reject being stacked on a
1001
repository in an incompatible format, as is the case when accessing them
1002
via other methods. This was causing fetches from those repositories via
1003
a smart server (e.g. using ``bzr branch``) to receive invalid data.
1004
(Andrew Bennetts, #562380)
1011
This fifth release in our 2.0 series addresses several user-inconvenience
1012
bugs. None are critical, but upgrading is recommended for all users on
1013
earlier 2.0 releases.
1018
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
1019
(Martin Pool, #331095)
1021
* Concurrent autopacking is more resilient to already-renamed pack files.
1022
If we find that a file we are about to obsolete is already obsoleted, we
1023
do not try to rename it, and we leave the file in ``obsolete_packs``.
1024
The code is also fault tolerant if a file goes missing, assuming that
1025
another process already removed the file.
1026
(John Arbash Meinel, Gareth White, #507557)
1028
* Cope with the lockdir ``held/info`` file being empty, which seems to
1029
happen fairly often if the process is suddenly interrupted while taking
1031
(Martin Pool, #185103)
1033
* Give the warning about potentially slow cross-format fetches much
1034
earlier on in the fetch operation. Don't show this message during
1035
upgrades, and show the correct format indication for remote
1037
(Martin Pool, #456077, #515356, #513157)
1039
* Handle renames correctly when there are files or directories that
1040
differ only in case. (Chris Jones, Martin Pool, #368931)
1042
* If ``bzr push --create-prefix`` triggers an unexpected ``NoSuchFile``
1043
error, report that error rather than failing with an unhelpful
1044
``UnboundLocalError``.
1045
(Andrew Bennetts, #423563)
1047
* Running ``bzr`` command without any arguments now shows bzr
1048
version number along with rest of the help text.
1049
(Parth Malwankar, #369501)
1051
* Use osutils.O_NOINHERIT for some files on win32 to avoid PermissionDenied
1053
(Inada Naoki, #524560)
1058
* Added ``location-alias`` help topic.
1059
(Andrew Bennetts, #337834)
1061
* Fixed CHM generation by moving the NEWS section template into
1062
a separate file. (Ian Clatworthy, #524184)
1068
:Codename: smooth sailing
1071
The fourth bugfix-only release in the 2.0 series contains more than a
1072
dozen bugfixes relative to 2.0.3. The primary focus is on handling
1073
interruptions and concurrent operations more cleanly, there is also a fair
1074
improvement to ``bzr export`` when exporting a remote branch.
1080
* ``bzr annotate`` on another branch with ``-r branch:...`` no longer
1081
fails with an ``ObjectNotLocked`` error. (Andrew Bennetts, #496590)
1083
* ``bzr export dir`` now requests all file content as a record stream,
1084
rather than requsting the file content one file-at-a-time. This can make
1085
exporting over the network significantly faster (54min => 9min in one
1086
case). (John Arbash Meinel, #343218)
1088
* ``bzr serve`` no longer slowly leaks memory. The compiled
1089
``bzrlib.bencode.Encoder()`` class was using ``__del__`` to cleanup and
1090
free resources, and it should have been using ``__dealloc__``.
1091
This will likely have an impact on any other process that is serving for
1092
an extended period of time. (John Arbash Meinel, #494406)
1094
* Check for SIGINT (Ctrl-C) and other signals immediately if ``readdir``
1095
returns ``EINTR`` by calling ``PyErr_CheckSignals``. This affected the
1096
optional ``_readdir_pyx`` extension. (Andrew Bennetts, #495023)
1098
* Concurrent autopacks will no longer lose a newly created pack file.
1099
There was a race condition, where if the reload happened at the right
1100
time, the second packer would forget the name of the newly added pack
1101
file. (John Arbash Meinel, Gareth White, #507566)
1103
* Give a clearer message if the lockdir disappears after being apparently
1104
successfully taken. (Martin Pool, #498378)
1106
* Give a warning when fetching between repositories (local or remote) with
1107
sufficiently different formats that the content will need to be
1108
serialized (ie ``InterDifferingSerializer`` or ``inventory-deltas``), so
1109
the user has a clue that upgrading could make it faster.
1110
(Martin Pool, #456077)
1112
* If we fail to open ``~/.bzr.log`` write a clear message to stderr rather
1113
than using ``warning()``. The log file is opened before logging is set
1114
up, and it leads to very confusing: 'no handlers for "bzr"' messages for
1115
users, rather than something nicer.
1116
(John Arbash Meinel, Barry Warsaw, #503886)
1118
* Refuse to build with any Pyrex 0.9.4 release, as they have known bugs.
1119
(Martin Pool, John Arbash Meinel, #449372)
1121
* ``setup.py bdist_rpm`` now properly finds extra files needed for the
1122
build. (there is still the distutils bug
1123
http://bugs.python.org/issue644744) (Joe Julian, #175839)
1125
* The 2a format wasn't properly restarting autopacks when something
1126
changed underneath it (like another autopack). Now concurrent
1127
autopackers will properly succeed. (John Arbash Meinel, #495000)
1129
* ``TreeTransform`` can now handle when a delta says that the file id for
1130
the tree root changes. Rather than trying to rename your working
1131
directory, or failing early saying that you can't have multiple
1132
tree roots. This also fixes revert, update, and pull when the root id
1133
changes. (John Arbash Meinel, #494269, #504390)
1135
* ``_update_current_block`` no longer suppresses exceptions, so ^C at just
1136
the right time will get propagated, rather than silently failing to move
1137
the block pointer. (John Arbash Meinel, Gareth White, #495023)
1142
* We have a new ``test_source`` that ensures all pyrex ``cdef`` functions
1143
handle exceptions somehow. (Possibly by setting ``# cannot_raise``
1144
rather than an ``except ?:`` clause.) This should help prevent bugs like
1145
bug #495023. (John Arbash Meinel)
1151
:Codename: san francisco airport
1152
:2.1.0b4: 2009-12-14
1154
The fourth beta release in the 2.1 series brings with it a significant
1155
number of bugfixes (~20). The test suite is once again (finally) "green"
1156
on Windows, and should remain that way for future releases. There are a
1157
few performance related updates (faster upgrade and log), and several UI
1158
tweaks. There has also been a significant number of tweaks to the runtime
1159
documentation. 2.1.0b4 include everything from the 2.0.3 release.
1162
Compatibility Breaks
1163
********************
1165
* The BZR_SSH environmental variable may now be set to the path of a secure
1166
shell client. If currently set to the value ``ssh`` it will now guess the
1167
vendor of the program with that name, to restore the old behaviour that
1168
indicated the SSH Corporation client use ``sshcorp`` instead as the magic
1169
string. (Martin <gzlist@googlemail.com>, #176292)
1174
* ``bzr commit`` now has a ``--commit-time`` option.
1175
(Alexander Sack, #459276)
1177
* ``-Dhpss`` now increases logging done when run on the bzr server,
1178
similarly to how it works on the client. (John Arbash Meinel)
1180
* New option ``bzr unshelve --keep`` applies the changes and leaves them
1181
on the shelf. (Martin Pool, Oscar Fuentes, #492091)
1183
* The ``BZR_COLUMNS`` envrionment variable can be set to force bzr to
1184
respect a given terminal width. This can be useful when output is
1185
redirected or in obscure cases where the default value is not
1186
appropriate. Pagers can use it to get a better control of the line
1190
* The new command ``bzr lp-mirror`` will request that Launchpad update its
1191
mirror of a local branch. This command will only function if launchpadlib
1199
* After renaming a file, the dirstate could accidentally reference
1200
``source\\path`` rather than ``source/path`` on Windows. This might be a
1201
source of some dirstate-related failures. (John Arbash Meinel)
1203
* ``bzr commit`` now detects commit messages that looks like file names
1204
and issues a warning.
1205
(Gioele Barabucci, #73073)
1207
* ``bzr ignore /`` no longer causes an IndexError. (Gorden Tyler, #456036)
1209
* ``bzr log -n0 -rN`` should not return revisions beyond its merged revisions.
1210
(#325618, #484109, Marius Kruger)
1212
* ``bzr merge --weave`` and ``--lca`` will now create ``.BASE`` files for
1213
files with conflicts (similar to ``--merge3``). The contents of the file
1214
is a synthesis of all bases used for the merge.
1215
(John Arbash Meinel, #40412)
1217
* ``bzr mv --quiet`` really is quiet now. (Gordon Tyler, #271790)
1219
* ``bzr serve`` is more clear about the risk of supplying --allow-writes.
1220
(Robert Collins, #84659)
1222
* ``bzr serve --quiet`` really is quiet now. (Gordon Tyler, #252834)
1224
* Fix bug with redirected URLs over authenticated HTTP.
1225
(Glen Mailer, Neil Martinsen-Burrell, Vincent Ladeuil, #395714)
1227
* Interactive merge doesn't leave branch locks behind. (Aaron Bentley)
1229
* Lots of bugfixes for the test suite on Windows. We should once again
1230
have a test suite with no failures on Windows. (John Arbash Meinel)
1232
* ``osutils.terminal_width()`` obeys the BZR_COLUMNS environment
1233
variable but returns None if the terminal is not a tty (when output is
1234
redirected for example). Also fixes its usage under OSes that doesn't
1235
provide termios.TIOCGWINSZ. Make sure the corresponding tests runs on
1237
(Joke de Buhr, Vincent Ladeuil, #353370, #62539)
1238
(John Arbash Meinel, Vincent Ladeuil, #492561)
1240
* Terminate ssh subprocesses when no references to them remain, fixing
1241
subprocess and file descriptor leaks. (Andrew Bennetts, #426662)
1243
* The ``--hardlink`` option of ``bzr branch`` and ``bzr checkout`` now
1244
works for 2a format trees. Only files unaffected by content filters
1245
will be hardlinked. (Andrew Bennetts, #408193)
1247
* The new glob expansion on Windows would replace all ``\`` characters
1248
with ``/`` even if it there wasn't a glob to expand, the arg was quoted,
1249
etc. Now only change slashes if there is something being glob expanded.
1250
(John Arbash Meinel, #485771)
1252
* Use our faster ``KnownGraph.heads()`` functionality when computing the
1253
new rich-root heads. This can cut a conversion time in half (mysql from
1254
13.5h => 6.2h) (John Arbash Meinel, #487632)
1256
* When launching a external diff tool via bzr diff --using, temporary files
1257
are no longer created, rather, the path to the file in the working tree is
1258
passed to the external diff tool. This allows the file to be edited if the
1259
diff tool provides for this. (Gary van der Merwe, #490738)
1261
* The launchpad-open command can now be used from a subdirectory of a
1262
branch, not just from the root of the branch.
1263
(Neil Martinsen-Burrell, #489102)
1269
* ``bzr log`` is now faster. (Ian Clatworthy)
1271
* ``bzr update`` provides feedback on which branch it is up to date with.
1272
(Neil Martinsen-Burrell)
1274
* ``bzr upgrade`` from pre-2a to 2a can be significantly faster (4x).
1275
For details see the xml8 patch and heads() improvements.
1276
(John Arbash Meinel)
1278
* ``bzrlib.urlutils.local_path_from_url`` now accepts
1279
'file://localhost/' as well as 'file:///' URLs on POSIX. (Michael
1282
* The progress bar now shows only a spinner and per-operation counts,
1283
not an overall progress bar. The previous bar was often not correlated
1284
with real overall operation progress, either because the operations take
1285
nonlinear time, or because at the start of the operation Bazaar couldn't
1286
estimate how much work there was to do. (Martin Pool)
1291
* Lots of documentation tweaks for inline help topics and command help
1297
* ``bzrlib.textui`` (vestigial module) removed. (Martin Pool)
1299
* The Launchpad plugin now has a function ``login`` which will log in to
1300
Launchpad with launchpadlib, and ``load_branch`` which will return the
1301
Launchpad Branch object corresponding to a given Bazaar Branch object.
1307
* New test Feature: ``ModuleAvailableFeature``. It is designed to make it
1308
easier to handle what tests you want to run based on what modules can be
1309
imported. (Rather than lots of custom-implemented features that were
1310
basically copy-and-pasted.) (John Arbash Meinel)
1312
* ``osutils.timer_func()`` can be used to get either ``time.time()`` or
1313
``time.clock()`` when you want to do performance timing.
1314
``time.time()`` is limited to 15ms resolution on Windows, but
1315
``time.clock()`` gives CPU and not wall-clock time on other platforms.
1316
(John Arbash Meinel)
1318
* Several code paths that were calling ``Transport.get().read()`` have
1319
been changed to the equalivent ``Transport.get_bytes()``. The main
1320
difference is that the latter will explicitly call ``file.close()``,
1321
rather than expecting the garbage collector to handle it. This helps
1322
with some race conditions on Windows during the test suite and sftp
1323
tests. (John Arbash Meinel)
1328
* TestCaseWithMemoryTransport no longer sets $HOME and $BZR_HOME to
1329
unicode strings. (Michael Hudson, #464174)
1335
:Codename: little italy
1339
The third stable release of Bazaar has a small handful of bugfixes. As
1340
expected, this has no internal or external compatibility changes versus
1346
* ``bzr push --use-existing-dir`` no longer crashes if the directory
1347
exists but contains an invalid ``.bzr`` directory.
1348
(Andrew Bennetts, #423563)
1350
* Content filters are now applied correctly after pull, merge and switch.
1351
(Ian Clatworthy, #385879)
1353
* Fix a potential segfault in the groupcompress hash map handling code.
1354
When inserting new entries, if the final hash bucket was empty, we could
1355
end up trying to access if ``(last_entry+1)->ptr == NULL``.
1356
(John Arbash Meinel, #490228)
1358
* Improve "Binary files differ" hunk handling. (Aaron Bentley, #436325)
1364
:Codename: after sprint recovery
1365
:2.1.0b3: 2009-11-16
1367
This release was pushed up from its normal release cycle due to a
1368
regression in python 2.4 compatibility in 2.1.0b2. Since this regression
1369
was caught before 2.1.0b2 was officially announced, the full changelog
1370
includes both 2.1.0b3 and 2.1.0b2 changes.
1372
Highlights of 2.1.0b3 are: new globbing code for all commands on Windows,
1373
the test suite now conforms to python's trunk enhanced semantics (skip,
1374
etc.), and ``bzr info -v`` will now report the correct branch and repo
1375
formats for Remote objects.
1381
* Users can define a shelve editor to provide shelf functionality at a
1382
granularity finer than per-patch-hunk. (Aaron Bentley)
1387
* Fix for shell completion and short options. (Benoît PIERRE)
1389
* Fix ``bzr --profile-imports`` with Python 2.6. (Martin Pool)
1391
* Hooks daughter classes should always call the base constructor.
1392
(Alexander Belchenko, Vincent Ladeuil, #389648)
1394
* Improve "Binary files differ" hunk handling. (Aaron Bentley, #436325)
1396
* On Windows, do glob expansion at the command-line level (as is usually
1397
done in bash, etc.) This means that *all* commands get glob expansion
1398
(bzr status, bzr add, bzr mv, etc). It uses a custom command line
1399
parser, which allows us to know if a given section was quoted. It means
1400
you can now do ``bzr ignore "*.py"``.
1401
(John Arbash Meinel, #425510, #426410, #194450)
1403
* Sanitize commit messages that come in from the '-m' flag. We translate
1404
'\r\n' => '\n' and a plain '\r' => '\n'. The storage layer doesn't
1405
allow those because XML store silently translate it anyway. (The parser
1406
auto-translates \r\n => \n in ways that are hard for us to catch.)
1408
* Show correct branch and repository format descriptions in
1409
``bzr info -v`` on a smart server location. (Andrew Bennetts, #196080)
1411
* The fix for bug #186920 accidentally broke compatibility with python
1412
2.4. (Vincent Ladeuil, #475585)
1414
* Using ``Repository.get_commit_builder().record_iter_changes()`` now
1415
correctly sets ``self.inv_sha1`` to a sha1 string and
1416
``self.new_inventory`` to an Inventory instance after calling
1417
``self.finish_inventory()``. (Previously it accidently set both values
1418
as a tuple on ``self.inv_sha1``. This was missed because
1419
``repo.add_revision`` ignores the supplied inventory sha1 and recomputes
1420
the sha1 from the repo directly. (John Arbash Meinel)
1422
* Shelve command refuse to run if there is no real terminal.
1423
(Alexander Belchenko)
1425
* Avoid unnecessarily flushing of trace file; it's now unbuffered at the
1426
Python level. (Martin Pool)
1431
* Include Japanese translations for documentation (Inada Naoki)
1433
* New API ``ui_factory.make_output_stream`` to be used for sending bulk
1434
(rather than user-interaction) data to stdout. This automatically
1435
coordinates with progress bars or other terminal activity, and can be
1437
(Martin Pool, 493944)
1442
* Some of the core groupcompress functionality now releases the GIL before
1443
operation. Similar to how zlib and bz2 operate without the GIL in the
1444
core compression and decompression routines. (John Arbash Meinel)
1449
* -Dhpssvfs will now trigger on ``RemoteBzrDir._ensure_real``, providing
1450
more debugging of VFS access triggers. (Robert Collins)
1452
* KnownFailure is now signalled to ``ExtendedTestResult`` using the same
1453
method that Python 2.7 uses - ``addExpectedFailure``. (Robert Collins)
1455
* ``--parallel=fork`` is now compatible with --subunit.
1456
(Robert Collins, Vincent Ladeuil, #419776)
1458
* Reporting of failures shows test ids not descriptions and thus shows
1459
parameterised tests correctly. (Robert Collins)
1461
* TestNotApplicable is now handled within the TestCase.run method rather
1462
than being looked for within ``ExtendedTestResult.addError``. This
1463
provides better handling with other ``TestResult`` objects, degrading to
1464
sucess rather than error. (Robert Collins)
1466
* The private method ``_testConcluded`` on ``ExtendedTestResult`` has been
1467
removed - it was empty and unused. (Robert Collins)
1469
* UnavailableFeature is now handled within the TestCase.run method rather
1470
than being looked for within addError. If the Result object does not
1471
have an addNotSupported method, addSkip is attempted instead, and
1472
failing that addSuccess. (Robert Collins)
1474
* When a TestResult does not have an addSkip method, skipped tests are now
1475
reported as successful tests, rather than as errors. This change is
1476
to make it possible to get a clean test run with a less capable
1477
TestResult. (Robert Collins)
1484
:Codename: a load off my mind
1485
:2.1.0b2: 2009-11-02
1487
This is our second feature-filled release since 2.0, pushing us down the
1488
path to a 2.1.0. Once again, all bugfixes in 2.0.2 are present in 2.1.0b2.
1490
Key highlights in this release are: improved handling of
1491
failures-during-cleanup for commit, fixing a long-standing bug with
1492
``bzr+http`` and shared repositories, all ``lp:`` urls to be resolved
1493
behind proxies, and a new StaticTuple datatype, allowing us to reduce
1494
memory consumption (50%) and garbage collector overhead (40% faster) for
1497
* A new ``--concurrency`` option has been added as well as an associated
1498
BZR_CONCURRENCY environment variable to specify the number of
1499
processes that can be run concurrently when running ``bzr selftest``. The
1500
command-line option overrides the environment variable if both are
1501
specified. If none is specified. the number of processes is obtained
1502
from the OS as before. (Matt Nordhoff, Vincent Ladeuil)
1507
* ``bzr+http`` servers no longer give spurious jail break errors when
1508
serving branches inside a shared repository. (Andrew Bennetts, #348308)
1510
* Errors during commit are handled more robustly so that knock-on errors
1511
are less likely to occur, and will not obscure the original error if
1512
they do occur. This fixes some causes of ``TooManyConcurrentRequests``
1513
and similar errors. (Andrew Bennetts, #429747, #243391)
1515
* Launchpad urls can now be resolved from behind proxies.
1516
(Gordon Tyler, Vincent Ladeuil, #186920)
1518
* Reduce the strictness for StaticTuple, instead add a debug flag
1519
``-Dstatic_tuple`` which will change apis to be strict and raise errors.
1520
This way, most users won't see failures, but developers can improve
1521
internals. (John Arbash Meinel, #471193)
1523
* TreeTransform.adjust_path updates the limbo paths of descendants of adjusted
1524
files. (Aaron Bentley)
1526
* Unicode paths are now handled correctly and consistently by the smart
1527
server. (Andrew Bennetts, Michael Hudson, #458762)
1532
* When reading index files, we now use a ``StaticTuple`` rather than a
1533
plain ``tuple`` object. This generally gives a 20% decrease in peak
1534
memory, and can give a performance boost up to 40% on large projects.
1535
(John Arbash Meinel)
1537
* Peak memory under certain operations has been reduced significantly.
1538
(eg, 'bzr branch launchpad standalone' is cut in half)
1539
(John Arbash Meinel)
1544
* Filtered views user documentation upgraded to refer to format 2a
1545
instead of pre-2.0 formats. (Ian Clatworthy)
1550
* Remove deprecated ``CLIUIFactory``. (Martin Pool)
1552
* ``UIFactory`` now has new ``show_error``, ``show_message`` and
1553
``show_warning`` methods, which can be hooked by non-text UIs.
1559
* Added ``bzrlib._simple_set_pyx``. This is a hybrid between a Set and a
1560
Dict (it only holds keys, but you can lookup the object located at a
1561
given key). It has significantly reduced memory consumption versus the
1562
builtin objects (1/2 the size of Set, 1/3rd the size of Dict). This is
1563
used as the interning structure for StaticTuple objects.
1564
(John Arbash Meinel)
1566
* ``bzrlib._static_tuple_c.StaticTuple`` is now available and used by
1567
the btree index parser and the chk map parser. This class functions
1568
similarly to ``tuple`` objects. However, it can only point to a limited
1569
collection of types. (Currently StaticTuple, str, unicode, None, bool,
1570
int, long, float, but not subclasses). This allows us to remove it from
1571
the garbage collector (it cannot be in a cycle), it also allows us to
1572
intern the objects. In testing, this can reduce peak memory by 20-40%,
1573
and significantly improve performance by removing objects from being
1574
inspected by the garbage collector. (John Arbash Meinel)
1576
* ``GroupCompressBlock._ensure_content()`` will now release the
1577
``zlib.decompressobj()`` when the first request is for all of the
1578
content. (Previously it would only be released if you made a request for
1579
part of the content, and then all of it later.) This turns out to be a
1580
significant memory savings, as a ``zstream`` carries around approx 260kB
1581
of internal state and buffers. (For branching bzr.dev this drops peak
1582
memory from 382MB => 345MB.) (John Arbash Meinel)
1584
* When streaming content between ``2a`` format repositories, we now clear
1585
caches from earlier versioned files. (So 'revisions' is cleared when we
1586
start reading 'inventories', etc.) This can have a significant impact on
1587
peak memory for initial copies (~200MB). (John Arbash Meinel)
1593
:Codename: after the scare
1596
The second in our "let's keep the stable bugfixes flowing" series. As
1597
expected this has a few (~9) bugfixes relative to 2.0.1, and no major api
1598
changes or features.
1603
* Avoid "NoneType has no attribute st_mode" error when files disappear
1604
from a directory while it's being read. (Martin Pool, #446033)
1606
* Content filters are now applied correctly after revert.
1609
* Diff parsing handles "Binary files differ" hunks. (Aaron Bentley, #436325)
1611
* Fetching from stacked pre-2a repository via a smart server no longer
1612
fails intermittently with "second push failed to complete".
1613
(Andrew Bennetts, #437626)
1615
* Fix typos left after test_selftest refactoring.
1616
(Vincent Ladeuil, Matt Nordhoff, #461149)
1618
* Fixed ``ObjectNotLocked`` errors during ``bzr log -r NNN somefile``.
1619
(Andrew Bennetts, #445171)
1621
* PreviewTree file names are not limited by the encoding of the temp
1622
directory's filesystem. (Aaron Bentley, #436794)
1627
* ``bzr log`` now read-locks branches exactly once, so makes better use of
1628
data caches. (Andrew Bennetts)
1633
* Filtered views user documentation upgraded to refer to format 2a
1634
instead of pre-2.0 formats. (Ian Clatworthy)
1640
:Codename: While the cat is away
1641
:2.1.0b1: 2009-10-14
1643
This is the first development release in the new split "stable" and
1644
"development" series. As such, the release is a snapshot of bzr.dev
1645
without creating a release candidate first. This release includes a
1646
fair amount of internal changes, with deprecated code being removed,
1647
and several new feature developments. People looking for a stable code
1648
base with only bugfixes should focus on the 2.0.1 release. All bugfixes
1649
present in 2.0.1 are present in 2.1.0b1.
1651
Highlights include support for ``bzr+ssh://host/~/homedir`` style urls,
1652
finer control over the plugin search path via extended BZR_PLUGIN_PATH
1653
syntax, visible warnings when extension modules fail to load, and improved
1654
error handling during unlocking.
1660
* Bazaar can now send mail through Apple OS X Mail.app.
1663
* ``bzr+ssh`` and ``bzr`` paths can now be relative to home directories
1664
specified in the URL. Paths starting with a path segment of ``~`` are
1665
relative to the home directory of the user running the server, and paths
1666
starting with ``~user`` are relative to the home directory of the named
1667
user. For example, for a user "bob" with a home directory of
1668
``/home/bob``, these URLs are all equivalent:
1670
* ``bzr+ssh://bob@host/~/repo``
1671
* ``bzr+ssh://bob@host/~bob/repo``
1672
* ``bzr+ssh://bob@host/home/bob/repo``
1674
If ``bzr serve`` was invoked with a ``--directory`` argument, then no
1675
home directories outside that directory will be accessible via this
1678
This is a feature of ``bzr serve``, so pre-2.1 clients will
1679
automatically benefit from this feature when ``bzr`` on the server is
1680
upgraded. (Andrew Bennetts, #109143)
1682
* Extensions can now be compiled if either Cython or Pyrex is available.
1683
Currently Pyrex is preferred, but that may change in the future.
1686
* Give more control on BZR_PLUGIN_PATH by providing a way to refer to or
1687
disable the user, site and core plugin directories.
1688
(Vincent Ladeuil, #412930, #316192, #145612)
1693
* Bazaar's native protocol code now correctly handles EINTR, which most
1694
noticeably occurs if you break in to the debugger while connected to a
1695
bzr+ssh server. You can now can continue from the debugger (by typing
1696
'c') and the process continues. However, note that pressing C-\ in the
1697
shell may still kill the SSH process, which is bug 162509, so you must
1698
sent a signal to the bzr process specifically, for example by typing
1699
``kill -QUIT PID`` in another shell. (Martin Pool, #341535)
1701
* ``bzr add`` in a tree that has files with ``\r`` or ``\n`` in the
1702
filename will issue a warning and skip over those files.
1703
(Robert Collins, #3918)
1705
* ``bzr dpush`` now aborts if uncommitted changes (including pending merges)
1706
are present in the working tree. The configuration option ``dpush_strict``
1707
can be used to set the default for this behavior.
1708
(Vincent Ladeuil, #438158)
1710
* ``bzr merge`` and ``bzr remove-tree`` now requires --force if pending
1711
merges are present in the working tree.
1712
(Vincent Ladeuil, #426344)
1714
* Clearer message when Bazaar runs out of memory, instead of a ``MemoryError``
1715
traceback. (Martin Pool, #109115)
1717
* Don't give a warning on Windows when failing to import ``_readdir_pyx``
1718
as it is never built. (John Arbash Meinel, #430645)
1720
* Don't restrict the command name used to run the test suite.
1721
(Vincent Ladeuil, #419950)
1723
* ftp transports were built differently when the kerberos python module was
1724
present leading to obscure failures related to ASCII/BINARY modes.
1725
(Vincent Ladeuil, #443041)
1727
* Network streams now decode adjacent records of the same type into a
1728
single stream, reducing layering churn. (Robert Collins)
1730
* PreviewTree behaves correctly when get_file_mtime is invoked on an unmodified
1731
file. (Aaron Bentley, #251532)
1733
* Registry objects should not use iteritems() when asked to use items().
1734
(Vincent Ladeuil, #430510)
1736
* Weave based repositories couldn't be cloned when committers were using
1737
domains or user ids embedding '.sig'. Now they can.
1738
(Matthew Fuller, Vincent Ladeuil, #430868)
1743
* Revision specifiers can now be given in a more DWIM form, without
1744
needing explicit prefixes for specifiers like tags or revision id's.
1745
See ``bzr help revisionspec`` for full details. (Matthew Fuller)
1747
* Bazaar gives a warning before exiting, and writes into ``.bzr.log``, if
1748
compiled extensions can't be loaded. This typically indicates a
1749
packaging or installation problem. In this case Bazaar will keep
1750
running using pure-Python versions, but this may be substantially
1751
slower. The warning can be disabled by setting
1752
``ignore_missing_extensions = True`` in ``bazaar.conf``.
1753
See also <https://answers.launchpad.net/bzr/+faq/703>.
1754
(Martin Pool, #406113, #430529)
1756
* Secondary errors that occur during Branch.unlock and Repository.unlock
1757
no longer obscure the original error. These methods now use a new
1758
decorator, ``only_raises``. This fixes many causes of
1759
``TooManyConcurrentRequests`` and similar errors.
1760
(Andrew Bennetts, #429747)
1765
* Describe the new shell-like test feature. (Vincent Ladeuil)
1767
* Help on hooks no longer says 'Not deprecated' for hooks that are
1768
currently supported. (Ian Clatworthy, #422415)
1773
* ``bzrlib.user_encoding`` has been removed; use
1774
``bzrlib.osutils.get_user_encoding`` instead. (Martin Pool)
1776
* ``bzrlib.tests`` now uses ``stopTestRun`` for its ``TestResult``
1777
subclasses - the same as python's unittest module. (Robert Collins)
1779
* ``diff._get_trees_to_diff`` has been renamed to
1780
``diff.get_trees_and_branches_to_diff``. It is now a public API, and it
1781
returns the old and new branches. (Gary van der Merwe)
1783
* ``bzrlib.trace.log_error``, ``error`` and ``info`` have been deprecated.
1786
* ``MutableTree.has_changes()`` does not require a tree parameter anymore. It
1787
now defaults to comparing to the basis tree. It now checks for pending
1788
merges too. ``Merger.check_basis`` has been deprecated and replaced by the
1789
corresponding has_changes() calls. ``Merge.compare_basis``,
1790
``Merger.file_revisions`` and ``Merger.ensure_revision_trees`` have also
1792
(Vincent Ladeuil, #440631)
1794
* ``ProgressTask.note`` is deprecated.
1800
* Added ``-Drelock`` debug flag. It will ``note`` a message every time a
1801
repository or branch object is unlocked then relocked the same way.
1804
* ``BTreeLeafParser.extract_key`` has been tweaked slightly to reduce
1805
mallocs while parsing the index (approx 3=>1 mallocs per key read).
1806
This results in a 10% speedup while reading an index.
1807
(John Arbash Meinel)
1809
* The ``bzrlib.lsprof`` module has a new class ``BzrProfiler`` which makes
1810
profiling in some situations like callbacks and generators easier.
1816
* Passing ``--lsprof-tests -v`` to bzr selftest will cause lsprof output to
1817
be output for every test. Note that this is very verbose! (Robert Collins)
1819
* Setting ``BZR_TEST_PDB=1`` when running selftest will cause a pdb
1820
post_mortem to be triggered when a test failure occurs. (Robert Collins)
1822
* Shell-like tests can now be written. Code in ``bzrlib/tests/script.py`` ,
1823
documentation in ``developers/testing.txt`` for details.
1826
* Some tests could end up with the same id, that was dormant for
1828
(Vincent Ladeuil, #442980)
1830
* Stop showing the number of tests due to missing features in the test
1831
progress bar. (Martin Pool)
1833
* Test parameterisation now does a shallow copy, not a deep copy of the test
1834
to be parameterised. This is not expected to break external use of test
1835
parameterisation, and is substantially faster. (Robert Collins)
1837
* Tests that try to open a bzr dir on an arbitrary transport will now
1838
fail unless they have explicitly permitted the transport via
1839
``self.permit_url``. The standard test factories such as ``self.get_url``
1840
will permit the urls they provide automatically, so only exceptional
1841
tests should need to do this. (Robert Collins)
1843
* The break-in test no longer cares about clean shutdown of the child,
1844
instead it is happy if the debugger starts up. (Robert Collins)
1846
* The full test suite is expected to pass when the C extensions are not
1847
present. (Vincent Ladeuil, #430749)
1853
:Codename: Stability First
1856
The first of our new ongoing bugfix-only stable releases has arrived. It
1857
includes a collection of 12 bugfixes applied to bzr 2.0.0, but does not
1858
include any of the feature development in the 2.1.0 series.
1864
* ``bzr add`` in a tree that has files with ``\r`` or ``\n`` in the
1865
filename will issue a warning and skip over those files.
1866
(Robert Collins, #3918)
1868
* bzr will attempt to authenticate with SSH servers that support
1869
``keyboard-interactive`` auth but not ``password`` auth when using
1870
Paramiko. (Andrew Bennetts, #433846)
1872
* Fixed fetches from a stacked branch on a smart server that were failing
1873
with some combinations of remote and local formats. This was causing
1874
"unknown object type identifier 60" errors. (Andrew Bennetts, #427736)
1876
* Fixed ``ObjectNotLocked`` errors when doing some log and diff operations
1877
on branches via a smart server. (Andrew Bennetts, #389413)
1879
* Handle things like ``bzr add foo`` and ``bzr rm foo`` when the tree is
1880
at the root of a drive. ``osutils._cicp_canonical_relpath`` always
1881
assumed that ``abspath()`` returned a path that did not have a trailing
1882
``/``, but that is not true when working at the root of the filesystem.
1883
(John Arbash Meinel, Jason Spashett, #322807)
1885
* Hide deprecation warnings for 'final' releases for python2.6.
1886
(John Arbash Meinel, #440062)
1888
* Improve the time for ``bzr log DIR`` for 2a format repositories.
1889
We had been using the same code path as for <2a formats, which required
1890
iterating over all objects in all revisions.
1891
(John Arbash Meinel, #374730)
1893
* Make sure that we unlock the tree if we fail to create a TreeTransform
1894
object when doing a merge, and there is limbo, or pending-deletions
1895
directory. (Gary van der Merwe, #427773)
1897
* Occasional IndexError on renamed files have been fixed. Operations that
1898
set a full inventory in the working tree will now go via the
1899
apply_inventory_delta code path which is simpler and easier to
1900
understand than dirstates set_state_from_inventory method. This may
1901
have a small performance impact on operations built on _write_inventory,
1902
but such operations are already doing full tree scans, so no radical
1903
performance change should be observed. (Robert Collins, #403322)
1905
* Retrieving file text or mtime from a _PreviewTree has good performance when
1906
there are many changes. (Aaron Bentley)
1908
* The CHK index pages now use an unlimited cache size. With a limited
1909
cache and a large project, the random access of chk pages could cause us
1910
to download the entire cix file many times.
1911
(John Arbash Meinel, #402623)
1913
* When a file kind becomes unversionable after being added, a sensible
1914
error will be shown instead of a traceback. (Robert Collins, #438569)
1919
* Improved README. (Ian Clatworthy)
1921
* Improved upgrade documentation for Launchpad branches.
1929
:Codename: Instant Karma
1931
This release of Bazaar makes the 2a (previously 'brisbane-core') format
1932
the default when new branches or repositories are created. This format is
1933
substantially smaller and faster for many operations. Most of the work in
1934
this release focuses on bug fixes and stabilization, covering both 2a and
1935
previous formats. (See the Upgrade Guide for information on migrating
1938
This release also improves the documentation content and presentation,
1939
including adding Windows HtmlHelp manuals.
1941
The Bazaar team decided that 2.0 will be a long-term supported release,
1942
with bugfix-only 2.0.x releases based on it, continuing for at least six
1943
months or until the following stable release.
1945
Changes from 2.0.0rc2 to final
1946
******************************
1948
* Officially branded as 2.0.0 rather than 2.0 to clarify between things
1949
that "want to happen on the 2.0.x stable series" versus things that want
1950
to "land in 2.0.0". (Changes how bzrlib._format_version_tuple() handles
1951
micro = 0.) (John Arbash Meinel)
1957
:2.0.0rc2: 2009-09-10
1962
* Added post_commit hook for mutable trees. This allows the keywords
1963
plugin to expand keywords on files changed by the commit.
1964
(Ian Clatworthy, #408841)
1969
* Bazaar's native protocol code now correctly handles EINTR, which most
1970
noticeably occurs if you break in to the debugger while connected to a
1971
bzr+ssh server. You can now can continue from the debugger (by typing
1972
'c') and the process continues. However, note that pressing C-\ in the
1973
shell may still kill the SSH process, which is bug 162509, so you must
1974
sent a signal to the bzr process specifically, for example by typing
1975
``kill -QUIT PID`` in another shell. (Martin Pool, #341535)
1977
* ``bzr check`` in pack-0.92, 1.6 and 1.9 format repositories will no
1978
longer report incorrect errors about ``Missing inventory ('TREE_ROOT', ...)``
1979
(Robert Collins, #416732)
1981
* ``bzr info -v`` on a 2a format still claimed that it was a "Development
1982
format" (John Arbash Meinel, #424392)
1984
* ``bzr log stacked-branch`` shows the full log including
1985
revisions that are in the fallback repository. (Regressed in 2.0rc1).
1986
(John Arbash Meinel, #419241)
1988
* Clearer message when Bazaar runs out of memory, instead of a ``MemoryError``
1989
traceback. (Martin Pool, #109115)
1991
* Conversion to 2a will create a single pack for all the new revisions (as
1992
long as it ran without interruption). This improves both ``bzr upgrade``
1993
and ``bzr pull`` or ``bzr merge`` from local branches in older formats.
1994
The autopack logic that occurs every 100 revisions during local
1995
conversions was not returning that pack's identifier, which resulted in
1996
the partial packs created during the conversion not being consolidated
1997
at the end of the conversion process. (Robert Collins, #423818)
1999
* Fetches from 2a to 2a are now again requested in 'groupcompress' order.
2000
Groups that are seen as 'underutilized' will be repacked on-the-fly.
2001
This means that when the source is fully packed, there is minimal
2002
overhead during the fetch, but if the source is poorly packed the result
2003
is a fairly well packed repository (not as good as 'bzr pack' but
2004
good-enough.) (Robert Collins, John Arbash Meinel, #402652)
2006
* Fix a potential segmentation fault when doing 'log' of a branch that had
2007
ghosts in its mainline. (Evaluating None as a tuple is bad.)
2008
(John Arbash Meinel, #419241)
2010
* ``groupcompress`` sort order is now more stable, rather than relying on
2011
``topo_sort`` ordering. The implementation is now
2012
``KnownGraph.gc_sort``. (John Arbash Meinel)
2014
* Local data conversion will generate correct deltas. This is a critical
2015
bugfix vs 2.0rc1, and all 2.0rc1 users should upgrade to 2.0rc2 before
2016
converting repositories. (Robert Collins, #422849)
2018
* Network streams now decode adjacent records of the same type into a
2019
single stream, reducing layering churn. (Robert Collins)
2021
* Prevent some kinds of incomplete data from being committed to a 2a
2022
repository, such as revisions without inventories, a missing chk_bytes
2023
record for an inventory, or a missing text referenced by an inventory.
2024
(Andrew Bennetts, #423506, #406687)
2029
* Fix assertion error about "_remember_remote_is_before" when pushing to
2030
older smart servers.
2031
(Andrew Bennetts, #418931)
2033
* Help on hooks no longer says 'Not deprecated' for hooks that are
2034
currently supported. (Ian Clatworthy, #422415)
2036
* PDF and CHM (Windows HtmlHelp) formats are now supported for the
2037
user documentation. The HTML documentation is better broken up into
2038
topics. (Ian Clatworthy)
2040
* The developer and foreign language documents are now separated
2041
out so that searching in the HTML and CHM files produces more
2042
useful results. (Ian Clatworthy)
2044
* The main table of contents now provides links to the new Migration Docs
2045
and Plugins Guide. (Ian Clatworthy)
2051
:Codename: no worries
2052
:2.0.0rc1: 2009-08-26
2054
Compatibility Breaks
2055
********************
2057
* The default format for bzr is now ``2a``. This format brings many
2058
significant performance and size improvements. bzr can pull from
2059
any existing repository into a ``2a`` one, but can only transfer
2060
from ``2a`` into ``rich-root`` repositories. The Upgrade guide
2061
has more information about this change. (Robert Collins)
2063
* On Windows auto-detection of Putty's plink.exe is disabled.
2064
Default SSH client for Windows is paramiko. User still can force
2065
usage of plink if explicitly set environment variable BZR_SSH=plink.
2066
(#414743, Alexander Belchenko)
2071
* ``bzr branch --switch`` can now switch the checkout in the current directory
2072
to the newly created branch. (Lukáš Lalinský)
2077
* Further tweaks to handling of ``bzr add`` messages about ignored files.
2078
(Jason Spashett, #76616)
2080
* Fetches were being requested in 'groupcompress' order, but weren't
2081
recombining the groups. Thus they would 'fragment' to get the correct
2082
order, but not 'recombine' to actually benefit from it. Until we get
2083
recombining to work, switching to 'unordered' fetches avoids the
2084
fragmentation. (John Arbash Meinel, #402645)
2086
* Fix a pycurl related test failure on karmic by recognizing an error
2087
raised by newer versions of pycurl.
2088
(Vincent Ladeuil, #306264)
2090
* Fix a test failure on karmic by making a locale test more robust.
2091
(Vincent Ladeuil, #413514)
2093
* Fix IndexError printing CannotBindAddress errors.
2094
(Martin Pool, #286871)
2096
* Fix "Revision ... not present" errors when upgrading stacked branches,
2097
or when doing fetches from a stacked source to a stacked target.
2098
(Andrew Bennetts, #399140)
2100
* ``bzr branch`` of 2a repositories over HTTP is much faster. bzr now
2101
batches together small fetches from 2a repositories, rather than
2102
fetching only a few hundred bytes at a time.
2103
(Andrew Bennetts, #402657)
2108
* A better description of the platform is shown in crash tracebacks, ``bzr
2109
--version`` and ``bzr selftest``.
2110
(Martin Pool, #409137)
2112
* bzr can now (again) capture crash data through the apport library,
2113
so that a single human-readable file can be attached to bug reports.
2114
This can be disabled by using ``-Dno_apport`` on the command line, or by
2115
putting ``no_apport`` into the ``debug_flags`` section of
2117
(Martin Pool, Robert Collins, #389328)
2119
* ``bzr push`` locally on windows will no longer give a locking error with
2120
dirstate based formats. (Robert Collins)
2122
* ``bzr shelve`` and ``bzr unshelve`` now work on windows.
2123
(Robert Collins, #305006)
2125
* Commit of specific files no longer prevents using the iter_changes
2126
codepath. On 2a repositories, commit of specific files should now be as
2127
fast, or slightly faster, than a full commit. (Robert Collins)
2129
* The internal core code that handles specific file operations like
2130
``bzr st FILENAME`` or ``bzr commit FILENAME`` has been changed to
2131
include the parent directories if they have altered, and when a
2132
directory stops being a directory its children are always included. This
2133
fixes a number of causes for ``InconsistentDelta`` errors, and permits
2134
faster commit of specific paths. (Robert Collins, #347649)
2139
* New developer documentation for content filtering.
2145
* ``bzrlib.shelf_ui`` has had the ``from_args`` convenience methods of its
2146
classes changed to manage lock lifetime of the trees they open in a way
2147
consistent with reader-exclusive locks. (Robert Collins, #305006)
2155
:Codename: nein nein nein!
2158
This release fixes two small but worthwhile bugs relevant to users on
2159
Microsoft Windows: some commands that failed on with locking errors will
2160
now work, and a bug that caused poor performance after committing a file
2161
with line-ending conversion has now been fixed. It also fixes a bug in
2162
pushing to older servers.
2167
* Fixed a problem where using content filtering and especially end-of-line
2168
conversion will commit too many copies a file.
2169
(Martin Pool, #415508)
2171
* Fix assertion error about ``_remember_remote_is_before`` in
2172
``set_tags_bytes`` when pushing to older smart servers.
2173
(Andrew Bennetts, Alexander Belchenko, #418931)
2178
* ``bzr push`` locally on Windows will no longer give a locking error with
2179
dirstate based formats. (Robert Collins)
2181
* ``bzr shelve`` and ``bzr unshelve`` now work on Windows.
2182
(Robert Collins, #305006)
2187
* ``bzrlib.shelf_ui`` has had the ``from_args`` convenience methods of its
2188
classes changed to manage lock lifetime of the trees they open in a way
2189
consistent with reader-exclusive locks. (Robert Collins, #305006)
2191
* ``Tree.path_content_summary`` may return a size of None, when called on
2192
a tree with content filtering where the size of the canonical form
2193
cannot be cheaply determined. (Martin Pool)
2195
* When manually creating transport servers in test cases, a new helper
2196
``TestCase.start_server`` that registers a cleanup and starts the server
2197
should be used. (Robert Collins)
2202
Compatibility Breaks
2203
********************
2205
* Committing directly to a stacked branch from a lightweight checkout will
2206
no longer work. In previous versions this would appear to work but would
2207
generate repositories with insufficient data to create deltas, leading
2208
to later errors when branching or reading from the repository.
2209
(Robert Collins, bug #375013)
2217
* Fetching from 2a branches from a version-2 bzr protocol would fail to
2218
copy the internal inventory pages from the CHK store. This cannot happen
2219
in normal use as all 2a compatible clients and servers support the
2220
version-3 protocol, but it does cause test suite failures when testing
2221
downlevel protocol behaviour. (Robert Collins)
2223
* Fix a test failure on karmic by making a locale test more robust.
2224
(Vincent Ladeuil, #413514)
2226
* Fixed "Pack ... already exists" error when running ``bzr pack`` on a
2227
fully packed 2a repository. (Andrew Bennetts, #382463)
2229
* Further tweaks to handling of ``bzr add`` messages about ignored files.
2230
(Jason Spashett, #76616)
2232
* Properly handle fetching into a stacked branch while converting the
2233
data, especially when there are also ghosts. The code was filling in
2234
parent inventories incorrectly, and also not handling when one of the
2235
parents was a ghost. (John Arbash Meinel, #402778, #412198)
2237
* ``RemoteStreamSource.get_stream_for_missing_keys`` will fetch CHK
2238
inventory pages when appropriate (by falling back to the vfs stream
2239
source). (Andrew Bennetts, #406686)
2241
* StreamSource generates rich roots from non-rich root sources correctly
2242
now. (Andrew Bennetts, #368921)
2244
* When deciding whether a repository was compatible for upgrading or
2245
fetching, we previously incorrectly checked the default repository
2246
format for the bzrdir format, rather than the format that was actually
2247
present on disk. (Martin Pool, #408824)
2252
* A better description of the platform is shown in crash tracebacks, ``bzr
2253
--version`` and ``bzr selftest``.
2254
(Martin Pool, #409137)
2256
* Cross-format fetches (such as between 1.9-rich-root and 2a) via the
2257
smart server are more efficient now. They send inventory deltas rather
2258
than full inventories. The smart server has two new requests,
2259
``Repository.get_stream_1.19`` and ``Repository.insert_stream_1.19`` to
2260
support this. (Andrew Bennetts, #374738, #385826)
2262
* Extracting the full ancestry and computing the ``merge_sort`` is now
2263
significantly faster. This effects things like ``bzr log -n0``. (For
2264
example, ``bzr log -r -10..-1 -n0 bzr.dev`` is 2.5s down to 1.0s.
2265
(John Arbash Meinel)
2276
* ``-Dstrict_locks`` can now be used to check that read and write locks
2277
are treated properly w.r.t. exclusivity. (We don't try to take an OS
2278
read lock on a file that we already have an OS write lock on.) This is
2279
now set by default for all tests, if you have a test which cannot be
2280
fixed, you can use ``self.thisFailsStrictLockCheck()`` as a
2281
compatibility knob. (John Arbash Meinel)
2283
* InterDifferingSerializer is now only used locally. Other fetches that
2284
would have used InterDifferingSerializer now use the more network
2285
friendly StreamSource, which now automatically does the same
2286
transformations as InterDifferingSerializer. (Andrew Bennetts)
2288
* ``KnownGraph`` now has a ``.topo_sort`` and ``.merge_sort`` member which
2289
are implemented in pyrex and significantly faster. This is exposed along
2290
with ``CombinedGraphIndex.find_ancestry()`` as
2291
``VersionedFiles.get_known_graph_ancestry(keys)``.
2292
(John Arbash Meinel)
2294
* RemoteBranch.open now honours ignore_fallbacks correctly on bzr-v2
2295
protocols. (Robert Collins)
2297
* The index code now has some specialized routines to extract the full
2298
ancestry of a key in a more efficient manner.
2299
``CombinedGraphIndex.find_ancestry()``. (Time to get ancestry for
2300
bzr.dev drops from 1.5s down to 300ms. For OOo from 33s => 10.5s) (John
2306
* Install the test ssl certificate and key so that installed bzr
2307
can run the https tests. (Denys Duchier, #392401)
2313
:Codename: little traveller
2315
:1.18rc1: 2009-08-10
2317
This release of Bazaar marches on towards the 2.0 release in which the 2a
2318
'brisbane-core' format becomes generally recommended. Most of the work in
2319
this release now focusses on bug fixes and stabilization, covering both 2a
2320
and previous formats. There is a new text-mode interactive merge feature,
2321
a new guide to migration to 2a format in the user documentation, and
2322
pushing branches to a smart server is now much faster.
2324
The Bazaar team decided that 2.0 will be a long-term supported release,
2325
with bugfix-only releases based on it continuing for at least six months
2326
or until the following stable release.
2328
There are no changes from 1.18rc1 to 1.18.
2333
* ``bzr merge --interactive`` applies a user-selected portion of the
2334
merge. The UI is similar to ``shelve``. (Aaron Bentley)
2336
* ``bzr reconfigure`` now takes options ``--stacked-on URL`` and
2337
``--unstacked`` to change stacking of a branch.
2338
(Martin Pool, #391411)
2343
* Annotating on a stacked branch will now succeed in simple scenarios.
2344
There are still some complex scenarios where it will fail (bug #399884)
2345
(John Arbash Meinel, #393366)
2347
* A progress bar is no longer left dangling when ``bzr selftest``
2348
completes, and the progress bar updates with zero latency so the
2349
displayed test name is always the one that's actually running.
2350
(Martin Pool, #123688)
2352
* Authenticating against an ssh server now uses ``auth_none`` to determine
2353
if password authentication is even supported. This fixes a bug where
2354
users would be prompted for a launchpad password, even though launchpad
2355
only supports publickey authentication. (John Arbash Meinel, #375867)
19
* ``merge --interactive`` applies a user-selected portion of the merge. The UI
20
is similar to ``shelve``. (Aaron Bentley)
2357
25
* BranchBuilder now accepts timezone to avoid test failures in countries far
2358
26
from GMT. (Vincent Ladeuil, #397716)
2360
* ``bzr commit`` no longer saves the unversioning of missing files until
2361
the commit has completed on the branch. This means that aborting a
2362
commit that found a missing file will leave the tree unedited.
2363
(Robert Collins, #282402)
2365
* ``bzr mv`` no longer takes out branch locks, which allows it to work
2366
when the branch is readonly. (Robert Collins, #216541)
2368
* ``bzr revert .`` no longer generates an InconsistentDelta error when
2369
there are missing subtrees. (Robert Collins, #367632)
2371
* ``bzr send`` now generates valid bundles with ``--2a`` formats. However,
2372
do to internal changes necessary to support this, older clients will
2373
fail when trying to insert them. For newer clients, the bundle can be
2374
used to apply the changes to any rich-root compatible format.
2375
(John Arbash Meinel, #393349)
2377
* Cope with FTP servers that don't support restart/append by falling back
2378
to reading and then rewriting the whole file, such as TahoeLAFS. (This
2379
fallback may be slow for some access patterns.) (Nils Durner, #294709)
2381
* Encode the paths in ``mbcs`` encoding on Windows when spawning an
2382
external diff client. This at least allows supporting filenames that are
2383
not ascii, but are present in the current locale. Ideally we would be
2384
able to pass the Unicode path, but that would be client dependent.
2385
(John Arbash Meinel, #382709)
2387
* Fix a compile bug on Solaris having to do with const and
2388
pointer-to-pointers. (John Arbash Meinel, #408441)
2390
* Fixed a NameError that occurs when merging or pulling from a URL that
2391
causes a redirection loop when bzr tries to read a URL as a bundle.
2392
(Andrew Bennetts, #400847)
2394
* Fix ``AttributeError: 'TestUIFactory' object has no attribute 'tick'``
2395
running send and similar commands on 2a formats.
2396
(Martin Pool, #408201)
2398
* Fix crash in some invocations of ``bzr status`` in format 2a.
2399
(Martin Pool, #403523)
2401
* Fixed export to existing directory: if directory is empty then export
2402
will succeed, otherwise it fails with error.
2403
(Alexander Belchenko, #406174)
2405
* Fixed spurious "Source branch does not support stacking" warning when
2406
pushing. (Andrew Bennetts, #388908)
2408
* Fixed spurious transport activity indicator appearing while tests are
2409
running. (Martin Pool, #343532)
2411
* Merge now correctly handles empty right-hand revision specs.
2412
(Aaron Bentley, #333961)
2414
* Renames to lexographically lower basenames in trees that have never been
2415
committed to will no longer corrupt the dirstate. This was caused by an
2416
bug in the dirstate update_minimal method. (Robert Collins, #395556)
2418
* Requests for unknown methods no longer cause the smart server to log
2419
lots of backtraces about ``UnknownSmartMethod``, ``do_chunk`` or
2420
``do_end``. (Andrew Bennetts, #338561)
2422
* Shelve will not shelve the initial add of the tree root. (Aaron Bentley)
2424
* Streaming from bzr servers where there is a chain of stacked branches
2425
(A stacked on B stacked on C) will now work. (Robert Collins, #406597)
2427
* The environment variable ``BZR_PROGRESS_BAR`` set to either ``text`` or ``none``
2428
always forces progress bars either on or off respectively. Otherwise,
2429
they're turned on if ``TERM`` is not ``dumb`` and stderr is a terminal.
2430
bzr always uses the 'text' user interface when run as a command, so
2431
``BZR_USE_TEXT_UI`` is no longer needed.
2432
(Martin Pool, #339385, #387717)
2434
* The optional ``_knit_load_data_pyx`` C extension was never being
2435
imported. This caused significant slowdowns when reading data from
2436
repositories. (Andrew Bennetts, #405653)
2438
* The ``--hardlink`` option to ``branch`` and ``checkout`` is not
2439
supported at the moment on workingtree formats that can do content
2440
filtering. (See <https://bugs.edge.launchpad.net/bzr/+bug/408193>.)
2441
bzr now says so, rather than just ignoring the option. (Martin Pool)
2443
* There was a bug in ``osutils.relpath`` that was only triggered on
2444
Windows. Essentially if you were at the root of a drive, and did
2445
something to a branch/repo on another drive, we would go into an
2446
infinite loop while trying to find a 'relative path'.
2447
(John Arbash Meinel, #394227)
2449
* ``WorkingTree4.unversion`` will no longer fail to unversion ids which
2450
were present in a parent tree but renamed in the working tree.
2451
(Robert Collins, #187207)
2456
* Can now rename/move files even if they have been removed from the inventory.
2459
* Pushing branches with tags via ``bzr://`` and ``bzr+ssh://`` is much
2460
faster, using a new ``Branch.set_tags_bytes`` smart server verb rather
2461
than VFS methods. For example, pushes of small branches with tags take
2462
11 rather than 18 smart server requests. (Andrew Bennetts, #398608)
2464
* Sending Ctrl-Break on Windows will now drop you into the debugger, in
2465
the same way that sending Ctrl-\\ does on other platforms.
2466
(John Arbash Meinel)
added
removed
NEWS
