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)
165
* Two new command hooks, ``pre_command`` and ``post_command``,
166
provide notification before and after a command has been run.
167
(Brian de Alwis, Jelmer Vernooij)
172
* ``bzr branch`` now fetches revisions when branching into an empty
173
control directory. (Jelmer Vernooij, #905594)
175
* A sane default is provided for ``ssl.ca_certs`` which should points to the
176
Certificate Authority bundle for supported platforms.
177
(Vincent Ladeuil, #920455)
179
* ``bzr branch`` generates correct target branch locations again if not
180
specified. (Jelmer Vernooij, #919218)
182
* ``bzr send`` works on treeless branches again.
183
(Jelmer Vernooij, #921591)
185
* ``bzr version`` no longer throws a UnicodeDecodeError if the .bzr.log path
186
contains non-ascii characters. (Martin Packman, #312841)
188
* Support scripts that don't call bzrlib.initialize() but still call run_bzr().
189
(Vincent Ladeuil, #917733)
191
* Test for equality instead of object identity where ROOT_PARENT is concerned.
192
(Wouter van Heyst, #881142)
194
* urllib-based HTTPS client connections now verify the server certificate
195
validity as well as the hostname.
196
(Jelmer Vernooij, Vincent Ladeuil, #651161)
202
* ``config.config_dir`` and related functions now always return paths as
203
unicode. (Martin Packman, #825826)
205
* ``ControlDir`` now has a new method ``set_branch_reference`` which can
206
be used for setting branch references. (Jelmer Vernooij)
208
* ``ControlDir.destroy_branch`` now raises ``NotBranchError`` rather than
209
``NoSuchFile`` if the branch didn't exist. (Jelmer Vernooij, #921693)
214
* A new matcher ``RevisionHistoryMatches`` has been added. (Jelmer Vernooij)
216
* Add new module ``bzrlib.url_policy_open``. (Jelmer Vernooij, #850843)
218
* ``MutableTree`` has two new hooks ``pre_transform`` and
219
``post_transform`` that are called for tree transform operations.
220
(Jelmer Vernooij, #912084)
226
* Be more careful about closing open files for pypy interoperability.
234
This is the fifth (and last) beta of the 2.5 series, leading to a 2.5.0
235
release in February 2012. Beta releases are suitable for everyday use but
236
may cause some incompatibilities with plugins.
238
This release includes many improvements in the smart server, UI polish for
239
the colocated branches, enhancements to the config framework and more
240
internal uses, bug fixes related to unicode and locale support and more.
242
All bug fixed in previous series known at the time of this release are
245
External Compatibility Breaks
246
*****************************
248
* The '.bzr/branch/email' file is no longer read to determine the users'
249
identity. Instead, the 'email' setting in '.bzr/branch/branch.conf'
250
should be used. (Jelmer Vernooij, #903894)
255
* "bzr mkdir" now includes -p (--parents) option for recursively adding
257
(Jared Hance, Jelmer Vernooij, #253529)
259
* ``config.Option`` can now declare ``override_from_env``, a list of
260
environment variables which, when set, that takes precedence over values
261
defined in configuration files. (Vincent Ladeuil, #907279)
266
* New HPSS call for ``Repository.reconcile``. (Jelmer Vernooij, #894455)
268
* Merge now has two new hooks ``pre_merge`` and ``post_merge``
269
that are called before and after a merge and can make
270
additional modifications to the trees involved.
271
(Jelmer Vernooij, #906877)
273
* Override the value returned by ``sys.getfilesystemencoding()`` for the bzr
274
script to utf-8 when it would otherwise be ascii on a posix system. This
275
will mean bzr works with non-ascii files when no locale or an incorrect
276
locale is set. (Martin Packman, #794353)
278
* ``bzr branches`` now indicates the active colocated branch.
279
(Jelmer Vernooij, #891667)
281
* ``bzr push`` now suggests using :parent if there is a parent location
282
set. (Jelmer Vernooij)
284
* ``bzr send`` now only opens a single connection, rather than two,
285
to the target branch. (Jelmer Vernooij)
290
* Allow configuration option default value to be a python callable at
291
registration. (Vincent Ladeuil, #832064)
293
* ``bzr config`` will now display the section ``[DEFAULT]`` used in
294
``bazaar.conf``. (Vincent Ladeuil, #907268)
296
* Configuration stores can now provides a specific quoting mechanism. This
297
is required to workaround ``configobj`` conflating quoting and list values
298
automatic conversion. (Vincent Ladeuil, #906897)
300
* Create obsolete_packs directory when repacking if it does not
301
exist. (Jonathan Riddell, Jelmer Vernooij, #314314)
303
* Fallback to the slower ``bzr log`` implementation when displaying a range
304
of revisions whose ancestry is not obviously on the same developement
305
line. (Vincent Ladeuil, #904744)
307
* Make lazy imports resilient when resolved concurrently from multiple
308
threads. Now the stand-in object will behave as a proxy for the real object
309
after the initial access, rather than throwing. Assigning the object to
310
multiple names should still be avoided. (Martin von Gagern, #396819)
312
* Not setting ``gpg_signing_key`` or setting it to ``default`` will use the
313
user email (obtained from the ``email`` configuration option or its
314
default value). (Vincent Ladeuil, Jelmer Vernooij, #904550)
316
* Prevent spurious InconsistentDelta error when committing a move of a
317
non-ascii directory with contents. (Rory Yorke, #185211)
319
* Properly ignore '\n' in an option reference since this cannot be part of a
320
config option identifier. (Vincent Ladeuil, #902125)
322
* Make sure that the bzr probers are always registered when
323
bzrlib.workingtree is imported. (Jelmer Vernooij, #905218)
325
* Report mistake trying to move a removed file with a non-ascii name without
326
UnicodeEncodeError being raised. (Martin Packman, #898541)
328
* Safely unquote configuration values in weird edge cases (a section seen as
329
a dictionary which is not a supported use case for the configuration
330
stacks). (Vincent Ladeuil, #908050)
332
* Stop altering ``sys.platform`` on OSX when initialising the locale.
333
(Martin Packman, #570495)
335
* Uncommit no longer removes tags if they are part of the working
336
trees pending merges. (Jelmer Vernooij, #905462)
341
* ``Config.signature_needed``, ``Config.signing_policy``,
342
``Config.gpg_signing_key``, ``Config.gpg_signing_command``,
343
``Config.checking_policy`` and ``Config.post_commit`` are now deprecated.
346
* ``Repository.get_commit_builder`` now takes a ``config_stack``
347
rather than a ``config`` argument. (Jelmer Vernooij)
349
* Scripts using bzrlib should now ensure setlocale is called on posix
350
platforms if they need a non-ascii user encoding. (Martin Packman)
352
* Send formats now accept a new optional argument ``submit_branch``,
353
which can be None or a Branch object for the submit branch location.
356
* ``VersionedFileRepository.add_revision`` no longer takes a ``config``
357
argument. (Jelmer Vernooij)
362
* Add HPSS call for ``Branch.get_checkout_format``. (Jelmer Vernooij, #894459)
364
* Add HPSS call for ``Repository.pack``. (Jelmer Vernooij, #894461)
366
* Add HPSS calls for ``Repository.iter_files_bytes``, speeding up
367
several commands including ``bzr export`` and ``bzr co --lightweight``.
368
(Jelmer Vernooij, #608640)
370
* All bzr control directories, branch formats, repository formats and
371
working tree formats now support feature flags, which are
372
serialized in their respective format files. See
373
``doc/developers/feature-flags.txt`` for details.
376
* ``bzrlib.urlutils`` now includes ``quote`` and ``unquote`` functions,
377
rather than importing them from ``urllib``. This prevents loading
378
of the ``socket``, ``ssl`` and ``urllib`` modules for
379
local bzr operations. (Jelmer Vernooij)
381
* Configuration options can be SI units by using ``int_SI_from_unicode`` as
382
their ``convert_from_unicode`` helper. (Vincent Ladeuil)
384
* Configuration stacks can now use ``StartingPathMatcher`` to select the
385
sections matching a location while respecting the order chosen by the user
386
in the configuration file: from generic sections to specific
387
sections. (Vincent Ladeuil, #832046).
389
* Configuration stores can now save incremental changes by using
390
``save_changes()`` instead of ``save()``. This reduces the number or
391
required input/outputs and allows stores to be shared between
392
stacks. (Vincent Ladeuil)
394
* ControlDir now has a get_branches method that returns a dictionary
395
whose keys are the names of the branches and whose values are the
396
branches themselves. The active branch uses the key None.
397
(Neil Martinsen-Burrell)
399
* Helper ``osutils.path_from_environ`` added for extracting a unicode path
400
from an environment variable. (Martin Packman, #832028)
402
* Helper ``win32utils.get_environ_unicode`` added for avoiding encoding
403
problems with ``os.environ.get`` use. (Martin Packman, #262874)
405
* Lazy imports can now only be absolute. (Jelmer Vernooij)
407
* Merge3Mergers now have an optional ``other_branch`` argument
408
which contains the branch from which the ``other_tree``
409
was obtained, if any. (Jelmer Vernooij)
411
* MutableTree now has a hook ``post_build_tree`` which is called after
412
a new mutable tree has been created. (Jelmer Vernooij, #912765)
414
* New HPSS call ``BzrDir.checkout_metadir``. (Jelmer Vernooij, #894459)
416
* New HPSS call ``VersionedFileRepository.get_inventories``,
417
speeding up various commands including ``bzr export``,
418
``bzr checkout`` and ``bzr cat``. (Jelmer Vernooij, #608640)
420
* The ``ConfigCommandLineStore`` is now supported by ``bzr config`` and is
421
seen as single no-name section of configuration options. (Vincent Ladeuil)
426
* New matcher ``ContainsNoVfsCalls`` which filters a list of HPSS
427
calls for VFS requests. (Jelmer Vernooij)
429
* New ``MemoryStack`` class allows for diskless tests and locally injected
430
configuration stacks. Lower level tests for predefined set of options can
431
be written without setting up configuration files. (Vincent Ladeuil)
439
This is the fourth beta of the 2.5 series, leading to a 2.5.0 release in
440
February 2012. Beta releases are suitable for everyday use but may cause
441
some incompatibilities with plugins.
443
This release includes many improvements in the smart server, UI polish for
444
the colocated branches, optimizations for revision specifiers to avoid
445
history sized operations, enhancements to the config framework, bug fixes
446
related to unicode paths and more.
448
All bug fixed in previous series known at the time of this release are
451
External Compatibility Breaks
452
*****************************
459
* Provides a ``po_merge`` plugin to automatically merge ``.po`` files with
460
``msgmerge``. See ``bzr help po_merge`` for details.
461
(Vincent Ladeuil, #884270)
466
* ``bzr branch --stacked`` now only makes a single connection to the remote
467
server rather than three. (Jelmer Vernooij, #444293)
469
* ``bzr export --uncommitted`` will export the uncommitted tree.
470
(Jelmer Vernooij, #555613)
472
* ``bzr rmbranch`` can now remove colocated branches.
473
(Jelmer Vernooij, #831464)
475
* ``bzr status`` no longer shows shelves if files are specified.
478
* ``bzr switch`` now accepts colocated branch names to switch to.
479
(Jelmer Vernooij, #826814)
481
* Plugins can now register additional "location aliases".
484
* Revision specifiers will now only browse as much history as they
485
need to, rather than grabbing the whole history unnecessarily in some
486
cases. (Jelmer Vernooij)
488
* When using ``bzr switch`` to switch to a sibling of the current
489
branch, the relative branch name should no longer be url-encoded.
495
* A new section local option ``basename`` is available to help support some
496
``bzr-pipeline`` workflows and more generally help mapping local paths to
497
remote ones. See ``bzr help configuration`` for more details.
498
(Vincent Ladeuil, #843211)
500
* Add HPSS call for looking up revision numbers from revision ids on
501
remote repositories. (Jelmer Vernooij, #640253)
503
* Add HPSS call for retrieving file contents from remote repositories.
504
Should improve performance for lightweight checkouts and exports of
505
from remote repositories. (Jelmer Vernooij, #368717, #762330, #608640)
507
* Allow lazy compiled patterns from ``bzrlib.lazy_regex`` to be
508
pickled. (Jelmer Vernooij, #893149)
510
* ``bzr info`` no longer shows empty output if only a control
511
directory is present. (Jelmer Vernooij, #159098)
513
* Cope with missing revision ids being specified to
514
``Repository.gather_stats`` HPSS call. (Jelmer Vernooij, #411290)
516
* Fix test failures on windows related to locations.conf handling.
517
(Vincent Ladeuil, #892992)
519
* Fixed parsing of the timestamp given to ``commit --commit-time``. Now
520
prohibits several invalid strings, reads the correct number of seconds,
521
and gives a better error message if the time zone offset is not given.
522
(Matt Giuca, #892657)
524
* Give meaningful file/line references when reporting deprecation warnings
525
for _CompatabilityThunkFeature based test features.
526
(Vincent Ladeuil, #897718)
528
* Make reporting of mistakes involving unversioned files with non-ascii
529
filenames work again without 'Unprintable exception' being shown.
530
(Martin Packman, #898408)
532
* Provide names for lazily registered hooks.
533
(Neil Martinsen-Burrell, #894609)
535
* Raise BadIndexKey exception in btree_index when a key is too large, fixing
536
an infinite recursion issue. (Shannon Weyrick, #720853)
538
* Resolve regression from colocated branch path handling, by ensuring that
539
unreserved characters are unquoted in URLs. (Martin Packman, #842223)
541
* Split segments from URLs for colocated branches without assuming the
542
combined form is valid. (Martin Packman, #842233)
544
* Support looking up revision numbers by revision id in empty branches.
545
(Jelmer Vernooij, #535031)
547
* Support verifying signatures on remote repositories.
548
(Jelmer Vernooij, #889694)
550
* Teach the bzr client how to reconnect if we get ``ConnectionReset``
551
while making an RPC request. This doesn't handle all possible network
552
disconnects, but it should at least handle when the server is asked to
553
shutdown gracefully. (John Arbash Meinel, #819604)
555
* When a remote format is unknown, bzr will now print a single-line error
556
message rather than a backtrace. (Jelmer Vernooij, #687226)
561
* ``BzrDir.open_branch`` and ``BranchFormat.open`` now take an optional
562
``possible_transports`` argument. (Jelmer Vernooij)
564
* New method ``Transport.set_segment_parameter``. (Jelmer Vernooij)
566
* ``Repository.verify_revision`` has been renamed to
567
``Repository.verify_revision_signature``. (Jelmer Vernooij)
569
* ``RevisionSpec.wants_revision_history`` now defaults to ``False`` and
570
is deprecated. The ``revs`` argument of
571
``RevisionInfo.from_revision_id`` is now deprecated. (Jelmer Vernooij)
573
* ``Tree.get_file_by_path`` is now deprecated. Use ``Tree.get_file`` instead.
574
(Jelmer Vernooij, #666897)
576
* Some global options for use with commands have been removed, construct
577
an ``Option`` with the name instead. (Martin Packman)
579
* The unused exception ``HistoryMissing`` has been removed.
585
* Add HPSS call for ``Repository.pack``. (Jelmer Vernooij, #894461)
587
* ``bzr config`` uses the new configuration implementation.
590
* Custom HPSS error handlers can now be installed in the smart server client
591
using the ``error_translators`` and ``no_context_error_translators``
592
registries. (Jelmer Vernooij)
594
* New HPSS calls ``Repository.has_signature_for_revision_id``,
595
``Repository.make_working_trees``, ``BzrDir.destroy_repository``,
596
``BzrDir.has_workingtree``, ``Repository.get_physical_lock_status``,
597
``Branch.get_physical_lock_status``,
598
``Branch.put_config_file``, ``Branch.break_lock``,
599
``BzrDir.destroy_branch``, ``Repository.break_lock``,
600
``VersionedFileRepository.get_serializer_format``,
601
``Repository.all_revision_ids``, ``Repository.start_write_group``,
602
``Repository.commit_write_group``, ``Repository.abort_write_group``
603
``Repository.check_write_group``, ``Repository.iter_revisions``,
604
``Repository.add_signature_revision_text`` and
605
``Repository.get_revision_signature_text``.
608
* ``RemoteBranch.get_config_stack`` and ``RemoteBzrDir.get_config_stack``
609
will now use HPSS calls where possible. (Jelmer Vernooij)
611
* The registry of merge types has been moved to ``merge`` from ``option`` but
612
``merge.get_merge_type_registry`` remains as an accessor. (Martin Packman)
617
* Avoid failures in test_transform when OS error messages are localised.
618
(Martin Packman, #891582)
620
* Tests are now subject to a time limit: by default 300s, and 120s when
621
run from 'make check', controlled by the `selftest.timeout`
622
configuration option. This is currently not supported on Windows.
630
This is the third beta of the 2.5 series, leading to a 2.5.0 release in
631
February 2012. Beta releases are suitable for everyday use but may cause
632
some incompatibilities with plugins.
634
This release includes log options for ``push`` and ``pull``, more UI polish
635
for colocated branches, a better and more coherent implementation for UI
636
dialogs, enhancements to the config framework and more.
638
This release includes all bug fixed in previous series known at the time of
641
External Compatibility Breaks
642
*****************************
649
* The ``log_format`` configuration can be used with ``-Olog_format=line`` to
650
change the format ``push`` and ``pull`` use to display the
651
revisions. I.e.: ``bzr pull -v -Olog_format=short`` will use the ``short``
652
format instead of the default ``long`` one. (Vincent Ladeuil, #861472)
654
* The new config scheme allows an alternative syntax for the 'appenpath'
655
policy relying on option expansion and defining a new 'relpath' option
656
local to a section. Instead of using '<option>:policy=appendpath', the
657
option value can de defined as 'option=xxxx/{relpath}'.
658
(Vincent Ladeuil, #832013)
663
* ``bzr info -v`` now shows the number of colocated branches
664
for control directories that support them.
665
(Jelmer Vernooij, #863285)
667
* ``bzr version-info`` now takes a ``--revision`` argument.
668
(Jelmer Vernooij, #238705)
670
* ``bzr revno`` now takes a ``--revision`` argument.
671
(Jelmer Vernooij, #870649)
673
* ``bzr serve`` now can serve from URLs rather than just from the
674
file system. I.e.: ``bzr serve -d lp:bzr`` or
675
``bzr serve -d file:///data/bzr`` (Jelmer Vernooij)
677
* all input prompts are now char-based when possible, and can be forced to
678
line-based mode by setting the ``BZR_TEXTUI_INPUT`` environment variable
679
to 'line-based'. This replace the previous shelf UI only patch using
680
``INSIDE_EMACS``. (Benoît Pierre)
685
* ``bzr info`` now shows the master branch location too for
686
treeless local branches. (Jelmer Vernooij, #258355)
688
* ``bzr mkdir --quiet`` now does not print a line for every created
689
directory. (Martin von Gagern, #869915)
691
* ``bzr mv`` does not crash when attempting to move the root of a
692
branch. (Jonathan Riddell, #809728)
694
* ``bzr shelve`` now use ``UIFactory.choose`` for input handling, making
695
it usable when creating a custom ``UIFactory`` implementation. (Benoît
698
* ``bzr clean-tree`` now use ``UIFactory.get_boolean`` for confirmation
699
prompt, making it usable when using a custom ``UIFactory``
700
implementation. (Benoît Pierre)
702
* If sending a crash through Apport fails report the Apport failure to
703
bzr.log rather than stderr. (Jonathan Riddell, #766735)
705
* ``bzr upgrade`` no longer treats 'already up-to-date' exceptions as
706
errors. (Benoît Pierre, #716560).
708
* ``bzr version-info`` no longer populates the clean state for custom
709
templates unless {clean} is explicitly asked for.
710
(Lawrence Mitchell, #882541)
712
* Fix finding the CPU count when using Python >= 2.6 on BSD-based systems.
713
(Jelmer Vernooij, #887151)
715
* ``WorkingTree.clone()`` now supports its ``revision_id`` being set
716
to the null revision. (Jelmer Vernooij, #876423)
718
* ``WorkingTree.pull`` can now pull ``NULL_REVISION``.
719
(Jelmer Vernooij, #887556)
724
* ``Branch.revision_history`` is now deprecated. (Jelmer Vernooij, #799519)
726
* Methods ``add`` and ``items`` of ``LRUCache`` and ``LRUSizeCache`` are
727
deprecated. Use normal dict-style access instead. (Martin Packman)
729
* New flag ``RepositoryFormat.supports_unreferenced_revisions`` which
730
indicates whether revisions can be present in a repository without
731
being referenced from e.g. a branch history at the same time.
734
* ``UIFactory.choose`` has been added: prompt the user for a list of
735
choices. (Benoît Pierre)
740
* ``ControlDirFormat`` now has a new method ``supports_transport``
741
which format implementations can use whether or not they can access
742
a control dir over a particular transport. (Jelmer Vernooij)
744
* ``BranchBuilder.build_commit`` now take ``parent_ids`` and
745
``allow_leftmost_as_ghost`` arguments. (Jelmer Vernooij)
750
* Ensure TestCase instances are deallocated immediately after running where
751
possible. This greatly reduces the peak resource needs of a full test suite
752
run. The new ``-Euncollected_cases`` selftest flag will add failures if any
753
case which persists pasts its expected lifetime. (Martin Packman, #613247)
755
* Report exceptions from child processes during fork instead of swallowing the
756
error and reporting that everything went okay. (Martin Packman, #804130)
762
This is the second beta of the 2.5 series, leading to a 2.5.0 release in
763
February 2012. Beta releases are suitable for everyday use but may cause some
764
incompatibilities with plugins.
766
This release includes more filtering options for ``bzr log``, idle
767
connections handling for ``bzr serve``, a ``development-colo`` experimental
768
format to flesh out the colocated branches UI, better support for foreign
769
formats, enhancements to the config framework and more.
771
This release includes all bug fixed in previous series known at the time of
776
External Compatibility Breaks
777
*****************************
784
* A new ``-O`` standard option (common to all commands) have been added. It
785
provides a value for a config option in the ``-Oname=value`` form that
786
takes precedence over all definitions found in config files. It can be
787
used multiple times to override different options.
788
(Vincent Ladeuil, #491196)
790
* ``bzr log`` now has an option called ``--omit-merges`` to omit
791
those commits that merged branches, i.e. those having more than one
793
In order to avoid confusion, the previous command line option
794
``--include-merges`` has been renamed to ``--include-merged``.
795
The old name of the command line option will still be accepted.
796
The name change also affects ``bzr missing``.
799
* ``bzr serve`` will now disconnect clients if they have not issued an RPC
800
request after 5minutes. On POSIX platforms, this will also happen for
801
``bzr serve --inet``. This can be overridden with the configuration
802
variable ``serve.client_timeout`` or in the command line parameter
803
``bzr serve --client-timeout=X``. Further, it is possible to request
804
``bzr serve [--inet]`` to shutdown gracefully by sending SIGHUP. It will
805
finish the current request, and then close the connection.
806
(John Arbash Meinel, #824797, #795025)
808
* The new experimental format ``development-colo`` supports colocated
809
branches. This format will eventually be merged back into the ``2a``
810
format when it has stabilized and there is adequate UI support for
812
(Jelmer Vernooij, #831481)
817
* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
818
every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
820
* ``bzr info -v`` can now be run against branches that don't support
821
``last_revision_info``, in which case the branch information will simply
822
not be displayed. (Jelmer Vernooij)
827
* ``bzr shelve`` can now be used in emacs shells as the input handling is
828
turned into a line-based one when ``INSIDE_EMACS`` is set (which is the
829
case for all recent emacs versions). (Vincent Ladeuil, #856261)
831
* ``bzr tags`` can now be used against remote repositories that do
832
not provide access to the revision graph. (Jelmer Vernooij, #858942)
834
* ``bzr update PATH`` will stop if you seem to be asking it to update
835
anything less than a whole tree, because that's not supported by ``bzr``'s
836
concept that the whole tree has a single basis revision. Previously, it
837
would go ahead and update the whole tree, which was surprising.
838
(Martin Pool, #557886)
840
* Don't crash if ``bzrlib.initialize()`` has not been called while accessing
841
configs. (Vincent Ladeuil, #863401)
843
* Redirects between http and https no longer discard path information
844
in some cases. (Jelmer Vernooij, #853765)
846
* The ``--overwrite`` argument to ``bzr push`` and ``bzr pull`` no longer
847
reports all tags as changed. (Jelmer Vernooij, #845396)
849
* ``WorkingTree.get_file_mtime`` now raises NoSuchId if a file id is
850
specified that is unknown. (Jelmer Vernooij, #847435)
856
* ``Branch.get_revision_delta`` has been deprecated. Use
857
``Repository.get_revision_delta`` instead. (Jelmer Vernooij, #859712)
859
* Plugins that implement custom protocols for ``bzr serve`` should now
860
also take an argument ``timeout``. This is used by the the bzr protocol
861
to close a connection if a client has been idle for more than X seconds.
862
(Default 5minutes). (John Arbash Meinel)
864
* ``Repository.fileids_altered_by_revision_ids`` has been moved to
865
``VersionedFileRepository`` and is no longer part of the standard
866
``Repository`` interface. (Jelmer Vernooij)
868
* The argument ``include_merges`` to ``missing.find_unmerged`` has
869
been renamed to ``include_merged``. The old name is still supported
870
for now but will cause a deprecation warning. (Martin von Gagern)
872
* The new method ``ControlDirFormat.is_initializable()`` returns a boolean
873
indicating whether or not it is possible to use any of the
874
initialization methods of that format to create a new control dir.
880
* ``Branch`` objects can now use a config stack with the newly introduced
881
``get_config_stack()``. Both ``get_config`` and ``get_config_stack`` can
882
be used for the same branch but it's recommended to stick to one for a
888
* Test scripts can now use ``bzr shelve`` and provide their input as
889
complete lines. (Vincent Ladeuil, #856261)
891
* Really corrupt the pack file without depending on a special length or value.
892
(Vincent Ladeuil, #807032)
900
This is the first beta of the 2.5 series, leading up to a 2.5.0
901
release in February 2012.
903
This release includes better support for gpg signing, better support for
904
i18n (mostly command help and error messages), more options to filter ``bzr
905
log`` output, more support for colocated branches ("location,branch=XXX"
906
syntax), better feedback on updated tags for various commands, faster
907
branching into an empty repository, enhancements to the config framework and
910
Beta releases are suitable for everyday use but may cause some
911
incompatibilities with plugins. Some plugins may need small updates to work
914
External Compatibility Breaks
915
*****************************
922
* A ``from_unicode`` parameter can be specified when registering a config
923
option. This implements boolean, integer and list config options when the
924
provided ``bool_from_store``, ``int_from_store`` and ``list_from_store``
925
are used for this parameter. (Vincent Ladeuil)
927
* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
928
checks to see if the most recent published source package version for
929
that project is present in the branch tags. This should help developers
930
trust whether the packaging branch is up-to-date and can be used for new
931
changes. The level of verbosity is controlled by the config item
932
``launchpad.packaging_verbosity``. It can be set to one of
939
only display if the branch is out-of-date
942
also display single-line up-to-date and missing,
946
(default) display multi-line content for all states
949
(John Arbash Meinel, #609187, #812928)
951
* Add a config option gpg_signing_key for setting which GPG key should
952
be used to sign commits. Also default to using the gpg user identity
953
which matches user_email() as set by whoami.
954
(Jonathan Riddell, #68501)
956
* An ``invalid`` parameter can be specified when registering a config option
957
to decide what should be done when invalid values are
958
encountered. 'warning' and 'error' will respectively emit a warning and
959
ignore the value or errors out. (Vincent Ladeuil)
961
* bzr add now skips large files in recursive mode. The default "large"
962
size is 20MB, and is configurable via the add.maximum_file_size
963
option. A value of 0 disables skipping. Named items passed to add are
964
never skipped. (Shannon Weyrick, #54624)
966
* ``bzr help configuration/<option>`` display the help for ``option`` for
967
all registered configuration options. (Vincent Ladeuil, #747050)
969
* ``bzr log -m`` now matches message, author, committer and bugs instead
970
of just matching the message. ``--message`` keeps its original meaning,
971
while ``--match-message, --match-author, --match-committer`` and
972
``--match-bugs`` match each of those fields. (Jacek Sieka)
974
* ``config.Option`` can now declare ``default_from_env``, a list of
975
environment variables to get a default value from. (Vincent Ladeuil)
977
* ``config.NameMatcher`` can be used to implement config stores and stacks
978
that need to provide specific option values for arbitrary unique IDs (svn
979
repository UUIDs, etc). (Vincent Ladeuil, #843638)
981
* New builtin ``bzr branches`` command, which lists all colocated branches
982
in a directory. (Jelmer Vernooij, #826820)
984
* Relative local paths can now be specified in URL syntax by using the
985
"file:" prefix. (Jelmer Vernooij)
987
* Report commits signed with expired keys in ``verify-signatures``.
988
(Jonathan Riddell, #804254)
990
* Translations are now enabled for command help, errors and globally
991
for any message using ``gettext`` given on output. (Jonathan Riddell,
997
* ``bzr add`` will now warn about nested subtrees that are skipped.
998
(Jelmer Vernooij, #187342)
1000
* ``bzr commit -m ''`` can now be used to force an empty commit message.
1001
Entering an empty commit message in the message editor still triggers
1002
an error. (Jelmer Vernooij)
1004
* ``bzr pull`` will now mention how many tags it has updated.
1005
(Jelmer Vernooij, #164450)
1007
* ``bzr tag`` no longer errors if a tag already exists but refers to the
1008
same revision, and will mention when a tag has been updated
1009
rather than created. (Jelmer Vernooij, #381203)
1011
* ``bzr uncommit`` will now remove tags that refer to removed revisions.
1012
The ``--keep-tags`` option can be used to prevent this behaviour.
1013
(Jelmer Vernooij, #605814)
1015
* Do not run i18n initialisation twice. (Jonathan Riddell)
1017
* Install translation .mo files. (Jonathan Riddell)
1019
* Locations printed by ``bzr upgrade`` are now formatted before display.
1022
* ``Repository.get_parent_map`` now estimates the size of the returned
1023
content more accurately. This means that we get closer to the desired
1024
64kB/request. For repositories converted from svn, this can be an
1025
improvement of approx 5:1 in round trips to discover the whole history.
1026
(John Arbash Meinel)
1028
* Support a ``bugtracker`` option which is used by ``bzr commit --fixes``
1029
if no bug tracker was specified on the command line.
1030
(Jelmer Vernooij, #334860)
1032
* Use ``gettext.NullTranslations`` in i18n to allow use of i18n even when
1033
translations are not turned on. (Jonathan Riddell)
1038
* ``bzr commit`` now correctly reports missing files as "removed", not
1039
"modified". (Jelmer Vernooij, #553955)
1041
* ``bzr reconfigure`` will now allow multiple non-conflicting requests
1042
in a single invocation, e.g. ``--branch`` and ``--use-shared``.
1043
(Martin von Gagern, #842993)
1045
* A call to CHKInventory's filter-method will not result in a
1046
DuplicateFileId error, if you move a subfolder and change a file in
1048
(Bastian Bowe, #809901)
1050
* Branching from a stacked branch no longer does a ``get_parent_map``
1051
request for each revisions that is in the stacked-on repository while
1052
determining what revisions need to be fetched. This mostly impacts
1053
branching initialy into an empty shared repository when the source is
1054
not the development focus. (John Arbash Meinel, #388269)
1056
* Decode ``BZR_HOME`` with fs encoding on posix platforms to avoid unicode
1057
errors. (Vincent Ladeuil, #822571)
1059
* Fix fallout from URL handling changes in 2.5 that caused an IndexError to be
1060
raised whenever a transport at the drive root was opened on windows.
1061
(Martin [gz], #841322)
1063
* Fixed loading of external merge tools from config to properly decode
1064
command-lines which contain embedded quotes. (Gordon Tyler, #828803)
1066
* Rather than an error being raised, a warning is now printed when the
1067
current user does not have permission to read a configuration file.
1068
(Jelmer Vernooij, #837324)
1070
* The pull command will now always use separate connections for the
1071
case where the destination is a heavyweight checkout of some remote
1072
branch on the same host as the source branch.
1073
(Martin von Gagern, #483661)
1075
* TreeTransformBase.fixup_new_roots no longer forces trees to have a root, so
1076
operations that use it, like merge, can now create trees without a root.
1082
* Release instructions refreshed. (Vincent Ladeuil)
1087
* ``BranchFormat.initialize`` now takes a ``append_revisions_only``
1088
argument. (Jelmer Vernooij)
1090
* ``Branch._get_checkout_format`` now takes a ``lightweight`` argument
1091
which indicates if the format should be for a lightweight or a
1092
heavyweight checkout. (Jelmer Vernooij)
1094
* ``ControlDir.create_branch`` now takes a ``append_revisions_only`` argument.
1097
* New class ``URL`` in ``bzrlib.utils`` for managing parsed URLs.
1100
* New method ``Config.get_user_option_as_int_from_SI`` added for expanding a
1101
value in SI format (i.e. "20MB", "1GB") into its integer equivalent.
1104
* New method ``InterTree.file_content_matches`` which checks that
1105
two files in different trees have the same contents.
1108
* New method ``Tree.get_file_verifier`` which allows tree implementations
1109
to return non-sha1 checksums to verify files.
1110
(Jelmer Vernooij, #720831)
1112
* New methods ``get_transport_from_path`` and ``get_transport_from_url``
1113
have been added that only support opening from a path or a URL,
1114
unlike ``get_transport``. (Jelmer Vernooij)
1116
* New registry ``OptionRegistry`` specialized for configuration options.
1119
* Remove ``AtomicFile.closed`` which has been deprecated in bzr 0.10.
1122
* Remove ``commands._builtin_commands``, ``commands.shlex_split_unicode``,
1123
``Command._maybe_expand_globs`` and ``Command.run_direct`` deprecated in
1124
2.10 and 2.2.0. (Vincent Ladeuil)
1126
* Remove ``diff.get_trees_and_branches_to_diff`` deprecated in 2.2.0.
1128
* Remove ``log.calculate_view_revisions``, ``log._filter_revision_range``,
1129
``log.get_view_revisions`` which have been deprecated in bzr 2.1.0. Also
1130
remove ``log.show_one_log`` which was never properly deprecated but wasn't
1131
used and is easy to inline if needed. (Vincent Ladeuil)
1133
* Remove ``trace.info``, ``trace.error`` and ``trace.show_log_error``
1134
deprecated in 2.1.0. (Vincent Ladeuil)
1136
* Remove ``TransportListRegistry.set_default_transport``, as the concept of
1137
a default transport is currently unused. (Jelmer Vernooij)
1139
* Remove ``UIFactory.warn_cross_format_fetch`` and
1140
``UIFactory.warn_experimental_format_fetch`` in favor of
1141
``UIFactory.show_user_warning``. (Jelmer Vernooij)
1143
* ``Tags`` containers can now declare whether they support versioned
1144
tags and whether tags can refer to ghost tags.
1147
* ``Tags.merge_to`` now returns a dictionary with the updated tags
1148
and a set of conflicts, rather than just conflicts. (Jelmer Vernooij)
1150
* There is a new class `ContentFilterTree` that provides a facade for
1151
content filtering. The `filtered` parameter to `export` is deprecated
1152
in favor of passing a filtered tree, and the specific exporter plugins
1153
no longer support it.
1156
* ``Transport`` now has a ``_parsed_url`` attribute instead of
1157
separate ``_user``, ``_password``, ``_port``, ``_scheme``, ``_host``
1158
and ``_path`` attributes. Proxies are provided for the moment but
1159
may be removed in the future. (Jelmer Vernooij)
1164
* A new debug flag ``hpss_client_no_vfs`` will now cause the HPSS client
1165
to raise a ``HpssVfsRequestNotAllowed`` exception when a VFS request
1166
is attempted. (Jelmer Vernooij)
1168
* New method ``ControlDir._get_selected_branch`` which returns the
1169
colocated branch selected using path segment parameters.
1170
(Jelmer Vernooij, #380871)
1175
* Blackbox tests (including test scripts) can be debugged interactively (see
1176
bzrlib.debug.BzrPdb for details). (Vincent Ladeuil)
1178
* `BranchBuilder.build_snapshot` now supports a "flush" action. This
1179
cleanly and reliably allows tests using `BranchBuilder` to construct
1180
branches that e.g. rename files out of a directory and unversion that
1181
directory in the same revision. Previously some changes were impossible
1182
due to the order that `build_snapshot` performs its actions.
1185
* Don't require ``os.fdatasync`` to be defined on all supported OSes
1186
(BSD-based OSes don't define it). (Vincent Ladeuil, #822649)
1188
* Fix compatibility with testtools 0.9.12. (Jelmer Vernooij, #815423)
1190
* ``LockDir`` can now be run when the local hostname is ``localhost``.
1191
(Jelmer Vernooij, #825994)
1193
* ``ModuleAvailableFeature`` won't try to import already imported modules,
1194
allowing it to be used for modules with side-effects.
1195
(Vincent Ladeuil, #712474)
1197
* Output time stamps while running ``make check`` to get better timings from
1198
pqm. (Vincent Ladeuil, #837926)
1200
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
1201
just compares the bytes in the dirstate file to its pristine state,
1202
rather than opening the WorkingTree and calling ``last_revision()``.
1203
This reduces the overall test suite time by about 10% on my laptop.
1206
* Update `TestCase.knownFailure` to the testtools way of handling expected
1207
failures to resolve Python 2.7 incompatibility. (Martin [gz], #607400)
1210
vim: tw=74 ft=rst ff=unix
added
removed
doc/en/release-notes/bzr-2.5.txt
