14
This release marks the start of a new long-term-stable series. From here, we
15
will only make bugfix releases on the 2.6 series (2.6.1, etc), while 2.7
16
will become our new development series.
18
This is a bugfix and polish release over the 2.4 series, with a large number
19
of bugs fixed (~170 for the 2.5 series alone). The 2.5 series provides a
20
faster smart protocol implementation for many operations, basic support for
21
colocated branches. We have started translating bzr with the 2.5 series:
22
https://translations.launchpad.net/bzr, more than 20 languages have already
23
been registered but these are the early days, contributions welcome.
25
Only a few bugfixes have been included since 2.5b6 so all known fixed bugs
28
Users are encouraged to upgrade from the other stable series.
30
External Compatibility Breaks
31
*****************************
33
* ``bzr lp-propose --approve`` now also adds an "Approve" vote to the merge
34
proposal. (Jonathan Lange)
39
* ``bzr switch --store`` now stores uncommitted changes in the branch, and
40
restores them when switching back to the branch. (Aaron Bentley)
42
* New option '--context' for 'bzr diff' command, to configure the amount of
43
context (i.e. showing lines that have not changed). Also available as the
44
named parameter 'context_lines' to bzrlib.diff.internal_diff(). (Paul Nixon)
46
* The 'grep' plugin is now shipped with bzr. (Jelmer Vernooij)
48
* The 'ping' plugin is now shipped with bzr. (Jelmer Vernooij)
53
* ``bzr help env-variables`` now points users at ``bzr help configuration``
54
which has much more detailed information on the same stuff.
57
* ``bzr lp-find-proposal`` now only cares about the revision-id that is
58
specified, not the branch you use. This was enabled by a new API call in
59
Launchpad's web service. (Aaron Bentley)
61
* Implement authentication.conf password obfuscation, the password_encoding
62
option can now be set to base64. (Florian Dorn)
64
* Local configurations files (i.e. accessed on the local file system like
65
``bazaar.conf`` and ``locations.conf``) are now shared, reducing the
66
number of IOs when querying a configuation option. (Vincent Ladeuil,
69
* ``bzr lp-propose --approve`` now correctly specifies the approved revision
70
and provides an "Approve" vote from the proposer, allowing for smoother
71
interaction with downstream merge tools. (Jonathan Lange)
76
* Add a ``progress_bar`` configuration option defaulting to
77
``BZR_PROGRESS_BAR``. This can be set in ``bazaar.conf`` or specified from
78
the command line with ``-Oprogress_bar=text``. (Vincent Ladeuil, #388275)
80
* ``Authentication.Config`` now always returns unicode user names and passwords.
81
(Vincent Ladeuil, #514301)
83
* Fixed a bug where the entire contents of ``/etc/mailname`` is read in.
84
We only want to read in the first line so that comments could be added
88
* Fixed a syntax error in ``doc/ja/user-guide/http_smart_server.txt`` that
89
causes breakage with docutils 0.9.1.
90
(Vincent Ladeuil, Jelmer Vernooij, #1066307)
92
* Support utf8 characters in platform names even without looking inside the
93
box (Fedora's Schrödinger's Cat).
94
(Toshio Kuratomi, Vincent Ladeuil, #1195783)
96
* Warn when ``--show-base`` is used for ``pull`` in a treeless branch
97
instead of failing. It's useless but harmless. (Vincent Ladeuil, #1022160)
99
* When a missing referenced chk root error is encountered, bzr now suggests
100
running ``bzr reconcile --canonicalize-chks``. (Jelmer Vernooij)
102
* When pushing a specific revision, create the new working tree at
103
that revision. (#484516, Neil Martinsen-Burrell)
108
* Clarify ``bzr config`` usages especially around other option references
109
expansion. (Vincent Ladeuil, #996401)
119
* Add __iter__ to http ResponseFile. (Jelmer Vernooij, #1184021)
121
* The launchpad plugin now requires API 1.6.0 or later. This version shipped
122
with Ubuntu 9.10. (Aaron Bentley)
124
* Better align with upstream gzip.py in tuned_gzip.py. We may lose a bit of
125
performance but that's for knit and weave formats and already partly
126
deprecated, better keep compatibility than failing fast ;)
127
(Vincent Ladeuil, #1116079)
132
* Fix test failures occurring only with LC_ALL=C, when prompting a user,
133
``stderr`` encoding should be preferred over terminal encoding if
134
available. (Vincent Ladeuil, #1086209)
141
This is the second beta for the 2.6 series, leading up to a 2.6.0 release in
144
This release includes minor bug fixes.
146
This release includes all bugs fixed in previous series known at the time of
149
Beta releases are suitable for everyday use but may cause some
150
incompatibilities with plugins. Some plugins may need small updates to work
153
External Compatibility Breaks
154
*****************************
161
* New option ``--overwrite-tags`` for ``bzr pull`` and ``bzr push``.
162
(Jelmer Vernooij, #681792)
167
* Colocated branches can now be addressed using the 'co:NAME' rather than
168
the more complex 'file://.,branch=NAME'. (Jelmer Vernooij, #833665)
173
* "bzr missing" now shows tag names when displaying revision information.
174
(#559072, Neil Martinsen-Burrell)
176
* Fix ``branch.conf`` saving when unlocking the branch for BranchFormat4.
177
(Vincent Ladeuil, #1020007)
179
* Implement ``ResponseFile.readline`` and ``ReponseFile.tell``,
180
fixing some clones over HTTP. (Jelmer Vernooij, #963769)
182
* Option values set on locked branches should be saved only when the branch
183
is finally unlocked. (Vincent Ladeuil, #948339)
188
* Document "bzr lp-propose", "bzr register-branch" and
189
the other Launchpad plugin commands in bzr(1).
190
(Jelmer Vernooij, #843801, #163995)
192
* Force format registration to avoid generate_docs.py traceback when the
193
registry is empty. (Vincent Ladeuil, #956860)
195
* Generate ``ENVIRONMENT`` section in bzr(1) from known environment variable
196
list rather than hardcoding. (Jelmer Vernooij, #197618)
202
* ``register_filter_stack_map`` and ``lazy_register_filter_stack_map``
203
are noew deprecated. Instead, use ``filter_stacks_registry.register``
204
and ``filter_stacks_registry.register_lazy``.
207
* Remove deprecated Branch.import_last_revision(). (Jelmer Vernooij)
209
* Remove deprecated ``RepositoryFormat.register_format``.
212
* Remove deprecated Repository.get_ancestry(). (Jelmer Vernooij)
214
* Remove deprecated Repository.iter_reverse_revision_history().
217
* The previously deprecated ``bzrlib.annotate.annotate_file`` function
218
has been removed. (Jelmer Vernooij)
229
* Fix test failures by removing a remaining reference to ``features.sphinx``
230
which isn't needed anymore since we don't test the texinfo sphinx builder
231
anymore either. (Vincent Ladeuil)
238
This is the first beta for the 2.6 series, leading up to a 2.6.0 release in
241
This release includes ssl certificates verification from the urllib-based
242
http implementation turned on by default, fixes some UI issues around
243
colocated branches, documentation fixes and more.
245
This release includes all bugs fixed in previous series known at the time of
248
Beta releases are suitable for everyday use but may cause some
249
incompatibilities with plugins. Some plugins may need small updates to work
252
External Compatibility Breaks
253
*****************************
260
* Access to HTTPS URLs now uses the urrllib implementation by default.
261
For the old pycurl-based implementation, specify ``https+pycurl://`` as
262
the URL scheme when accessing a HTTPS location.
263
(Jelmer Vernooij, #125055)
265
* Add short option alias ``-N`` for ``--no-recurse``.
266
(Jelmer Vernooij, #945904)
268
* Avoid 'Invalid range access' errors when whole files are retrieved with
269
transport.http.get() . (Vincent Ladeuil, #924746)
271
* ``bzr rmbranch`` now supports removing colocated branches.
272
(Jelmer Vernooij, #920653)
274
* ``bzr rmbranch`` no longer removes active branches unless ``--force``
275
is specified. (Jelmer Vernooij, #922953)
277
* ``bzr verify-signatures`` now shows a progress bar.
280
* Two new command hooks, ``pre_command`` and ``post_command``,
281
provide notification before and after a command has been run.
282
(Brian de Alwis, Jelmer Vernooij)
287
* Fix ``bzr config`` display for ``RegistryOption`` values.
288
(Vincent Ladeuil, #930182)
293
* Prevent lines of command descriptions starting with a dot to
294
accidentally be interpreted as a roff macro in bzr(1).
295
(Jelmer Vernooij, #711079)
297
* Properly format apostrophes in manual page. (Jelmer Vernooij, #234771)
302
* ``GPGStrategy.do_verifications`` has been deprecated.
305
* File ids in the ``Tree`` API can now be bytestring as previously,
306
or tuples of bytestrings.
309
* ``mail_client`` now accepts a configuration stack object rather than
310
an old style Config object. (Jelmer Vernooij)
312
* New method ``Repository.verify_revision_signatures``.
315
* New configuration option class ``RegistryOption`` which is backed
316
onto a registry. (Jelmer Vernooij)
318
* New convenience API method ``WorkingTree.get_config_stack``.
322
``branch.PullResult.__int__`` deprecated in 2.3.0,
323
``branch.PushResult.__int__`` deprecated in 2.3.0,
324
``branch.BranchFormat.get_default_format`` deprecated in 2.4.0,
325
``branch.BranchFormat.get_formats`` deprecated in 2.4.0,
326
``branch.BranchFormat.set_default_format`` deprecated in 2.4.0,
327
``branch.BranchFormat.register_format`` deprecated in 2.4.0,
328
``branch.BranchFormat.unregister_format`` deprecated in 2.4.0,
329
``bzrdir.BzrDir.generate_backup_name`` deprecated in 2.3.0,
330
``bzrdir.BzrProber.register_bzrdir_format`` deprecated in 2.4.0,
331
``bzrdir.BzrProber.unregister_bzrdir_format`` deprecated in 2.4.0,
332
``config.Config.get_editor`` deprecated in 2.4.0,
333
``hooks.known_hooks_key_to_parent_and_attribute`` deprecated in 2.3,
334
``hooks.Hooks.create_hook`` deprecated in 2.4,
335
``inventory.Inventory.__contains__`` deprecated in 2.4.0,
336
``merge.Merge3Merger.scalar_three_way`` deprecated in 2.2.0,
337
``merge.Merge3Merger.fix_root`` deprecated in 2.4.0,
338
``transform.TreeTransformBase.has_named_child`` deprecated in 2.3.0,
339
``transform.get_backup_name`` deprecated in 2.3.0,
340
``transform._get_backup_name`` deprecated in 2.3.0,
341
``workingtree.WorkingTreeFormat.get_default_format`` deprecated in 2.4.0,
342
``workingtree.WorkingTreeFormat.register_format`` deprecated in 2.4.0,
343
``workingtree.WorkingTreeFormat.register_extra_format`` deprecated in 2.4.0,
344
``workingtree.WorkingTreeFormat.unregister_extra_format`` deprecated in 2.4.0,
345
``workingtree.WorkingTreeFormat.get_formats`` deprecated in 2.4.0,
346
``workingtree.WorkingTreeFormat.set_default_format`` deprecated in 2.4.0,
347
``workingtree.WorkingTreeFormat.unregister_format`` deprecated in 2.4.0,
350
* Remove deprecated ``Branch.set_revision_history`` and
351
``Branch.revision_history`` methods and the ``set_rh``
352
hook on ``Branch``. (Jelmer Vernooij)
357
* ``Tree.path2id`` now once again accepts a list of path elements
358
in addition to a path. (Jelmer Vernooij)
360
* Turn config option expansion on by default. The only options for which
361
this should be disabled are templates which should already have used
362
conf.get(option, expand=False) or conf.get_user_option(option,
363
expand=False). (Vincent Ladeuil)
366
vim: tw=74 ft=rst ff=unix
added
removed
doc/en/release-notes/bzr-2.6.txt
