11
:2.5.1: NOT RELEASED YET
13
External Compatibility Breaks
14
*****************************
16
.. These may require users to change the way they use Bazaar.
21
.. New commands, options, etc that users may wish to try out.
26
.. Improvements to existing commands, especially improved performance
27
or memory usage, or better results.
32
.. Fixes for situations where bzr would previously crash or give incorrect
33
or undesirable results.
38
.. Improved or updated documentation.
43
.. Changes that may require updates in plugins or other code that uses
49
.. Major internal changes, unlikely to be visible to users or plugin
50
developers, but interesting for bzr developers.
55
.. Fixes and changes that are only relevant to bzr's test framework and
56
suite. This can include new facilities for writing tests, fixes to
57
spurious test failures and changes to the way things should be tested.
66
This release marks the start of a new long-term-stable series. From here, we
67
will only make bugfix releases on the 2.5 series (2.5.1, etc, and support it
68
until April 2017), while 2.6 will become our new development series.
70
This is a bugfix and polish release over the 2.4 series, with a large number
71
of bugs fixed (~170 for the 2.5 series alone). The 2.5 series provides a
72
faster smart protocol implementation for many operations, basic support for
73
colocated branches. We have started translating bzr with the 2.5 series:
74
https://translations.launchpad.net/bzr, more than 20 languages have already
75
been registered but these are the early days, contributions welcome.
77
Only a few bugfixes have been included since 2.5b6 so all known fixed bugs
80
Users are encouraged to upgrade from the other stable series.
83
External Compatibility Breaks
84
*****************************
96
* The names of colocated branches are used as branch nicks if no nick is
97
specified. (Aaron Bentley)
102
* Show locks in ``bzr info`` on control directories without a
103
repository. (Jelmer Vernooij, #936767)
105
* Disable ssl certificate verification on osx and windows until a native
106
access to the the root certificates is provided there.
107
(Vincent Ladeuil, #929179)
112
* Stop depending on the particular CPython ordering of dictionary keys
113
when testing the result of BzrDir.get_branches.
121
This is the sixth (and last (really)) beta of the 2.5 series, leading to a
122
2.5.0 release in March 2012. Beta releases are suitable for everyday use
123
but may cause some incompatibilities with plugins.
125
This introduces the support for colocated branches into the '2a' format in a
126
backward compatible way, fix more glitches in the colocated UI, verify https
127
certificates for the urllib https client implementation, fix some more
128
unicode issues and more.
130
All bugs fixed in previous series known at the time of this release are
133
External Compatibility Breaks
134
*****************************
141
* Support for colocated branches is now available in the default
142
format ("2a"). (Jelmer Vernooij)
147
* ``bzr switch -b`` in a standalone tree will now create a colocated branch.
148
(Jelmer Vernooij, #918197)
150
* ``bzr info`` now reports when there are present (but unused) colocated
151
branches. (Jelmer Vernooij, #891646)
153
* Checkouts can now be into target directories that already have
154
a control directory (but no branch or working tree).
155
(Jelmer Vernooij, #913980)
157
* Checkouts of colocated branches are now always lightweight.
158
(Jelmer Vernooij, #918828)
160
* Colocated branches can now have names including forward slashes, to
161
allow for namespaces. (Jelmer Vernooij, #907980)
163
* New HPSS call for ``BzrDir.get_branches``. (Jelmer Vernooij, #894460)
168
* ``bzr branch`` now fetches revisions when branching into an empty
169
control directory. (Jelmer Vernooij, #905594)
171
* A sane default is provided for ``ssl.ca_certs`` which should points to the
172
Certificate Authority bundle for supported platforms.
173
(Vincent Ladeuil, #920455)
175
* ``bzr branch`` generates correct target branch locations again if not
176
specified. (Jelmer Vernooij, #919218)
178
* ``bzr send`` works on treeless branches again.
179
(Jelmer Vernooij, #921591)
181
* ``bzr version`` no longer throws a UnicodeDecodeError if the .bzr.log path
182
contains non-ascii characters. (Martin Packman, #312841)
184
* Support scripts that don't call bzrlib.initialize() but still call run_bzr().
185
(Vincent Ladeuil, #917733)
187
* Test for equality instead of object identity where ROOT_PARENT is concerned.
188
(Wouter van Heyst, #881142)
190
* urllib-based HTTPS client connections now verify the server certificate
191
validity as well as the hostname.
192
(Jelmer Vernooij, Vincent Ladeuil, #651161)
198
* ``config.config_dir`` and related functions now always return paths as
199
unicode. (Martin Packman, #825826)
201
* ``ControlDir`` now has a new method ``set_branch_reference`` which can
202
be used for setting branch references. (Jelmer Vernooij)
204
* ``ControlDir.destroy_branch`` now raises ``NotBranchError`` rather than
205
``NoSuchFile`` if the branch didn't exist. (Jelmer Vernooij, #921693)
210
* A new matcher ``RevisionHistoryMatches`` has been added. (Jelmer Vernooij)
212
* Add new module ``bzrlib.url_policy_open``. (Jelmer Vernooij, #850843)
214
* ``MutableTree`` has two new hooks ``pre_transform`` and
215
``post_transform`` that are called for tree transform operations.
216
(Jelmer Vernooij, #912084)
222
* Be more careful about closing open files for pypy interoperability.
230
This is the fifth (and last) beta of the 2.5 series, leading to a 2.5.0
231
release in February 2012. Beta releases are suitable for everyday use but
232
may cause some incompatibilities with plugins.
234
This release includes many improvements in the smart server, UI polish for
235
the colocated branches, enhancements to the config framework and more
236
internal uses, bug fixes related to unicode and locale support and more.
238
All bug fixed in previous series known at the time of this release are
241
External Compatibility Breaks
242
*****************************
244
* The '.bzr/branch/email' file is no longer read to determine the users'
245
identity. Instead, the 'email' setting in '.bzr/branch/branch.conf'
246
should be used. (Jelmer Vernooij, #903894)
251
* "bzr mkdir" now includes -p (--parents) option for recursively adding
253
(Jared Hance, Jelmer Vernooij, #253529)
255
* ``config.Option`` can now declare ``override_from_env``, a list of
256
environment variables which, when set, that takes precedence over values
257
defined in configuration files. (Vincent Ladeuil, #907279)
262
* New HPSS call for ``Repository.reconcile``. (Jelmer Vernooij, #894455)
264
* Merge now has two new hooks ``pre_merge`` and ``post_merge``
265
that are called before and after a merge and can make
266
additional modifications to the trees involved.
267
(Jelmer Vernooij, #906877)
269
* Override the value returned by ``sys.getfilesystemencoding()`` for the bzr
270
script to utf-8 when it would otherwise be ascii on a posix system. This
271
will mean bzr works with non-ascii files when no locale or an incorrect
272
locale is set. (Martin Packman, #794353)
274
* ``bzr branches`` now indicates the active colocated branch.
275
(Jelmer Vernooij, #891667)
277
* ``bzr push`` now suggests using :parent if there is a parent location
278
set. (Jelmer Vernooij)
280
* ``bzr send`` now only opens a single connection, rather than two,
281
to the target branch. (Jelmer Vernooij)
286
* Allow configuration option default value to be a python callable at
287
registration. (Vincent Ladeuil, #832064)
289
* ``bzr config`` will now display the section ``[DEFAULT]`` used in
290
``bazaar.conf``. (Vincent Ladeuil, #907268)
292
* Configuration stores can now provides a specific quoting mechanism. This
293
is required to workaround ``configobj`` conflating quoting and list values
294
automatic conversion. (Vincent Ladeuil, #906897)
296
* Create obsolete_packs directory when repacking if it does not
297
exist. (Jonathan Riddell, Jelmer Vernooij, #314314)
299
* Fallback to the slower ``bzr log`` implementation when displaying a range
300
of revisions whose ancestry is not obviously on the same developement
301
line. (Vincent Ladeuil, #904744)
303
* Make lazy imports resilient when resolved concurrently from multiple
304
threads. Now the stand-in object will behave as a proxy for the real object
305
after the initial access, rather than throwing. Assigning the object to
306
multiple names should still be avoided. (Martin von Gagern, #396819)
308
* Not setting ``gpg_signing_key`` or setting it to ``default`` will use the
309
user email (obtained from the ``email`` configuration option or its
310
default value). (Vincent Ladeuil, Jelmer Vernooij, #904550)
312
* Prevent spurious InconsistentDelta error when committing a move of a
313
non-ascii directory with contents. (Rory Yorke, #185211)
315
* Properly ignore '\n' in an option reference since this cannot be part of a
316
config option identifier. (Vincent Ladeuil, #902125)
318
* Make sure that the bzr probers are always registered when
319
bzrlib.workingtree is imported. (Jelmer Vernooij, #905218)
321
* Report mistake trying to move a removed file with a non-ascii name without
322
UnicodeEncodeError being raised. (Martin Packman, #898541)
324
* Safely unquote configuration values in weird edge cases (a section seen as
325
a dictionary which is not a supported use case for the configuration
326
stacks). (Vincent Ladeuil, #908050)
328
* Stop altering ``sys.platform`` on OSX when initialising the locale.
329
(Martin Packman, #570495)
331
* Uncommit no longer removes tags if they are part of the working
332
trees pending merges. (Jelmer Vernooij, #905462)
337
* ``Config.signature_needed``, ``Config.signing_policy``,
338
``Config.gpg_signing_key``, ``Config.gpg_signing_command``,
339
``Config.checking_policy`` and ``Config.post_commit`` are now deprecated.
342
* ``Repository.get_commit_builder`` now takes a ``config_stack``
343
rather than a ``config`` argument. (Jelmer Vernooij)
345
* Scripts using bzrlib should now ensure setlocale is called on posix
346
platforms if they need a non-ascii user encoding. (Martin Packman)
348
* Send formats now accept a new optional argument ``submit_branch``,
349
which can be None or a Branch object for the submit branch location.
352
* ``VersionedFileRepository.add_revision`` no longer takes a ``config``
353
argument. (Jelmer Vernooij)
358
* Add HPSS call for ``Branch.get_checkout_format``. (Jelmer Vernooij, #894459)
360
* Add HPSS call for ``Repository.pack``. (Jelmer Vernooij, #894461)
362
* Add HPSS calls for ``Repository.iter_files_bytes``, speeding up
363
several commands including ``bzr export`` and ``bzr co --lightweight``.
364
(Jelmer Vernooij, #608640)
366
* All bzr control directories, branch formats, repository formats and
367
working tree formats now support feature flags, which are
368
serialized in their respective format files. See
369
``doc/developers/feature-flags.txt`` for details.
372
* ``bzrlib.urlutils`` now includes ``quote`` and ``unquote`` functions,
373
rather than importing them from ``urllib``. This prevents loading
374
of the ``socket``, ``ssl`` and ``urllib`` modules for
375
local bzr operations. (Jelmer Vernooij)
377
* Configuration options can be SI units by using ``int_SI_from_unicode`` as
378
their ``convert_from_unicode`` helper. (Vincent Ladeuil)
380
* Configuration stacks can now use ``StartingPathMatcher`` to select the
381
sections matching a location while respecting the order chosen by the user
382
in the configuration file: from generic sections to specific
383
sections. (Vincent Ladeuil, #832046).
385
* Configuration stores can now save incremental changes by using
386
``save_changes()`` instead of ``save()``. This reduces the number or
387
required input/outputs and allows stores to be shared between
388
stacks. (Vincent Ladeuil)
390
* ControlDir now has a get_branches method that returns a dictionary
391
whose keys are the names of the branches and whose values are the
392
branches themselves. The active branch uses the key None.
393
(Neil Martinsen-Burrell)
395
* Helper ``osutils.path_from_environ`` added for extracting a unicode path
396
from an environment variable. (Martin Packman, #832028)
398
* Helper ``win32utils.get_environ_unicode`` added for avoiding encoding
399
problems with ``os.environ.get`` use. (Martin Packman, #262874)
401
* Lazy imports can now only be absolute. (Jelmer Vernooij)
403
* Merge3Mergers now have an optional ``other_branch`` argument
404
which contains the branch from which the ``other_tree``
405
was obtained, if any. (Jelmer Vernooij)
407
* MutableTree now has a hook ``post_build_tree`` which is called after
408
a new mutable tree has been created. (Jelmer Vernooij, #912765)
410
* New HPSS call ``BzrDir.checkout_metadir``. (Jelmer Vernooij, #894459)
412
* New HPSS call ``VersionedFileRepository.get_inventories``,
413
speeding up various commands including ``bzr export``,
414
``bzr checkout`` and ``bzr cat``. (Jelmer Vernooij, #608640)
416
* The ``ConfigCommandLineStore`` is now supported by ``bzr config`` and is
417
seen as single no-name section of configuration options. (Vincent Ladeuil)
422
* New matcher ``ContainsNoVfsCalls`` which filters a list of HPSS
423
calls for VFS requests. (Jelmer Vernooij)
425
* New ``MemoryStack`` class allows for diskless tests and locally injected
426
configuration stacks. Lower level tests for predefined set of options can
427
be written without setting up configuration files. (Vincent Ladeuil)
435
This is the fourth beta of the 2.5 series, leading to a 2.5.0 release in
436
February 2012. Beta releases are suitable for everyday use but may cause
437
some incompatibilities with plugins.
439
This release includes many improvements in the smart server, UI polish for
440
the colocated branches, optimizations for revision specifiers to avoid
441
history sized operations, enhancements to the config framework, bug fixes
442
related to unicode paths and more.
444
All bug fixed in previous series known at the time of this release are
447
External Compatibility Breaks
448
*****************************
455
* Provides a ``po_merge`` plugin to automatically merge ``.po`` files with
456
``msgmerge``. See ``bzr help po_merge`` for details.
457
(Vincent Ladeuil, #884270)
462
* ``bzr branch --stacked`` now only makes a single connection to the remote
463
server rather than three. (Jelmer Vernooij, #444293)
465
* ``bzr export --uncommitted`` will export the uncommitted tree.
466
(Jelmer Vernooij, #555613)
468
* ``bzr rmbranch`` can now remove colocated branches.
469
(Jelmer Vernooij, #831464)
471
* ``bzr status`` no longer shows shelves if files are specified.
474
* ``bzr switch`` now accepts colocated branch names to switch to.
475
(Jelmer Vernooij, #826814)
477
* Plugins can now register additional "location aliases".
480
* Revision specifiers will now only browse as much history as they
481
need to, rather than grabbing the whole history unnecessarily in some
482
cases. (Jelmer Vernooij)
484
* When using ``bzr switch`` to switch to a sibling of the current
485
branch, the relative branch name should no longer be url-encoded.
491
* A new section local option ``basename`` is available to help support some
492
``bzr-pipeline`` workflows and more generally help mapping local paths to
493
remote ones. See ``bzr help configuration`` for more details.
494
(Vincent Ladeuil, #843211)
496
* Add HPSS call for looking up revision numbers from revision ids on
497
remote repositories. (Jelmer Vernooij, #640253)
499
* Add HPSS call for retrieving file contents from remote repositories.
500
Should improve performance for lightweight checkouts and exports of
501
from remote repositories. (Jelmer Vernooij, #368717, #762330, #608640)
503
* Allow lazy compiled patterns from ``bzrlib.lazy_regex`` to be
504
pickled. (Jelmer Vernooij, #893149)
506
* ``bzr info`` no longer shows empty output if only a control
507
directory is present. (Jelmer Vernooij, #159098)
509
* Cope with missing revision ids being specified to
510
``Repository.gather_stats`` HPSS call. (Jelmer Vernooij, #411290)
512
* Fix test failures on windows related to locations.conf handling.
513
(Vincent Ladeuil, #892992)
515
* Fixed parsing of the timestamp given to ``commit --commit-time``. Now
516
prohibits several invalid strings, reads the correct number of seconds,
517
and gives a better error message if the time zone offset is not given.
518
(Matt Giuca, #892657)
520
* Give meaningful file/line references when reporting deprecation warnings
521
for _CompatabilityThunkFeature based test features.
522
(Vincent Ladeuil, #897718)
524
* Make reporting of mistakes involving unversioned files with non-ascii
525
filenames work again without 'Unprintable exception' being shown.
526
(Martin Packman, #898408)
528
* Provide names for lazily registered hooks.
529
(Neil Martinsen-Burrell, #894609)
531
* Raise BadIndexKey exception in btree_index when a key is too large, fixing
532
an infinite recursion issue. (Shannon Weyrick, #720853)
534
* Resolve regression from colocated branch path handling, by ensuring that
535
unreserved characters are unquoted in URLs. (Martin Packman, #842223)
537
* Split segments from URLs for colocated branches without assuming the
538
combined form is valid. (Martin Packman, #842233)
540
* Support looking up revision numbers by revision id in empty branches.
541
(Jelmer Vernooij, #535031)
543
* Support verifying signatures on remote repositories.
544
(Jelmer Vernooij, #889694)
546
* Teach the bzr client how to reconnect if we get ``ConnectionReset``
547
while making an RPC request. This doesn't handle all possible network
548
disconnects, but it should at least handle when the server is asked to
549
shutdown gracefully. (John Arbash Meinel, #819604)
551
* When a remote format is unknown, bzr will now print a single-line error
552
message rather than a backtrace. (Jelmer Vernooij, #687226)
557
* ``BzrDir.open_branch`` and ``BranchFormat.open`` now take an optional
558
``possible_transports`` argument. (Jelmer Vernooij)
560
* New method ``Transport.set_segment_parameter``. (Jelmer Vernooij)
562
* ``Repository.verify_revision`` has been renamed to
563
``Repository.verify_revision_signature``. (Jelmer Vernooij)
565
* ``RevisionSpec.wants_revision_history`` now defaults to ``False`` and
566
is deprecated. The ``revs`` argument of
567
``RevisionInfo.from_revision_id`` is now deprecated. (Jelmer Vernooij)
569
* ``Tree.get_file_by_path`` is now deprecated. Use ``Tree.get_file`` instead.
570
(Jelmer Vernooij, #666897)
572
* Some global options for use with commands have been removed, construct
573
an ``Option`` with the name instead. (Martin Packman)
575
* The unused exception ``HistoryMissing`` has been removed.
581
* Add HPSS call for ``Repository.pack``. (Jelmer Vernooij, #894461)
583
* ``bzr config`` uses the new configuration implementation.
586
* Custom HPSS error handlers can now be installed in the smart server client
587
using the ``error_translators`` and ``no_context_error_translators``
588
registries. (Jelmer Vernooij)
590
* New HPSS calls ``Repository.has_signature_for_revision_id``,
591
``Repository.make_working_trees``, ``BzrDir.destroy_repository``,
592
``BzrDir.has_workingtree``, ``Repository.get_physical_lock_status``,
593
``Branch.get_physical_lock_status``,
594
``Branch.put_config_file``, ``Branch.break_lock``,
595
``BzrDir.destroy_branch``, ``Repository.break_lock``,
596
``VersionedFileRepository.get_serializer_format``,
597
``Repository.all_revision_ids``, ``Repository.start_write_group``,
598
``Repository.commit_write_group``, ``Repository.abort_write_group``
599
``Repository.check_write_group``, ``Repository.iter_revisions``,
600
``Repository.add_signature_revision_text`` and
601
``Repository.get_revision_signature_text``.
604
* ``RemoteBranch.get_config_stack`` and ``RemoteBzrDir.get_config_stack``
605
will now use HPSS calls where possible. (Jelmer Vernooij)
607
* The registry of merge types has been moved to ``merge`` from ``option`` but
608
``merge.get_merge_type_registry`` remains as an accessor. (Martin Packman)
613
* Avoid failures in test_transform when OS error messages are localised.
614
(Martin Packman, #891582)
616
* Tests are now subject to a time limit: by default 300s, and 120s when
617
run from 'make check', controlled by the `selftest.timeout`
618
configuration option. This is currently not supported on Windows.
626
This is the third beta of the 2.5 series, leading to a 2.5.0 release in
627
February 2012. Beta releases are suitable for everyday use but may cause
628
some incompatibilities with plugins.
630
This release includes log options for ``push`` and ``pull``, more UI polish
631
for colocated branches, a better and more coherent implementation for UI
632
dialogs, enhancements to the config framework and more.
634
This release includes all bug fixed in previous series known at the time of
637
External Compatibility Breaks
638
*****************************
645
* The ``log_format`` configuration can be used with ``-Olog_format=line`` to
646
change the format ``push`` and ``pull`` use to display the
647
revisions. I.e.: ``bzr pull -v -Olog_format=short`` will use the ``short``
648
format instead of the default ``long`` one. (Vincent Ladeuil, #861472)
650
* The new config scheme allows an alternative syntax for the 'appenpath'
651
policy relying on option expansion and defining a new 'relpath' option
652
local to a section. Instead of using '<option>:policy=appendpath', the
653
option value can de defined as 'option=xxxx/{relpath}'.
654
(Vincent Ladeuil, #832013)
659
* ``bzr info -v`` now shows the number of colocated branches
660
for control directories that support them.
661
(Jelmer Vernooij, #863285)
663
* ``bzr version-info`` now takes a ``--revision`` argument.
664
(Jelmer Vernooij, #238705)
666
* ``bzr revno`` now takes a ``--revision`` argument.
667
(Jelmer Vernooij, #870649)
669
* ``bzr serve`` now can serve from URLs rather than just from the
670
file system. I.e.: ``bzr serve -d lp:bzr`` or
671
``bzr serve -d file:///data/bzr`` (Jelmer Vernooij)
673
* all input prompts are now char-based when possible, and can be forced to
674
line-based mode by setting the ``BZR_TEXTUI_INPUT`` environment variable
675
to 'line-based'. This replace the previous shelf UI only patch using
676
``INSIDE_EMACS``. (Benoît Pierre)
681
* ``bzr info`` now shows the master branch location too for
682
treeless local branches. (Jelmer Vernooij, #258355)
684
* ``bzr mkdir --quiet`` now does not print a line for every created
685
directory. (Martin von Gagern, #869915)
687
* ``bzr mv`` does not crash when attempting to move the root of a
688
branch. (Jonathan Riddell, #809728)
690
* ``bzr shelve`` now use ``UIFactory.choose`` for input handling, making
691
it usable when creating a custom ``UIFactory`` implementation. (Benoît
694
* ``bzr clean-tree`` now use ``UIFactory.get_boolean`` for confirmation
695
prompt, making it usable when using a custom ``UIFactory``
696
implementation. (Benoît Pierre)
698
* If sending a crash through Apport fails report the Apport failure to
699
bzr.log rather than stderr. (Jonathan Riddell, #766735)
701
* ``bzr upgrade`` no longer treats 'already up-to-date' exceptions as
702
errors. (Benoît Pierre, #716560).
704
* ``bzr version-info`` no longer populates the clean state for custom
705
templates unless {clean} is explicitly asked for.
706
(Lawrence Mitchell, #882541)
708
* Fix finding the CPU count when using Python >= 2.6 on BSD-based systems.
709
(Jelmer Vernooij, #887151)
711
* ``WorkingTree.clone()`` now supports its ``revision_id`` being set
712
to the null revision. (Jelmer Vernooij, #876423)
714
* ``WorkingTree.pull`` can now pull ``NULL_REVISION``.
715
(Jelmer Vernooij, #887556)
720
* ``Branch.revision_history`` is now deprecated. (Jelmer Vernooij, #799519)
722
* Methods ``add`` and ``items`` of ``LRUCache`` and ``LRUSizeCache`` are
723
deprecated. Use normal dict-style access instead. (Martin Packman)
725
* New flag ``RepositoryFormat.supports_unreferenced_revisions`` which
726
indicates whether revisions can be present in a repository without
727
being referenced from e.g. a branch history at the same time.
730
* ``UIFactory.choose`` has been added: prompt the user for a list of
731
choices. (Benoît Pierre)
736
* ``ControlDirFormat`` now has a new method ``supports_transport``
737
which format implementations can use whether or not they can access
738
a control dir over a particular transport. (Jelmer Vernooij)
740
* ``BranchBuilder.build_commit`` now take ``parent_ids`` and
741
``allow_leftmost_as_ghost`` arguments. (Jelmer Vernooij)
746
* Ensure TestCase instances are deallocated immediately after running where
747
possible. This greatly reduces the peak resource needs of a full test suite
748
run. The new ``-Euncollected_cases`` selftest flag will add failures if any
749
case which persists pasts its expected lifetime. (Martin Packman, #613247)
751
* Report exceptions from child processes during fork instead of swallowing the
752
error and reporting that everything went okay. (Martin Packman, #804130)
758
This is the second beta of the 2.5 series, leading to a 2.5.0 release in
759
February 2012. Beta releases are suitable for everyday use but may cause some
760
incompatibilities with plugins.
762
This release includes more filtering options for ``bzr log``, idle
763
connections handling for ``bzr serve``, a ``development-colo`` experimental
764
format to flesh out the colocated branches UI, better support for foreign
765
formats, enhancements to the config framework and more.
767
This release includes all bug fixed in previous series known at the time of
772
External Compatibility Breaks
773
*****************************
780
* A new ``-O`` standard option (common to all commands) have been added. It
781
provides a value for a config option in the ``-Oname=value`` form that
782
takes precedence over all definitions found in config files. It can be
783
used multiple times to override different options.
784
(Vincent Ladeuil, #491196)
786
* ``bzr log`` now has an option called ``--omit-merges`` to omit
787
those commits that merged branches, i.e. those having more than one
789
In order to avoid confusion, the previous command line option
790
``--include-merges`` has been renamed to ``--include-merged``.
791
The old name of the command line option will still be accepted.
792
The name change also affects ``bzr missing``.
795
* ``bzr serve`` will now disconnect clients if they have not issued an RPC
796
request after 5minutes. On POSIX platforms, this will also happen for
797
``bzr serve --inet``. This can be overridden with the configuration
798
variable ``serve.client_timeout`` or in the command line parameter
799
``bzr serve --client-timeout=X``. Further, it is possible to request
800
``bzr serve [--inet]`` to shutdown gracefully by sending SIGHUP. It will
801
finish the current request, and then close the connection.
802
(John Arbash Meinel, #824797, #795025)
804
* The new experimental format ``development-colo`` supports colocated
805
branches. This format will eventually be merged back into the ``2a``
806
format when it has stabilized and there is adequate UI support for
808
(Jelmer Vernooij, #831481)
813
* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
814
every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
816
* ``bzr info -v`` can now be run against branches that don't support
817
``last_revision_info``, in which case the branch information will simply
818
not be displayed. (Jelmer Vernooij)
823
* ``bzr shelve`` can now be used in emacs shells as the input handling is
824
turned into a line-based one when ``INSIDE_EMACS`` is set (which is the
825
case for all recent emacs versions). (Vincent Ladeuil, #856261)
827
* ``bzr tags`` can now be used against remote repositories that do
828
not provide access to the revision graph. (Jelmer Vernooij, #858942)
830
* ``bzr update PATH`` will stop if you seem to be asking it to update
831
anything less than a whole tree, because that's not supported by ``bzr``'s
832
concept that the whole tree has a single basis revision. Previously, it
833
would go ahead and update the whole tree, which was surprising.
834
(Martin Pool, #557886)
836
* Don't crash if ``bzrlib.initialize()`` has not been called while accessing
837
configs. (Vincent Ladeuil, #863401)
839
* Redirects between http and https no longer discard path information
840
in some cases. (Jelmer Vernooij, #853765)
842
* The ``--overwrite`` argument to ``bzr push`` and ``bzr pull`` no longer
843
reports all tags as changed. (Jelmer Vernooij, #845396)
845
* ``WorkingTree.get_file_mtime`` now raises NoSuchId if a file id is
846
specified that is unknown. (Jelmer Vernooij, #847435)
852
* ``Branch.get_revision_delta`` has been deprecated. Use
853
``Repository.get_revision_delta`` instead. (Jelmer Vernooij, #859712)
855
* Plugins that implement custom protocols for ``bzr serve`` should now
856
also take an argument ``timeout``. This is used by the the bzr protocol
857
to close a connection if a client has been idle for more than X seconds.
858
(Default 5minutes). (John Arbash Meinel)
860
* ``Repository.fileids_altered_by_revision_ids`` has been moved to
861
``VersionedFileRepository`` and is no longer part of the standard
862
``Repository`` interface. (Jelmer Vernooij)
864
* The argument ``include_merges`` to ``missing.find_unmerged`` has
865
been renamed to ``include_merged``. The old name is still supported
866
for now but will cause a deprecation warning. (Martin von Gagern)
868
* The new method ``ControlDirFormat.is_initializable()`` returns a boolean
869
indicating whether or not it is possible to use any of the
870
initialization methods of that format to create a new control dir.
876
* ``Branch`` objects can now use a config stack with the newly introduced
877
``get_config_stack()``. Both ``get_config`` and ``get_config_stack`` can
878
be used for the same branch but it's recommended to stick to one for a
884
* Test scripts can now use ``bzr shelve`` and provide their input as
885
complete lines. (Vincent Ladeuil, #856261)
887
* Really corrupt the pack file without depending on a special length or value.
888
(Vincent Ladeuil, #807032)
896
This is the first beta of the 2.5 series, leading up to a 2.5.0
897
release in February 2012.
899
This release includes better support for gpg signing, better support for
900
i18n (mostly command help and error messages), more options to filter ``bzr
901
log`` output, more support for colocated branches ("location,branch=XXX"
902
syntax), better feedback on updated tags for various commands, faster
903
branching into an empty repository, enhancements to the config framework and
906
Beta releases are suitable for everyday use but may cause some
907
incompatibilities with plugins. Some plugins may need small updates to work
910
External Compatibility Breaks
911
*****************************
918
* A ``from_unicode`` parameter can be specified when registering a config
919
option. This implements boolean, integer and list config options when the
920
provided ``bool_from_store``, ``int_from_store`` and ``list_from_store``
921
are used for this parameter. (Vincent Ladeuil)
923
* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
924
checks to see if the most recent published source package version for
925
that project is present in the branch tags. This should help developers
926
trust whether the packaging branch is up-to-date and can be used for new
927
changes. The level of verbosity is controlled by the config item
928
``launchpad.packaging_verbosity``. It can be set to one of
935
only display if the branch is out-of-date
938
also display single-line up-to-date and missing,
942
(default) display multi-line content for all states
945
(John Arbash Meinel, #609187, #812928)
947
* Add a config option gpg_signing_key for setting which GPG key should
948
be used to sign commits. Also default to using the gpg user identity
949
which matches user_email() as set by whoami.
950
(Jonathan Riddell, #68501)
952
* An ``invalid`` parameter can be specified when registering a config option
953
to decide what should be done when invalid values are
954
encountered. 'warning' and 'error' will respectively emit a warning and
955
ignore the value or errors out. (Vincent Ladeuil)
957
* bzr add now skips large files in recursive mode. The default "large"
958
size is 20MB, and is configurable via the add.maximum_file_size
959
option. A value of 0 disables skipping. Named items passed to add are
960
never skipped. (Shannon Weyrick, #54624)
962
* ``bzr help configuration/<option>`` display the help for ``option`` for
963
all registered configuration options. (Vincent Ladeuil, #747050)
965
* ``bzr log -m`` now matches message, author, committer and bugs instead
966
of just matching the message. ``--message`` keeps its original meaning,
967
while ``--match-message, --match-author, --match-committer`` and
968
``--match-bugs`` match each of those fields. (Jacek Sieka)
970
* ``config.Option`` can now declare ``default_from_env``, a list of
971
environment variables to get a default value from. (Vincent Ladeuil)
973
* ``config.NameMatcher`` can be used to implement config stores and stacks
974
that need to provide specific option values for arbitrary unique IDs (svn
975
repository UUIDs, etc). (Vincent Ladeuil, #843638)
977
* New builtin ``bzr branches`` command, which lists all colocated branches
978
in a directory. (Jelmer Vernooij, #826820)
980
* Relative local paths can now be specified in URL syntax by using the
981
"file:" prefix. (Jelmer Vernooij)
983
* Report commits signed with expired keys in ``verify-signatures``.
984
(Jonathan Riddell, #804254)
986
* Translations are now enabled for command help, errors and globally
987
for any message using ``gettext`` given on output. (Jonathan Riddell,
993
* ``bzr add`` will now warn about nested subtrees that are skipped.
994
(Jelmer Vernooij, #187342)
996
* ``bzr commit -m ''`` can now be used to force an empty commit message.
997
Entering an empty commit message in the message editor still triggers
998
an error. (Jelmer Vernooij)
1000
* ``bzr pull`` will now mention how many tags it has updated.
1001
(Jelmer Vernooij, #164450)
1003
* ``bzr tag`` no longer errors if a tag already exists but refers to the
1004
same revision, and will mention when a tag has been updated
1005
rather than created. (Jelmer Vernooij, #381203)
1007
* ``bzr uncommit`` will now remove tags that refer to removed revisions.
1008
The ``--keep-tags`` option can be used to prevent this behaviour.
1009
(Jelmer Vernooij, #605814)
1011
* Do not run i18n initialisation twice. (Jonathan Riddell)
1013
* Install translation .mo files. (Jonathan Riddell)
1015
* Locations printed by ``bzr upgrade`` are now formatted before display.
1018
* ``Repository.get_parent_map`` now estimates the size of the returned
1019
content more accurately. This means that we get closer to the desired
1020
64kB/request. For repositories converted from svn, this can be an
1021
improvement of approx 5:1 in round trips to discover the whole history.
1022
(John Arbash Meinel)
1024
* Support a ``bugtracker`` option which is used by ``bzr commit --fixes``
1025
if no bug tracker was specified on the command line.
1026
(Jelmer Vernooij, #334860)
1028
* Use ``gettext.NullTranslations`` in i18n to allow use of i18n even when
1029
translations are not turned on. (Jonathan Riddell)
1034
* ``bzr commit`` now correctly reports missing files as "removed", not
1035
"modified". (Jelmer Vernooij, #553955)
1037
* ``bzr reconfigure`` will now allow multiple non-conflicting requests
1038
in a single invocation, e.g. ``--branch`` and ``--use-shared``.
1039
(Martin von Gagern, #842993)
1041
* A call to CHKInventory's filter-method will not result in a
1042
DuplicateFileId error, if you move a subfolder and change a file in
1044
(Bastian Bowe, #809901)
1046
* Branching from a stacked branch no longer does a ``get_parent_map``
1047
request for each revisions that is in the stacked-on repository while
1048
determining what revisions need to be fetched. This mostly impacts
1049
branching initialy into an empty shared repository when the source is
1050
not the development focus. (John Arbash Meinel, #388269)
1052
* Decode ``BZR_HOME`` with fs encoding on posix platforms to avoid unicode
1053
errors. (Vincent Ladeuil, #822571)
1055
* Fix fallout from URL handling changes in 2.5 that caused an IndexError to be
1056
raised whenever a transport at the drive root was opened on windows.
1057
(Martin [gz], #841322)
1059
* Fixed loading of external merge tools from config to properly decode
1060
command-lines which contain embedded quotes. (Gordon Tyler, #828803)
1062
* Rather than an error being raised, a warning is now printed when the
1063
current user does not have permission to read a configuration file.
1064
(Jelmer Vernooij, #837324)
1066
* The pull command will now always use separate connections for the
1067
case where the destination is a heavyweight checkout of some remote
1068
branch on the same host as the source branch.
1069
(Martin von Gagern, #483661)
1071
* TreeTransformBase.fixup_new_roots no longer forces trees to have a root, so
1072
operations that use it, like merge, can now create trees without a root.
1078
* Release instructions refreshed. (Vincent Ladeuil)
1083
* ``BranchFormat.initialize`` now takes a ``append_revisions_only``
1084
argument. (Jelmer Vernooij)
1086
* ``Branch._get_checkout_format`` now takes a ``lightweight`` argument
1087
which indicates if the format should be for a lightweight or a
1088
heavyweight checkout. (Jelmer Vernooij)
1090
* ``ControlDir.create_branch`` now takes a ``append_revisions_only`` argument.
1093
* New class ``URL`` in ``bzrlib.utils`` for managing parsed URLs.
1096
* New method ``Config.get_user_option_as_int_from_SI`` added for expanding a
1097
value in SI format (i.e. "20MB", "1GB") into its integer equivalent.
1100
* New method ``InterTree.file_content_matches`` which checks that
1101
two files in different trees have the same contents.
1104
* New method ``Tree.get_file_verifier`` which allows tree implementations
1105
to return non-sha1 checksums to verify files.
1106
(Jelmer Vernooij, #720831)
1108
* New methods ``get_transport_from_path`` and ``get_transport_from_url``
1109
have been added that only support opening from a path or a URL,
1110
unlike ``get_transport``. (Jelmer Vernooij)
1112
* New registry ``OptionRegistry`` specialized for configuration options.
1115
* Remove ``AtomicFile.closed`` which has been deprecated in bzr 0.10.
1118
* Remove ``commands._builtin_commands``, ``commands.shlex_split_unicode``,
1119
``Command._maybe_expand_globs`` and ``Command.run_direct`` deprecated in
1120
2.10 and 2.2.0. (Vincent Ladeuil)
1122
* Remove ``diff.get_trees_and_branches_to_diff`` deprecated in 2.2.0.
1124
* Remove ``log.calculate_view_revisions``, ``log._filter_revision_range``,
1125
``log.get_view_revisions`` which have been deprecated in bzr 2.1.0. Also
1126
remove ``log.show_one_log`` which was never properly deprecated but wasn't
1127
used and is easy to inline if needed. (Vincent Ladeuil)
1129
* Remove ``trace.info``, ``trace.error`` and ``trace.show_log_error``
1130
deprecated in 2.1.0. (Vincent Ladeuil)
1132
* Remove ``TransportListRegistry.set_default_transport``, as the concept of
1133
a default transport is currently unused. (Jelmer Vernooij)
1135
* Remove ``UIFactory.warn_cross_format_fetch`` and
1136
``UIFactory.warn_experimental_format_fetch`` in favor of
1137
``UIFactory.show_user_warning``. (Jelmer Vernooij)
1139
* ``Tags`` containers can now declare whether they support versioned
1140
tags and whether tags can refer to ghost tags.
1143
* ``Tags.merge_to`` now returns a dictionary with the updated tags
1144
and a set of conflicts, rather than just conflicts. (Jelmer Vernooij)
1146
* There is a new class `ContentFilterTree` that provides a facade for
1147
content filtering. The `filtered` parameter to `export` is deprecated
1148
in favor of passing a filtered tree, and the specific exporter plugins
1149
no longer support it.
1152
* ``Transport`` now has a ``_parsed_url`` attribute instead of
1153
separate ``_user``, ``_password``, ``_port``, ``_scheme``, ``_host``
1154
and ``_path`` attributes. Proxies are provided for the moment but
1155
may be removed in the future. (Jelmer Vernooij)
1160
* A new debug flag ``hpss_client_no_vfs`` will now cause the HPSS client
1161
to raise a ``HpssVfsRequestNotAllowed`` exception when a VFS request
1162
is attempted. (Jelmer Vernooij)
1164
* New method ``ControlDir._get_selected_branch`` which returns the
1165
colocated branch selected using path segment parameters.
1166
(Jelmer Vernooij, #380871)
1171
* Blackbox tests (including test scripts) can be debugged interactively (see
1172
bzrlib.debug.BzrPdb for details). (Vincent Ladeuil)
1174
* `BranchBuilder.build_snapshot` now supports a "flush" action. This
1175
cleanly and reliably allows tests using `BranchBuilder` to construct
1176
branches that e.g. rename files out of a directory and unversion that
1177
directory in the same revision. Previously some changes were impossible
1178
due to the order that `build_snapshot` performs its actions.
1181
* Don't require ``os.fdatasync`` to be defined on all supported OSes
1182
(BSD-based OSes don't define it). (Vincent Ladeuil, #822649)
1184
* Fix compatibility with testtools 0.9.12. (Jelmer Vernooij, #815423)
1186
* ``LockDir`` can now be run when the local hostname is ``localhost``.
1187
(Jelmer Vernooij, #825994)
1189
* ``ModuleAvailableFeature`` won't try to import already imported modules,
1190
allowing it to be used for modules with side-effects.
1191
(Vincent Ladeuil, #712474)
1193
* Output time stamps while running ``make check`` to get better timings from
1194
pqm. (Vincent Ladeuil, #837926)
1196
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
1197
just compares the bytes in the dirstate file to its pristine state,
1198
rather than opening the WorkingTree and calling ``last_revision()``.
1199
This reduces the overall test suite time by about 10% on my laptop.
1202
* Update `TestCase.knownFailure` to the testtools way of handling expected
1203
failures to resolve Python 2.7 incompatibility. (Martin [gz], #607400)
1206
vim: tw=74 ft=rst ff=unix