5
5
.. contents:: List of Releases
11
:2.2b3: NOT RELEASED YET
19
* ``bzr commit`` accepts ``-p`` (for "patch") as a shorter name for
21
(Parth Malwankar, #571467)
23
* ``bzr ignore`` now supports a ``--default-rules`` option that displays
24
the default ignore rules used by bzr. The flag ``--old-default-rules``
25
is no longer supported by ``ignore``.
26
(Parth Malwankar, #538703)
28
* ``bzr pack`` now supports a ``--clean-obsolete-packs`` option that
29
can save disk space by deleting obsolete pack files created during the
31
(Parth Malwankar, #304320)
36
* ``.bazaar``, ``.bazaar/bazaar.conf`` and ``.bzr.log`` inherit user and
37
group ownership from the containing directory. This allow bzr to work
39
(Martin <gzlist@googlemail.com>, Parth Malwankar, #376388)
41
* ``bzr log --exclude-common-ancestry -r X..Y`` displays the revisions that
42
are part of Y ancestry but not part of X ancestry (aka the graph
44
(Vincent Ladeuil, #320119)
46
* ``bzr selftest --parallel=fork`` wait for its children avoiding zombies.
47
(Vincent Ladeuil, #566670)
49
* ``bzr selftest`` should not use ui.note() since it's not unicode safe.
50
(Vincent Ladeuil, #563997)
52
* Don't mention --no-strict when we just issue the warning about unclean trees.
53
(Vincent Ladeuil, #401599)
55
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
57
(Andrew Bennetts, #528041)
59
* Reduce peak memory by one copy of compressed text.
60
(John Arbash Meinel, #566940)
62
* Show the filenames when a file rename fails so that the error will be
64
(Martin Pool, #491763)
69
* ``append_revisions_only`` will now be interpreted as a boolean and a
70
warning emitted if illegal values are used. Note that for projects
71
that needs to maintain compatibility with previsous bzr versions,
72
only 'True' and 'False' strings must be used (previous versions of
73
bzr will interpret all strings differing from 'True'
74
(case-sensitive) as false.
75
(Brian de Alwis, Vincent Ladeuil)
77
* ``Config.get_user_option_as_bool`` will now warn if a value cannot
78
be interpreted as a boolean.
87
* Added ``bzrlib.merge.PerFileMerger``, a more convenient way to write
88
some kinds of ``merge_file_content`` hook functions.
91
* `BzrDir`, `Branch`, `Repository` and `WorkingTree` now all support `user_url`,
92
`user_transport`, `control_url` and `control_transport` members pointing
93
respectively to the directory containing the ``.bzr`` control directory,
94
and to the directory within ``.bzr`` used for the particular component.
95
All of them inherit from `ControlComponent` which provides default
99
* Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
100
expected to return an object which can be used to unlock them. This reduces
101
duplicate code when using cleanups. The previous 'tokens's returned by
102
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
103
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
104
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)
109
* ``log._get_info_for_log_files`` now takes an add_cleanup callable.
112
* ``_remember_remote_is_before`` no longer raises AssertionError when
113
suboptimal network behaviour is noticed; instead it just mutters to the
114
log file (and warns the user if they have set the ``hpss`` debug flag).
115
This was causing unnecessary aborts for performance bugs that are minor
117
(Andrew Bennetts, #528041)
119
* Permit bzr to run under ``python -OO`` which reduces the size of bytecode
120
files loaded from disk. To ensure docstrings needed for help are never
121
stripped, the prefix ``__doc__ =`` should now be used.
122
(Martin <gzlist@googlemail.com>)
127
* Added ``bzrlib.tests.matchers`` as a place to put matchers, along with
128
our first in-tree matcher. See the module docstring for details.
131
* ``bzr selftest --parallel=subprocess`` now works correctly on win32.
132
(Gordon Tyler, #551332)
134
* Workaround ``Crypto.Random`` check leading to spurious test
135
failures on Lucid, FreeBSD and gentoo.
136
(Vincent Ladeuil, #528436)
143
This is a somewhat early second beta of the 2.2 series, to fix a python2.4
144
incompatibility in the 2.2b1 release. It also includes a swag of
145
performance, usability and correctness improvements: test feedback on all
146
of these would be welcome.
152
* ``bzr diff`` now supports a --format option, which can be used to
153
select alternative diff formats. (Jelmer Vernooij, #555994)
158
* ``bzr dpush``, ``bzr push`` and ``bzr send`` will now issue a warning
159
instead of failing when dirty trees are involved. The corresponding
160
``dpush_strict``, ``push_strict`` and ``send_strict`` should be set to
161
True explicitly to get the previous behaviour.
162
(Vincent Ladeuil, #519319)
164
* ``bzr export`` to tar file does not fail if any parent directory
165
contains unicode characters. This works around upstream Python bug
166
http://bugs.python.org/issue8396 .
167
(Parth Malwankar, #413406)
169
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
170
(Aaron Bentley, #559436)
172
* ``bzr update`` when a pending merge in the working tree has been merged
173
into the master branch will no longer claim that old commits have become
174
pending merges. (Robert Collins, #562079)
176
* ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
177
config as in previous versions of bzrlib. (Robert Collins)
179
* Fix glitch in the warning about unclean trees display.
180
(Vincent Ladeuil, #562665)
182
* Fixed Python2.4 incompatibilities in the bzr2.2b1 source tarball.
185
* Help messages generated by ``RegistryOption.from_kwargs`` list the
186
switches in alphabetical order, rather than in an undefined order.
187
(Martin von Gagern, #559409)
189
* Make sure the ``ExecutablePath`` and ``InterpreterPath`` are set in
190
Apport crash reports, to avoid "This problem report applies to a program
191
which is not installed any more" error.
192
(Martin Pool, James Westby, #528114)
194
* Reset ``siginterrupt`` flag to False every time we handle a signal
195
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
196
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
197
errors after two window resizes.
200
* When invoked with a range revision, ``bzr log`` doesn't show revisions
201
that are not part of the Y revisions ancestry anymore when invoked with
203
(Vincent Ladeuil, #474807)
205
* Properly handle ``param_name`` attribute for ``ListOption``.
206
(Martin von Gagern, 387117)
211
* ``bzr commit`` will prompt before using a commit message that was
212
generated by a template and not edited by the user.
213
(Robert Collins, #530265)
215
* ``bzr diff`` read-locks the trees and branches only once, saving about
216
10-20ms on ``bzr diff`` in a bzr.dev tree.
219
* ``bzr missing`` read-locks the branches only once.
222
* ``bzr pull`` locks the branches and tree only once.
225
* Index lookups in pack repositories search recently hit pack files first.
226
In repositories with many pack files this can greatly reduce the
227
number of files accessed, the number of bytes read, and the number of
228
read calls. An incremental pull via plain HTTP takes half the time and
229
bytes for a moderately large repository. (Andrew Bennetts)
231
* Index lookups only re-order the indexes when the hit files aren't
232
already first. Reduces the cost of reordering
233
(John Arbash Meinel, #562429)
235
* Less code is loaded at startup. (Cold-cache start time is about 10-20%
237
(Martin Pool, #553017)
242
* ``bzrlib.diff.get_trees_and_branches_to_diff`` is deprecated. Use
243
``get_trees_and_branches_to_diff_locked`` instead.
249
* ``bzrlib.commands.Command.run_direct`` is no longer needed - the pre
250
2.1 method of calling run() to perform testing or direct use via the API
251
is now possible again. As part of this, the _operation attribute on
252
Command is now transient and only exists for the duration of ``run()``.
12
:2.2.0b1: Not released yet
260
14
Compatibility Breaks
261
15
********************
263
* BTreeGraphIndex can now take an offset to indicate that the data starts
264
somewhere other than then beginning of the file. (John Arbash Meinel)
266
17
* Deleted very old hidden commands ``versionedfile-list``,
267
18
``weave-plan-merge``, ``weave-merge-text``.
333
58
* Added docstring for ``Tree.iter_changes``
334
59
(John Arbash Meinel, #304182)
336
* Allow additional arguments to
337
``RemoteRepository.add_inventory_by_delta()``. (Jelmer Vernooij, #532631)
339
61
* Allow exporting a single file using ``bzr export``.
340
62
(Michal Junák, #511987)
342
* Allow syscalls to automatically restart when ``TextUIFactory``'s
343
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
344
IO, which are often poorly handled by Python's libraries and parts of
345
bzrlib. (Andrew Bennetts, #496813)
347
64
* Avoid infinite recursion when probing for apport.
348
65
(Vincent Ladeuil, #516934)
350
67
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
351
68
(Martin Pool, #331095)
353
* Avoid truncating svn URLs.
354
(Martin Pool, Martin von Gagern, #545185)
356
70
* ``bzr add`` will not add conflict related files unless explicitly required.
357
71
(Vincent Ladeuil, #322767, #414589)
359
* ``bzr dump-btree`` now works on ``*.cix`` and ``*.six`` files. Those
360
indices do not have reference lists, so ``dump-btree`` will simply show
361
``None`` instead. (Andrew Bennetts, #488607)
363
* ``bzr help`` will no longer trigger the get_missing_command hook when
364
doing a topic lookup. This avoids prompting (like 'no command plugins/loom,
365
did you mean log?') when getting help. In future we may trigger the hook
366
deliberately when no help topics match from any help index.
367
(Robert Collins, #396261)
369
* ``bzr log -n0 -r..A.B.C`` should not crash but just consider the None
370
revspec as representing the first revision of the branch.
371
(Vincent Ladeuil, #519862)
373
73
* ``bzr remove-tree`` can now remove multiple working trees.
374
74
(Jared Hance, Andrew Bennetts, #253137)
376
* ``bzr resolve --take-this`` and ``--take-other`` now correctly renames
377
the kept file on content conflicts where one side deleted the file.
378
(Vincent Ladeuil, #529968)
380
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
381
permissions as ``.bzr`` directory on a POSIX OS.
382
(Parth Malwankar, #262450)
384
* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
385
of ``backup.bzr``. This directory is ignored by bzr commands such as
387
(Parth Malwankar, #335033, #300001)
389
* Cope with non-utf8 characters inside ``.bzrignore``.
390
(Jason Spashett, #183504)
392
* Correctly interpret "451 Rename/move failure: Directory not empty" from
393
ftp servers while trying to take a lock.
394
(Martin Pool, #528722)
396
* DirStateRevisionTree.kind() was returning wrong result when 'kind'
397
changes occured between the workingtree and one of its parents.
398
(Vincent Ladeuil, #535547)
400
* Fix ``log`` to better check ancestors even if merged revisions are involved.
401
(Vincent Ladeuil, #476293)
403
* Loading a plugin from a given path with ``BZR_PLUGINS_AT`` doesn't depend
404
on os.lisdir() order and is now reliable.
405
(Vincent Ladeuil, #552922).
407
* Many IO operations that returned ``EINTR`` were retried even if it
408
wasn't safe to do so via careless use of ``until_no_eintr``. Bazaar now
409
only retries operations that are safe to retry, and in some cases has
410
switched to operations that can be retried (e.g. ``sock.send`` rather than
412
(Andrew Bennetts, Martin <gzlist@googlemail.com>, #496813)
414
* Path conflicts now support --take-this and --take-other even when a
415
deletion is involved.
416
(Vincent Ladeuil, #531967)
418
76
* Network transfer amounts and rates are now displayed in SI units according
419
77
to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
420
78
(Gordon Tyler, #514399)
423
81
prevents ``bzr status --short`` from crashing when those files are
424
82
present. (John Arbash Meinel, #303275)
426
* ``bzr mkdir DIR`` will not create DIR unless DIR's parent is a versioned
427
directory. (Parth Malwankar, #138600)
429
* SSH child processes will now ignore SIGQUIT on nix systems so breaking into
430
the debugger won't kill the session.
431
(Martin <gzlist@googlemail.com>, #162502)
433
* Tolerate patches with leading noise in ``bzr-handle-patch``.
434
(Toshio Kuratomi, Martin Pool, #502076)
436
* ``update -r`` now supports updating to revisions that are not on
437
mainline (i.e. it supports dotted revisions).
438
(Parth Malwankar, #517800)
440
* Use first apparent author not committer in GNU Changelog format.
441
(Martin von Gagern, #513322)
84
* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
85
of ``backup.bzr``. This directory is ignored by bzr commands such as
87
(Parth Malwankar, #335033, #300001)
446
* ``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
447
``bzrlib.merge_directive.BaseMergeDirective`` and is now public.
450
* ``BranchFormat.initialize`` now takes an optional ``name`` of the colocated
451
branch to create. (Jelmer Vernooij)
453
* ``BzrDir.get_branch_transport`` now takes an optional ``name`` of the
454
colocated branch to open. (Jelmer Vernooij)
456
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
457
can set a signal handler and call ``signal.siginterrupt(signum,
458
False)`` for it, if the platform and Python version supports it.
459
(Andrew Bennetts, #496813)
461
92
* New ``bzrlib.initialize`` is recommended for programs using bzrlib to
462
93
run when starting up; it sets up several things that previously needed
463
94
to be done separately.
464
95
(Martin Pool, #507710)
466
* Exporters now support a ``per_file_timestamps`` argument to write out the
467
timestamp of the commit in which a file revision was introduced.
470
* New method ``BzrDir.list_branches()`` that returns a sequence of branches
471
present in a control directory. (Jelmer Vernooij)
473
* New method ``Repository.get_known_graph_ancestry()``.
474
(Jelmer Vernooij, #495502)
476
* New transport methods ``readlink``, ``symlink`` and ``hardlink``.
479
97
* Remove unused ``CommandFailed`` exception.
485
* ``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
486
``message_callback`` in the same way that commit does. (Robert Collins)
488
* ``bzrlib.builtins.Commit.run`` raises ``bzrlib.errors.BoundBranchOutOfDate``
489
rather than ``bzrlib.errors.BzrCommandError`` when the bound branch is out
490
of date. (Gary van der Merwe)
492
103
* ``bzrlib.commands.run_bzr`` is more extensible: callers can supply the
493
104
functions to load or disable plugins if they wish to use a different
494
105
plugin mechanism; the --help, --version and no-command name code paths
495
106
now use the generic pluggable command lookup infrastructure.
498
* ``bzrlib.errors.BoundBranchOutOfDate`` has a new field ``extra_help``
499
which can be set to add extra help to the error. (Gary van der Merwe)
501
* New method ``Branch.automatic_tag_name`` that can be used to find the
502
tag name for a particular revision automatically. (Jelmer Vernooij)
504
* The methods ``BzrDir.create_branch()``, ``BzrDir.destroy_branch()`` and
505
``BzrDir.open_branch()`` now take an optional ``name`` argument.
511
* bzr now has a ``.testr.conf`` file in its source tree configured
512
appropriately for running tests with Testrepository
513
(``https://launchpad.net/testrepository``). (Robert Collins)
515
* Documentation about testing with ``subunit`` has been tweaked.
518
* Known failures has been added for resolve --take-other on ParentLoop
519
conflicts. This reflects bug #537956 without fixing it.
522
* New ``bzrlib.tests.test_import_tariff`` can make assertions about what
112
* New `bzrlib.tests.test_import_tariff` can make assertions about what
523
113
Python modules are loaded, to guard against startup time or library
524
114
dependency regressions.
527
* PQM will now run with subunit output. To analyze a PQM error use
528
tribunal, or cat log | subunit-filter | subunit2pyunit. (Robert Collins)
530
117
* Stop sending apport crash files to ``.cache`` in the directory from
531
118
which ``bzr selftest`` was run. (Martin Pool, #422350)
533
* Tests no longer fail if "close() called during concurrent
534
operation on the same file object" occurs when closing the log file
535
(which can happen if a thread tries to write to the log file at the
536
wrong moment). An warning will be written to ``stderr`` when this
537
happens, and another warning will be written if the log file could not
538
be closed after retrying 100 times. (Andrew Bennetts, #531746)
543
:2.1.2: NOT RELEASED YET
548
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
549
(Aaron Bentley, #559436)
551
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
553
(Andrew Bennetts, #528041)
555
* Reset ``siginterrupt`` flag to False every time we handle a signal
556
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
557
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
558
errors after two window resizes.
564
* ``_remember_remote_is_before`` no longer raises AssertionError when
565
suboptimal network behaviour is noticed; instead it just mutters to the
566
log file (and warns the user if they have set the ``hpss`` debug flag).
567
This was causing unnecessary aborts for performance bugs that are minor
569
(Andrew Bennetts, #528041)
577
This is a small bugfix release. Upgrading is recommended for anyone
578
running 2.1.0 or earlier.
123
:2.1.1: not released yet
583
* Allow syscalls to automatically restart when ``TextUIFactory``'s
584
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
585
IO, which are often poorly handled by Python's libraries and parts of
586
bzrlib. (Andrew Bennetts, #496813)
588
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
589
(Martin Pool, #331095)
591
* Fix plugin packaging on Windows. (Ian Clatworthy, #524162)
593
* Fix stub sftp test server to call os.getcwdu().
594
(Vincent Ladeuil, #526221, #526353)
596
* Fixed CHM generation by moving the NEWS section template into
597
a separate file. (Ian Clatworthy, #524184)
599
* Merge correctly when this_tree is not a WorkingTree. (Aaron Bentley)
601
128
* Register SIGWINCH handler only when creating a ``TextUIFactory``; avoids
602
129
problems importing bzrlib from a non-main thread.
603
130
(Elliot Murphy, #521989)
605
* Repositories accessed via a smart server now reject being stacked on a
606
repository in an incompatible format, as is the case when accessing them
607
via other methods. This was causing fetches from those repositories via
608
a smart server (e.g. using ``bzr branch``) to receive invalid data.
609
(Andrew Bennetts, #562380)
611
132
* Standardize the error handling when creating a new ``StaticTuple``
612
133
(problems will raise TypeError). (Matt Nordhoff, #457979)
614
* Warn if pyrex is too old to compile the new ``SimpleSet`` and
615
``StaticTuple`` extensions, rather than having the build fail randomly.
616
(John Arbash Meinel, #449776)
135
* Merge correctly when this_tree is not a WorkingTree. (Aaron Bentley)
621
* Added a link to the Desktop Guide. (Ian Clatworthy)
623
140
* Added What's New in Bazaar 2.1 document. (Ian Clatworthy)
625
* Drop Google Analytics from the core docs as they caused problems
626
in the CHM files. (Ian Clatworthy, #502010)
631
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
632
can set a signal handler and call ``signal.siginterrupt(signum,
633
False)`` for it, if the platform and Python version supports it.
634
(Andrew Bennetts, #496813)
987
495
tests that 'failed' - they're all just failures.
993
:2.0.6: NOT RELEASED YET
998
* Additional merges after an unrelated branch has been merged with its
999
history no longer crash when deleted files are involved.
1000
(Vincent Ladeuil, John Arbash Meinel, #375898)
1002
* ``bzr revert`` now only takes write lock on working tree, instead of on
1003
both working tree and branch.
1004
(Danny van Heumen, #498409)
1006
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
1007
permissions as ``.bzr`` directory on a POSIX OS.
1008
(Parth Malwankar, #262450)
1010
* Repositories accessed via a smart server now reject being stacked on a
1011
repository in an incompatible format, as is the case when accessing them
1012
via other methods. This was causing fetches from those repositories via
1013
a smart server (e.g. using ``bzr branch``) to receive invalid data.
1014
(Andrew Bennetts, #562380)
1021
This fifth release in our 2.0 series addresses several user-inconvenience
1022
bugs. None are critical, but upgrading is recommended for all users on
1023
earlier 2.0 releases.
1028
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
1029
(Martin Pool, #331095)
1031
* Concurrent autopacking is more resilient to already-renamed pack files.
1032
If we find that a file we are about to obsolete is already obsoleted, we
1033
do not try to rename it, and we leave the file in ``obsolete_packs``.
1034
The code is also fault tolerant if a file goes missing, assuming that
1035
another process already removed the file.
1036
(John Arbash Meinel, Gareth White, #507557)
1038
* Cope with the lockdir ``held/info`` file being empty, which seems to
1039
happen fairly often if the process is suddenly interrupted while taking
1041
(Martin Pool, #185103)
1043
* Give the warning about potentially slow cross-format fetches much
1044
earlier on in the fetch operation. Don't show this message during
1045
upgrades, and show the correct format indication for remote
1047
(Martin Pool, #456077, #515356, #513157)
499
bzr 2.0.5 (not released yet)
500
############################
1049
508
* Handle renames correctly when there are files or directories that
1050
509
differ only in case. (Chris Jones, Martin Pool, #368931)
added
removed
NEWS
