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
* Fix a traceback when trying to checkout a tree that also has an entry
67
with file-id `TREE_ROOT` somewhere other than at the root directory.
68
(John Arbash Meinel, #830947)
70
* Fixed a bug where the entire contents of ``/etc/mailname`` is read in.
71
We only want to read in the first line so that comments could be added
75
* Fixed a syntax error in ``doc/ja/user-guide/http_smart_server.txt`` that
76
causes breakage with docutils 0.9.1.
77
(Vincent Ladeuil, Jelmer Vernooij, #1066307)
79
* Some filesystems give ``EOPNOTSUPP`` when trying to call ``fdatasync``.
80
This shouldn't be treated as a fatal error.
81
(John Arbash Meinel, #1075108)
83
* Warn when ``--show-base`` is used for ``pull`` in a treeless branch
84
instead of failing. It's useless but harmless. (Vincent Ladeuil, #1022160)
86
* When a missing referenced chk root error is encountered, bzr now suggests
87
running ``bzr reconcile --canonicalize-chks``. (Jelmer Vernooij, #1021537)
89
* When pushing a specific revision, create the new working tree at
90
that revision. (#484516, Neil Martinsen-Burrell)
95
.. Improved or updated documentation.
97
* Clarify ``bzr config`` usages especially around other option references
98
expansion. (Vincent Ladeuil, #996401)
103
.. Changes that may require updates in plugins or other code that uses
109
* The launchpad plugin now requires API 1.6.0 or later. This version shipped
110
with Ubuntu 9.10. (Aaron Bentley)
115
* Fix test failures occurring only with LC_ALL=C, when prompting a user,
116
``stderr`` encoding should be preferred over terminal encoding if
117
available. (Vincent Ladeuil, #1086209)
125
This is the second beta for the 2.6 series, leading up to a 2.6.0 release in
128
This release includes minor bug fixes.
130
This release includes all bugs fixed in previous series known at the time of
133
Beta releases are suitable for everyday use but may cause some
134
incompatibilities with plugins. Some plugins may need small updates to work
137
External Compatibility Breaks
138
*****************************
145
* New option ``--overwrite-tags`` for ``bzr pull`` and ``bzr push``.
146
(Jelmer Vernooij, #681792)
148
* The 'grep' plugin is now shipped with bzr. (Jelmer Vernooij)
153
* Colocated branches can now be addressed using the 'co:NAME' rather than
154
the more complex 'file://.,branch=NAME'. (Jelmer Vernooij, #833665)
159
* "bzr missing" now shows tag names when displaying revision information.
160
(#559072, Neil Martinsen-Burrell)
162
* Fix ``branch.conf`` saving when unlocking the branch for BranchFormat4.
163
(Vincent Ladeuil, #1020007)
165
* Implement ``ResponseFile.readline`` and ``ReponseFile.tell``,
166
fixing some clones over HTTP. (Jelmer Vernooij, #963769)
168
* Option values set on locked branches should be saved only when the branch
169
is finally unlocked. (Vincent Ladeuil, #948339)
174
* Document "bzr lp-propose", "bzr register-branch" and
175
the other Launchpad plugin commands in bzr(1).
176
(Jelmer Vernooij, #843801, #163995)
178
* Force format registration to avoid generate_docs.py traceback when the
179
registry is empty. (Vincent Ladeuil, #956860)
181
* Generate ``ENVIRONMENT`` section in bzr(1) from known environment variable
182
list rather than hardcoding. (Jelmer Vernooij, #197618)
188
* ``register_filter_stack_map`` and ``lazy_register_filter_stack_map``
189
are noew deprecated. Instead, use ``filter_stacks_registry.register``
190
and ``filter_stacks_registry.register_lazy``.
193
* Remove deprecated Branch.import_last_revision(). (Jelmer Vernooij)
195
* Remove deprecated ``RepositoryFormat.register_format``.
198
* Remove deprecated Repository.get_ancestry(). (Jelmer Vernooij)
200
* Remove deprecated Repository.iter_reverse_revision_history().
203
* The previously deprecated ``bzrlib.annotate.annotate_file`` function
204
has been removed. (Jelmer Vernooij)
215
* Fix test failures by removing a remaining reference to ``features.sphinx``
216
which isn't needed anymore since we don't test the texinfo sphinx builder
217
anymore either. (Vincent Ladeuil)
224
This is the first beta for the 2.6 series, leading up to a 2.6.0 release in
227
This release includes ssl certificates verification from the urllib-based
228
http implementation turned on by default, fixes some UI issues around
229
colocated branches, documentation fixes and more.
231
This release includes all bugs fixed in previous series known at the time of
234
Beta releases are suitable for everyday use but may cause some
235
incompatibilities with plugins. Some plugins may need small updates to work
238
External Compatibility Breaks
239
*****************************
246
* Access to HTTPS URLs now uses the urrllib implementation by default.
247
For the old pycurl-based implementation, specify ``https+pycurl://`` as
248
the URL scheme when accessing a HTTPS location.
249
(Jelmer Vernooij, #125055)
251
* Add short option alias ``-N`` for ``--no-recurse``.
252
(Jelmer Vernooij, #945904)
254
* Avoid 'Invalid range access' errors when whole files are retrieved with
255
transport.http.get() . (Vincent Ladeuil, #924746)
257
* ``bzr rmbranch`` now supports removing colocated branches.
258
(Jelmer Vernooij, #920653)
260
* ``bzr rmbranch`` no longer removes active branches unless ``--force``
261
is specified. (Jelmer Vernooij, #922953)
263
* ``bzr verify-signatures`` now shows a progress bar.
266
* Two new command hooks, ``pre_command`` and ``post_command``,
267
provide notification before and after a command has been run.
268
(Brian de Alwis, Jelmer Vernooij)
273
* Fix ``bzr config`` display for ``RegistryOption`` values.
274
(Vincent Ladeuil, #930182)
279
* Prevent lines of command descriptions starting with a dot to
280
accidentally be interpreted as a roff macro in bzr(1).
281
(Jelmer Vernooij, #711079)
283
* Properly format apostrophes in manual page. (Jelmer Vernooij, #234771)
288
* ``GPGStrategy.do_verifications`` has been deprecated.
291
* File ids in the ``Tree`` API can now be bytestring as previously,
292
or tuples of bytestrings.
295
* ``mail_client`` now accepts a configuration stack object rather than
296
an old style Config object. (Jelmer Vernooij)
298
* New method ``Repository.verify_revision_signatures``.
301
* New configuration option class ``RegistryOption`` which is backed
302
onto a registry. (Jelmer Vernooij)
304
* New convenience API method ``WorkingTree.get_config_stack``.
308
``branch.PullResult.__int__`` deprecated in 2.3.0,
309
``branch.PushResult.__int__`` deprecated in 2.3.0,
310
``branch.BranchFormat.get_default_format`` deprecated in 2.4.0,
311
``branch.BranchFormat.get_formats`` deprecated in 2.4.0,
312
``branch.BranchFormat.set_default_format`` deprecated in 2.4.0,
313
``branch.BranchFormat.register_format`` deprecated in 2.4.0,
314
``branch.BranchFormat.unregister_format`` deprecated in 2.4.0,
315
``bzrdir.BzrDir.generate_backup_name`` deprecated in 2.3.0,
316
``bzrdir.BzrProber.register_bzrdir_format`` deprecated in 2.4.0,
317
``bzrdir.BzrProber.unregister_bzrdir_format`` deprecated in 2.4.0,
318
``config.Config.get_editor`` deprecated in 2.4.0,
319
``hooks.known_hooks_key_to_parent_and_attribute`` deprecated in 2.3,
320
``hooks.Hooks.create_hook`` deprecated in 2.4,
321
``inventory.Inventory.__contains__`` deprecated in 2.4.0,
322
``merge.Merge3Merger.scalar_three_way`` deprecated in 2.2.0,
323
``merge.Merge3Merger.fix_root`` deprecated in 2.4.0,
324
``transform.TreeTransformBase.has_named_child`` deprecated in 2.3.0,
325
``transform.get_backup_name`` deprecated in 2.3.0,
326
``transform._get_backup_name`` deprecated in 2.3.0,
327
``workingtree.WorkingTreeFormat.get_default_format`` deprecated in 2.4.0,
328
``workingtree.WorkingTreeFormat.register_format`` deprecated in 2.4.0,
329
``workingtree.WorkingTreeFormat.register_extra_format`` deprecated in 2.4.0,
330
``workingtree.WorkingTreeFormat.unregister_extra_format`` deprecated in 2.4.0,
331
``workingtree.WorkingTreeFormat.get_formats`` deprecated in 2.4.0,
332
``workingtree.WorkingTreeFormat.set_default_format`` deprecated in 2.4.0,
333
``workingtree.WorkingTreeFormat.unregister_format`` deprecated in 2.4.0,
336
* Remove deprecated ``Branch.set_revision_history`` and
337
``Branch.revision_history`` methods and the ``set_rh``
338
hook on ``Branch``. (Jelmer Vernooij)
343
* ``Tree.path2id`` now once again accepts a list of path elements
344
in addition to a path. (Jelmer Vernooij)
346
* Turn config option expansion on by default. The only options for which
347
this should be disabled are templates which should already have used
348
conf.get(option, expand=False) or conf.get_user_option(option,
349
expand=False). (Vincent Ladeuil)
352
vim: tw=74 ft=rst ff=unix