5
5
.. contents:: List of Releases
8
bzr 2.1.0rc1 (not released yet)
9
###############################
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)
11
102
:Codename: the 'new' stable
12
:2.1.0rc1: 2009-01-06 (expected)
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.
20
119
* Add bug information to log output when available.
21
120
(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.
23
131
* ``bzr branch`` now takes a ``--bind`` option. This lets you
24
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)
26
137
* ``bzr unshelve --preview`` can now be used to show how a patch on the
27
138
shelf would be applied to the working tree.
28
139
(Guilherme Salgado, #308122)
36
147
transferred for the current command. This information is always logged
37
148
to ``.bzr.log`` for later inspection. (John Arbash Meinel)
39
* The ``suppress_warnings`` configuration option has been introduced and
40
accept the ``format_deprecation`` value to disable the corresponding
41
warning for repositories. It can be set to in either ``bazaar.conf``,
42
``locations.conf`` or ``branch.conf``.
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``.
43
161
(Ted Gould, Matthew Fuller, Vincent Ladeuil)
49
167
user-specified commit message editor.
50
168
(Martin Pool, #504842)
52
* ``bzr export dir`` now requests all file content as a record stream,
53
rather than requsting the file content one file-at-a-time. This can make
54
exporting over the network significantly faster (54min => 9min in one
55
case). (John Arbash Meinel, #343218)
57
* ``bzr serve`` no longer slowly leaks memory. The compiled
58
``bzrlib.bencode.Encoder()`` class was using ``__del__`` to cleanup and
59
free resources, and it should have been using ``__dealloc__``.
60
This will likely have an impact on any other process that is serving for
61
an extended period of time. (John Arbash Meinel, #494406)
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)
63
174
* ``bzr switch -b`` can now create branches that are located using directory
64
175
services such as ``lp:``, even when the branch name doesn't contain a
67
178
* ``bzr unshelve`` has improved messages about what it is doing.
68
179
(Neil Martinsen-Burrell, #496917)
70
* Check for SIGINT (Ctrl-C) and other signals immediately if ``readdir``
71
returns ``EINTR`` by calling ``PyErr_CheckSignals``. This affected the
72
optional ``_readdir_pyx`` extension. (Andrew Bennetts, #495023)
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)
74
188
* Fix "Too many concurrent requests" in reconcile when network connection
75
189
fails. (Andrew Bennetts, #503878)
84
198
* FTP transports support Unicode paths by encoding/decoding them as utf8.
85
199
(Vincent Ladeuil, #472161)
87
* Give a clearer message if the lockdir disappears after being apparently
88
successfully taken. (Martin Pool, #498378)
90
201
* Listen to the SIGWINCH signal to update the terminal width.
91
202
(Vincent Ladeuil, #316357)
93
* The 2a format wasn't properly restarting autopacks when something
94
changed underneath it (like another autopack). Now concurrent
95
autopackers will properly succeed. (John Arbash Meinel, #495000)
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)
97
212
* When operations update the working tree, all affected files should end
98
213
up with the same mtime. (eg. when versioning a generated file, if you
108
223
``try``/``finally`` blocks where applicable as it is simpler and more
109
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)
111
233
* Push will now inform the user when they are trying to push to a foreign
112
234
VCS for which roundtripping is not supported, and will suggest them to
113
235
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)
125
256
* Improved help for ``bzr send``.
126
257
(Martin Pool, Bojan Nikolic)
273
* Added ``cachedproperty`` decorator to ``bzrlib.decorators``.
142
276
* Many test features were renamed from ``FooFeature`` to ``foo_feature``
143
277
to be consistent with instances being lower case and classes being
144
278
CamelCase. For the features that were more likely to be used, we added a
145
279
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)
147
285
* The Branch hooks pre_change_branch_tip no longer masks exceptions raised
148
286
by plugins - the original exceptions are now preserved. (Robert Collins)
190
332
tests that 'failed' - they're all just failures.
193
bzr 2.0.4 (not released yet)
194
############################
197
:2.0.4: smooth sailing
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.
223
366
returns ``EINTR`` by calling ``PyErr_CheckSignals``. This affected the
224
367
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)
226
374
* Give a clearer message if the lockdir disappears after being apparently
227
375
successfully taken. (Martin Pool, #498378)
229
* Give a warning when fetching between local repositories with
377
* Give a warning when fetching between repositories (local or remote) with
230
378
sufficiently different formats that the content will need to be
231
serialized (ie ``InterDifferingSerializer``) so the user has a clue that
232
upgrading could make it faster.
379
serialized (ie ``InterDifferingSerializer`` or ``inventory-deltas``), so
380
the user has a clue that upgrading could make it faster.
233
381
(Martin Pool, #456077)
235
383
* If we fail to open ``~/.bzr.log`` write a clear message to stderr rather
588
724
* ``--parallel=fork`` is now compatible with --subunit.
589
725
(Robert Collins, Vincent Ladeuil, #419776)
727
* Reporting of failures shows test ids not descriptions and thus shows
728
parameterised tests correctly. (Robert Collins)
591
730
* TestNotApplicable is now handled within the TestCase.run method rather
592
731
than being looked for within ``ExtendedTestResult.addError``. This
593
732
provides better handling with other ``TestResult`` objects, degrading to
added
removed
NEWS
