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.
29
* ``bzr branches`` will now also list sibling branches when
30
the current location is a lightweight checkout of a branch in
31
a shared repository. (Jelmer Vernooij)
36
.. Fixes for situations where bzr would previously crash or give incorrect
37
or undesirable results.
39
* Fixed merge tool availability checking and invocation to search the
40
Windows App Path registry in addition to the PATH. (Gordon Tyler, #939605)
42
* Make sure configuration options can provide their own help topic.
43
(Jelmer Vernooij, #941672)
48
.. Improved or updated documentation.
53
.. Changes that may require updates in plugins or other code that uses
59
.. Major internal changes, unlikely to be visible to users or plugin
60
developers, but interesting for bzr developers.
65
.. Fixes and changes that are only relevant to bzr's test framework and
66
suite. This can include new facilities for writing tests, fixes to
67
spurious test failures and changes to the way things should be tested.
76
This release marks the start of a new long-term-stable series. From here, we
77
will only make bugfix releases on the 2.5 series (2.5.1, etc, and support it
78
until April 2017), while 2.6 will become our new development series.
80
This is a bugfix and polish release over the 2.4 series, with a large number
81
of bugs fixed (~170 for the 2.5 series alone). The 2.5 series provides a
82
faster smart protocol implementation for many operations, basic support for
83
colocated branches. We have started translating bzr with the 2.5 series:
84
https://translations.launchpad.net/bzr, more than 20 languages have already
85
been registered but these are the early days, contributions welcome.
87
Only a few bugfixes have been included since 2.5b6 so all known fixed bugs
90
Users are encouraged to upgrade from the other stable series.
93
External Compatibility Breaks
94
*****************************
106
* The names of colocated branches are used as branch nicks if no nick is
107
specified. (Aaron Bentley)
112
* Show locks in ``bzr info`` on control directories without a
113
repository. (Jelmer Vernooij, #936767)
115
* Disable ssl certificate verification on osx and windows until a native
116
access to the the root certificates is provided there.
117
(Vincent Ladeuil, #929179)
122
* Stop depending on the particular CPython ordering of dictionary keys
123
when testing the result of BzrDir.get_branches.
131
This is the sixth (and last (really)) beta of the 2.5 series, leading to a
132
2.5.0 release in March 2012. Beta releases are suitable for everyday use
133
but may cause some incompatibilities with plugins.
135
This introduces the support for colocated branches into the '2a' format in a
136
backward compatible way, fix more glitches in the colocated UI, verify https
137
certificates for the urllib https client implementation, fix some more
138
unicode issues and more.
140
All bugs fixed in previous series known at the time of this release are
143
External Compatibility Breaks
144
*****************************
151
* Support for colocated branches is now available in the default
152
format ("2a"). (Jelmer Vernooij)
157
* ``bzr switch -b`` in a standalone tree will now create a colocated branch.
158
(Jelmer Vernooij, #918197)
160
* ``bzr info`` now reports when there are present (but unused) colocated
161
branches. (Jelmer Vernooij, #891646)
163
* Checkouts can now be into target directories that already have
164
a control directory (but no branch or working tree).
165
(Jelmer Vernooij, #913980)
167
* Checkouts of colocated branches are now always lightweight.
168
(Jelmer Vernooij, #918828)
170
* Colocated branches can now have names including forward slashes, to
171
allow for namespaces. (Jelmer Vernooij, #907980)
173
* New HPSS call for ``BzrDir.get_branches``. (Jelmer Vernooij, #894460)
178
* ``bzr branch`` now fetches revisions when branching into an empty
179
control directory. (Jelmer Vernooij, #905594)
181
* A sane default is provided for ``ssl.ca_certs`` which should points to the
182
Certificate Authority bundle for supported platforms.
183
(Vincent Ladeuil, #920455)
185
* ``bzr branch`` generates correct target branch locations again if not
186
specified. (Jelmer Vernooij, #919218)
188
* ``bzr send`` works on treeless branches again.
189
(Jelmer Vernooij, #921591)
191
* ``bzr version`` no longer throws a UnicodeDecodeError if the .bzr.log path
192
contains non-ascii characters. (Martin Packman, #312841)
194
* Support scripts that don't call bzrlib.initialize() but still call run_bzr().
195
(Vincent Ladeuil, #917733)
197
* Test for equality instead of object identity where ROOT_PARENT is concerned.
198
(Wouter van Heyst, #881142)
200
* urllib-based HTTPS client connections now verify the server certificate
201
validity as well as the hostname.
202
(Jelmer Vernooij, Vincent Ladeuil, #651161)
208
* ``config.config_dir`` and related functions now always return paths as
209
unicode. (Martin Packman, #825826)
211
* ``ControlDir`` now has a new method ``set_branch_reference`` which can
212
be used for setting branch references. (Jelmer Vernooij)
214
* ``ControlDir.destroy_branch`` now raises ``NotBranchError`` rather than
215
``NoSuchFile`` if the branch didn't exist. (Jelmer Vernooij, #921693)
220
* A new matcher ``RevisionHistoryMatches`` has been added. (Jelmer Vernooij)
222
* Add new module ``bzrlib.url_policy_open``. (Jelmer Vernooij, #850843)
224
* ``MutableTree`` has two new hooks ``pre_transform`` and
225
``post_transform`` that are called for tree transform operations.
226
(Jelmer Vernooij, #912084)
232
* Be more careful about closing open files for pypy interoperability.
240
This is the fifth (and last) beta of the 2.5 series, leading to a 2.5.0
241
release in February 2012. Beta releases are suitable for everyday use but
242
may cause some incompatibilities with plugins.
244
This release includes many improvements in the smart server, UI polish for
245
the colocated branches, enhancements to the config framework and more
246
internal uses, bug fixes related to unicode and locale support and more.
248
All bug fixed in previous series known at the time of this release are
251
External Compatibility Breaks
252
*****************************
254
* The '.bzr/branch/email' file is no longer read to determine the users'
255
identity. Instead, the 'email' setting in '.bzr/branch/branch.conf'
256
should be used. (Jelmer Vernooij, #903894)
261
* "bzr mkdir" now includes -p (--parents) option for recursively adding
263
(Jared Hance, Jelmer Vernooij, #253529)
265
* ``config.Option`` can now declare ``override_from_env``, a list of
266
environment variables which, when set, that takes precedence over values
267
defined in configuration files. (Vincent Ladeuil, #907279)
272
* New HPSS call for ``Repository.reconcile``. (Jelmer Vernooij, #894455)
274
* Merge now has two new hooks ``pre_merge`` and ``post_merge``
275
that are called before and after a merge and can make
276
additional modifications to the trees involved.
277
(Jelmer Vernooij, #906877)
279
* Override the value returned by ``sys.getfilesystemencoding()`` for the bzr
280
script to utf-8 when it would otherwise be ascii on a posix system. This
281
will mean bzr works with non-ascii files when no locale or an incorrect
282
locale is set. (Martin Packman, #794353)
284
* ``bzr branches`` now indicates the active colocated branch.
285
(Jelmer Vernooij, #891667)
287
* ``bzr push`` now suggests using :parent if there is a parent location
288
set. (Jelmer Vernooij)
290
* ``bzr send`` now only opens a single connection, rather than two,
291
to the target branch. (Jelmer Vernooij)
296
* Allow configuration option default value to be a python callable at
297
registration. (Vincent Ladeuil, #832064)
299
* ``bzr config`` will now display the section ``[DEFAULT]`` used in
300
``bazaar.conf``. (Vincent Ladeuil, #907268)
302
* Configuration stores can now provides a specific quoting mechanism. This
303
is required to workaround ``configobj`` conflating quoting and list values
304
automatic conversion. (Vincent Ladeuil, #906897)
306
* Create obsolete_packs directory when repacking if it does not
307
exist. (Jonathan Riddell, Jelmer Vernooij, #314314)
309
* Fallback to the slower ``bzr log`` implementation when displaying a range
310
of revisions whose ancestry is not obviously on the same developement
311
line. (Vincent Ladeuil, #904744)
313
* Make lazy imports resilient when resolved concurrently from multiple
314
threads. Now the stand-in object will behave as a proxy for the real object
315
after the initial access, rather than throwing. Assigning the object to
316
multiple names should still be avoided. (Martin von Gagern, #396819)
318
* Not setting ``gpg_signing_key`` or setting it to ``default`` will use the
319
user email (obtained from the ``email`` configuration option or its
320
default value). (Vincent Ladeuil, Jelmer Vernooij, #904550)
322
* Prevent spurious InconsistentDelta error when committing a move of a
323
non-ascii directory with contents. (Rory Yorke, #185211)
325
* Properly ignore '\n' in an option reference since this cannot be part of a
326
config option identifier. (Vincent Ladeuil, #902125)
328
* Make sure that the bzr probers are always registered when
329
bzrlib.workingtree is imported. (Jelmer Vernooij, #905218)
331
* Report mistake trying to move a removed file with a non-ascii name without
332
UnicodeEncodeError being raised. (Martin Packman, #898541)
334
* Safely unquote configuration values in weird edge cases (a section seen as
335
a dictionary which is not a supported use case for the configuration
336
stacks). (Vincent Ladeuil, #908050)
338
* Stop altering ``sys.platform`` on OSX when initialising the locale.
339
(Martin Packman, #570495)
341
* Uncommit no longer removes tags if they are part of the working
342
trees pending merges. (Jelmer Vernooij, #905462)
347
* ``Config.signature_needed``, ``Config.signing_policy``,
348
``Config.gpg_signing_key``, ``Config.gpg_signing_command``,
349
``Config.checking_policy`` and ``Config.post_commit`` are now deprecated.
352
* ``Repository.get_commit_builder`` now takes a ``config_stack``
353
rather than a ``config`` argument. (Jelmer Vernooij)
355
* Scripts using bzrlib should now ensure setlocale is called on posix
356
platforms if they need a non-ascii user encoding. (Martin Packman)
358
* Send formats now accept a new optional argument ``submit_branch``,
359
which can be None or a Branch object for the submit branch location.
362
* ``VersionedFileRepository.add_revision`` no longer takes a ``config``
363
argument. (Jelmer Vernooij)
368
* Add HPSS call for ``Branch.get_checkout_format``. (Jelmer Vernooij, #894459)
370
* Add HPSS call for ``Repository.pack``. (Jelmer Vernooij, #894461)
372
* Add HPSS calls for ``Repository.iter_files_bytes``, speeding up
373
several commands including ``bzr export`` and ``bzr co --lightweight``.
374
(Jelmer Vernooij, #608640)
376
* All bzr control directories, branch formats, repository formats and
377
working tree formats now support feature flags, which are
378
serialized in their respective format files. See
379
``doc/developers/feature-flags.txt`` for details.
382
* ``bzrlib.urlutils`` now includes ``quote`` and ``unquote`` functions,
383
rather than importing them from ``urllib``. This prevents loading
384
of the ``socket``, ``ssl`` and ``urllib`` modules for
385
local bzr operations. (Jelmer Vernooij)
387
* Configuration options can be SI units by using ``int_SI_from_unicode`` as
388
their ``convert_from_unicode`` helper. (Vincent Ladeuil)
390
* Configuration stacks can now use ``StartingPathMatcher`` to select the
391
sections matching a location while respecting the order chosen by the user
392
in the configuration file: from generic sections to specific
393
sections. (Vincent Ladeuil, #832046).
395
* Configuration stores can now save incremental changes by using
396
``save_changes()`` instead of ``save()``. This reduces the number or
397
required input/outputs and allows stores to be shared between
398
stacks. (Vincent Ladeuil)
400
* ControlDir now has a get_branches method that returns a dictionary
401
whose keys are the names of the branches and whose values are the
402
branches themselves. The active branch uses the key None.
403
(Neil Martinsen-Burrell)
405
* Helper ``osutils.path_from_environ`` added for extracting a unicode path
406
from an environment variable. (Martin Packman, #832028)
408
* Helper ``win32utils.get_environ_unicode`` added for avoiding encoding
409
problems with ``os.environ.get`` use. (Martin Packman, #262874)
411
* Lazy imports can now only be absolute. (Jelmer Vernooij)
413
* Merge3Mergers now have an optional ``other_branch`` argument
414
which contains the branch from which the ``other_tree``
415
was obtained, if any. (Jelmer Vernooij)
417
* MutableTree now has a hook ``post_build_tree`` which is called after
418
a new mutable tree has been created. (Jelmer Vernooij, #912765)
420
* New HPSS call ``BzrDir.checkout_metadir``. (Jelmer Vernooij, #894459)
422
* New HPSS call ``VersionedFileRepository.get_inventories``,
423
speeding up various commands including ``bzr export``,
424
``bzr checkout`` and ``bzr cat``. (Jelmer Vernooij, #608640)
426
* The ``ConfigCommandLineStore`` is now supported by ``bzr config`` and is
427
seen as single no-name section of configuration options. (Vincent Ladeuil)
432
* New matcher ``ContainsNoVfsCalls`` which filters a list of HPSS
433
calls for VFS requests. (Jelmer Vernooij)
435
* New ``MemoryStack`` class allows for diskless tests and locally injected
436
configuration stacks. Lower level tests for predefined set of options can
437
be written without setting up configuration files. (Vincent Ladeuil)
445
This is the fourth beta of the 2.5 series, leading to a 2.5.0 release in
446
February 2012. Beta releases are suitable for everyday use but may cause
447
some incompatibilities with plugins.
449
This release includes many improvements in the smart server, UI polish for
450
the colocated branches, optimizations for revision specifiers to avoid
451
history sized operations, enhancements to the config framework, bug fixes
452
related to unicode paths and more.
454
All bug fixed in previous series known at the time of this release are
457
External Compatibility Breaks
458
*****************************
465
* Provides a ``po_merge`` plugin to automatically merge ``.po`` files with
466
``msgmerge``. See ``bzr help po_merge`` for details.
467
(Vincent Ladeuil, #884270)
472
* ``bzr branch --stacked`` now only makes a single connection to the remote
473
server rather than three. (Jelmer Vernooij, #444293)
475
* ``bzr export --uncommitted`` will export the uncommitted tree.
476
(Jelmer Vernooij, #555613)
478
* ``bzr rmbranch`` can now remove colocated branches.
479
(Jelmer Vernooij, #831464)
481
* ``bzr status`` no longer shows shelves if files are specified.
484
* ``bzr switch`` now accepts colocated branch names to switch to.
485
(Jelmer Vernooij, #826814)
487
* Plugins can now register additional "location aliases".
490
* Revision specifiers will now only browse as much history as they
491
need to, rather than grabbing the whole history unnecessarily in some
492
cases. (Jelmer Vernooij)
494
* When using ``bzr switch`` to switch to a sibling of the current
495
branch, the relative branch name should no longer be url-encoded.
501
* A new section local option ``basename`` is available to help support some
502
``bzr-pipeline`` workflows and more generally help mapping local paths to
503
remote ones. See ``bzr help configuration`` for more details.
504
(Vincent Ladeuil, #843211)
506
* Add HPSS call for looking up revision numbers from revision ids on
507
remote repositories. (Jelmer Vernooij, #640253)
509
* Add HPSS call for retrieving file contents from remote repositories.
510
Should improve performance for lightweight checkouts and exports of
511
from remote repositories. (Jelmer Vernooij, #368717, #762330, #608640)
513
* Allow lazy compiled patterns from ``bzrlib.lazy_regex`` to be
514
pickled. (Jelmer Vernooij, #893149)
516
* ``bzr info`` no longer shows empty output if only a control
517
directory is present. (Jelmer Vernooij, #159098)
519
* Cope with missing revision ids being specified to
520
``Repository.gather_stats`` HPSS call. (Jelmer Vernooij, #411290)
522
* Fix test failures on windows related to locations.conf handling.
523
(Vincent Ladeuil, #892992)
525
* Fixed parsing of the timestamp given to ``commit --commit-time``. Now
526
prohibits several invalid strings, reads the correct number of seconds,
527
and gives a better error message if the time zone offset is not given.
528
(Matt Giuca, #892657)
530
* Give meaningful file/line references when reporting deprecation warnings
531
for _CompatabilityThunkFeature based test features.
532
(Vincent Ladeuil, #897718)
534
* Make reporting of mistakes involving unversioned files with non-ascii
535
filenames work again without 'Unprintable exception' being shown.
536
(Martin Packman, #898408)
538
* Provide names for lazily registered hooks.
539
(Neil Martinsen-Burrell, #894609)
541
* Raise BadIndexKey exception in btree_index when a key is too large, fixing
542
an infinite recursion issue. (Shannon Weyrick, #720853)
544
* Resolve regression from colocated branch path handling, by ensuring that
545
unreserved characters are unquoted in URLs. (Martin Packman, #842223)
547
* Split segments from URLs for colocated branches without assuming the
548
combined form is valid. (Martin Packman, #842233)
550
* Support looking up revision numbers by revision id in empty branches.
551
(Jelmer Vernooij, #535031)
553
* Support verifying signatures on remote repositories.
554
(Jelmer Vernooij, #889694)
556
* Teach the bzr client how to reconnect if we get ``ConnectionReset``
557
while making an RPC request. This doesn't handle all possible network
558
disconnects, but it should at least handle when the server is asked to
559
shutdown gracefully. (John Arbash Meinel, #819604)
561
* When a remote format is unknown, bzr will now print a single-line error
562
message rather than a backtrace. (Jelmer Vernooij, #687226)
567
* ``BzrDir.open_branch`` and ``BranchFormat.open`` now take an optional
568
``possible_transports`` argument. (Jelmer Vernooij)
570
* New method ``Transport.set_segment_parameter``. (Jelmer Vernooij)
572
* ``Repository.verify_revision`` has been renamed to
573
``Repository.verify_revision_signature``. (Jelmer Vernooij)
575
* ``RevisionSpec.wants_revision_history`` now defaults to ``False`` and
576
is deprecated. The ``revs`` argument of
577
``RevisionInfo.from_revision_id`` is now deprecated. (Jelmer Vernooij)
579
* ``Tree.get_file_by_path`` is now deprecated. Use ``Tree.get_file`` instead.
580
(Jelmer Vernooij, #666897)
582
* Some global options for use with commands have been removed, construct
583
an ``Option`` with the name instead. (Martin Packman)
585
* The unused exception ``HistoryMissing`` has been removed.
591
* Add HPSS call for ``Repository.pack``. (Jelmer Vernooij, #894461)
593
* ``bzr config`` uses the new configuration implementation.
596
* Custom HPSS error handlers can now be installed in the smart server client
597
using the ``error_translators`` and ``no_context_error_translators``
598
registries. (Jelmer Vernooij)
600
* New HPSS calls ``Repository.has_signature_for_revision_id``,
601
``Repository.make_working_trees``, ``BzrDir.destroy_repository``,
602
``BzrDir.has_workingtree``, ``Repository.get_physical_lock_status``,
603
``Branch.get_physical_lock_status``,
604
``Branch.put_config_file``, ``Branch.break_lock``,
605
``BzrDir.destroy_branch``, ``Repository.break_lock``,
606
``VersionedFileRepository.get_serializer_format``,
607
``Repository.all_revision_ids``, ``Repository.start_write_group``,
608
``Repository.commit_write_group``, ``Repository.abort_write_group``
609
``Repository.check_write_group``, ``Repository.iter_revisions``,
610
``Repository.add_signature_revision_text`` and
611
``Repository.get_revision_signature_text``.
614
* ``RemoteBranch.get_config_stack`` and ``RemoteBzrDir.get_config_stack``
615
will now use HPSS calls where possible. (Jelmer Vernooij)
617
* The registry of merge types has been moved to ``merge`` from ``option`` but
618
``merge.get_merge_type_registry`` remains as an accessor. (Martin Packman)
623
* Avoid failures in test_transform when OS error messages are localised.
624
(Martin Packman, #891582)
626
* Tests are now subject to a time limit: by default 300s, and 120s when
627
run from 'make check', controlled by the `selftest.timeout`
628
configuration option. This is currently not supported on Windows.
636
This is the third beta of the 2.5 series, leading to a 2.5.0 release in
637
February 2012. Beta releases are suitable for everyday use but may cause
638
some incompatibilities with plugins.
640
This release includes log options for ``push`` and ``pull``, more UI polish
641
for colocated branches, a better and more coherent implementation for UI
642
dialogs, enhancements to the config framework and more.
644
This release includes all bug fixed in previous series known at the time of
647
External Compatibility Breaks
648
*****************************
655
* The ``log_format`` configuration can be used with ``-Olog_format=line`` to
656
change the format ``push`` and ``pull`` use to display the
657
revisions. I.e.: ``bzr pull -v -Olog_format=short`` will use the ``short``
658
format instead of the default ``long`` one. (Vincent Ladeuil, #861472)
660
* The new config scheme allows an alternative syntax for the 'appenpath'
661
policy relying on option expansion and defining a new 'relpath' option
662
local to a section. Instead of using '<option>:policy=appendpath', the
663
option value can de defined as 'option=xxxx/{relpath}'.
664
(Vincent Ladeuil, #832013)
669
* ``bzr info -v`` now shows the number of colocated branches
670
for control directories that support them.
671
(Jelmer Vernooij, #863285)
673
* ``bzr version-info`` now takes a ``--revision`` argument.
674
(Jelmer Vernooij, #238705)
676
* ``bzr revno`` now takes a ``--revision`` argument.
677
(Jelmer Vernooij, #870649)
679
* ``bzr serve`` now can serve from URLs rather than just from the
680
file system. I.e.: ``bzr serve -d lp:bzr`` or
681
``bzr serve -d file:///data/bzr`` (Jelmer Vernooij)
683
* all input prompts are now char-based when possible, and can be forced to
684
line-based mode by setting the ``BZR_TEXTUI_INPUT`` environment variable
685
to 'line-based'. This replace the previous shelf UI only patch using
686
``INSIDE_EMACS``. (Benoît Pierre)
691
* ``bzr info`` now shows the master branch location too for
692
treeless local branches. (Jelmer Vernooij, #258355)
694
* ``bzr mkdir --quiet`` now does not print a line for every created
695
directory. (Martin von Gagern, #869915)
697
* ``bzr mv`` does not crash when attempting to move the root of a
698
branch. (Jonathan Riddell, #809728)
700
* ``bzr shelve`` now use ``UIFactory.choose`` for input handling, making
701
it usable when creating a custom ``UIFactory`` implementation. (Benoît
704
* ``bzr clean-tree`` now use ``UIFactory.get_boolean`` for confirmation
705
prompt, making it usable when using a custom ``UIFactory``
706
implementation. (Benoît Pierre)
708
* If sending a crash through Apport fails report the Apport failure to
709
bzr.log rather than stderr. (Jonathan Riddell, #766735)
711
* ``bzr upgrade`` no longer treats 'already up-to-date' exceptions as
712
errors. (Benoît Pierre, #716560).
714
* ``bzr version-info`` no longer populates the clean state for custom
715
templates unless {clean} is explicitly asked for.
716
(Lawrence Mitchell, #882541)
718
* Fix finding the CPU count when using Python >= 2.6 on BSD-based systems.
719
(Jelmer Vernooij, #887151)
721
* ``WorkingTree.clone()`` now supports its ``revision_id`` being set
722
to the null revision. (Jelmer Vernooij, #876423)
724
* ``WorkingTree.pull`` can now pull ``NULL_REVISION``.
725
(Jelmer Vernooij, #887556)
730
* ``Branch.revision_history`` is now deprecated. (Jelmer Vernooij, #799519)
732
* Methods ``add`` and ``items`` of ``LRUCache`` and ``LRUSizeCache`` are
733
deprecated. Use normal dict-style access instead. (Martin Packman)
735
* New flag ``RepositoryFormat.supports_unreferenced_revisions`` which
736
indicates whether revisions can be present in a repository without
737
being referenced from e.g. a branch history at the same time.
740
* ``UIFactory.choose`` has been added: prompt the user for a list of
741
choices. (Benoît Pierre)
746
* ``ControlDirFormat`` now has a new method ``supports_transport``
747
which format implementations can use whether or not they can access
748
a control dir over a particular transport. (Jelmer Vernooij)
750
* ``BranchBuilder.build_commit`` now take ``parent_ids`` and
751
``allow_leftmost_as_ghost`` arguments. (Jelmer Vernooij)
756
* Ensure TestCase instances are deallocated immediately after running where
757
possible. This greatly reduces the peak resource needs of a full test suite
758
run. The new ``-Euncollected_cases`` selftest flag will add failures if any
759
case which persists pasts its expected lifetime. (Martin Packman, #613247)
761
* Report exceptions from child processes during fork instead of swallowing the
762
error and reporting that everything went okay. (Martin Packman, #804130)
768
This is the second beta of the 2.5 series, leading to a 2.5.0 release in
769
February 2012. Beta releases are suitable for everyday use but may cause some
770
incompatibilities with plugins.
772
This release includes more filtering options for ``bzr log``, idle
773
connections handling for ``bzr serve``, a ``development-colo`` experimental
774
format to flesh out the colocated branches UI, better support for foreign
775
formats, enhancements to the config framework and more.
777
This release includes all bug fixed in previous series known at the time of
782
External Compatibility Breaks
783
*****************************
790
* A new ``-O`` standard option (common to all commands) have been added. It
791
provides a value for a config option in the ``-Oname=value`` form that
792
takes precedence over all definitions found in config files. It can be
793
used multiple times to override different options.
794
(Vincent Ladeuil, #491196)
796
* ``bzr log`` now has an option called ``--omit-merges`` to omit
797
those commits that merged branches, i.e. those having more than one
799
In order to avoid confusion, the previous command line option
800
``--include-merges`` has been renamed to ``--include-merged``.
801
The old name of the command line option will still be accepted.
802
The name change also affects ``bzr missing``.
805
* ``bzr serve`` will now disconnect clients if they have not issued an RPC
806
request after 5minutes. On POSIX platforms, this will also happen for
807
``bzr serve --inet``. This can be overridden with the configuration
808
variable ``serve.client_timeout`` or in the command line parameter
809
``bzr serve --client-timeout=X``. Further, it is possible to request
810
``bzr serve [--inet]`` to shutdown gracefully by sending SIGHUP. It will
811
finish the current request, and then close the connection.
812
(John Arbash Meinel, #824797, #795025)
814
* The new experimental format ``development-colo`` supports colocated
815
branches. This format will eventually be merged back into the ``2a``
816
format when it has stabilized and there is adequate UI support for
818
(Jelmer Vernooij, #831481)
823
* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
824
every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
826
* ``bzr info -v`` can now be run against branches that don't support
827
``last_revision_info``, in which case the branch information will simply
828
not be displayed. (Jelmer Vernooij)
833
* ``bzr shelve`` can now be used in emacs shells as the input handling is
834
turned into a line-based one when ``INSIDE_EMACS`` is set (which is the
835
case for all recent emacs versions). (Vincent Ladeuil, #856261)
837
* ``bzr tags`` can now be used against remote repositories that do
838
not provide access to the revision graph. (Jelmer Vernooij, #858942)
840
* ``bzr update PATH`` will stop if you seem to be asking it to update
841
anything less than a whole tree, because that's not supported by ``bzr``'s
842
concept that the whole tree has a single basis revision. Previously, it
843
would go ahead and update the whole tree, which was surprising.
844
(Martin Pool, #557886)
846
* Don't crash if ``bzrlib.initialize()`` has not been called while accessing
847
configs. (Vincent Ladeuil, #863401)
849
* Redirects between http and https no longer discard path information
850
in some cases. (Jelmer Vernooij, #853765)
852
* The ``--overwrite`` argument to ``bzr push`` and ``bzr pull`` no longer
853
reports all tags as changed. (Jelmer Vernooij, #845396)
855
* ``WorkingTree.get_file_mtime`` now raises NoSuchId if a file id is
856
specified that is unknown. (Jelmer Vernooij, #847435)
862
* ``Branch.get_revision_delta`` has been deprecated. Use
863
``Repository.get_revision_delta`` instead. (Jelmer Vernooij, #859712)
865
* Plugins that implement custom protocols for ``bzr serve`` should now
866
also take an argument ``timeout``. This is used by the the bzr protocol
867
to close a connection if a client has been idle for more than X seconds.
868
(Default 5minutes). (John Arbash Meinel)
870
* ``Repository.fileids_altered_by_revision_ids`` has been moved to
871
``VersionedFileRepository`` and is no longer part of the standard
872
``Repository`` interface. (Jelmer Vernooij)
874
* The argument ``include_merges`` to ``missing.find_unmerged`` has
875
been renamed to ``include_merged``. The old name is still supported
876
for now but will cause a deprecation warning. (Martin von Gagern)
878
* The new method ``ControlDirFormat.is_initializable()`` returns a boolean
879
indicating whether or not it is possible to use any of the
880
initialization methods of that format to create a new control dir.
886
* ``Branch`` objects can now use a config stack with the newly introduced
887
``get_config_stack()``. Both ``get_config`` and ``get_config_stack`` can
888
be used for the same branch but it's recommended to stick to one for a
894
* Test scripts can now use ``bzr shelve`` and provide their input as
895
complete lines. (Vincent Ladeuil, #856261)
897
* Really corrupt the pack file without depending on a special length or value.
898
(Vincent Ladeuil, #807032)
906
This is the first beta of the 2.5 series, leading up to a 2.5.0
907
release in February 2012.
909
This release includes better support for gpg signing, better support for
910
i18n (mostly command help and error messages), more options to filter ``bzr
911
log`` output, more support for colocated branches ("location,branch=XXX"
912
syntax), better feedback on updated tags for various commands, faster
913
branching into an empty repository, enhancements to the config framework and
916
Beta releases are suitable for everyday use but may cause some
917
incompatibilities with plugins. Some plugins may need small updates to work
920
External Compatibility Breaks
921
*****************************
928
* A ``from_unicode`` parameter can be specified when registering a config
929
option. This implements boolean, integer and list config options when the
930
provided ``bool_from_store``, ``int_from_store`` and ``list_from_store``
931
are used for this parameter. (Vincent Ladeuil)
933
* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
934
checks to see if the most recent published source package version for
935
that project is present in the branch tags. This should help developers
936
trust whether the packaging branch is up-to-date and can be used for new
937
changes. The level of verbosity is controlled by the config item
938
``launchpad.packaging_verbosity``. It can be set to one of
945
only display if the branch is out-of-date
948
also display single-line up-to-date and missing,
952
(default) display multi-line content for all states
955
(John Arbash Meinel, #609187, #812928)
957
* Add a config option gpg_signing_key for setting which GPG key should
958
be used to sign commits. Also default to using the gpg user identity
959
which matches user_email() as set by whoami.
960
(Jonathan Riddell, #68501)
962
* An ``invalid`` parameter can be specified when registering a config option
963
to decide what should be done when invalid values are
964
encountered. 'warning' and 'error' will respectively emit a warning and
965
ignore the value or errors out. (Vincent Ladeuil)
967
* bzr add now skips large files in recursive mode. The default "large"
968
size is 20MB, and is configurable via the add.maximum_file_size
969
option. A value of 0 disables skipping. Named items passed to add are
970
never skipped. (Shannon Weyrick, #54624)
972
* ``bzr help configuration/<option>`` display the help for ``option`` for
973
all registered configuration options. (Vincent Ladeuil, #747050)
975
* ``bzr log -m`` now matches message, author, committer and bugs instead
976
of just matching the message. ``--message`` keeps its original meaning,
977
while ``--match-message, --match-author, --match-committer`` and
978
``--match-bugs`` match each of those fields. (Jacek Sieka)
980
* ``config.Option`` can now declare ``default_from_env``, a list of
981
environment variables to get a default value from. (Vincent Ladeuil)
983
* ``config.NameMatcher`` can be used to implement config stores and stacks
984
that need to provide specific option values for arbitrary unique IDs (svn
985
repository UUIDs, etc). (Vincent Ladeuil, #843638)
987
* New builtin ``bzr branches`` command, which lists all colocated branches
988
in a directory. (Jelmer Vernooij, #826820)
990
* Relative local paths can now be specified in URL syntax by using the
991
"file:" prefix. (Jelmer Vernooij)
993
* Report commits signed with expired keys in ``verify-signatures``.
994
(Jonathan Riddell, #804254)
996
* Translations are now enabled for command help, errors and globally
997
for any message using ``gettext`` given on output. (Jonathan Riddell,
1003
* ``bzr add`` will now warn about nested subtrees that are skipped.
1004
(Jelmer Vernooij, #187342)
1006
* ``bzr commit -m ''`` can now be used to force an empty commit message.
1007
Entering an empty commit message in the message editor still triggers
1008
an error. (Jelmer Vernooij)
1010
* ``bzr pull`` will now mention how many tags it has updated.
1011
(Jelmer Vernooij, #164450)
1013
* ``bzr tag`` no longer errors if a tag already exists but refers to the
1014
same revision, and will mention when a tag has been updated
1015
rather than created. (Jelmer Vernooij, #381203)
1017
* ``bzr uncommit`` will now remove tags that refer to removed revisions.
1018
The ``--keep-tags`` option can be used to prevent this behaviour.
1019
(Jelmer Vernooij, #605814)
1021
* Do not run i18n initialisation twice. (Jonathan Riddell)
1023
* Install translation .mo files. (Jonathan Riddell)
1025
* Locations printed by ``bzr upgrade`` are now formatted before display.
1028
* ``Repository.get_parent_map`` now estimates the size of the returned
1029
content more accurately. This means that we get closer to the desired
1030
64kB/request. For repositories converted from svn, this can be an
1031
improvement of approx 5:1 in round trips to discover the whole history.
1032
(John Arbash Meinel)
1034
* Support a ``bugtracker`` option which is used by ``bzr commit --fixes``
1035
if no bug tracker was specified on the command line.
1036
(Jelmer Vernooij, #334860)
1038
* Use ``gettext.NullTranslations`` in i18n to allow use of i18n even when
1039
translations are not turned on. (Jonathan Riddell)
1044
* ``bzr commit`` now correctly reports missing files as "removed", not
1045
"modified". (Jelmer Vernooij, #553955)
1047
* ``bzr reconfigure`` will now allow multiple non-conflicting requests
1048
in a single invocation, e.g. ``--branch`` and ``--use-shared``.
1049
(Martin von Gagern, #842993)
1051
* A call to CHKInventory's filter-method will not result in a
1052
DuplicateFileId error, if you move a subfolder and change a file in
1054
(Bastian Bowe, #809901)
1056
* Branching from a stacked branch no longer does a ``get_parent_map``
1057
request for each revisions that is in the stacked-on repository while
1058
determining what revisions need to be fetched. This mostly impacts
1059
branching initialy into an empty shared repository when the source is
1060
not the development focus. (John Arbash Meinel, #388269)
1062
* Decode ``BZR_HOME`` with fs encoding on posix platforms to avoid unicode
1063
errors. (Vincent Ladeuil, #822571)
1065
* Fix fallout from URL handling changes in 2.5 that caused an IndexError to be
1066
raised whenever a transport at the drive root was opened on windows.
1067
(Martin [gz], #841322)
1069
* Fixed loading of external merge tools from config to properly decode
1070
command-lines which contain embedded quotes. (Gordon Tyler, #828803)
1072
* Rather than an error being raised, a warning is now printed when the
1073
current user does not have permission to read a configuration file.
1074
(Jelmer Vernooij, #837324)
1076
* The pull command will now always use separate connections for the
1077
case where the destination is a heavyweight checkout of some remote
1078
branch on the same host as the source branch.
1079
(Martin von Gagern, #483661)
1081
* TreeTransformBase.fixup_new_roots no longer forces trees to have a root, so
1082
operations that use it, like merge, can now create trees without a root.
1085
* Fixed problem with getting errors about failing to open /dev/tty when using
1086
Bazaar Explorer to sign commits. (Mark Grandi, #847388)
1091
* Release instructions refreshed. (Vincent Ladeuil)
1096
* ``BranchFormat.initialize`` now takes a ``append_revisions_only``
1097
argument. (Jelmer Vernooij)
1099
* ``Branch._get_checkout_format`` now takes a ``lightweight`` argument
1100
which indicates if the format should be for a lightweight or a
1101
heavyweight checkout. (Jelmer Vernooij)
1103
* ``ControlDir.create_branch`` now takes a ``append_revisions_only`` argument.
1106
* New class ``URL`` in ``bzrlib.utils`` for managing parsed URLs.
1109
* New method ``Config.get_user_option_as_int_from_SI`` added for expanding a
1110
value in SI format (i.e. "20MB", "1GB") into its integer equivalent.
1113
* New method ``InterTree.file_content_matches`` which checks that
1114
two files in different trees have the same contents.
1117
* New method ``Tree.get_file_verifier`` which allows tree implementations
1118
to return non-sha1 checksums to verify files.
1119
(Jelmer Vernooij, #720831)
1121
* New methods ``get_transport_from_path`` and ``get_transport_from_url``
1122
have been added that only support opening from a path or a URL,
1123
unlike ``get_transport``. (Jelmer Vernooij)
1125
* New registry ``OptionRegistry`` specialized for configuration options.
1128
* Remove ``AtomicFile.closed`` which has been deprecated in bzr 0.10.
1131
* Remove ``commands._builtin_commands``, ``commands.shlex_split_unicode``,
1132
``Command._maybe_expand_globs`` and ``Command.run_direct`` deprecated in
1133
2.10 and 2.2.0. (Vincent Ladeuil)
1135
* Remove ``diff.get_trees_and_branches_to_diff`` deprecated in 2.2.0.
1137
* Remove ``log.calculate_view_revisions``, ``log._filter_revision_range``,
1138
``log.get_view_revisions`` which have been deprecated in bzr 2.1.0. Also
1139
remove ``log.show_one_log`` which was never properly deprecated but wasn't
1140
used and is easy to inline if needed. (Vincent Ladeuil)
1142
* Remove ``trace.info``, ``trace.error`` and ``trace.show_log_error``
1143
deprecated in 2.1.0. (Vincent Ladeuil)
1145
* Remove ``TransportListRegistry.set_default_transport``, as the concept of
1146
a default transport is currently unused. (Jelmer Vernooij)
1148
* Remove ``UIFactory.warn_cross_format_fetch`` and
1149
``UIFactory.warn_experimental_format_fetch`` in favor of
1150
``UIFactory.show_user_warning``. (Jelmer Vernooij)
1152
* ``Tags`` containers can now declare whether they support versioned
1153
tags and whether tags can refer to ghost tags.
1156
* ``Tags.merge_to`` now returns a dictionary with the updated tags
1157
and a set of conflicts, rather than just conflicts. (Jelmer Vernooij)
1159
* There is a new class `ContentFilterTree` that provides a facade for
1160
content filtering. The `filtered` parameter to `export` is deprecated
1161
in favor of passing a filtered tree, and the specific exporter plugins
1162
no longer support it.
1165
* ``Transport`` now has a ``_parsed_url`` attribute instead of
1166
separate ``_user``, ``_password``, ``_port``, ``_scheme``, ``_host``
1167
and ``_path`` attributes. Proxies are provided for the moment but
1168
may be removed in the future. (Jelmer Vernooij)
1173
* A new debug flag ``hpss_client_no_vfs`` will now cause the HPSS client
1174
to raise a ``HpssVfsRequestNotAllowed`` exception when a VFS request
1175
is attempted. (Jelmer Vernooij)
1177
* New method ``ControlDir._get_selected_branch`` which returns the
1178
colocated branch selected using path segment parameters.
1179
(Jelmer Vernooij, #380871)
1184
* Blackbox tests (including test scripts) can be debugged interactively (see
1185
bzrlib.debug.BzrPdb for details). (Vincent Ladeuil)
1187
* `BranchBuilder.build_snapshot` now supports a "flush" action. This
1188
cleanly and reliably allows tests using `BranchBuilder` to construct
1189
branches that e.g. rename files out of a directory and unversion that
1190
directory in the same revision. Previously some changes were impossible
1191
due to the order that `build_snapshot` performs its actions.
1194
* Don't require ``os.fdatasync`` to be defined on all supported OSes
1195
(BSD-based OSes don't define it). (Vincent Ladeuil, #822649)
1197
* Fix compatibility with testtools 0.9.12. (Jelmer Vernooij, #815423)
1199
* ``LockDir`` can now be run when the local hostname is ``localhost``.
1200
(Jelmer Vernooij, #825994)
1202
* ``ModuleAvailableFeature`` won't try to import already imported modules,
1203
allowing it to be used for modules with side-effects.
1204
(Vincent Ladeuil, #712474)
1206
* Output time stamps while running ``make check`` to get better timings from
1207
pqm. (Vincent Ladeuil, #837926)
1209
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
1210
just compares the bytes in the dirstate file to its pristine state,
1211
rather than opening the WorkingTree and calling ``last_revision()``.
1212
This reduces the overall test suite time by about 10% on my laptop.
1215
* Update `TestCase.knownFailure` to the testtools way of handling expected
1216
failures to resolve Python 2.7 incompatibility. (Martin [gz], #607400)
1219
vim: tw=74 ft=rst ff=unix
added
removed
doc/en/release-notes/bzr-2.5.txt
