11
:2.6b3: NOT RELEASED YET
13
External Compatibility Breaks
14
*****************************
16
.. These may require users to change the way they use Bazaar.
18
* ``bzr lp-propose --approve`` now also adds an "Approve" vote to the merge
19
proposal. (Jonathan Lange)
24
* ``bzr switch --store`` now stores uncommitted changes in the branch, and
25
restores them when switching back to the branch. (Aaron Bentley)
27
* New option '--context' for 'bzr diff' command, to configure the amount of
28
context (i.e. showing lines that have not changed). Also available as the
29
named parameter 'context_lines' to bzrlib.diff.internal_diff(). (Paul Nixon)
31
* The 'ping' plugin is now shipped with bzr. (Jelmer Vernooij)
36
* ``bzr help env-variables`` now points users at ``bzr help configuration``
37
which has much more detailed information on the same stuff.
40
* ``bzr lp-find-proposal`` now only cares about the revision-id that is
41
specified, not the branch you use. This was enabled by a new API call in
42
Launchpad's web service. (Aaron Bentley)
44
* Implement authentication.conf password obfuscation, the password_encoding
45
option can now be set to base64. (Florian Dorn)
47
* Local configurations files (i.e. accessed on the local file system like
48
``bazaar.conf`` and ``locations.conf``) are now shared, reducing the
49
number of IOs when querying a configuation option. (Vincent Ladeuil,
52
* ``bzr lp-propose --approve`` now correctly specifies the approved revision
53
and provides an "Approve" vote from the proposer, allowing for smoother
54
interaction with downstream merge tools. (Jonathan Lange)
59
* Add a ``progress_bar`` configuration option defaulting to
60
``BZR_PROGRESS_BAR``. This can be set in ``bazaar.conf`` or specified from
61
the command line with ``-Oprogress_bar=text``. (Vincent Ladeuil, #388275)
63
* ``Authentication.Config`` now always returns unicode user names and passwords.
64
(Vincent Ladeuil, #514301)
66
* Fixed a bug where the entire contents of ``/etc/mailname`` is read in.
67
We only want to read in the first line so that comments could be added
71
* Fixed a syntax error in ``doc/ja/user-guide/http_smart_server.txt`` that
72
causes breakage with docutils 0.9.1.
73
(Vincent Ladeuil, Jelmer Vernooij, #1066307)
75
* Warn when ``--show-base`` is used for ``pull`` in a treeless branch
76
instead of failing. It's useless but harmless. (Vincent Ladeuil, #1022160)
78
* When a missing referenced chk root error is encountered, bzr now suggests
79
running ``bzr reconcile --canonicalize-chks``. (Jelmer Vernooij, #1021537)
81
* When pushing a specific revision, create the new working tree at
82
that revision. (#484516, Neil Martinsen-Burrell)
87
.. Improved or updated documentation.
89
* Clarify ``bzr config`` usages especially around other option references
90
expansion. (Vincent Ladeuil, #996401)
95
.. Changes that may require updates in plugins or other code that uses
101
* Add __iter__ to http ResponseFile. (Jelmer Vernooij, #1184021)
103
* The launchpad plugin now requires API 1.6.0 or later. This version shipped
104
with Ubuntu 9.10. (Aaron Bentley)
109
* Fix test failures occurring only with LC_ALL=C, when prompting a user,
110
``stderr`` encoding should be preferred over terminal encoding if
111
available. (Vincent Ladeuil, #1086209)
118
This is the second beta for the 2.6 series, leading up to a 2.6.0 release in
121
This release includes minor bug fixes.
123
This release includes all bugs fixed in previous series known at the time of
126
Beta releases are suitable for everyday use but may cause some
127
incompatibilities with plugins. Some plugins may need small updates to work
130
External Compatibility Breaks
131
*****************************
138
* New option ``--overwrite-tags`` for ``bzr pull`` and ``bzr push``.
139
(Jelmer Vernooij, #681792)
141
* The 'grep' plugin is now shipped with bzr. (Jelmer Vernooij)
146
* Colocated branches can now be addressed using the 'co:NAME' rather than
147
the more complex 'file://.,branch=NAME'. (Jelmer Vernooij, #833665)
152
* "bzr missing" now shows tag names when displaying revision information.
153
(#559072, Neil Martinsen-Burrell)
155
* Fix ``branch.conf`` saving when unlocking the branch for BranchFormat4.
156
(Vincent Ladeuil, #1020007)
158
* Implement ``ResponseFile.readline`` and ``ReponseFile.tell``,
159
fixing some clones over HTTP. (Jelmer Vernooij, #963769)
161
* Option values set on locked branches should be saved only when the branch
162
is finally unlocked. (Vincent Ladeuil, #948339)
167
* Document "bzr lp-propose", "bzr register-branch" and
168
the other Launchpad plugin commands in bzr(1).
169
(Jelmer Vernooij, #843801, #163995)
171
* Force format registration to avoid generate_docs.py traceback when the
172
registry is empty. (Vincent Ladeuil, #956860)
174
* Generate ``ENVIRONMENT`` section in bzr(1) from known environment variable
175
list rather than hardcoding. (Jelmer Vernooij, #197618)
181
* ``register_filter_stack_map`` and ``lazy_register_filter_stack_map``
182
are noew deprecated. Instead, use ``filter_stacks_registry.register``
183
and ``filter_stacks_registry.register_lazy``.
186
* Remove deprecated Branch.import_last_revision(). (Jelmer Vernooij)
188
* Remove deprecated ``RepositoryFormat.register_format``.
191
* Remove deprecated Repository.get_ancestry(). (Jelmer Vernooij)
193
* Remove deprecated Repository.iter_reverse_revision_history().
196
* The previously deprecated ``bzrlib.annotate.annotate_file`` function
197
has been removed. (Jelmer Vernooij)
208
* Fix test failures by removing a remaining reference to ``features.sphinx``
209
which isn't needed anymore since we don't test the texinfo sphinx builder
210
anymore either. (Vincent Ladeuil)
217
This is the first beta for the 2.6 series, leading up to a 2.6.0 release in
220
This release includes ssl certificates verification from the urllib-based
221
http implementation turned on by default, fixes some UI issues around
222
colocated branches, documentation fixes and more.
224
This release includes all bugs fixed in previous series known at the time of
227
Beta releases are suitable for everyday use but may cause some
228
incompatibilities with plugins. Some plugins may need small updates to work
231
External Compatibility Breaks
232
*****************************
239
* Access to HTTPS URLs now uses the urrllib implementation by default.
240
For the old pycurl-based implementation, specify ``https+pycurl://`` as
241
the URL scheme when accessing a HTTPS location.
242
(Jelmer Vernooij, #125055)
244
* Add short option alias ``-N`` for ``--no-recurse``.
245
(Jelmer Vernooij, #945904)
247
* Avoid 'Invalid range access' errors when whole files are retrieved with
248
transport.http.get() . (Vincent Ladeuil, #924746)
250
* ``bzr rmbranch`` now supports removing colocated branches.
251
(Jelmer Vernooij, #920653)
253
* ``bzr rmbranch`` no longer removes active branches unless ``--force``
254
is specified. (Jelmer Vernooij, #922953)
256
* ``bzr verify-signatures`` now shows a progress bar.
259
* Two new command hooks, ``pre_command`` and ``post_command``,
260
provide notification before and after a command has been run.
261
(Brian de Alwis, Jelmer Vernooij)
266
* Fix ``bzr config`` display for ``RegistryOption`` values.
267
(Vincent Ladeuil, #930182)
272
* Prevent lines of command descriptions starting with a dot to
273
accidentally be interpreted as a roff macro in bzr(1).
274
(Jelmer Vernooij, #711079)
276
* Properly format apostrophes in manual page. (Jelmer Vernooij, #234771)
281
* ``GPGStrategy.do_verifications`` has been deprecated.
284
* File ids in the ``Tree`` API can now be bytestring as previously,
285
or tuples of bytestrings.
288
* ``mail_client`` now accepts a configuration stack object rather than
289
an old style Config object. (Jelmer Vernooij)
291
* New method ``Repository.verify_revision_signatures``.
294
* New configuration option class ``RegistryOption`` which is backed
295
onto a registry. (Jelmer Vernooij)
297
* New convenience API method ``WorkingTree.get_config_stack``.
301
``branch.PullResult.__int__`` deprecated in 2.3.0,
302
``branch.PushResult.__int__`` deprecated in 2.3.0,
303
``branch.BranchFormat.get_default_format`` deprecated in 2.4.0,
304
``branch.BranchFormat.get_formats`` deprecated in 2.4.0,
305
``branch.BranchFormat.set_default_format`` deprecated in 2.4.0,
306
``branch.BranchFormat.register_format`` deprecated in 2.4.0,
307
``branch.BranchFormat.unregister_format`` deprecated in 2.4.0,
308
``bzrdir.BzrDir.generate_backup_name`` deprecated in 2.3.0,
309
``bzrdir.BzrProber.register_bzrdir_format`` deprecated in 2.4.0,
310
``bzrdir.BzrProber.unregister_bzrdir_format`` deprecated in 2.4.0,
311
``config.Config.get_editor`` deprecated in 2.4.0,
312
``hooks.known_hooks_key_to_parent_and_attribute`` deprecated in 2.3,
313
``hooks.Hooks.create_hook`` deprecated in 2.4,
314
``inventory.Inventory.__contains__`` deprecated in 2.4.0,
315
``merge.Merge3Merger.scalar_three_way`` deprecated in 2.2.0,
316
``merge.Merge3Merger.fix_root`` deprecated in 2.4.0,
317
``transform.TreeTransformBase.has_named_child`` deprecated in 2.3.0,
318
``transform.get_backup_name`` deprecated in 2.3.0,
319
``transform._get_backup_name`` deprecated in 2.3.0,
320
``workingtree.WorkingTreeFormat.get_default_format`` deprecated in 2.4.0,
321
``workingtree.WorkingTreeFormat.register_format`` deprecated in 2.4.0,
322
``workingtree.WorkingTreeFormat.register_extra_format`` deprecated in 2.4.0,
323
``workingtree.WorkingTreeFormat.unregister_extra_format`` deprecated in 2.4.0,
324
``workingtree.WorkingTreeFormat.get_formats`` deprecated in 2.4.0,
325
``workingtree.WorkingTreeFormat.set_default_format`` deprecated in 2.4.0,
326
``workingtree.WorkingTreeFormat.unregister_format`` deprecated in 2.4.0,
329
* Remove deprecated ``Branch.set_revision_history`` and
330
``Branch.revision_history`` methods and the ``set_rh``
331
hook on ``Branch``. (Jelmer Vernooij)
336
* ``Tree.path2id`` now once again accepts a list of path elements
337
in addition to a path. (Jelmer Vernooij)
339
* Turn config option expansion on by default. The only options for which
340
this should be disabled are templates which should already have used
341
conf.get(option, expand=False) or conf.get_user_option(option,
342
expand=False). (Vincent Ladeuil)
345
vim: tw=74 ft=rst ff=unix