5
5
.. contents:: List of Releases
8
bzr 2.2.0b1 (not released yet)
9
##############################
17
* ``Repository.get_inventory_sha1()`` has been removed. (Jelmer Vernooij)
22
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
23
``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
24
as resolved is still accessible via the ``--done`` default action.
27
bzr 2.1.0 (not released yet)
28
############################
36
* Fix "AttributeError in Inter1and2Helper" during fetch.
37
(Martin Pool, #513432)
39
* Set the mtime of files exported to a directory by ``bzr export`` all to
40
the same value to avoid confusing ``make`` and other date-based build
41
systems. (Robert Collins, #515631)
52
* ``Repository.deserialise_inventory`` has been renamed to
53
``Repository._deserialise_inventory`` to indicate it is private.
56
* ``Repository.get_inventory_xml`` has been renamed to
57
``Repository._get_inventory_xml`` to indicate it is private.
60
* ``Repository.serialise_inventory`` has been renamed to
61
``Repository._serialise_inventory`` to indicate it is private.
68
* Using the ``bzrlib.chk_map`` module from within multiple threads at the
69
same time was broken due to race conditions with a module level page
70
cache. This shows up as a KeyError in the ``bzrlib.lru_cache`` code with
71
``bzrlib.chk_map`` in the backtrace, and can be triggered without using
72
the same high level objects such as ``bzrlib.repository.Repository``
73
from different threads. chk_map now uses a thread local cache which may
74
increase memory pressure on processes using threads.
75
(Robert Collins, John Arbash Meinel, #514090)
81
:Codename: after the bubbles
84
This is a quick-turn-around to update a small issue with our new per-file
85
merge hook. We expect no major changes from this to the final 2.1.0.
90
* The new ``merge_file_content`` hook point has been altered to provide a
91
better API where state for extensions can be stored rather than the
92
too-simple function based approach. This fixes a performance regression
93
where branch configuration would be parsed per-file during merge. As
94
part of this the included news_merger has been refactored into a base
95
helper class ``bzrlib.merge.ConfigurableFileMerger``.
96
(Robert Collins, John Arbash Meinel, #513822)
8
bzr 2.1.0rc1 (not released yet)
9
###############################
102
11
:Codename: the 'new' stable
103
:2.1.0rc1: 2009-01-21
105
This is the first stable release candidate for Bazaar's 2.1 series. From
106
this point onwards, the 2.1 series will be considered stable (as the 2.0
107
series) and only bugfixes are expected to be incorporated. The dozen or so
108
bugfixes in the 2.0.4 release are also included in this release (along
109
with more than 15 more bugfixes). Some of the interesting features are
110
support for per-file merge hooks, ``bzr unshelve --preview``, support
111
for using ! in ignore files to exclude files from being ignored, a small
112
memory leak was squashed, and many ``ObjectNotLocked`` errors were fixed.
113
This looks to be a very good start for a new stable series.
12
:2.1.0rc1: 2009-01-06 (expected)
119
20
* Add bug information to log output when available.
120
21
(Neil Martinsen-Burrell, Guillermo Gonzalez, #251729)
122
* Added ``merge_file_content`` hook point to ``Merger``, allowing plugins
123
to register custom merge logic, e.g. to provide smarter merging for
126
* Bazaar now includes the ``news_merge`` plugin. It is disabled by
127
default, to enable it add a ``news_merge_files`` option to your
128
configuration. Consult ``bzr help news_merge`` for more information.
131
* ``bzr branch`` now takes a ``--bind`` option. This lets you
132
branch and bind all in one command. (Ian Clatworthy)
134
* ``bzr switch`` now takes a ``--revision`` option, to allow switching to
135
a specific revision of a branch. (Daniel Watkins, #183559)
137
* ``bzr unshelve --preview`` can now be used to show how a patch on the
138
shelf would be applied to the working tree.
139
(Guilherme Salgado, #308122)
141
23
* ``bzr update`` now takes a ``--revision`` argument. This lets you
142
24
change the revision of the working tree to any revision in the
143
25
ancestry of the current or master branch. (Matthieu Moy, Mark Hammond,
147
29
transferred for the current command. This information is always logged
148
30
to ``.bzr.log`` for later inspection. (John Arbash Meinel)
150
* New ignore patterns. Patterns prefixed with '!' are exceptions to
151
ignore patterns and take precedence over regular ignores. Such
152
exceptions are used to specify files that should be versioned which
153
would otherwise be ignored. Patterns prefixed with '!!' act as regular
154
ignore patterns, but have highest precedence, even over the '!'
155
exception patterns. (John Whitley, #428031)
157
* The ``supress_warnings`` configuration option has been introduced to disable
158
various warnings (it currently only supports the ``format_deprecation``
159
warning). The new option can be set in any of the following locations:
160
``bazaar.conf``, ``locations.conf`` and/or ``branch.conf``.
32
* The ``suppress_warnings`` configuration option has been introduced and
33
accept the ``format_deprecation`` value to disable the corresponding
34
warning for repositories. It can be set to in either ``bazaar.conf``,
35
``locations.conf`` or ``branch.conf``.
161
36
(Ted Gould, Matthew Fuller, Vincent Ladeuil)
166
* Always show a message if an OS error occurs while trying to run a
167
user-specified commit message editor.
168
(Martin Pool, #504842)
42
* ``bzr export dir`` now requests all file content as a record stream,
43
rather than requsting the file content one file-at-a-time. This can make
44
exporting over the network significantly faster (54min => 9min in one
45
case). (John Arbash Meinel, #343218)
170
* ``bzr diff`` will now use the epoch when it is unable to determine
171
the timestamp of a file, if the revision it was introduced in is a
172
ghost. (Jelmer Vernooij, #295611)
47
* ``bzr serve`` no longer slowly leaks memory. The compiled
48
``bzrlib.bencode.Encoder()`` class was using ``__del__`` to cleanup and
49
free resources, and it should have been using ``__dealloc__``.
50
This will likely have an impact on any other process that is serving for
51
an extended period of time. (John Arbash Meinel, #494406)
174
53
* ``bzr switch -b`` can now create branches that are located using directory
175
54
services such as ``lp:``, even when the branch name doesn't contain a
178
57
* ``bzr unshelve`` has improved messages about what it is doing.
179
58
(Neil Martinsen-Burrell, #496917)
181
* Concurrent autopacking is more resilient to already-renamed pack files.
182
If we find that a file we are about to obsolete is already obsoleted, we
183
do not try to rename it, and we leave the file in ``obsolete_packs``.
184
The code is also fault tolerant if a file goes missing, assuming that
185
another process already removed the file.
186
(John Arbash Meinel, Gareth White, #507557)
188
* Fix "Too many concurrent requests" in reconcile when network connection
189
fails. (Andrew Bennetts, #503878)
191
* Fixed a side effect mutation of ``RemoteBzrDirFormat._network_name``
192
that caused some tests to fail when run in a non-default order.
193
Probably no user impact. (Martin Pool, #504102)
195
* Fixed ``ObjectNotLocked`` error in ``bzr cat -rbranch:../foo FILE``.
196
(Andrew Bennetts, #506274)
198
* FTP transports support Unicode paths by encoding/decoding them as utf8.
199
(Vincent Ladeuil, #472161)
60
* Check for SIGINT (Ctrl-C) and other signals immediately if ``readdir``
61
returns ``EINTR`` by calling ``PyErr_CheckSignals``. This affected the
62
optional ``_readdir_pyx`` extension. (Andrew Bennetts, #495023)
64
* Give a clearer message if the lockdir disappears after being apparently
65
successfully taken. (Martin Pool, #498378)
201
67
* Listen to the SIGWINCH signal to update the terminal width.
202
68
(Vincent Ladeuil, #316357)
204
* Progress bars are now hidden when ``--quiet`` is given.
205
(Martin Pool, #320035)
207
* ``SilentUIFactory`` now supports ``make_output_stream`` and discards
208
whatever is written to it. This un-breaks some plugin tests that
209
depended on this behaviour.
210
(Martin Pool, #499757)
70
* The 2a format wasn't properly restarting autopacks when something
71
changed underneath it (like another autopack). Now concurrent
72
autopackers will properly succeed. (John Arbash Meinel, #495000)
212
74
* When operations update the working tree, all affected files should end
213
75
up with the same mtime. (eg. when versioning a generated file, if you
221
* Added ``add_cleanup`` and ``cleanup_now`` to ``bzrlib.command.Command``.
222
All the builtin commands now use ``add_cleanup`` rather than
223
``try``/``finally`` blocks where applicable as it is simpler and more
224
robust. (Andrew Bennetts)
226
* All except a small number of storage formats are now hidden, making
227
the help for numerous commands far more digestible. (Ian Clatworthy)
229
* Attempts to open a shared repository as a branch (e.g. ``bzr branch
230
path/to/repo``) will now include "location is a repository" as a hint in
231
the error message. (Brian de Alwis, Andrew Bennetts, #440952)
233
83
* Push will now inform the user when they are trying to push to a foreign
234
84
VCS for which roundtripping is not supported, and will suggest them to
235
85
use dpush. (Jelmer Vernooij)
247
* Add documentation on creating merges with more than one parent.
248
(Neil Martinsen-Burrell, #481526)
250
* Better explain the --uncommitted option of merge.
251
(Neil Martinsen-Burrell, #505088)
253
* Improve discussion of pending merges in the documentation for
254
``revert``. (Neil Martinsen-Burrell, #505093)
256
* Improved help for ``bzr send``.
257
(Martin Pool, Bojan Nikolic)
259
97
* There is a System Administrator's Guide in ``doc/en/admin-guide``,
260
98
including discussions of installation, relevant plugins, security and
261
backup. (Neil Martinsen-Burrell)
263
* The ``conflicts`` help topic has been renamed to ``conflict-types``.
266
* The User Reference is now presented as a series of topics.
267
Many of the included topics have link and format tweaks applied.
273
* Added ``cachedproperty`` decorator to ``bzrlib.decorators``.
276
104
* Many test features were renamed from ``FooFeature`` to ``foo_feature``
277
105
to be consistent with instances being lower case and classes being
278
106
CamelCase. For the features that were more likely to be used, we added a
279
107
deprecation thunk, but not all. (John Arbash Meinel)
281
* Merger classes (such as ``Merge3Merger``) now expect a ``this_branch``
282
parameter in their constructors, and provide ``this_branch`` as an
283
attribute. (Andrew Bennetts)
285
* The Branch hooks pre_change_branch_tip no longer masks exceptions raised
286
by plugins - the original exceptions are now preserved. (Robert Collins)
288
* The Transport ``Server.tearDown`` method is now renamed to
289
``stop_server`` and ``setUp`` to ``start_server`` for consistency with
290
our normal naming pattern, and to avoid confusion with Python's
291
``TestCase.tearDown``. (Martin Pool)
293
109
* ``WorkingTree.update`` implementations must now accept a ``revision``
299
* Added ``BzrDir.open_branchV3`` smart server request, which can receive
300
a string of details (such as "location is a repository") as part of a
301
``nobranch`` response. (Andrew Bennetts, #440952)
303
115
* New helper osutils.UnicodeOrBytesToBytesWriter which encodes unicode
304
116
objects but passes str objects straight through. This is used for
305
117
selftest but may be useful for diff and other operations that generate
324
136
testtools less than 0.9.2 will cause bzr to error while loading the test
325
137
suite. (Robert Collins)
327
* Shell-like tests now support the command "mv" for moving files. The
328
syntax for ``mv file1 file2``, ``mv dir1 dir2`` and ``mv file dir`` is
329
supported. (Neil Martinsen-Burrell)
331
139
* The test progress bar no longer distinguishes tests that 'errored' from
332
140
tests that 'failed' - they're all just failures.
339
:Codename: smooth sailing
342
The fourth bugfix-only release in the 2.0 series contains more than a
343
dozen bugfixes relative to 2.0.3. The primary focus is on handling
344
interruptions and concurrent operations more cleanly, there is also a fair
345
improvement to ``bzr export`` when exporting a remote branch.
143
bzr 2.0.4 (not released yet)
144
############################
147
:2.0.4: smooth sailing
351
* ``bzr annotate`` on another branch with ``-r branch:...`` no longer
352
fails with an ``ObjectNotLocked`` error. (Andrew Bennetts, #496590)
354
158
* ``bzr export dir`` now requests all file content as a record stream,
355
159
rather than requsting the file content one file-at-a-time. This can make
356
160
exporting over the network significantly faster (54min => 9min in one
366
170
returns ``EINTR`` by calling ``PyErr_CheckSignals``. This affected the
367
171
optional ``_readdir_pyx`` extension. (Andrew Bennetts, #495023)
369
* Concurrent autopacks will no longer lose a newly created pack file.
370
There was a race condition, where if the reload happened at the right
371
time, the second packer would forget the name of the newly added pack
372
file. (John Arbash Meinel, Gareth White, #507566)
374
173
* Give a clearer message if the lockdir disappears after being apparently
375
174
successfully taken. (Martin Pool, #498378)
377
* Give a warning when fetching between repositories (local or remote) with
378
sufficiently different formats that the content will need to be
379
serialized (ie ``InterDifferingSerializer`` or ``inventory-deltas``), so
380
the user has a clue that upgrading could make it faster.
381
(Martin Pool, #456077)
383
* If we fail to open ``~/.bzr.log`` write a clear message to stderr rather
384
than using ``warning()``. The log file is opened before logging is set
385
up, and it leads to very confusing: 'no handlers for "bzr"' messages for
386
users, rather than something nicer.
387
(John Arbash Meinel, Barry Warsaw, #503886)
389
* Refuse to build with any Pyrex 0.9.4 release, as they have known bugs.
390
(Martin Pool, John Arbash Meinel, #449372)
392
* ``setup.py bdist_rpm`` now properly finds extra files needed for the
393
build. (there is still the distutils bug
394
http://bugs.python.org/issue644744) (Joe Julian, #175839)
396
176
* The 2a format wasn't properly restarting autopacks when something
397
177
changed underneath it (like another autopack). Now concurrent
398
178
autopackers will properly succeed. (John Arbash Meinel, #495000)
400
* ``TreeTransform`` can now handle when a delta says that the file id for
401
the tree root changes. Rather than trying to rename your working
402
directory, or failing early saying that you can't have multiple
403
tree roots. This also fixes revert, update, and pull when the root id
404
changes. (John Arbash Meinel, #494269, #504390)
406
180
* ``_update_current_block`` no longer suppresses exceptions, so ^C at just
407
181
the right time will get propagated, rather than silently failing to move
408
182
the block pointer. (John Arbash Meinel, Gareth White, #495023)
724
510
* ``--parallel=fork`` is now compatible with --subunit.
725
511
(Robert Collins, Vincent Ladeuil, #419776)
727
* Reporting of failures shows test ids not descriptions and thus shows
728
parameterised tests correctly. (Robert Collins)
730
513
* TestNotApplicable is now handled within the TestCase.run method rather
731
514
than being looked for within ``ExtendedTestResult.addError``. This
732
515
provides better handling with other ``TestResult`` objects, degrading to
added
removed
NEWS
