11
:2.5.2: 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.
35
* ``bzr config`` properly handles aliases and references in the
36
``--directory`` parameter (Vincent Ladeuil, Wouter van Heyst, #947049)
38
* Empty arguments in EDITOR are now properly preserved.
39
(Ross Lagerwall, #1089792)
41
* Fix a traceback when trying to checkout a tree that also has an entry
42
with file-id `TREE_ROOT` somewhere other than at the root directory.
43
(John Arbash Meinel, #830947)
45
* Lightweight checkouts of remote repositories had a bug with how they
46
extracted texts from the repository. (Just an ordering constraint on how
47
they consumed the stream.) (John Arbash Meinel, #1046284)
49
* ``osutils.send_all`` now detects if we get a series of zero bytes sent,
50
and fails with a ECONNRESET. It seems if paramiko gets disconnected, it
51
will get into a state where it returns 0 bytes sent, but doesn't raise
52
an error. This change allows us to get a couple hiccups of no content
53
sent, but if it is consistent, we will consider it to be a failure.
54
(John Arbash Meinel, #1047309)
56
* Revert use of --no-tty when gpg signing commits. (Jelmer Vernooij, #1014570)
58
* Some filesystems give ``EOPNOTSUPP`` when trying to call ``fdatasync``.
59
This shouldn't be treated as a fatal error.
60
(John Arbash Meinel, #1075108)
62
* Some small bug fixes wrt lightweight checkouts and remote repositories.
63
A test permutation was added that runs all working tree tests against a
64
lightweight checkout. (John Arbash Meinel, #1046697)
69
.. Improved or updated documentation.
74
.. Changes that may require updates in plugins or other code that uses
80
.. Major internal changes, unlikely to be visible to users or plugin
81
developers, but interesting for bzr developers.
86
.. Fixes and changes that are only relevant to bzr's test framework and
87
suite. This can include new facilities for writing tests, fixes to
88
spurious test failures and changes to the way things should be tested.
96
This is a bugfix release. Most of the bugs dealt with https and colocated
97
branches glitches. Upgrading is recommended for all users of earlier 2.5
100
External Compatibility Breaks
101
*****************************
113
* ``bzr rmbranch`` now supports removing colocated branches.
114
(Jelmer Vernooij, #920653)
116
* ``bzr rmbranch`` no longer removes active branches unless ``--force``
117
is specified. (Jelmer Vernooij, #922953)
122
* Connecting with HTTPS via HTTP now correctly uses the host name of the
123
destination rather than the proxy when checking certificates.
124
(Martin Packman, #944696)
126
* Fixed merge tool availability checking and invocation to search the
127
Windows App Path registry in addition to the PATH. (Gordon Tyler, #939605)
129
* Fixed problem with getting errors about failing to open /dev/tty when using
130
Bazaar Explorer to sign commits. (Mark Grandi, #847388)
132
* Fix UnicodeEncodeError when translated progress task messages contain
133
non-ascii text. (Martin Packman, #966934)
135
* Make sure configuration options can provide their own help topic.
136
(Jelmer Vernooij, #941672)
141
* The alpha-quality texinfo sphinx builder has been deprecated. Sphinx >=
142
1.1.2 now provides a better one. Most of the documentation can now be
143
generated to the texinfo format with ``make texinfo-sphinx``. This will
144
generate both the ``.texi`` files and the ``.info`` ones.
145
(Vincent Ladeuil, #940164)
155
* Add support for pyftpdlib >= 0.7.0 and drop support for previous pyftpdlib
156
versions. (Vincent Ladeuil, #956027)
158
* Run smoketest for setup.py isolated in a tempdir. (Martin Packman, #140874)
167
This release marks the start of a new long-term-stable series. From here, we
168
will only make bugfix releases on the 2.5 series (2.5.1, etc, and support it
169
until April 2017), while 2.6 will become our new development series.
171
This is a bugfix and polish release over the 2.4 series, with a large number
172
of bugs fixed (~170 for the 2.5 series alone). The 2.5 series provides a
173
faster smart protocol implementation for many operations, basic support for
174
colocated branches. We have started translating bzr with the 2.5 series:
175
https://translations.launchpad.net/bzr, more than 20 languages have already
176
been registered but these are the early days, contributions welcome.
178
Only a few bugfixes have been included since 2.5b6 so all known fixed bugs
181
Users are encouraged to upgrade from the other stable series.
184
External Compatibility Breaks
185
*****************************
197
* The names of colocated branches are used as branch nicks if no nick is
198
specified. (Aaron Bentley)
203
* Show locks in ``bzr info`` on control directories without a
204
repository. (Jelmer Vernooij, #936767)
206
* Disable ssl certificate verification on osx and windows until a native
207
access to the the root certificates is provided there.
208
(Vincent Ladeuil, #929179)
213
* Stop depending on the particular CPython ordering of dictionary keys
214
when testing the result of BzrDir.get_branches.
222
This is the sixth (and last (really)) beta of the 2.5 series, leading to a
223
2.5.0 release in March 2012. Beta releases are suitable for everyday use
224
but may cause some incompatibilities with plugins.
226
This introduces the support for colocated branches into the '2a' format in a
227
backward compatible way, fix more glitches in the colocated UI, verify https
228
certificates for the urllib https client implementation, fix some more
229
unicode issues and more.
231
All bugs fixed in previous series known at the time of this release are
234
External Compatibility Breaks
235
*****************************
242
* Support for colocated branches is now available in the default
243
format ("2a"). (Jelmer Vernooij)
248
* ``bzr switch -b`` in a standalone tree will now create a colocated branch.
249
(Jelmer Vernooij, #918197)
251
* ``bzr info`` now reports when there are present (but unused) colocated
252
branches. (Jelmer Vernooij, #891646)
254
* Checkouts can now be into target directories that already have
255
a control directory (but no branch or working tree).
256
(Jelmer Vernooij, #913980)
258
* Colocated branches can now have names including forward slashes, to
259
allow for namespaces. (Jelmer Vernooij, #907980)
261
* New HPSS call for ``BzrDir.get_branches``. (Jelmer Vernooij, #894460)
263
* Checkouts of colocated branches are now always lightweight.
264
(Jelmer Vernooij, #918828)
269
* ``bzr branch`` now fetches revisions when branching into an empty
270
control directory. (Jelmer Vernooij, #905594)
272
* A sane default is provided for ``ssl.ca_certs`` which should points to the
273
Certificate Authority bundle for supported platforms.
274
(Vincent Ladeuil, #920455)
276
* ``bzr branch`` generates correct target branch locations again if not
277
specified. (Jelmer Vernooij, #919218)
279
* ``bzr send`` works on treeless branches again.
280
(Jelmer Vernooij, #921591)
282
* ``bzr version`` no longer throws a UnicodeDecodeError if the .bzr.log path
283
contains non-ascii characters. (Martin Packman, #312841)
285
* Support scripts that don't call bzrlib.initialize() but still call run_bzr().
286
(Vincent Ladeuil, #917733)
288
* Test for equality instead of object identity where ROOT_PARENT is concerned.
289
(Wouter van Heyst, #881142)
291
* urllib-based HTTPS client connections now verify the server certificate
292
validity as well as the hostname.
293
(Jelmer Vernooij, Vincent Ladeuil, #651161)
299
* ``config.config_dir`` and related functions now always return paths as
300
unicode. (Martin Packman, #825826)
302
* ``ControlDir`` now has a new method ``set_branch_reference`` which can
303
be used for setting branch references. (Jelmer Vernooij)
305
* ``ControlDir.destroy_branch`` now raises ``NotBranchError`` rather than
306
``NoSuchFile`` if the branch didn't exist. (Jelmer Vernooij, #921693)
311
* A new matcher ``RevisionHistoryMatches`` has been added. (Jelmer Vernooij)
313
* Add new module ``bzrlib.url_policy_open``. (Jelmer Vernooij, #850843)
315
* ``MutableTree`` has two new hooks ``pre_transform`` and
316
``post_transform`` that are called for tree transform operations.
317
(Jelmer Vernooij, #912084)
323
* Be more careful about closing open files for pypy interoperability.
331
This is the fifth (and last) beta of the 2.5 series, leading to a 2.5.0
332
release in February 2012. Beta releases are suitable for everyday use but
333
may cause some incompatibilities with plugins.
335
This release includes many improvements in the smart server, UI polish for
336
the colocated branches, enhancements to the config framework and more
337
internal uses, bug fixes related to unicode and locale support and more.
339
All bug fixed in previous series known at the time of this release are
342
External Compatibility Breaks
343
*****************************
345
* The '.bzr/branch/email' file is no longer read to determine the users'
346
identity. Instead, the 'email' setting in '.bzr/branch/branch.conf'
347
should be used. (Jelmer Vernooij, #903894)
352
* "bzr mkdir" now includes -p (--parents) option for recursively adding
354
(Jared Hance, Jelmer Vernooij, #253529)
356
* ``config.Option`` can now declare ``override_from_env``, a list of
357
environment variables which, when set, that takes precedence over values
358
defined in configuration files. (Vincent Ladeuil, #907279)
363
* New HPSS call for ``Repository.reconcile``. (Jelmer Vernooij, #894455)
365
* Merge now has two new hooks ``pre_merge`` and ``post_merge``
366
that are called before and after a merge and can make
367
additional modifications to the trees involved.
368
(Jelmer Vernooij, #906877)
370
* Override the value returned by ``sys.getfilesystemencoding()`` for the bzr
371
script to utf-8 when it would otherwise be ascii on a posix system. This
372
will mean bzr works with non-ascii files when no locale or an incorrect
373
locale is set. (Martin Packman, #794353)
375
* ``bzr branches`` now indicates the active colocated branch.
376
(Jelmer Vernooij, #891667)
378
* ``bzr push`` now suggests using :parent if there is a parent location
379
set. (Jelmer Vernooij)
381
* ``bzr send`` now only opens a single connection, rather than two,
382
to the target branch. (Jelmer Vernooij)
387
* Allow configuration option default value to be a python callable at
388
registration. (Vincent Ladeuil, #832064)
390
* ``bzr config`` will now display the section ``[DEFAULT]`` used in
391
``bazaar.conf``. (Vincent Ladeuil, #907268)
393
* Configuration stores can now provides a specific quoting mechanism. This
394
is required to workaround ``configobj`` conflating quoting and list values
395
automatic conversion. (Vincent Ladeuil, #906897)
397
* Create obsolete_packs directory when repacking if it does not
398
exist. (Jonathan Riddell, Jelmer Vernooij, #314314)
400
* Fallback to the slower ``bzr log`` implementation when displaying a range
401
of revisions whose ancestry is not obviously on the same developement
402
line. (Vincent Ladeuil, #904744)
404
* Make lazy imports resilient when resolved concurrently from multiple
405
threads. Now the stand-in object will behave as a proxy for the real object
406
after the initial access, rather than throwing. Assigning the object to
407
multiple names should still be avoided. (Martin von Gagern, #396819)
409
* Not setting ``gpg_signing_key`` or setting it to ``default`` will use the
410
user email (obtained from the ``email`` configuration option or its
411
default value). (Vincent Ladeuil, Jelmer Vernooij, #904550)
413
* Prevent spurious InconsistentDelta error when committing a move of a
414
non-ascii directory with contents. (Rory Yorke, #185211)
416
* Properly ignore '\n' in an option reference since this cannot be part of a
417
config option identifier. (Vincent Ladeuil, #902125)
419
* Make sure that the bzr probers are always registered when
420
bzrlib.workingtree is imported. (Jelmer Vernooij, #905218)
422
* Report mistake trying to move a removed file with a non-ascii name without
423
UnicodeEncodeError being raised. (Martin Packman, #898541)
425
* Safely unquote configuration values in weird edge cases (a section seen as
426
a dictionary which is not a supported use case for the configuration
427
stacks). (Vincent Ladeuil, #908050)
429
* Stop altering ``sys.platform`` on OSX when initialising the locale.
430
(Martin Packman, #570495)
432
* Uncommit no longer removes tags if they are part of the working
433
trees pending merges. (Jelmer Vernooij, #905462)
438
* ``Config.signature_needed``, ``Config.signing_policy``,
439
``Config.gpg_signing_key``, ``Config.gpg_signing_command``,
440
``Config.checking_policy`` and ``Config.post_commit`` are now deprecated.
443
* ``Repository.get_commit_builder`` now takes a ``config_stack``
444
rather than a ``config`` argument. (Jelmer Vernooij)
446
* Scripts using bzrlib should now ensure setlocale is called on posix
447
platforms if they need a non-ascii user encoding. (Martin Packman)
449
* Send formats now accept a new optional argument ``submit_branch``,
450
which can be None or a Branch object for the submit branch location.
453
* ``VersionedFileRepository.add_revision`` no longer takes a ``config``
454
argument. (Jelmer Vernooij)
459
* Add HPSS call for ``Branch.get_checkout_format``. (Jelmer Vernooij, #894459)
461
* Add HPSS call for ``Repository.pack``. (Jelmer Vernooij, #894461)
463
* Add HPSS calls for ``Repository.iter_files_bytes``, speeding up
464
several commands including ``bzr export`` and ``bzr co --lightweight``.
465
(Jelmer Vernooij, #608640)
467
* All bzr control directories, branch formats, repository formats and
468
working tree formats now support feature flags, which are
469
serialized in their respective format files. See
470
``doc/developers/feature-flags.txt`` for details.
473
* ``bzrlib.urlutils`` now includes ``quote`` and ``unquote`` functions,
474
rather than importing them from ``urllib``. This prevents loading
475
of the ``socket``, ``ssl`` and ``urllib`` modules for
476
local bzr operations. (Jelmer Vernooij)
478
* Configuration options can be SI units by using ``int_SI_from_unicode`` as
479
their ``convert_from_unicode`` helper. (Vincent Ladeuil)
481
* Configuration stacks can now use ``StartingPathMatcher`` to select the
482
sections matching a location while respecting the order chosen by the user
483
in the configuration file: from generic sections to specific
484
sections. (Vincent Ladeuil, #832046).
486
* Configuration stores can now save incremental changes by using
487
``save_changes()`` instead of ``save()``. This reduces the number or
488
required input/outputs and allows stores to be shared between
489
stacks. (Vincent Ladeuil)
491
* ControlDir now has a get_branches method that returns a dictionary
492
whose keys are the names of the branches and whose values are the
493
branches themselves. The active branch uses the key None.
494
(Neil Martinsen-Burrell)
496
* Helper ``osutils.path_from_environ`` added for extracting a unicode path
497
from an environment variable. (Martin Packman, #832028)
499
* Helper ``win32utils.get_environ_unicode`` added for avoiding encoding
500
problems with ``os.environ.get`` use. (Martin Packman, #262874)
502
* Lazy imports can now only be absolute. (Jelmer Vernooij)
504
* Merge3Mergers now have an optional ``other_branch`` argument
505
which contains the branch from which the ``other_tree``
506
was obtained, if any. (Jelmer Vernooij)
508
* MutableTree now has a hook ``post_build_tree`` which is called after
509
a new mutable tree has been created. (Jelmer Vernooij, #912765)
511
* New HPSS call ``BzrDir.checkout_metadir``. (Jelmer Vernooij, #894459)
513
* New HPSS call ``VersionedFileRepository.get_inventories``,
514
speeding up various commands including ``bzr export``,
515
``bzr checkout`` and ``bzr cat``. (Jelmer Vernooij, #608640)
517
* The ``ConfigCommandLineStore`` is now supported by ``bzr config`` and is
518
seen as single no-name section of configuration options. (Vincent Ladeuil)
523
* New matcher ``ContainsNoVfsCalls`` which filters a list of HPSS
524
calls for VFS requests. (Jelmer Vernooij)
526
* New ``MemoryStack`` class allows for diskless tests and locally injected
527
configuration stacks. Lower level tests for predefined set of options can
528
be written without setting up configuration files. (Vincent Ladeuil)
536
This is the fourth beta of the 2.5 series, leading to a 2.5.0 release in
537
February 2012. Beta releases are suitable for everyday use but may cause
538
some incompatibilities with plugins.
540
This release includes many improvements in the smart server, UI polish for
541
the colocated branches, optimizations for revision specifiers to avoid
542
history sized operations, enhancements to the config framework, bug fixes
543
related to unicode paths and more.
545
All bug fixed in previous series known at the time of this release are
548
External Compatibility Breaks
549
*****************************
556
* Provides a ``po_merge`` plugin to automatically merge ``.po`` files with
557
``msgmerge``. See ``bzr help po_merge`` for details.
558
(Vincent Ladeuil, #884270)
563
* ``bzr branch --stacked`` now only makes a single connection to the remote
564
server rather than three. (Jelmer Vernooij, #444293)
566
* ``bzr export --uncommitted`` will export the uncommitted tree.
567
(Jelmer Vernooij, #555613)
569
* ``bzr rmbranch`` can now remove colocated branches.
570
(Jelmer Vernooij, #831464)
572
* ``bzr status`` no longer shows shelves if files are specified.
575
* ``bzr switch`` now accepts colocated branch names to switch to.
576
(Jelmer Vernooij, #826814)
578
* Plugins can now register additional "location aliases".
581
* Revision specifiers will now only browse as much history as they
582
need to, rather than grabbing the whole history unnecessarily in some
583
cases. (Jelmer Vernooij)
585
* When using ``bzr switch`` to switch to a sibling of the current
586
branch, the relative branch name should no longer be url-encoded.
592
* A new section local option ``basename`` is available to help support some
593
``bzr-pipeline`` workflows and more generally help mapping local paths to
594
remote ones. See ``bzr help configuration`` for more details.
595
(Vincent Ladeuil, #843211)
597
* Add HPSS call for looking up revision numbers from revision ids on
598
remote repositories. (Jelmer Vernooij, #640253)
600
* Add HPSS call for retrieving file contents from remote repositories.
601
Should improve performance for lightweight checkouts and exports of
602
from remote repositories. (Jelmer Vernooij, #368717, #762330, #608640)
604
* Allow lazy compiled patterns from ``bzrlib.lazy_regex`` to be
605
pickled. (Jelmer Vernooij, #893149)
607
* ``bzr info`` no longer shows empty output if only a control
608
directory is present. (Jelmer Vernooij, #159098)
610
* Cope with missing revision ids being specified to
611
``Repository.gather_stats`` HPSS call. (Jelmer Vernooij, #411290)
613
* Fix test failures on windows related to locations.conf handling.
614
(Vincent Ladeuil, #892992)
616
* Fixed parsing of the timestamp given to ``commit --commit-time``. Now
617
prohibits several invalid strings, reads the correct number of seconds,
618
and gives a better error message if the time zone offset is not given.
619
(Matt Giuca, #892657)
621
* Give meaningful file/line references when reporting deprecation warnings
622
for _CompatabilityThunkFeature based test features.
623
(Vincent Ladeuil, #897718)
625
* Make reporting of mistakes involving unversioned files with non-ascii
626
filenames work again without 'Unprintable exception' being shown.
627
(Martin Packman, #898408)
629
* Provide names for lazily registered hooks.
630
(Neil Martinsen-Burrell, #894609)
632
* Raise BadIndexKey exception in btree_index when a key is too large, fixing
633
an infinite recursion issue. (Shannon Weyrick, #720853)
635
* Resolve regression from colocated branch path handling, by ensuring that
636
unreserved characters are unquoted in URLs. (Martin Packman, #842223)
638
* Split segments from URLs for colocated branches without assuming the
639
combined form is valid. (Martin Packman, #842233)
641
* Support looking up revision numbers by revision id in empty branches.
642
(Jelmer Vernooij, #535031)
644
* Support verifying signatures on remote repositories.
645
(Jelmer Vernooij, #889694)
647
* Teach the bzr client how to reconnect if we get ``ConnectionReset``
648
while making an RPC request. This doesn't handle all possible network
649
disconnects, but it should at least handle when the server is asked to
650
shutdown gracefully. (John Arbash Meinel, #819604)
652
* When a remote format is unknown, bzr will now print a single-line error
653
message rather than a backtrace. (Jelmer Vernooij, #687226)
658
* ``BzrDir.open_branch`` and ``BranchFormat.open`` now take an optional
659
``possible_transports`` argument. (Jelmer Vernooij)
661
* New method ``Transport.set_segment_parameter``. (Jelmer Vernooij)
663
* ``Repository.verify_revision`` has been renamed to
664
``Repository.verify_revision_signature``. (Jelmer Vernooij)
666
* ``RevisionSpec.wants_revision_history`` now defaults to ``False`` and
667
is deprecated. The ``revs`` argument of
668
``RevisionInfo.from_revision_id`` is now deprecated. (Jelmer Vernooij)
670
* ``Tree.get_file_by_path`` is now deprecated. Use ``Tree.get_file`` instead.
671
(Jelmer Vernooij, #666897)
673
* Some global options for use with commands have been removed, construct
674
an ``Option`` with the name instead. (Martin Packman)
676
* The unused exception ``HistoryMissing`` has been removed.
682
* Add HPSS call for ``Repository.pack``. (Jelmer Vernooij, #894461)
684
* ``bzr config`` uses the new configuration implementation.
687
* Custom HPSS error handlers can now be installed in the smart server client
688
using the ``error_translators`` and ``no_context_error_translators``
689
registries. (Jelmer Vernooij)
691
* New HPSS calls ``Repository.has_signature_for_revision_id``,
692
``Repository.make_working_trees``, ``BzrDir.destroy_repository``,
693
``BzrDir.has_workingtree``, ``Repository.get_physical_lock_status``,
694
``Branch.get_physical_lock_status``,
695
``Branch.put_config_file``, ``Branch.break_lock``,
696
``BzrDir.destroy_branch``, ``Repository.break_lock``,
697
``VersionedFileRepository.get_serializer_format``,
698
``Repository.all_revision_ids``, ``Repository.start_write_group``,
699
``Repository.commit_write_group``, ``Repository.abort_write_group``
700
``Repository.check_write_group``, ``Repository.iter_revisions``,
701
``Repository.add_signature_revision_text`` and
702
``Repository.get_revision_signature_text``.
705
* ``RemoteBranch.get_config_stack`` and ``RemoteBzrDir.get_config_stack``
706
will now use HPSS calls where possible. (Jelmer Vernooij)
708
* The registry of merge types has been moved to ``merge`` from ``option`` but
709
``merge.get_merge_type_registry`` remains as an accessor. (Martin Packman)
714
* Avoid failures in test_transform when OS error messages are localised.
715
(Martin Packman, #891582)
717
* Tests are now subject to a time limit: by default 300s, and 120s when
718
run from 'make check', controlled by the `selftest.timeout`
719
configuration option. This is currently not supported on Windows.
727
This is the third beta of the 2.5 series, leading to a 2.5.0 release in
728
February 2012. Beta releases are suitable for everyday use but may cause
729
some incompatibilities with plugins.
731
This release includes log options for ``push`` and ``pull``, more UI polish
732
for colocated branches, a better and more coherent implementation for UI
733
dialogs, enhancements to the config framework and more.
735
This release includes all bug fixed in previous series known at the time of
738
External Compatibility Breaks
739
*****************************
746
* The ``log_format`` configuration can be used with ``-Olog_format=line`` to
747
change the format ``push`` and ``pull`` use to display the
748
revisions. I.e.: ``bzr pull -v -Olog_format=short`` will use the ``short``
749
format instead of the default ``long`` one. (Vincent Ladeuil, #861472)
751
* The new config scheme allows an alternative syntax for the 'appenpath'
752
policy relying on option expansion and defining a new 'relpath' option
753
local to a section. Instead of using '<option>:policy=appendpath', the
754
option value can de defined as 'option=xxxx/{relpath}'.
755
(Vincent Ladeuil, #832013)
760
* ``bzr info -v`` now shows the number of colocated branches
761
for control directories that support them.
762
(Jelmer Vernooij, #863285)
764
* ``bzr version-info`` now takes a ``--revision`` argument.
765
(Jelmer Vernooij, #238705)
767
* ``bzr revno`` now takes a ``--revision`` argument.
768
(Jelmer Vernooij, #870649)
770
* ``bzr serve`` now can serve from URLs rather than just from the
771
file system. I.e.: ``bzr serve -d lp:bzr`` or
772
``bzr serve -d file:///data/bzr`` (Jelmer Vernooij)
774
* all input prompts are now char-based when possible, and can be forced to
775
line-based mode by setting the ``BZR_TEXTUI_INPUT`` environment variable
776
to 'line-based'. This replace the previous shelf UI only patch using
777
``INSIDE_EMACS``. (Benoît Pierre)
782
* ``bzr info`` now shows the master branch location too for
783
treeless local branches. (Jelmer Vernooij, #258355)
785
* ``bzr mkdir --quiet`` now does not print a line for every created
786
directory. (Martin von Gagern, #869915)
788
* ``bzr mv`` does not crash when attempting to move the root of a
789
branch. (Jonathan Riddell, #809728)
791
* ``bzr shelve`` now use ``UIFactory.choose`` for input handling, making
792
it usable when creating a custom ``UIFactory`` implementation. (Benoît
795
* ``bzr clean-tree`` now use ``UIFactory.get_boolean`` for confirmation
796
prompt, making it usable when using a custom ``UIFactory``
797
implementation. (Benoît Pierre)
799
* If sending a crash through Apport fails report the Apport failure to
800
bzr.log rather than stderr. (Jonathan Riddell, #766735)
802
* ``bzr upgrade`` no longer treats 'already up-to-date' exceptions as
803
errors. (Benoît Pierre, #716560).
805
* ``bzr version-info`` no longer populates the clean state for custom
806
templates unless {clean} is explicitly asked for.
807
(Lawrence Mitchell, #882541)
809
* Fix finding the CPU count when using Python >= 2.6 on BSD-based systems.
810
(Jelmer Vernooij, #887151)
812
* ``WorkingTree.clone()`` now supports its ``revision_id`` being set
813
to the null revision. (Jelmer Vernooij, #876423)
815
* ``WorkingTree.pull`` can now pull ``NULL_REVISION``.
816
(Jelmer Vernooij, #887556)
821
* ``Branch.revision_history`` is now deprecated. (Jelmer Vernooij, #799519)
823
* Methods ``add`` and ``items`` of ``LRUCache`` and ``LRUSizeCache`` are
824
deprecated. Use normal dict-style access instead. (Martin Packman)
826
* New flag ``RepositoryFormat.supports_unreferenced_revisions`` which
827
indicates whether revisions can be present in a repository without
828
being referenced from e.g. a branch history at the same time.
831
* ``UIFactory.choose`` has been added: prompt the user for a list of
832
choices. (Benoît Pierre)
837
* ``ControlDirFormat`` now has a new method ``supports_transport``
838
which format implementations can use whether or not they can access
839
a control dir over a particular transport. (Jelmer Vernooij)
841
* ``BranchBuilder.build_commit`` now take ``parent_ids`` and
842
``allow_leftmost_as_ghost`` arguments. (Jelmer Vernooij)
847
* Ensure TestCase instances are deallocated immediately after running where
848
possible. This greatly reduces the peak resource needs of a full test suite
849
run. The new ``-Euncollected_cases`` selftest flag will add failures if any
850
case which persists pasts its expected lifetime. (Martin Packman, #613247)
852
* Report exceptions from child processes during fork instead of swallowing the
853
error and reporting that everything went okay. (Martin Packman, #804130)
859
This is the second beta of the 2.5 series, leading to a 2.5.0 release in
860
February 2012. Beta releases are suitable for everyday use but may cause some
861
incompatibilities with plugins.
863
This release includes more filtering options for ``bzr log``, idle
864
connections handling for ``bzr serve``, a ``development-colo`` experimental
865
format to flesh out the colocated branches UI, better support for foreign
866
formats, enhancements to the config framework and more.
868
This release includes all bug fixed in previous series known at the time of
873
External Compatibility Breaks
874
*****************************
881
* A new ``-O`` standard option (common to all commands) have been added. It
882
provides a value for a config option in the ``-Oname=value`` form that
883
takes precedence over all definitions found in config files. It can be
884
used multiple times to override different options.
885
(Vincent Ladeuil, #491196)
887
* ``bzr log`` now has an option called ``--omit-merges`` to omit
888
those commits that merged branches, i.e. those having more than one
890
In order to avoid confusion, the previous command line option
891
``--include-merges`` has been renamed to ``--include-merged``.
892
The old name of the command line option will still be accepted.
893
The name change also affects ``bzr missing``.
896
* ``bzr serve`` will now disconnect clients if they have not issued an RPC
897
request after 5minutes. On POSIX platforms, this will also happen for
898
``bzr serve --inet``. This can be overridden with the configuration
899
variable ``serve.client_timeout`` or in the command line parameter
900
``bzr serve --client-timeout=X``. Further, it is possible to request
901
``bzr serve [--inet]`` to shutdown gracefully by sending SIGHUP. It will
902
finish the current request, and then close the connection.
903
(John Arbash Meinel, #824797, #795025)
905
* The new experimental format ``development-colo`` supports colocated
906
branches. This format will eventually be merged back into the ``2a``
907
format when it has stabilized and there is adequate UI support for
909
(Jelmer Vernooij, #831481)
914
* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
915
every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
917
* ``bzr info -v`` can now be run against branches that don't support
918
``last_revision_info``, in which case the branch information will simply
919
not be displayed. (Jelmer Vernooij)
924
* ``bzr shelve`` can now be used in emacs shells as the input handling is
925
turned into a line-based one when ``INSIDE_EMACS`` is set (which is the
926
case for all recent emacs versions). (Vincent Ladeuil, #856261)
928
* ``bzr tags`` can now be used against remote repositories that do
929
not provide access to the revision graph. (Jelmer Vernooij, #858942)
931
* ``bzr update PATH`` will stop if you seem to be asking it to update
932
anything less than a whole tree, because that's not supported by ``bzr``'s
933
concept that the whole tree has a single basis revision. Previously, it
934
would go ahead and update the whole tree, which was surprising.
935
(Martin Pool, #557886)
937
* Don't crash if ``bzrlib.initialize()`` has not been called while accessing
938
configs. (Vincent Ladeuil, #863401)
940
* Redirects between http and https no longer discard path information
941
in some cases. (Jelmer Vernooij, #853765)
943
* The ``--overwrite`` argument to ``bzr push`` and ``bzr pull`` no longer
944
reports all tags as changed. (Jelmer Vernooij, #845396)
946
* ``WorkingTree.get_file_mtime`` now raises NoSuchId if a file id is
947
specified that is unknown. (Jelmer Vernooij, #847435)
953
* ``Branch.get_revision_delta`` has been deprecated. Use
954
``Repository.get_revision_delta`` instead. (Jelmer Vernooij, #859712)
956
* Plugins that implement custom protocols for ``bzr serve`` should now
957
also take an argument ``timeout``. This is used by the the bzr protocol
958
to close a connection if a client has been idle for more than X seconds.
959
(Default 5minutes). (John Arbash Meinel)
961
* ``Repository.fileids_altered_by_revision_ids`` has been moved to
962
``VersionedFileRepository`` and is no longer part of the standard
963
``Repository`` interface. (Jelmer Vernooij)
965
* The argument ``include_merges`` to ``missing.find_unmerged`` has
966
been renamed to ``include_merged``. The old name is still supported
967
for now but will cause a deprecation warning. (Martin von Gagern)
969
* The new method ``ControlDirFormat.is_initializable()`` returns a boolean
970
indicating whether or not it is possible to use any of the
971
initialization methods of that format to create a new control dir.
977
* ``Branch`` objects can now use a config stack with the newly introduced
978
``get_config_stack()``. Both ``get_config`` and ``get_config_stack`` can
979
be used for the same branch but it's recommended to stick to one for a
985
* Test scripts can now use ``bzr shelve`` and provide their input as
986
complete lines. (Vincent Ladeuil, #856261)
988
* Really corrupt the pack file without depending on a special length or value.
989
(Vincent Ladeuil, #807032)
997
This is the first beta of the 2.5 series, leading up to a 2.5.0
998
release in February 2012.
1000
This release includes better support for gpg signing, better support for
1001
i18n (mostly command help and error messages), more options to filter ``bzr
1002
log`` output, more support for colocated branches ("location,branch=XXX"
1003
syntax), better feedback on updated tags for various commands, faster
1004
branching into an empty repository, enhancements to the config framework and
1007
Beta releases are suitable for everyday use but may cause some
1008
incompatibilities with plugins. Some plugins may need small updates to work
1011
External Compatibility Breaks
1012
*****************************
1019
* A ``from_unicode`` parameter can be specified when registering a config
1020
option. This implements boolean, integer and list config options when the
1021
provided ``bool_from_store``, ``int_from_store`` and ``list_from_store``
1022
are used for this parameter. (Vincent Ladeuil)
1024
* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
1025
checks to see if the most recent published source package version for
1026
that project is present in the branch tags. This should help developers
1027
trust whether the packaging branch is up-to-date and can be used for new
1028
changes. The level of verbosity is controlled by the config item
1029
``launchpad.packaging_verbosity``. It can be set to one of
1036
only display if the branch is out-of-date
1039
also display single-line up-to-date and missing,
1043
(default) display multi-line content for all states
1046
(John Arbash Meinel, #609187, #812928)
1048
* Add a config option gpg_signing_key for setting which GPG key should
1049
be used to sign commits. Also default to using the gpg user identity
1050
which matches user_email() as set by whoami.
1051
(Jonathan Riddell, #68501)
1053
* An ``invalid`` parameter can be specified when registering a config option
1054
to decide what should be done when invalid values are
1055
encountered. 'warning' and 'error' will respectively emit a warning and
1056
ignore the value or errors out. (Vincent Ladeuil)
1058
* bzr add now skips large files in recursive mode. The default "large"
1059
size is 20MB, and is configurable via the add.maximum_file_size
1060
option. A value of 0 disables skipping. Named items passed to add are
1061
never skipped. (Shannon Weyrick, #54624)
1063
* ``bzr help configuration/<option>`` display the help for ``option`` for
1064
all registered configuration options. (Vincent Ladeuil, #747050)
1066
* ``bzr log -m`` now matches message, author, committer and bugs instead
1067
of just matching the message. ``--message`` keeps its original meaning,
1068
while ``--match-message, --match-author, --match-committer`` and
1069
``--match-bugs`` match each of those fields. (Jacek Sieka)
1071
* ``config.Option`` can now declare ``default_from_env``, a list of
1072
environment variables to get a default value from. (Vincent Ladeuil)
1074
* ``config.NameMatcher`` can be used to implement config stores and stacks
1075
that need to provide specific option values for arbitrary unique IDs (svn
1076
repository UUIDs, etc). (Vincent Ladeuil, #843638)
1078
* New builtin ``bzr branches`` command, which lists all colocated branches
1079
in a directory. (Jelmer Vernooij, #826820)
1081
* Relative local paths can now be specified in URL syntax by using the
1082
"file:" prefix. (Jelmer Vernooij)
1084
* Report commits signed with expired keys in ``verify-signatures``.
1085
(Jonathan Riddell, #804254)
1087
* Translations are now enabled for command help, errors and globally
1088
for any message using ``gettext`` given on output. (Jonathan Riddell,
1089
INADA Naoki, #83941)
1094
* ``bzr add`` will now warn about nested subtrees that are skipped.
1095
(Jelmer Vernooij, #187342)
1097
* ``bzr commit -m ''`` can now be used to force an empty commit message.
1098
Entering an empty commit message in the message editor still triggers
1099
an error. (Jelmer Vernooij)
1101
* ``bzr pull`` will now mention how many tags it has updated.
1102
(Jelmer Vernooij, #164450)
1104
* ``bzr tag`` no longer errors if a tag already exists but refers to the
1105
same revision, and will mention when a tag has been updated
1106
rather than created. (Jelmer Vernooij, #381203)
1108
* ``bzr uncommit`` will now remove tags that refer to removed revisions.
1109
The ``--keep-tags`` option can be used to prevent this behaviour.
1110
(Jelmer Vernooij, #605814)
1112
* Do not run i18n initialisation twice. (Jonathan Riddell)
1114
* Install translation .mo files. (Jonathan Riddell)
1116
* Locations printed by ``bzr upgrade`` are now formatted before display.
1119
* ``Repository.get_parent_map`` now estimates the size of the returned
1120
content more accurately. This means that we get closer to the desired
1121
64kB/request. For repositories converted from svn, this can be an
1122
improvement of approx 5:1 in round trips to discover the whole history.
1123
(John Arbash Meinel)
1125
* Support a ``bugtracker`` option which is used by ``bzr commit --fixes``
1126
if no bug tracker was specified on the command line.
1127
(Jelmer Vernooij, #334860)
1129
* Use ``gettext.NullTranslations`` in i18n to allow use of i18n even when
1130
translations are not turned on. (Jonathan Riddell)
1135
* ``bzr commit`` now correctly reports missing files as "removed", not
1136
"modified". (Jelmer Vernooij, #553955)
1138
* ``bzr reconfigure`` will now allow multiple non-conflicting requests
1139
in a single invocation, e.g. ``--branch`` and ``--use-shared``.
1140
(Martin von Gagern, #842993)
1142
* A call to CHKInventory's filter-method will not result in a
1143
DuplicateFileId error, if you move a subfolder and change a file in
1145
(Bastian Bowe, #809901)
1147
* Branching from a stacked branch no longer does a ``get_parent_map``
1148
request for each revisions that is in the stacked-on repository while
1149
determining what revisions need to be fetched. This mostly impacts
1150
branching initialy into an empty shared repository when the source is
1151
not the development focus. (John Arbash Meinel, #388269)
1153
* Decode ``BZR_HOME`` with fs encoding on posix platforms to avoid unicode
1154
errors. (Vincent Ladeuil, #822571)
1156
* Fix fallout from URL handling changes in 2.5 that caused an IndexError to be
1157
raised whenever a transport at the drive root was opened on windows.
1158
(Martin [gz], #841322)
1160
* Fixed loading of external merge tools from config to properly decode
1161
command-lines which contain embedded quotes. (Gordon Tyler, #828803)
1163
* Rather than an error being raised, a warning is now printed when the
1164
current user does not have permission to read a configuration file.
1165
(Jelmer Vernooij, #837324)
1167
* The pull command will now always use separate connections for the
1168
case where the destination is a heavyweight checkout of some remote
1169
branch on the same host as the source branch.
1170
(Martin von Gagern, #483661)
1172
* TreeTransformBase.fixup_new_roots no longer forces trees to have a root, so
1173
operations that use it, like merge, can now create trees without a root.
1179
* Release instructions refreshed. (Vincent Ladeuil)
1184
* ``BranchFormat.initialize`` now takes a ``append_revisions_only``
1185
argument. (Jelmer Vernooij)
1187
* ``Branch._get_checkout_format`` now takes a ``lightweight`` argument
1188
which indicates if the format should be for a lightweight or a
1189
heavyweight checkout. (Jelmer Vernooij)
1191
* ``ControlDir.create_branch`` now takes a ``append_revisions_only`` argument.
1194
* New class ``URL`` in ``bzrlib.utils`` for managing parsed URLs.
1197
* New method ``Config.get_user_option_as_int_from_SI`` added for expanding a
1198
value in SI format (i.e. "20MB", "1GB") into its integer equivalent.
1201
* New method ``InterTree.file_content_matches`` which checks that
1202
two files in different trees have the same contents.
1205
* New method ``Tree.get_file_verifier`` which allows tree implementations
1206
to return non-sha1 checksums to verify files.
1207
(Jelmer Vernooij, #720831)
1209
* New methods ``get_transport_from_path`` and ``get_transport_from_url``
1210
have been added that only support opening from a path or a URL,
1211
unlike ``get_transport``. (Jelmer Vernooij)
1213
* New registry ``OptionRegistry`` specialized for configuration options.
1216
* Remove ``AtomicFile.closed`` which has been deprecated in bzr 0.10.
1219
* Remove ``commands._builtin_commands``, ``commands.shlex_split_unicode``,
1220
``Command._maybe_expand_globs`` and ``Command.run_direct`` deprecated in
1221
2.10 and 2.2.0. (Vincent Ladeuil)
1223
* Remove ``diff.get_trees_and_branches_to_diff`` deprecated in 2.2.0.
1225
* Remove ``log.calculate_view_revisions``, ``log._filter_revision_range``,
1226
``log.get_view_revisions`` which have been deprecated in bzr 2.1.0. Also
1227
remove ``log.show_one_log`` which was never properly deprecated but wasn't
1228
used and is easy to inline if needed. (Vincent Ladeuil)
1230
* Remove ``trace.info``, ``trace.error`` and ``trace.show_log_error``
1231
deprecated in 2.1.0. (Vincent Ladeuil)
1233
* Remove ``TransportListRegistry.set_default_transport``, as the concept of
1234
a default transport is currently unused. (Jelmer Vernooij)
1236
* Remove ``UIFactory.warn_cross_format_fetch`` and
1237
``UIFactory.warn_experimental_format_fetch`` in favor of
1238
``UIFactory.show_user_warning``. (Jelmer Vernooij)
1240
* ``Tags`` containers can now declare whether they support versioned
1241
tags and whether tags can refer to ghost tags.
1244
* ``Tags.merge_to`` now returns a dictionary with the updated tags
1245
and a set of conflicts, rather than just conflicts. (Jelmer Vernooij)
1247
* There is a new class `ContentFilterTree` that provides a facade for
1248
content filtering. The `filtered` parameter to `export` is deprecated
1249
in favor of passing a filtered tree, and the specific exporter plugins
1250
no longer support it.
1253
* ``Transport`` now has a ``_parsed_url`` attribute instead of
1254
separate ``_user``, ``_password``, ``_port``, ``_scheme``, ``_host``
1255
and ``_path`` attributes. Proxies are provided for the moment but
1256
may be removed in the future. (Jelmer Vernooij)
1261
* A new debug flag ``hpss_client_no_vfs`` will now cause the HPSS client
1262
to raise a ``HpssVfsRequestNotAllowed`` exception when a VFS request
1263
is attempted. (Jelmer Vernooij)
1265
* New method ``ControlDir._get_selected_branch`` which returns the
1266
colocated branch selected using path segment parameters.
1267
(Jelmer Vernooij, #380871)
1272
* Blackbox tests (including test scripts) can be debugged interactively (see
1273
bzrlib.debug.BzrPdb for details). (Vincent Ladeuil)
1275
* `BranchBuilder.build_snapshot` now supports a "flush" action. This
1276
cleanly and reliably allows tests using `BranchBuilder` to construct
1277
branches that e.g. rename files out of a directory and unversion that
1278
directory in the same revision. Previously some changes were impossible
1279
due to the order that `build_snapshot` performs its actions.
1282
* Don't require ``os.fdatasync`` to be defined on all supported OSes
1283
(BSD-based OSes don't define it). (Vincent Ladeuil, #822649)
1285
* Fix compatibility with testtools 0.9.12. (Jelmer Vernooij, #815423)
1287
* ``LockDir`` can now be run when the local hostname is ``localhost``.
1288
(Jelmer Vernooij, #825994)
1290
* ``ModuleAvailableFeature`` won't try to import already imported modules,
1291
allowing it to be used for modules with side-effects.
1292
(Vincent Ladeuil, #712474)
1294
* Output time stamps while running ``make check`` to get better timings from
1295
pqm. (Vincent Ladeuil, #837926)
1297
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
1298
just compares the bytes in the dirstate file to its pristine state,
1299
rather than opening the WorkingTree and calling ``last_revision()``.
1300
This reduces the overall test suite time by about 10% on my laptop.
1303
* Update `TestCase.knownFailure` to the testtools way of handling expected
1304
failures to resolve Python 2.7 incompatibility. (Martin [gz], #607400)
1307
vim: tw=74 ft=rst ff=unix
added
removed
doc/en/release-notes/bzr-2.5.txt
