5
5
.. contents:: List of Releases
11
:2.2b3: NOT RELEASED YET
16
* An API break has been made to the lock_write method of ``Branch`` and
17
``Repository`` objects; they now return ``branch.BranchWriteLockResult``
18
and ``repository.RepositoryWriteLockResult`` objects. This makes
19
changing the API in future easier and permits some cleaner calling code.
20
The lock_read method has also changed from having no defined return
21
value to returning ``LogicalLockResult`` objects.
24
* ``bzr`` does not try to guess the username as ``username@hostname``
25
and requires it to be explictly set. This can be set using ``bzr
27
(Parth Malwankar, #549310)
32
* ``bzr commit`` accepts ``-p`` (for "patch") as a shorter name for
34
(Parth Malwankar, #571467)
36
* ``bzr ignore`` now supports a ``--default-rules`` option that displays
37
the default ignore rules used by bzr. The flag ``--old-default-rules``
38
is no longer supported by ``ignore``.
39
(Parth Malwankar, #538703)
41
* ``bzr pack`` now supports a ``--clean-obsolete-packs`` option that
42
can save disk space by deleting obsolete pack files created during the
44
(Parth Malwankar, #304320)
46
* New command line option ``--authors`` to ``bzr log`` allows users to
47
select which of the apparent authors and committer should be
48
included in the log. Defaults depend on format. (Martin von Gagern, #513322)
50
* Support ``--directory`` option for a number of additional commands:
51
added, annotate, bind, cat, cat-revision, clean-tree, deleted,
52
export, ignore, ignored, lookup-revision, ls, modified, nick,
53
re-sign, unbind, unknowns.
54
(Martin von Gagern, #527878)
59
* ``.bazaar``, ``.bazaar/bazaar.conf`` and ``.bzr.log`` inherit user and
60
group ownership from the containing directory. This allow bzr to work
62
(Martin <gzlist@googlemail.com>, Parth Malwankar, #376388)
64
* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
65
support of bzr-externals and scmproj plugins.
66
(Alexander Belchenko, bug #572098)
68
* ``bzr ignore`` will no longer add duplicate patterns to .bzrignore.
69
(Gordon Tyler, #572092)
71
* ``bzr log --exclude-common-ancestry -r X..Y`` displays the revisions that
72
are part of Y ancestry but not part of X ancestry (aka the graph
74
(Vincent Ladeuil, #320119)
76
* ``bzr rm`` should not refuse to delete directories which contained a file
77
which has been moved elsewhere in the tree after the previous commit.
78
(Marius Kruger, Daniel Watkins, #129880)
80
* ``bzr selftest --parallel=fork`` wait for its children avoiding zombies.
81
(Vincent Ladeuil, #566670)
83
* ``bzr selftest`` should not use ui.note() since it's not unicode safe.
84
(Vincent Ladeuil, #563997)
86
* Don't mention --no-strict when we just issue the warning about unclean trees.
87
(Vincent Ladeuil, #401599)
89
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
91
(Andrew Bennetts, #528041)
93
* Heavyweight checkout operation now shows a message to the user indicating
94
history is being copied.
95
(Parth Malwankar, #538868)
97
* Reduce peak memory by one copy of compressed text.
98
(John Arbash Meinel, #566940)
100
* Show the filenames when a file rename fails so that the error will be
102
(Martin Pool, #491763)
104
* Unicode characters in aliases are now handled correctly and do not cause
105
UnicodeEncodeError exception. (Parth Malwankar, #529930)
107
* Unicode commit messages that are the same as a file name no longer cause
108
UnicodeEncodeError. ``ui.text.show_warning`` now handles unicode
110
(Parth Malwankar, #563646)
112
* Using bzr with `lp:` urls behind an http proxy should work.
113
(Robert Collins, #558343)
118
* ``append_revisions_only`` will now be interpreted as a boolean and a
119
warning emitted if illegal values are used. Note that for projects
120
that needs to maintain compatibility with previsous bzr versions,
121
only 'True' and 'False' strings must be used (previous versions of
122
bzr will interpret all strings differing from 'True'
123
(case-sensitive) as false.
124
(Brian de Alwis, Vincent Ladeuil)
126
* ``bzr ls`` now supports short options for existing long options.
127
``-k/--kind``, ``-i/--ignored``, ``-u/--unknown`` and ``-0/--null``.
128
(Parth Malwankar, #181124)
130
* ``Config.get_user_option_as_bool`` will now warn if a value cannot
131
be interpreted as a boolean.
140
* Added ``bzrlib.merge.PerFileMerger``, a more convenient way to write
141
some kinds of ``merge_file_content`` hook functions.
144
* `BzrDir`, `Branch`, `Repository` and `WorkingTree` now all support `user_url`,
145
`user_transport`, `control_url` and `control_transport` members pointing
146
respectively to the directory containing the ``.bzr`` control directory,
147
and to the directory within ``.bzr`` used for the particular component.
148
All of them inherit from `ControlComponent` which provides default
152
* Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
153
expected to return an object which can be used to unlock them. This reduces
154
duplicate code when using cleanups. The previous 'tokens's returned by
155
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
156
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
157
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)
159
* ``Repository.refresh_data`` may now be called in a write group on
160
pack-based repositories. Older repositories will still raise an error
161
in this case. Subclasses of ``Repository`` can still override
162
``Repository._refresh_data``, but are now responsible for raising
163
``bzrlib.repository.IsInWriteGroupError`` if they do not support
164
``refresh_data`` during a write group.
165
(Andrew Bennetts, #574236)
170
* ``log._get_info_for_log_files`` now takes an add_cleanup callable.
173
* ``_remember_remote_is_before`` no longer raises AssertionError when
174
suboptimal network behaviour is noticed; instead it just mutters to the
175
log file (and warns the user if they have set the ``hpss`` debug flag).
176
This was causing unnecessary aborts for performance bugs that are minor
178
(Andrew Bennetts, #528041)
180
* Permit bzr to run under ``python -OO`` which reduces the size of bytecode
181
files loaded from disk. To ensure docstrings needed for help are never
182
stripped, the prefix ``__doc__ =`` should now be used.
183
(Martin <gzlist@googlemail.com>)
188
* Added ``bzrlib.tests.matchers`` as a place to put matchers, along with
189
our first in-tree matcher. See the module docstring for details.
192
* ``bzr selftest --parallel=subprocess`` now works correctly on win32.
193
(Gordon Tyler, #551332)
195
* Workaround ``Crypto.Random`` check leading to spurious test
196
failures on Lucid, FreeBSD and gentoo.
197
(Vincent Ladeuil, #528436)
204
This is a somewhat early second beta of the 2.2 series, to fix a python2.4
205
incompatibility in the 2.2b1 release. It also includes a swag of
206
performance, usability and correctness improvements: test feedback on all
207
of these would be welcome.
213
* ``bzr diff`` now supports a --format option, which can be used to
214
select alternative diff formats. (Jelmer Vernooij, #555994)
219
* ``bzr dpush``, ``bzr push`` and ``bzr send`` will now issue a warning
220
instead of failing when dirty trees are involved. The corresponding
221
``dpush_strict``, ``push_strict`` and ``send_strict`` should be set to
222
True explicitly to get the previous behaviour.
223
(Vincent Ladeuil, #519319)
225
* ``bzr export`` to tar file does not fail if any parent directory
226
contains unicode characters. This works around upstream Python bug
227
http://bugs.python.org/issue8396 .
228
(Parth Malwankar, #413406)
230
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
231
(Aaron Bentley, #559436)
233
* ``bzr update`` when a pending merge in the working tree has been merged
234
into the master branch will no longer claim that old commits have become
235
pending merges. (Robert Collins, #562079)
237
* ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
238
config as in previous versions of bzrlib. (Robert Collins)
240
* Fix glitch in the warning about unclean trees display.
241
(Vincent Ladeuil, #562665)
243
* Fixed Python2.4 incompatibilities in the bzr2.2b1 source tarball.
246
* Help messages generated by ``RegistryOption.from_kwargs`` list the
247
switches in alphabetical order, rather than in an undefined order.
248
(Martin von Gagern, #559409)
250
* Make sure the ``ExecutablePath`` and ``InterpreterPath`` are set in
251
Apport crash reports, to avoid "This problem report applies to a program
252
which is not installed any more" error.
253
(Martin Pool, James Westby, #528114)
255
* Reset ``siginterrupt`` flag to False every time we handle a signal
256
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
257
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
258
errors after two window resizes.
261
* When invoked with a range revision, ``bzr log`` doesn't show revisions
262
that are not part of the Y revisions ancestry anymore when invoked with
264
(Vincent Ladeuil, #474807)
266
* Properly handle ``param_name`` attribute for ``ListOption``.
267
(Martin von Gagern, 387117)
272
* ``bzr commit`` will prompt before using a commit message that was
273
generated by a template and not edited by the user.
274
(Robert Collins, #530265)
276
* ``bzr diff`` read-locks the trees and branches only once, saving about
277
10-20ms on ``bzr diff`` in a bzr.dev tree.
280
* ``bzr missing`` read-locks the branches only once.
283
* ``bzr pull`` locks the branches and tree only once.
286
* Index lookups in pack repositories search recently hit pack files first.
287
In repositories with many pack files this can greatly reduce the
288
number of files accessed, the number of bytes read, and the number of
289
read calls. An incremental pull via plain HTTP takes half the time and
290
bytes for a moderately large repository. (Andrew Bennetts)
292
* Index lookups only re-order the indexes when the hit files aren't
293
already first. Reduces the cost of reordering
294
(John Arbash Meinel, #562429)
296
* Less code is loaded at startup. (Cold-cache start time is about 10-20%
298
(Martin Pool, #553017)
303
* ``bzrlib.diff.get_trees_and_branches_to_diff`` is deprecated. Use
304
``get_trees_and_branches_to_diff_locked`` instead.
307
* ``TreeTransform.commit`` supports the full set of commit parameters, and
308
auto-determines branch nick if not supplied. (Aaron Bentley)
313
* ``bzrlib.commands.Command.run_direct`` is no longer needed - the pre
314
2.1 method of calling run() to perform testing or direct use via the API
315
is now possible again. As part of this, the _operation attribute on
316
Command is now transient and only exists for the duration of ``run()``.
327
* BTreeGraphIndex can now take an offset to indicate that the data starts
328
somewhere other than then beginning of the file. (John Arbash Meinel)
330
* Deleted very old hidden commands ``versionedfile-list``,
331
``weave-plan-merge``, ``weave-merge-text``.
334
* ``Repository.get_inventory_sha1()`` and ``Repository.get_revision_xml()``
335
have been removed. (Jelmer Vernooij)
337
* ``Repository.get_revision_inventory()`` has been removed in favor of
338
``Repository.get_inventory()``. (Jelmer Vernooij)
340
* All test servers have been moved out of the bzrlib.transport hierarchy to
341
bzrlib.tests.test_server *except* for MemoryServer, ChrootServer and
342
PathFilteringServer. ``bzrlib`` users may encounter test failures that can
343
be fixed by updating the related imports from ``bzrlib.transport.xxx`` to
344
``bzrlib.tests.test_server``.
347
* ``BranchReferenceFormat.initialize()`` now takes an optional name argument
348
as its second parameter, for consistency with the initialize() method of
349
other formats. (Jelmer Vernooij)
354
* Added ``bzr remove-branch`` command that can remove a local or remote
355
branch. (Jelmer Vernooij, #276295)
357
* ``bzr export`` now takes an optional argument ``--per-file-timestamps``
358
to set file mtimes to the last timestamp of the last revision in which
359
they were changed rather than the current time. (Jelmer Vernooij)
361
* If the Apport crash-reporting tool is available, bzr crashes are now
362
stored into the ``/var/crash`` apport spool directory, and the user is
363
invited to report them to the developers from there, either
364
automatically or by running ``apport-bug``. No information is sent
365
without specific permission from the user. (Martin Pool, #515052)
367
* Parsing of command lines, for example in ``diff --using``, no longer
368
treats backslash as an escape character on Windows. (Gordon Tyler,
371
* Plugins can be disabled by defining ``BZR_DISABLE_PLUGINS`` as
372
a list of plugin names separated by ':' (';' on windows).
373
(Vincent Ladeuil, #411413)
375
* Plugins can be loaded from arbitrary locations by defining
376
``BZR_PLUGINS_AT`` as a list of name@path separated by ':' (';' on
377
windows). This takes precedence over ``BZR_PLUGIN_PATH`` for the
378
specified plugins. This is targeted at plugin developers for punctual
379
needs and *not* intended to replace ``BZR_PLUGIN_PATH``.
380
(Vincent Ladeuil, #82693)
382
* Tag names can now be determined automatically by ``automatic_tag_name``
383
hooks on ``Branch`` if they are not specified on the command line.
386
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
387
``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
388
as resolved is still accessible via the ``--done`` default action.
391
* Merges can be proposed on Launchpad with the new lp-propose-merge command.
392
(Aaron Bentley, Jonathan Lange)
397
* Added docstring for ``Tree.iter_changes``
398
(John Arbash Meinel, #304182)
400
* Allow additional arguments to
401
``RemoteRepository.add_inventory_by_delta()``. (Jelmer Vernooij, #532631)
403
* Allow exporting a single file using ``bzr export``.
404
(Michal Junák, #511987)
406
* Allow syscalls to automatically restart when ``TextUIFactory``'s
407
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
408
IO, which are often poorly handled by Python's libraries and parts of
409
bzrlib. (Andrew Bennetts, #496813)
411
* Avoid infinite recursion when probing for apport.
412
(Vincent Ladeuil, #516934)
414
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
415
(Martin Pool, #331095)
417
* Avoid truncating svn URLs.
418
(Martin Pool, Martin von Gagern, #545185)
420
* ``bzr add`` will not add conflict related files unless explicitly required.
421
(Vincent Ladeuil, #322767, #414589)
423
* ``bzr dump-btree`` now works on ``*.cix`` and ``*.six`` files. Those
424
indices do not have reference lists, so ``dump-btree`` will simply show
425
``None`` instead. (Andrew Bennetts, #488607)
427
* ``bzr help`` will no longer trigger the get_missing_command hook when
428
doing a topic lookup. This avoids prompting (like 'no command plugins/loom,
429
did you mean log?') when getting help. In future we may trigger the hook
430
deliberately when no help topics match from any help index.
431
(Robert Collins, #396261)
433
* ``bzr log -n0 -r..A.B.C`` should not crash but just consider the None
434
revspec as representing the first revision of the branch.
435
(Vincent Ladeuil, #519862)
437
* ``bzr remove-tree`` can now remove multiple working trees.
438
(Jared Hance, Andrew Bennetts, #253137)
440
* ``bzr resolve --take-this`` and ``--take-other`` now correctly renames
441
the kept file on content conflicts where one side deleted the file.
442
(Vincent Ladeuil, #529968)
444
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
445
permissions as ``.bzr`` directory on a POSIX OS.
446
(Parth Malwankar, #262450)
448
* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
449
of ``backup.bzr``. This directory is ignored by bzr commands such as
451
(Parth Malwankar, #335033, #300001)
453
* Cope with non-utf8 characters inside ``.bzrignore``.
454
(Jason Spashett, #183504)
456
* Correctly interpret "451 Rename/move failure: Directory not empty" from
457
ftp servers while trying to take a lock.
458
(Martin Pool, #528722)
460
* DirStateRevisionTree.kind() was returning wrong result when 'kind'
461
changes occured between the workingtree and one of its parents.
462
(Vincent Ladeuil, #535547)
464
* Fix ``log`` to better check ancestors even if merged revisions are involved.
465
(Vincent Ladeuil, #476293)
467
* Loading a plugin from a given path with ``BZR_PLUGINS_AT`` doesn't depend
468
on os.lisdir() order and is now reliable.
469
(Vincent Ladeuil, #552922).
471
* Many IO operations that returned ``EINTR`` were retried even if it
472
wasn't safe to do so via careless use of ``until_no_eintr``. Bazaar now
473
only retries operations that are safe to retry, and in some cases has
474
switched to operations that can be retried (e.g. ``sock.send`` rather than
476
(Andrew Bennetts, Martin <gzlist@googlemail.com>, #496813)
478
* Path conflicts now support --take-this and --take-other even when a
479
deletion is involved.
480
(Vincent Ladeuil, #531967)
482
* Network transfer amounts and rates are now displayed in SI units according
483
to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
484
(Gordon Tyler, #514399)
486
* Support kind markers for socket and fifo filesystem objects. This
487
prevents ``bzr status --short`` from crashing when those files are
488
present. (John Arbash Meinel, #303275)
490
* ``bzr mkdir DIR`` will not create DIR unless DIR's parent is a versioned
491
directory. (Parth Malwankar, #138600)
493
* SSH child processes will now ignore SIGQUIT on nix systems so breaking into
494
the debugger won't kill the session.
495
(Martin <gzlist@googlemail.com>, #162502)
497
* Tolerate patches with leading noise in ``bzr-handle-patch``.
498
(Toshio Kuratomi, Martin Pool, #502076)
500
* ``update -r`` now supports updating to revisions that are not on
501
mainline (i.e. it supports dotted revisions).
502
(Parth Malwankar, #517800)
504
* Use first apparent author not committer in GNU Changelog format.
505
(Martin von Gagern, #513322)
510
* ``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
511
``bzrlib.merge_directive.BaseMergeDirective`` and is now public.
514
* ``BranchFormat.initialize`` now takes an optional ``name`` of the colocated
515
branch to create. (Jelmer Vernooij)
517
* ``BzrDir.get_branch_transport`` now takes an optional ``name`` of the
518
colocated branch to open. (Jelmer Vernooij)
520
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
521
can set a signal handler and call ``signal.siginterrupt(signum,
522
False)`` for it, if the platform and Python version supports it.
523
(Andrew Bennetts, #496813)
525
* New ``bzrlib.initialize`` is recommended for programs using bzrlib to
526
run when starting up; it sets up several things that previously needed
527
to be done separately.
528
(Martin Pool, #507710)
530
* Exporters now support a ``per_file_timestamps`` argument to write out the
531
timestamp of the commit in which a file revision was introduced.
534
* New method ``BzrDir.list_branches()`` that returns a sequence of branches
535
present in a control directory. (Jelmer Vernooij)
537
* New method ``Repository.get_known_graph_ancestry()``.
538
(Jelmer Vernooij, #495502)
540
* New transport methods ``readlink``, ``symlink`` and ``hardlink``.
543
* Remove unused ``CommandFailed`` exception.
549
* ``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
550
``message_callback`` in the same way that commit does. (Robert Collins)
552
* ``bzrlib.builtins.Commit.run`` raises ``bzrlib.errors.BoundBranchOutOfDate``
553
rather than ``bzrlib.errors.BzrCommandError`` when the bound branch is out
554
of date. (Gary van der Merwe)
556
* ``bzrlib.commands.run_bzr`` is more extensible: callers can supply the
557
functions to load or disable plugins if they wish to use a different
558
plugin mechanism; the --help, --version and no-command name code paths
559
now use the generic pluggable command lookup infrastructure.
562
* ``bzrlib.errors.BoundBranchOutOfDate`` has a new field ``extra_help``
563
which can be set to add extra help to the error. (Gary van der Merwe)
565
* New method ``Branch.automatic_tag_name`` that can be used to find the
566
tag name for a particular revision automatically. (Jelmer Vernooij)
568
* The methods ``BzrDir.create_branch()``, ``BzrDir.destroy_branch()`` and
569
``BzrDir.open_branch()`` now take an optional ``name`` argument.
575
* bzr now has a ``.testr.conf`` file in its source tree configured
576
appropriately for running tests with Testrepository
577
(``https://launchpad.net/testrepository``). (Robert Collins)
579
* Documentation about testing with ``subunit`` has been tweaked.
582
* Known failures has been added for resolve --take-other on ParentLoop
583
conflicts. This reflects bug #537956 without fixing it.
586
* New ``bzrlib.tests.test_import_tariff`` can make assertions about what
587
Python modules are loaded, to guard against startup time or library
588
dependency regressions.
591
* PQM will now run with subunit output. To analyze a PQM error use
592
tribunal, or cat log | subunit-filter | subunit2pyunit. (Robert Collins)
594
* Stop sending apport crash files to ``.cache`` in the directory from
595
which ``bzr selftest`` was run. (Martin Pool, #422350)
597
* Tests no longer fail if "close() called during concurrent
598
operation on the same file object" occurs when closing the log file
599
(which can happen if a thread tries to write to the log file at the
600
wrong moment). An warning will be written to ``stderr`` when this
601
happens, and another warning will be written if the log file could not
602
be closed after retrying 100 times. (Andrew Bennetts, #531746)
607
:2.1.2: NOT RELEASED YET
612
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
613
(Aaron Bentley, #559436)
615
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
617
(Andrew Bennetts, #528041)
619
* Reset ``siginterrupt`` flag to False every time we handle a signal
620
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
621
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
622
errors after two window resizes.
628
* ``_remember_remote_is_before`` no longer raises AssertionError when
629
suboptimal network behaviour is noticed; instead it just mutters to the
630
log file (and warns the user if they have set the ``hpss`` debug flag).
631
This was causing unnecessary aborts for performance bugs that are minor
633
(Andrew Bennetts, #528041)
641
This is a small bugfix release. Upgrading is recommended for anyone
642
running 2.1.0 or earlier.
647
* Allow syscalls to automatically restart when ``TextUIFactory``'s
648
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
649
IO, which are often poorly handled by Python's libraries and parts of
650
bzrlib. (Andrew Bennetts, #496813)
652
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
653
(Martin Pool, #331095)
655
* Fix plugin packaging on Windows. (Ian Clatworthy, #524162)
657
* Fix stub sftp test server to call os.getcwdu().
658
(Vincent Ladeuil, #526221, #526353)
660
* Fixed CHM generation by moving the NEWS section template into
661
a separate file. (Ian Clatworthy, #524184)
663
* Merge correctly when this_tree is not a WorkingTree. (Aaron Bentley)
665
* Register SIGWINCH handler only when creating a ``TextUIFactory``; avoids
666
problems importing bzrlib from a non-main thread.
667
(Elliot Murphy, #521989)
669
* Repositories accessed via a smart server now reject being stacked on a
670
repository in an incompatible format, as is the case when accessing them
671
via other methods. This was causing fetches from those repositories via
672
a smart server (e.g. using ``bzr branch``) to receive invalid data.
673
(Andrew Bennetts, #562380)
675
* Standardize the error handling when creating a new ``StaticTuple``
676
(problems will raise TypeError). (Matt Nordhoff, #457979)
678
* Warn if pyrex is too old to compile the new ``SimpleSet`` and
679
``StaticTuple`` extensions, rather than having the build fail randomly.
680
(John Arbash Meinel, #449776)
685
* Added a link to the Desktop Guide. (Ian Clatworthy)
687
* Added What's New in Bazaar 2.1 document. (Ian Clatworthy)
689
* Drop Google Analytics from the core docs as they caused problems
690
in the CHM files. (Ian Clatworthy, #502010)
695
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
696
can set a signal handler and call ``signal.siginterrupt(signum,
697
False)`` for it, if the platform and Python version supports it.
698
(Andrew Bennetts, #496813)
704
:Codename: Strasbourg
707
This release marks our second long-term-stable series. The Bazaar team
708
has decided that we will continue to make bugfix-only 2.0.x and 2.1.x
709
releases, along with 2.2 development releases.
711
This is a fairly incremental update, focusing on polish and bugfixing.
712
There are no changes for supported disk formats. Key updates include
713
reduced memory consumption for many operations, a new per-file merge
714
hook, ignore patterns can now include '!' to exclude files, globbing
715
support for all commands on Windows, and support for addressing home
716
directories via ``bzr+ssh://host/~/`` syntax.
718
Users are encouraged to upgrade from the 2.0 stable series.
723
* Don't require testtools to use sftp.
724
(Vincent Ladeuil, #516183)
726
* Fix "AttributeError in Inter1and2Helper" during fetch.
727
(Martin Pool, #513432)
729
* ``bzr update`` performs the two merges in a more logical order and will stop
730
when it encounters conflicts.
731
(Gerard Krol, #113809)
733
* Give a better error message when doing ``bzr bind`` in an already bound
734
branch. (Neil Martinsen-Burrell, #513063)
736
* Ignore ``KeyError`` from ``remove_index`` during ``_abort_write_group``
737
in a pack repository, which can happen harmlessly if the abort occurs during
738
finishing the write group. Also use ``bzrlib.cleanup`` so that any
739
other errors that occur while aborting the individual packs won't be
740
hidden by secondary failures when removing the corresponding indices.
741
(Andrew Bennetts, #423015)
743
* Set the mtime of files exported to a directory by ``bzr export`` all to
744
the same value to avoid confusing ``make`` and other date-based build
745
systems. (Robert Collins, #515631)
750
* Fetching into experimental formats will now print a warning. (Jelmer
756
* ``Repository.deserialise_inventory`` has been renamed to
757
``Repository._deserialise_inventory`` to indicate it is private.
760
* ``Repository.get_inventory_xml`` has been renamed to
761
``Repository._get_inventory_xml`` to indicate it is private.
764
* ``Repository.serialise_inventory`` has been renamed to
765
``Repository._serialise_inventory`` to indicate it is private.
767
* Using the ``bzrlib.chk_map`` module from within multiple threads at the
768
same time was broken due to race conditions with a module level page
769
cache. This shows up as a KeyError in the ``bzrlib.lru_cache`` code with
770
``bzrlib.chk_map`` in the backtrace, and can be triggered without using
771
the same high level objects such as ``bzrlib.repository.Repository``
772
from different threads. chk_map now uses a thread local cache which may
773
increase memory pressure on processes using threads.
774
(Robert Collins, John Arbash Meinel, #514090)
776
* The new ``merge_file_content`` should now be ok with tests to avoid
778
(Vincent Ladeuil, #515597)
783
* Use ``bzrlib.cleanup`` rather than less robust ``try``/``finally``
784
blocks in several places in ``bzrlib.merge``. This avoids masking prior
785
errors when errors like ``ImmortalPendingDeletion`` occur during cleanup
787
(Andrew Bennetts, #517275)
792
* The ``remove_index`` method of
793
``bzrlib.repofmt.pack_repo.AggregateIndex`` no longer takes a ``pack``
794
argument. This argument was always ignored.
795
(Andrew Bennetts, #423015)
800
:Codename: after the bubbles
801
:2.1.0rc2: 2010-01-29
803
This is a quick-turn-around to update a small issue with our new per-file
804
merge hook. We expect no major changes from this to the final 2.1.0.
809
* The new ``merge_file_content`` hook point has been altered to provide a
810
better API where state for extensions can be stored rather than the
811
too-simple function based approach. This fixes a performance regression
812
where branch configuration would be parsed per-file during merge. As
813
part of this the included news_merger has been refactored into a base
814
helper class ``bzrlib.merge.ConfigurableFileMerger``.
815
(Robert Collins, John Arbash Meinel, #513822)
821
:Codename: the 'new' stable
822
:2.1.0rc1: 2009-01-21
824
This is the first stable release candidate for Bazaar's 2.1 series. From
825
this point onwards, the 2.1 series will be considered stable (as the 2.0
826
series) and only bugfixes are expected to be incorporated. The dozen or so
827
bugfixes in the 2.0.4 release are also included in this release (along
828
with more than 15 more bugfixes). Some of the interesting features are
829
support for per-file merge hooks, ``bzr unshelve --preview``, support
830
for using ! in ignore files to exclude files from being ignored, a small
831
memory leak was squashed, and many ``ObjectNotLocked`` errors were fixed.
832
This looks to be a very good start for a new stable series.
838
* Add bug information to log output when available.
839
(Neil Martinsen-Burrell, Guillermo Gonzalez, #251729)
841
* Added ``merge_file_content`` hook point to ``Merger``, allowing plugins
842
to register custom merge logic, e.g. to provide smarter merging for
845
* Bazaar now includes the ``news_merge`` plugin. It is disabled by
846
default, to enable it add a ``news_merge_files`` option to your
847
configuration. Consult ``bzr help news_merge`` for more information.
850
* ``bzr branch`` now takes a ``--bind`` option. This lets you
851
branch and bind all in one command. (Ian Clatworthy)
853
* ``bzr switch`` now takes a ``--revision`` option, to allow switching to
854
a specific revision of a branch. (Daniel Watkins, #183559)
856
* ``bzr unshelve --preview`` can now be used to show how a patch on the
857
shelf would be applied to the working tree.
858
(Guilherme Salgado, #308122)
860
* ``bzr update`` now takes a ``--revision`` argument. This lets you
861
change the revision of the working tree to any revision in the
862
ancestry of the current or master branch. (Matthieu Moy, Mark Hammond,
865
* ``-Dbytes`` can now be used to display the total number of bytes
866
transferred for the current command. This information is always logged
867
to ``.bzr.log`` for later inspection. (John Arbash Meinel)
869
* New ignore patterns. Patterns prefixed with '!' are exceptions to
870
ignore patterns and take precedence over regular ignores. Such
871
exceptions are used to specify files that should be versioned which
872
would otherwise be ignored. Patterns prefixed with '!!' act as regular
873
ignore patterns, but have highest precedence, even over the '!'
874
exception patterns. (John Whitley, #428031)
876
* The ``supress_warnings`` configuration option has been introduced to disable
877
various warnings (it currently only supports the ``format_deprecation``
878
warning). The new option can be set in any of the following locations:
879
``bazaar.conf``, ``locations.conf`` and/or ``branch.conf``.
8
bzr 2.1.0rc1 (not released yet)
9
###############################
12
:2.1.0rc1: 2009-01-06 (expected)
20
* The ``suppress_warnings`` configuration option has been introduced and
21
accept the ``format_deprecation`` value to disable the corresponding
22
warning for repositories. It can be set to in either ``bazaar.conf``,
23
``locations.conf`` or ``branch.conf``.
880
24
(Ted Gould, Matthew Fuller, Vincent Ladeuil)
885
* Always show a message if an OS error occurs while trying to run a
886
user-specified commit message editor.
887
(Martin Pool, #504842)
889
* ``bzr diff`` will now use the epoch when it is unable to determine
890
the timestamp of a file, if the revision it was introduced in is a
891
ghost. (Jelmer Vernooij, #295611)
893
29
* ``bzr switch -b`` can now create branches that are located using directory
894
30
services such as ``lp:``, even when the branch name doesn't contain a
895
31
'/'. (Neil Martinsen-Burrell, #495263)
966
* Add documentation on creating merges with more than one parent.
967
(Neil Martinsen-Burrell, #481526)
969
* Better explain the --uncommitted option of merge.
970
(Neil Martinsen-Burrell, #505088)
972
* Improve discussion of pending merges in the documentation for
973
``revert``. (Neil Martinsen-Burrell, #505093)
975
* Improved help for ``bzr send``.
976
(Martin Pool, Bojan Nikolic)
978
* There is a System Administrator's Guide in ``doc/en/admin-guide``,
979
including discussions of installation, relevant plugins, security and
980
backup. (Neil Martinsen-Burrell)
982
* The ``conflicts`` help topic has been renamed to ``conflict-types``.
985
* The User Reference is now presented as a series of topics.
986
Many of the included topics have link and format tweaks applied.
992
* Added ``cachedproperty`` decorator to ``bzrlib.decorators``.
995
52
* Many test features were renamed from ``FooFeature`` to ``foo_feature``
996
53
to be consistent with instances being lower case and classes being
997
54
CamelCase. For the features that were more likely to be used, we added a
998
55
deprecation thunk, but not all. (John Arbash Meinel)
1000
* Merger classes (such as ``Merge3Merger``) now expect a ``this_branch``
1001
parameter in their constructors, and provide ``this_branch`` as an
1002
attribute. (Andrew Bennetts)
1004
* The Branch hooks pre_change_branch_tip no longer masks exceptions raised
1005
by plugins - the original exceptions are now preserved. (Robert Collins)
1007
* The Transport ``Server.tearDown`` method is now renamed to
1008
``stop_server`` and ``setUp`` to ``start_server`` for consistency with
1009
our normal naming pattern, and to avoid confusion with Python's
1010
``TestCase.tearDown``. (Martin Pool)
1012
* ``WorkingTree.update`` implementations must now accept a ``revision``
1018
* Added ``BzrDir.open_branchV3`` smart server request, which can receive
1019
a string of details (such as "location is a repository") as part of a
1020
``nobranch`` response. (Andrew Bennetts, #440952)
1022
* New helper osutils.UnicodeOrBytesToBytesWriter which encodes unicode
1023
objects but passes str objects straight through. This is used for
1024
selftest but may be useful for diff and other operations that generate
1025
mixed output. (Robert Collins)
1027
* New exception ``NoRoundtrippingSupport``, for use by foreign branch
1028
plugins. (Jelmer Vernooij)
1033
* ``bzrlib.tests.permute_for_extension`` is a helper that simplifies
1034
running all tests in the current module, once against a pure python
1035
implementation, and once against an extension (pyrex/C) implementation.
1036
It can be used to dramatically simplify the implementation of
1037
``load_tests``. (John Arbash Meinel)
1039
* ``bzrlib.tests.TestCase`` now subclasses ``testtools.testcase.TestCase``.
1040
This permits features in testtools such as getUniqueInteger and
1041
getUniqueString to be used. Because of this, testtools version 0.9.2 or
1042
newer is now a dependency to run bzr selftest. Running with versions of
1043
testtools less than 0.9.2 will cause bzr to error while loading the test
1044
suite. (Robert Collins)
1046
* Shell-like tests now support the command "mv" for moving files. The
1047
syntax for ``mv file1 file2``, ``mv dir1 dir2`` and ``mv file dir`` is
1048
supported. (Neil Martinsen-Burrell)
1050
* The test progress bar no longer distinguishes tests that 'errored' from
1051
tests that 'failed' - they're all just failures.
1057
:2.0.6: NOT RELEASED YET
1062
* Additional merges after an unrelated branch has been merged with its
1063
history no longer crash when deleted files are involved.
1064
(Vincent Ladeuil, John Arbash Meinel, #375898)
1066
* ``bzr revert`` now only takes write lock on working tree, instead of on
1067
both working tree and branch.
1068
(Danny van Heumen, #498409)
1070
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
1071
permissions as ``.bzr`` directory on a POSIX OS.
1072
(Parth Malwankar, #262450)
1074
* Repositories accessed via a smart server now reject being stacked on a
1075
repository in an incompatible format, as is the case when accessing them
1076
via other methods. This was causing fetches from those repositories via
1077
a smart server (e.g. using ``bzr branch``) to receive invalid data.
1078
(Andrew Bennetts, #562380)
1085
This fifth release in our 2.0 series addresses several user-inconvenience
1086
bugs. None are critical, but upgrading is recommended for all users on
1087
earlier 2.0 releases.
1092
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
1093
(Martin Pool, #331095)
1095
* Concurrent autopacking is more resilient to already-renamed pack files.
1096
If we find that a file we are about to obsolete is already obsoleted, we
1097
do not try to rename it, and we leave the file in ``obsolete_packs``.
1098
The code is also fault tolerant if a file goes missing, assuming that
1099
another process already removed the file.
1100
(John Arbash Meinel, Gareth White, #507557)
1102
* Cope with the lockdir ``held/info`` file being empty, which seems to
1103
happen fairly often if the process is suddenly interrupted while taking
1105
(Martin Pool, #185103)
1107
* Give the warning about potentially slow cross-format fetches much
1108
earlier on in the fetch operation. Don't show this message during
1109
upgrades, and show the correct format indication for remote
1111
(Martin Pool, #456077, #515356, #513157)
1113
* Handle renames correctly when there are files or directories that
1114
differ only in case. (Chris Jones, Martin Pool, #368931)
1116
* If ``bzr push --create-prefix`` triggers an unexpected ``NoSuchFile``
1117
error, report that error rather than failing with an unhelpful
1118
``UnboundLocalError``.
1119
(Andrew Bennetts, #423563)
1121
* Running ``bzr`` command without any arguments now shows bzr
1122
version number along with rest of the help text.
1123
(Parth Malwankar, #369501)
1125
* Use osutils.O_NOINHERIT for some files on win32 to avoid PermissionDenied
1127
(Inada Naoki, #524560)
63
bzr 2.0.4 (not released yet)
64
############################
1132
* Added ``location-alias`` help topic.
1133
(Andrew Bennetts, #337834)
1135
* Fixed CHM generation by moving the NEWS section template into
1136
a separate file. (Ian Clatworthy, #524184)
1142
:Codename: smooth sailing
1145
The fourth bugfix-only release in the 2.0 series contains more than a
1146
dozen bugfixes relative to 2.0.3. The primary focus is on handling
1147
interruptions and concurrent operations more cleanly, there is also a fair
1148
improvement to ``bzr export`` when exporting a remote branch.
1154
* ``bzr annotate`` on another branch with ``-r branch:...`` no longer
1155
fails with an ``ObjectNotLocked`` error. (Andrew Bennetts, #496590)
1157
* ``bzr export dir`` now requests all file content as a record stream,
1158
rather than requsting the file content one file-at-a-time. This can make
1159
exporting over the network significantly faster (54min => 9min in one
1160
case). (John Arbash Meinel, #343218)
1162
* ``bzr serve`` no longer slowly leaks memory. The compiled
1163
``bzrlib.bencode.Encoder()`` class was using ``__del__`` to cleanup and
1164
free resources, and it should have been using ``__dealloc__``.
1165
This will likely have an impact on any other process that is serving for
1166
an extended period of time. (John Arbash Meinel, #494406)
1168
* Check for SIGINT (Ctrl-C) and other signals immediately if ``readdir``
1169
returns ``EINTR`` by calling ``PyErr_CheckSignals``. This affected the
1170
optional ``_readdir_pyx`` extension. (Andrew Bennetts, #495023)
1172
* Concurrent autopacks will no longer lose a newly created pack file.
1173
There was a race condition, where if the reload happened at the right
1174
time, the second packer would forget the name of the newly added pack
1175
file. (John Arbash Meinel, Gareth White, #507566)
1177
* Give a clearer message if the lockdir disappears after being apparently
1178
successfully taken. (Martin Pool, #498378)
1180
* Give a warning when fetching between repositories (local or remote) with
1181
sufficiently different formats that the content will need to be
1182
serialized (ie ``InterDifferingSerializer`` or ``inventory-deltas``), so
1183
the user has a clue that upgrading could make it faster.
1184
(Martin Pool, #456077)
1186
* If we fail to open ``~/.bzr.log`` write a clear message to stderr rather
1187
than using ``warning()``. The log file is opened before logging is set
1188
up, and it leads to very confusing: 'no handlers for "bzr"' messages for
1189
users, rather than something nicer.
1190
(John Arbash Meinel, Barry Warsaw, #503886)
1192
* Refuse to build with any Pyrex 0.9.4 release, as they have known bugs.
1193
(Martin Pool, John Arbash Meinel, #449372)
1195
* ``setup.py bdist_rpm`` now properly finds extra files needed for the
1196
build. (there is still the distutils bug
1197
http://bugs.python.org/issue644744) (Joe Julian, #175839)
1199
* The 2a format wasn't properly restarting autopacks when something
1200
changed underneath it (like another autopack). Now concurrent
1201
autopackers will properly succeed. (John Arbash Meinel, #495000)
1203
* ``TreeTransform`` can now handle when a delta says that the file id for
1204
the tree root changes. Rather than trying to rename your working
1205
directory, or failing early saying that you can't have multiple
1206
tree roots. This also fixes revert, update, and pull when the root id
1207
changes. (John Arbash Meinel, #494269, #504390)
1209
* ``_update_current_block`` no longer suppresses exceptions, so ^C at just
1210
the right time will get propagated, rather than silently failing to move
1211
the block pointer. (John Arbash Meinel, Gareth White, #495023)
1216
* We have a new ``test_source`` that ensures all pyrex ``cdef`` functions
1217
handle exceptions somehow. (Possibly by setting ``# cannot_raise``
1218
rather than an ``except ?:`` clause.) This should help prevent bugs like
1219
bug #495023. (John Arbash Meinel)
added
removed
NEWS
