5
5
.. contents:: List of Releases
12
:2.3b1: NOT RELEASED YET
17
* BzrError subclasses no longer support the name "message" to be used
18
as an argument for __init__ or in _fmt format specification as this
19
breaks in some Python versions. errors.LockError.__init__ argument
20
is now named "msg" instead of earlier "message".
21
(Parth Malwankar, #603461)
23
* `decode` parameter to get() method in FtpTransport and GioTransport classes
24
is deprecated. (Alexander Belchenko)
26
* `FileInWrongBranch` is deprecated in favour of `PathNotChild` and no
30
* `tree_files` and `internal_tree_files` are now deprecated in favor of
31
`WorkingTree.open_containing_paths`.
34
* `ControlDirFormat` and `ControlDir` have been split out of `BzrDirFormat`
35
and `BzrDir`, respectively. `ControlDirFormat`
36
and `ControlDir` should be used as the base classes for new non-.bzr
39
`BzrDirFormat.register_control_format` has been renamed to
40
`ControlDirFormat.register_format`.
42
`BzrDirFormat.register_server_control_format` has been removed.
44
Probing for control directories is now done by separate objects derived
45
from `bzrlib.controldir.Prober` and registered using
46
`bzrlib.controldir.ControlDirFormat.register_prober` or
47
`bzrlib.controldir.ControlDirFormat.register_server_prober`.
48
`BzrDirFormat.probe_transport` has been moved onto `Prober`.
50
`BzrDirFormat.register_format` has been renamed to
51
`BzrProber.register_bzrdir_format`.
54
* The old ``bzr selftest --benchmark`` option has been removed.
55
<https://launchpad.net/bzr-usertest> is an actively-maintained
62
* ``bzr break-lock --config [location]`` can now break config files
63
locks. (Vincent Ladeuil, #525571)
65
* ``bzrlib.config.LockableConfig`` is a base class for config files that
66
needs to be protected against multiple writers. All methods that
67
change a configuration variable value must be decorated with
68
@needs_write_lock (set_option() for example).
69
(Vincent Ladeuil, #525571)
71
* The ``lp:`` prefix will now use your known username (from
72
``bzr launchpad-login``) to expand ``~`` to your username. For example:
73
``bzr launchpad-login user && bzr push lp:~/project/branch`` will now
74
push to ``lp:~user/project/branch``. (John Arbash Meinel)
79
* Allow using both --using and --diff-options.
80
(Matthäus G. Chajdas, #234708)
82
* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
83
previously-unversioned directory within the tree: the directory is
85
(Martin Pool, #192859)
87
* ``bzr ignore PATTERNS`` exits with error if a bad pattern is supplied.
88
``InvalidPattern`` exception error message now shows faulting
90
(Parth Malwankar #300062)
92
* ``clean-tree`` issues a warning if it is unable to delete a file
93
due to ``errno.EACCES`` instead of exiting with an error on Windows.
94
(Parth Malwankar, #430785)
96
* CommitBuilder now uses the committer instead of _config.username to generate
97
the revision-id. (Aaron Bentley, #614404)
99
* Configuration files in ``${BZR_HOME}`` are now protected against
100
concurrent writers by using a lock. (Vincent Ladeuil, #525571)
102
* Cope with Microsoft FTP Server and VSFTPd that return reply '250
103
Directory created' when mkdir succeeds. (Martin Pool, #224373)
105
* Decrease peak memory during ``bzr send``. The old code was caching all
106
text content and all inventory strings for all revisions before
107
computing the diffs. Now we only cache as long as there is a child that
108
will need them. Sending 2000 bzr revisions drops from 1.2GB peak to
109
256MB peak. (John Arbash Meinel, #614576)
111
* Don't print internal object name when print an invalid revision spec
112
error. (Neil Martinsen-Burrell, #598701)
114
* ``EPIPE`` can be raised during test server shutdown. This happened on
115
gentoo only so far. (Vincent Ladeuil, #627277)
117
* Errors occurring during http(s) test server starts should now be
118
handled cleanly. (Vincent Ladeuil, #392402)
120
* Fix ``AttributeError on parent.children`` when adding a file under a
121
directory that was a symlink in the previous commit.
122
(Martin Pool, #192859)
124
* Fix spurious paramiko warning on hardy by ensuring that ``selftest``
125
properly remove its warning filter. (Vincent Ladeuil, #625686)
127
* ``HTTP/1.1`` test servers now set a ``Content-Length`` header to comply
128
with pedantic ``HTTP/1.1`` clients. (Vincent Ladeuil, #568421)
130
* Most of the leaked threads during selftest are now fixed, allowing the
131
full test suite to pass on gentoo.
132
(Vincent Ladeuil, #392127)
134
* `PathNotChild` should not give a traceback.
135
(Martin Pool, #98735)
137
* ``PQM`` will no longer ignore syntax errors in submissions.
138
(Vincent Ladeuil, #626667)
140
* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
141
which can result in "missing referenced chk root keys" errors when
142
fetching from repositories with affected revisions.
143
(Andrew Bennetts, #522637)
145
* ``Transport.stat`` on a symlink, including a transport pointing directly
146
to a symlink, now returns information about the symlink.
152
* ``bzr remove`` now just backs up changed files instead of exiting,
153
forcing you to choose to either keep or delete them. Bazaar will now delete
154
the files if they can easily be recovered using revert, otherwise they
155
will be backed up (adding an extention of the form .~#~).
156
(Marius Kruger, #400554)
158
* ``bzr revert`` and ``bzr status`` are up to 15% faster on large trees
159
with many changes by not repeatedly building a list of all file-ids.
162
* Decrease memory consumption when many chk index pages are loaded. (Such
163
as during ``bzr co`` or ``bzr ls -R`` of a large tree.) Often we need to
164
read many chk pages because the individual chk map nodes will be spread
165
randomly. Peak memory for 'bzr ls -R' on a large tree dropped from 396MB
166
down to 247MB, expect even more significant savings on 64-bit platforms.
169
* ``DirState`` internals use a little bit less memory. For bzr.dev it
170
drops the memory from 1MB down to about 800kB. And replaces a few
171
thousand tuples and sets with StaticTuple. (John Arbash Meinel)
173
* Inventory entries now consume less memory (on 32-bit Ubuntu file entries
174
have dropped from 68 bytes to 40, and directory entries from 120 bytes
175
to 48). (Andrew Bennetts)
177
* When building new working trees, default to reading from the repository
178
rather than the source tree unless explicitly requested. (via
179
``--files-from`` and ``--hardlink`` for ``bzr branch`` and
180
``bzr checkout``. Generally, 2a format repositories extract
181
content faster than seeking and reading content from another tree,
182
especially in cold-cache situations. (John Arbash Meinel, #607298)
187
* Added a builder/writer sphinx extension that can generate texinfo files. The
188
generated files are syntactically correct but the info navigation nodes
189
needs more work. (Vincent Ladeuil, #219334)
191
* First tests defined for sphinx, including a new bzrlib.tests.features.sphinx
192
to make the tests conditional.
195
* Fix a lot of references in the docs to the old http://bazaar-vcs.org to
196
the new http://bazaar.canonical.com or http://wiki.bazaar.canonical.com
197
(John Arbash Meinel, #617503)
202
* Configuration files should now use the ``from_string`` constructor rather
203
than the ``file`` parameter of the ``_get_parser`` method. The later has
204
been deprecated. ``from_string`` also accept a ``save=True`` parameter to
205
have the configuration file immediately written to disk.
208
* ``IniBaseConfig`` objects should now use the ``from_string`` constructor
209
the rather than the ``file`` parameter of the ``_get_parser`` method. The
210
later has been deprecated. (Vincent Ladeuil)
212
* InventoryEntry instances now raise AttributeError if you try to assign
213
to attributes that are irrelevant to that kind of entry. e.g. setting
214
``symlink_target`` on an InventoryFile will fail. It is still okay to
215
read those attributes on any kind of InventoryEntry. The complete list
216
of affected attributes is: ``executable``, ``text_id``, ``text_sha1``,
217
``text_size`` (only valid for kind == file); ``symlink_target`` (only
218
valid for kind == link); and ``reference_revision`` (only valid for kind
219
== tree-reference). (Andrew Bennetts)
221
* InventoryEntry objects no longer have ``_put_in_tar`` or
222
``_put_on_disk`` methods. (Andrew Bennetts)
224
* The ``get_filename`` parameter in the ``config.IniBaseConfig``
225
constructor has been deprecated, use the ``file_name`` parameter instead.
231
* Remove used and broken code path in ``BranchInitHookParams.__repr__``.
237
* HTTP test servers will leak less threads (and sockets) and will not hang on
238
AIX anymore. (Vincent Ladeuil, #405745)
240
* The way ``bzr selftest --parallel`` generates N partitions of tests to
241
run in parallel has changed. Instead of splitting the list of tests at
242
N-1 points, it distributes the tests one-by-one into the partitions in a
243
round robin fashion. This reduces the total time to run the tests in
244
parallel because a series of slow tests in the test suite will be
245
distributed evenly among the parallel test suites, rather than slowing
246
down just one suite. (Andrew Bennetts)
253
:2.2.1: NOT RELEASED YET
258
* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
259
previously-unversioned directory within the tree: the directory is
260
marked versioned too.
261
(Martin Pool, #192859)
263
* CommitBuilder now uses the committer instead of _config.username to generate
264
the revision-id. (Aaron Bentley, #614404)
266
* Cope with Microsoft FTP server that returns reply '250 Directory
267
created' when mkdir succeeds. (Martin Pool, #224373)
269
* Fix ``AttributeError on parent.children`` when adding a file under a
270
directory that was a symlink in the previous commit.
271
(Martin Pool, #192859)
276
* Fix a lot of references in the docs to the old http://bazaar-vcs.org to
277
the new http://bazaar.canonical.com or http://wiki.bazaar.canonical.com
278
(John Arbash Meinel, #617503)
283
* Remove used and broken code path in ``BranchInitHookParams.__repr__``.
293
This release marks the start of another long-term-stable series. From
294
here, we will only make bugfix releases on the 2.2 series (2.2.1, etc),
295
while 2.3 will become our new development series. The 2.0 and 2.1 series
296
will also continue to get bugfixes. (Currently 2.0 is planned to be
297
supported for another 6 months.)
299
This is primarily a bugfix and polish release over the 2.1 series, with
300
a large number of bugs fixed (>120), and some performance improvements.
302
There are some compatibility changes in this release. For users of bzrlib
303
as a library, we now request that they call ``bzrlib.initialize`` and use
304
the returned context manager appropriately. For commandline users we no
305
longer guess user identity for ``bzr commit``, users must specify their
306
identity using ``bzr whoami`` (you don't need to specify your identity for
307
readonly operations).
309
Users are encouraged to upgrade from the other stable series.
314
* BzrError subclasses no longer support the name "message" to be used
315
as an argument for __init__ or in _fmt format specification as this
316
breaks in some Python versions. errors.LockError.__init__ argument
317
is now named "msg" instead of earlier "message".
318
(Parth Malwankar, #603461)
320
* The old ``bzr selftest --benchmark`` option has been removed.
321
<https://launchpad.net/bzr-usertest> is an actively-maintained
322
macrobenchmark suite.
328
* ``bzr ignore PATTERNS`` exits with error if a bad pattern is supplied.
329
``InvalidPattern`` exception error message now shows faulting
331
(Parth Malwankar #300062)
333
* Configuration files in ``${BZR_HOME}`` are now written in an atomic
334
way which should help avoid problems with concurrent writers.
335
(Vincent Ladeuil, #525571)
337
* Don't traceback trying to unversion children files of an already
338
unversioned directory. (Vincent Ladeuil, #494221)
340
* ``HTTP/1.1`` test servers now set a ``Content-Length`` header to comply
341
with pedantic ``HTTP/1.1`` clients. (Vincent Ladeuil, #568421)
343
* Progress bars prefer to truncate the text message rather than the
344
counters. The spinner is shown between the network transfer indicator
345
and the progress message. Progress bars are correctly cleared off when
346
they finish. (Martin Pool, #611127)
348
* Recursive binding for checkouts is now detected by bzr. A clear error
349
message is shown to the user. (Parth Malwankar, #405192)
354
* Add ``bzrlib.merge.MergeIntoMerger``, which can merge part or all of a
355
tree, and works with unrelated branches. (Andrew Bennetts)
357
* Add py2exe windows target ``bzrw.exe``. This allow for starting a Bazaar
358
GUI with out have a console open in the background.
359
(Gary van der Merwe, #433781)
364
* ``bzr help patterns`` now explains case insensitive patterns and
365
points to Python regular expression documentation.
366
(Parth Malwankar, #594386)
371
* Delete ``ProgressTask.note``, which was deprecated in 2.1.
376
* Unit test added to ensure that "message" is not uses as a format variable
377
name in BzrError subclasses as this conflicts with some Python versions.
378
(Parth Malwankar, #603461)
383
:Codename: Monkey Magic
387
This fourth and final beta in the 2.2 series now stabilizes the internal
388
APIs. Plugin authors are recommended to ensure their releases are
389
compatible, so that 2.2rc1 can be a true release candidate, containing
390
stable and compatible plugin versions.
392
For users of bzrlib as a library, one of the primary changes is to request
393
that they call ``bzrlib.initialize`` and use the returned context manager
396
Better interaction with ``bzr-loom`` to make sure branching from a loom
397
even over a smart server still yields a local loom. Not to mention lots of
403
* bzrlib library users now need to call ``__enter__`` and ``__exit__`` on
404
the result of ``bzrlib.initialize``. This change was made when fixing
405
the bad habit recent bzr versions have had of leaving progress bars
406
behind on the screen. That required calling another function before
407
exiting the program, and it made sense to provide a full context
408
manager at the same time. (Robert Collins)
410
* The ``bzr`` front end now requires a ``bzrlib.ui.ui_factory`` which is a
411
context manager in the Python 2.5 and above sense. The bzrlib base class
412
is such a manager, but third party UI factories which do not derive from
413
``bzrlib.ui.UIFactory`` will be incompatible with the command line front
416
* URLs like ``foo:bar/baz`` are now always parsed as a URL with scheme "foo"
417
and path "bar/baz", even if bzr does not recognize "foo" as a known URL
418
scheme. Previously these URLs would be treated as local paths.
425
* Support ``--directory`` option for a number of additional commands:
426
conflicts, merge-directive, missing, resolve, shelve, switch,
427
unshelve, whoami. (Martin von Gagern, #527878)
432
* ``bzr branch`` to a new repository with a default stacking policy no
433
longer transfers the full history unnecessarily.
434
(Andrew Bennetts, #597942)
436
* ``bzr init`` does not recursively scan directory contents anymore
437
leading to faster init for directories with existing content.
438
(Martin [gz], Parth Malwankar, #501307)
440
* ``bzr log --exclude-common-ancestry`` is now taken into account for
441
linear ancetries. (Vincent Ladeuil, #575631)
443
* ``bzr log -r branch:REMOTE`` can now properly log the remote branch,
444
rather than trying to fetch the data locally and failing because of a
445
readonly error. (Martin von Gagern, #149270)
447
* ``bzr pull`` now works when a lp: URL is explicitly defined as the parent
448
or pull location in locations.conf or branch.conf.
449
(Gordon Tyler, #534787)
451
* ``bzr reconfigure --unstacked`` now works with branches accessed via a
452
smart server. (Andrew Bennetts, #551525)
454
* ``BzrDir.find_branches`` should ignore branches with missing repositories.
455
(Marius Kruger, Robert Collins)
457
* ``BzrDir.find_bzrdirs`` should ignore dirs that raises PermissionDenied.
458
(Marius Kruger, Robert Collins)
460
* Ensure that wrong path specifications in ``BZR_PLUGINS_AT`` display
461
proper error messages. (Vincent Ladeuil, #591215)
463
* Explicitly removing ``--profile-imports`` option from parsed command-line
464
arguments on Windows, because bzr script does the same.
465
(Alexander Belchenko, #588277)
467
* Fetching was slightly confused about the best code to use and was
468
using a new code path for all branches, resulting in more lookups than
469
necessary on old branches. (Robert Collins, #593515)
471
* Final fix for 'no help for command' issue. We now show a clean message
472
when a command has no help, document how to set help more clearly, and
473
test that all commands available to the test suite have help.
474
(Robert Collins, #177500)
476
* Invalid patterns supplied to ``Globster`` or ``lazy_regex`` now raise
477
``InvalidPattern`` exception showing clear error message to the user.
478
(Parth Malwankar #300062)
480
* Progress output is cleaned up when exiting. (Aaron Bentley)
482
* Raise ValueError instead of a string exception.
483
(John Arbash Meinel, #586926)
485
* Relative imports in plugins are now handled correctly when using
486
BZR_PLUGINS_AT. (Vincent Ladeuil, #588959)
488
* ``ScriptRunner`` now strips off leading indentation from test scripts,
489
which previously caused "SyntaxError: No command for line".
492
* Show unicode filenames in diff headers using terminal encoding.
493
(Alexander Belchenko, Bug #382699)
494
NOTE for Windows users: If user need to save diff to file then user need to
495
change encoding of the terminal to ANSI encoding with command ``chcp XXX``
496
(e.g. ``chcp 1251`` for Russian Windows).
498
* URL displayed for use with ``break-lock`` when smart server sees lock
499
contention are now valid. Default timeout for lock contention retry is
500
now 30 seconds instead of 300 seconds.
501
(Parth Malwankar, #250451)
503
* ``walkdirs`` now raises a useful message when the filenames are not using
504
the filesystem encoding. (Eric Moritz, #488519)
506
* Enable debugging of bzr on windows with pdb and other tools. This was
507
broken because we call GetCommandLineW on windows. The fix adjusts the
508
command line we get to be the same length as sys.argv.
509
(Jason Spashett, Alexander Belchenko, #587868)
514
* Bazaar now reads data from SSH connections more efficiently on platforms
515
that provide the ``socketpair`` function, and when using paramiko.
516
(Andrew Bennetts, #590637)
518
* ``Branch.copy_content_into`` is now a convenience method dispatching to
519
a ``InterBranch`` multi-method. This permits ``bzr-loom`` and other
520
plugins to intercept this even when a ``RemoteBranch`` proxy is in use.
521
(Robert Collins, #201613)
523
* ``Branch`` formats can now be loaded lazily by registering a
524
``MetaDirBranchFormatFactory`` rather than an actual format. This will
525
cause the named format class to be loaded only when an enumeration of
526
formats is needed or when the format string for the object is
527
encountered. (Robert Collins, Jelmer Vernooij)
529
* The encoding that bzr uses to output things other than file content can
530
now be overridden via the output_encoding configuration option.
531
(Martin Pool, #340394)
533
* Use lazy imports in ``bzrlib/merge.py`` so that plugins like ``news_merge``
534
do not cause modules to be loaded unnecessarily just because the plugin
535
registers a merge hook. This improves ``bzr rocks`` time by about 25%
536
in a default installation (with just the core plugins).
542
* Added ``regression`` tag to our tags list. (Robert Collins)
544
* Improved our release checklist to have a bit less churn and leave things
545
ready-to-go for the next action (including other people doing
546
development). (Robert Collins)
548
* Remove obsolete discussion of PQM in documentation about how to
549
contribute to Bazaar. (Martin Pool, #588444)
554
* ``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns
555
an iterable of format pairs, rather than just a single pair, permitting
556
InterBranch objects that work with multiple permutations to be
557
comprehensively tested. (Robert Collins)
559
* ``bzrlib.lsprof.profile`` will no longer silently generate bad threaded
560
profiles when concurrent profile requests are made. Instead the profile
561
requests will be serialised. Reentrant requests will now deadlock.
564
* ``bzrlib.knit.KnitSequenceMatcher``, which has been deprecated since
565
2007, has been deleted. Use ``PatienceSequenceMatcher`` from
566
``bzrlib.patiencediff`` instead. (Andrew Bennetts)
568
* ``bzrlib.re_compile_checked`` is now deprecated. Caller should handle
569
``bzrlib.errors.InvalidPattern`` exception thrown by ``re.match`` in
570
case the default error message not suitable for the use case.
573
* ``bzrlib.tests.blackbox.ExternalBase`` is deprecated. It provided only
574
one method ``check_output``, and we now recommend checking command
575
output using ``run_script``. (Martin Pool)
577
* ``bzrlib.transport.ssh.SSHVendor.connect_ssh`` now returns an object
578
that implements the interface of ``bzrlib.transport.ssh.SSHConnection``.
579
Third-party implementations of ``SSHVendor`` may need to be updated
580
accordingly. Similarly, any code using ``SSHConnection`` directly will
581
need to be updated. (Andrew Bennetts)
583
* The constructor of ``bzrilb.smart.medium.SmartSSHClientMedium`` has
584
changed to take an ``SSHParams`` instance (replacing many individual
585
values). (Andrew Bennetts)
590
* ``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
591
selection when explicitly requested; this avoids many duplicate calls
592
being logged when helpers, wrappers and older code that manually calls
593
it are executed it is now logged deliberately by the ui setup code.
596
* Improved ``bzrlib.urlutils`` to handle lp:foo/bar URLs. (Gordon Tyler)
598
* ``bzrlib._c_static_tuple.StaticTuple`` now implements ``__sizeof__``, so
599
that ``sys.getsizeof`` and other memory analysis tools will report more
600
accurate results. (Andrew Bennetts)
602
* The symbol_versioning module can now cleanup after itself -
603
``suppress_deprecation_warnings`` now returns a cleanup function.
609
* Add ``bzrlib.tests.fixtures`` to hold code for setting up objects
610
to test. (Martin Pool)
612
* ``test_import_tariff`` now respects BZR_PLUGINS_AT and BZR_PLUGINS_DISABLE.
613
(Vincent Ladeuil, #595587)
620
This third beta in the 2.2 series brings with it all the goodness of 2.1.2
621
and 2.0.6 (though it preceeds 2.0.6 slightly). Of particular note for
622
users are compatibility fixes with bzr 1.5 and below servers, a hopeful
623
end to the EINTR errors caused by SIGWINCH interactions, a shiny new
624
bash completion script and bzr will no longer guess at identity details -
625
it was too unreliable in reality. Use ``bzr whoami`` on every new install.
626
For developers we have some API changes which may impact plugins as well
627
as a bunch of our regular improvements to internal clarity and test
633
* An API break has been made to the lock_write method of ``Branch`` and
634
``Repository`` objects; they now return ``branch.BranchWriteLockResult``
635
and ``repository.RepositoryWriteLockResult`` objects. This makes
636
changing the API in future easier and permits some cleaner calling code.
637
The lock_read method has also changed from having no defined return
638
value to returning ``LogicalLockResult`` objects.
641
* ``bzr`` does not try to guess the username as ``username@hostname``
642
and requires it to be explictly set. This can be set using ``bzr
643
whoami``. (Parth Malwankar, #549310)
645
* ``bzrlib.commands.Command`` will now raise ValueError during
646
construction if there is no __doc__ set. (Note, this will be reverted in
647
2.2b4) (Robert Collins)
649
* The source tree no longer contains a contrib/zsh/_bzr completion
650
script. The new file contrib/zsh/README suggests alternatives.
651
(Martin von Gagern, #560030)
656
* ``bzr commit`` accepts ``-p`` (for "patch") as a shorter name for
658
(Parth Malwankar, #571467)
660
* ``bzr ignore`` now supports a ``--default-rules`` option that displays
661
the default ignore rules used by bzr. The flag ``--old-default-rules``
662
is no longer supported by ``ignore``.
663
(Parth Malwankar, #538703)
665
* ``bzr pack`` now supports a ``--clean-obsolete-packs`` option that
666
can save disk space by deleting obsolete pack files created during the
668
(Parth Malwankar, #304320)
670
* New command line option ``--authors`` to ``bzr log`` allows users to
671
select which of the apparent authors and committer should be
672
included in the log. Defaults depend on format. (Martin von Gagern, #513322)
674
* Support ``--directory`` option for a number of additional commands:
675
added, annotate, bind, cat, cat-revision, clean-tree, deleted,
676
export, ignore, ignored, lookup-revision, ls, modified, nick,
677
re-sign, unbind, unknowns.
678
(Martin von Gagern, #527878)
680
* The bash_completion plugin from the bzr-bash-completion project has
681
been merged into the tree. It provides a bash-completion command and
682
replaces the outdated ``contrib/bash/bzr`` script with a version
683
using the plugin. (Martin von Gagern, #560030)
685
* A new transport based on GIO (the gnome i/o library) provides access to
686
samba shares, webdav using gio+smb and gio+dav. It is also possible to
687
use gio for some already existing transport methods as gio+file,
694
* Alias information shown by ``bzr help`` is now accurate. This
695
was showing an internal object name for some plugin aliases.
696
(Parth Malwankar, #584650)
698
* ``.bazaar``, ``.bazaar/bazaar.conf`` and ``.bzr.log`` inherit user and
699
group ownership from the containing directory. This allow bzr to work
701
(Martin <gzlist@googlemail.com>, Parth Malwankar, #376388)
703
* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
704
support of bzr-externals and scmproj plugins.
705
(Alexander Belchenko, bug #572098)
707
* ``bzr ignore`` will no longer add duplicate patterns to .bzrignore.
708
(Gordon Tyler, #572092)
710
* ``bzr log --exclude-common-ancestry -r X..Y`` displays the revisions that
711
are part of Y ancestry but not part of X ancestry (aka the graph
713
(Vincent Ladeuil, #320119)
715
* ``bzr lp-propose`` which was switched to use production Launchpad API
716
servers a few commits ago has been reverted to use edge: there is a
717
problem with using production which isn't trivially obvious, so we've
718
filed a bug to track it, and until thats fixed will be using edge.
719
(Robert Collins, #583667)
721
* ``bzr rm`` should not refuse to delete directories which contained a file
722
which has been moved elsewhere in the tree after the previous commit.
723
(Marius Kruger, Daniel Watkins, #129880)
725
* ``bzr selftest --parallel=fork`` wait for its children avoiding zombies.
726
(Vincent Ladeuil, #566670)
728
* ``bzr selftest`` should not use ui.note() since it's not unicode safe.
729
(Vincent Ladeuil, #563997)
731
* CommitBuilder refuses to create revisions whose trees have no root.
734
* Do not register a SIGWINCH signal handler, instead just poll for the
735
terminal width as needed. This avoids the "Interrupted System Call"
736
problems that occur on POSIX with all currently released versions of
738
(Andrew Bennetts, #583941)
740
* Don't mention --no-strict when we just issue the warning about unclean trees.
741
(Vincent Ladeuil, #401599)
743
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
745
(Andrew Bennetts, #528041)
747
* Improved progress bar for fetch (2a format only). Bazaar now shows an
748
estimate of the number of records to be fetched vs actually fetched.
749
(Parth Malwankar, #374740, #538868)
751
* Reduce peak memory by one copy of compressed text.
752
(John Arbash Meinel, #566940)
754
* ``RemoteBranch.lock_write`` raises ``ReadOnlyError`` if called during a
755
read lock, rather than causing an ``AttributeError``.
756
(Andrew Bennetts, Данило Шеган, #582781)
758
* Selftest was failing with testtools 0.9.3, which caused an
759
AssertionError raised from a cleanUp to be reported as a Failure, not an
760
Error, breaking on of our test hygiene tests.
761
(Robert Collins, Vincent Ladeuil).
763
* ``set_user_option`` with a dict on remote branches no longer fails with
764
an AttributeError. There is a new ``Branch.set_config_option_dict`` RPC
765
to support this efficiently.
766
(Andrew Bennetts, #430382)
768
* Show the filenames when a file rename fails so that the error will be
770
(Martin Pool, #491763)
772
* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
773
(John Arbash Meinel, #582656)
775
* Unicode characters in aliases are now handled correctly and do not cause
776
UnicodeEncodeError exception. (Parth Malwankar, #529930)
778
* Unicode commit messages that are the same as a file name no longer cause
779
UnicodeEncodeError. ``ui.text.show_warning`` now handles unicode
781
(Parth Malwankar, #563646)
783
* Using bzr with `lp:` urls behind an http proxy should work.
784
(Robert Collins, #558343)
786
* When passing a file to ``UTF8DirReader`` make sure to close the current
787
directory file handle after the chdir fails. Otherwise when passing many
788
filenames into a command line ``bzr status`` we would leak descriptors.
789
(John Arbash Meinel, #583486)
794
* ``append_revisions_only`` will now be interpreted as a boolean and a
795
warning emitted if illegal values are used. Note that for projects
796
that needs to maintain compatibility with previsous bzr versions,
797
only 'True' and 'False' strings must be used (previous versions of
798
bzr will interpret all strings differing from 'True'
799
(case-sensitive) as false.
800
(Brian de Alwis, Vincent Ladeuil)
802
* ``bzr ls`` now supports short options for existing long options.
803
``-k/--kind``, ``-i/--ignored``, ``-u/--unknown`` and ``-0/--null``.
804
(Parth Malwankar, #181124)
806
* ``Config.get_user_option_as_bool`` will now warn if a value cannot
807
be interpreted as a boolean.
810
* The all-in-one Windows installer will now be built with docstrings stripped
811
from the library zip, reducing the size and slightly improving cold startup
812
time. Bundled plugins are unchanged for the moment, but if adding other new
813
plugins to an all-in-one installation, ensure they are compiled and
814
installed with -O1 or help may not work. (Martin [gz])
819
* Added ``bzrlib.merge.PerFileMerger``, a more convenient way to write
820
some kinds of ``merge_file_content`` hook functions.
823
* `BzrDir`, `Branch`, `Repository` and `WorkingTree` now all support `user_url`,
824
`user_transport`, `control_url` and `control_transport` members pointing
825
respectively to the directory containing the ``.bzr`` control directory,
826
and to the directory within ``.bzr`` used for the particular component.
827
All of them inherit from `ControlComponent` which provides default
831
* Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
832
expected to return an object which can be used to unlock them. This reduces
833
duplicate code when using cleanups. The previous 'tokens's returned by
834
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
835
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
836
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)
838
* ``Repository.refresh_data`` may now be called in a write group on
839
pack-based repositories. Older repositories will still raise an error
840
in this case. Subclasses of ``Repository`` can still override
841
``Repository._refresh_data``, but are now responsible for raising
842
``bzrlib.repository.IsInWriteGroupError`` if they do not support
843
``refresh_data`` during a write group.
844
(Andrew Bennetts, #574236)
849
* ``chk_map._bytes_to_text_key`` is now an optimized function to extract
850
the (file-id, revision-id) key from a CHKInventory entry. This can
851
potentially shave 5-10% time off during a large fetch. Related to bug
852
#562666. (John Arbash Meinel)
854
* ``log._get_info_for_log_files`` now takes an add_cleanup callable.
857
* ``_remember_remote_is_before`` no longer raises AssertionError when
858
suboptimal network behaviour is noticed; instead it just mutters to the
859
log file (and warns the user if they have set the ``hpss`` debug flag).
860
This was causing unnecessary aborts for performance bugs that are minor
862
(Andrew Bennetts, #528041)
864
* Permit bzr to run under ``python -OO`` which reduces the size of bytecode
865
files loaded from disk. To ensure docstrings needed for help are never
866
stripped, the prefix ``__doc__ =`` should now be used.
867
(Martin <gzlist@googlemail.com>)
869
* No longer require zlib headers to build extensions, and remove the need
870
for seperate copy of zlib library on windows.
871
(John Arbash Meinel, Martin <gzlist@googlemail.com>, #566923)
876
* Added ``bzrlib.tests.matchers`` as a place to put matchers, along with
877
our first in-tree matcher. See the module docstring for details.
880
* ``bzr selftest --parallel=subprocess`` now works correctly on win32.
881
(Gordon Tyler, #551332)
883
* Workaround ``Crypto.Random`` check leading to spurious test
884
failures on Lucid, FreeBSD and gentoo.
885
(Vincent Ladeuil, #528436)
887
* New class ``ExecutableFeature`` for checking the availability of
888
executables on the ``PATH``. Migrated from bash_completion plugin.
896
This is a somewhat early second beta of the 2.2 series, to fix a python2.4
897
incompatibility in the 2.2b1 release. It also includes a swag of
898
performance, usability and correctness improvements: test feedback on all
899
of these would be welcome.
905
* ``bzr diff`` now supports a --format option, which can be used to
906
select alternative diff formats. (Jelmer Vernooij, #555994)
911
* ``bzr dpush``, ``bzr push`` and ``bzr send`` will now issue a warning
912
instead of failing when dirty trees are involved. The corresponding
913
``dpush_strict``, ``push_strict`` and ``send_strict`` should be set to
914
True explicitly to get the previous behaviour.
915
(Vincent Ladeuil, #519319)
917
* ``bzr export`` to tar file does not fail if any parent directory
918
contains unicode characters. This works around upstream Python bug
919
http://bugs.python.org/issue8396 .
920
(Parth Malwankar, #413406)
922
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
923
(Aaron Bentley, #559436)
925
* ``bzr update`` when a pending merge in the working tree has been merged
926
into the master branch will no longer claim that old commits have become
927
pending merges. (Robert Collins, #562079)
929
* ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
930
config as in previous versions of bzrlib. (Robert Collins)
932
* Fix glitch in the warning about unclean trees display.
933
(Vincent Ladeuil, #562665)
935
* Fixed Python2.4 incompatibilities in the bzr2.2b1 source tarball.
938
* Help messages generated by ``RegistryOption.from_kwargs`` list the
939
switches in alphabetical order, rather than in an undefined order.
940
(Martin von Gagern, #559409)
942
* Make sure the ``ExecutablePath`` and ``InterpreterPath`` are set in
943
Apport crash reports, to avoid "This problem report applies to a program
944
which is not installed any more" error.
945
(Martin Pool, James Westby, #528114)
947
* Reset ``siginterrupt`` flag to False every time we handle a signal
948
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
949
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
950
errors compared to registering ``signal.signal`` directly.
953
* When invoked with a range revision, ``bzr log`` doesn't show revisions
954
that are not part of the Y revisions ancestry anymore when invoked with
956
(Vincent Ladeuil, #474807)
958
* Properly handle ``param_name`` attribute for ``ListOption``.
959
(Martin von Gagern, #387117)
964
* ``bzr commit`` will prompt before using a commit message that was
965
generated by a template and not edited by the user.
966
(Robert Collins, #530265)
968
* ``bzr diff`` read-locks the trees and branches only once, saving about
969
10-20ms on ``bzr diff`` in a bzr.dev tree.
972
* ``bzr missing`` read-locks the branches only once.
975
* ``bzr pull`` locks the branches and tree only once.
978
* Index lookups in pack repositories search recently hit pack files first.
979
In repositories with many pack files this can greatly reduce the
980
number of files accessed, the number of bytes read, and the number of
981
read calls. An incremental pull via plain HTTP takes half the time and
982
bytes for a moderately large repository. (Andrew Bennetts)
984
* Index lookups only re-order the indexes when the hit files aren't
985
already first. Reduces the cost of reordering
986
(John Arbash Meinel, #562429)
988
* Less code is loaded at startup. (Cold-cache start time is about 10-20%
990
(Martin Pool, #553017)
995
* ``bzrlib.diff.get_trees_and_branches_to_diff`` is deprecated. Use
996
``get_trees_and_branches_to_diff_locked`` instead.
999
* ``TreeTransform.commit`` supports the full set of commit parameters, and
1000
auto-determines branch nick if not supplied. (Aaron Bentley)
1005
* ``bzrlib.commands.Command.run_direct`` is no longer needed - the pre
1006
2.1 method of calling run() to perform testing or direct use via the API
1007
is now possible again. As part of this, the _operation attribute on
1008
Command is now transient and only exists for the duration of ``run()``.
1016
This is the first beta of the 2.2 series, leading up to a 2.2.0
1017
release in July or August. Beta releases are suitable for everyday use
1018
but may cause some incompatibilities with plugins. Some plugins may need
1019
small updates to work with 2.2b1.
1021
2.2b1 includes some changes to make merge conflicts easier to understand
1022
and resolve. It also removes some old unnecessary code, and loads
1023
somewhat less code at startup. It starts adding a common infrastructure
1024
for dealing with colocated named branches, which can be implemented in
1025
various ways in either bzr native or foreign formats. On Ubuntu and
1026
other platforms with the apport bug-reporting library, there's an easier
1027
path to report problems with bzr. We plan to continue with these themes
1028
through the 2.2 series.
1030
Over thirty bugs have been fixed, including in the log command, exporting
1031
to tarballs, restarting interrupted system calls, portability of compiled
1032
extensions, making backups during upgrade, and locking on ftp.
1034
Compatibility Breaks
1035
********************
1037
* BTreeGraphIndex can now take an offset to indicate that the data starts
1038
somewhere other than then beginning of the file. (John Arbash Meinel)
1040
* Deleted very old hidden commands ``versionedfile-list``,
1041
``weave-plan-merge``, ``weave-merge-text``.
1044
* ``Repository.get_inventory_sha1()`` and ``Repository.get_revision_xml()``
1045
have been removed. (Jelmer Vernooij)
1047
* ``Repository.get_revision_inventory()`` has been removed in favor of
1048
``Repository.get_inventory()``. (Jelmer Vernooij)
1050
* All test servers have been moved out of the bzrlib.transport hierarchy to
1051
bzrlib.tests.test_server *except* for MemoryServer, ChrootServer and
1052
PathFilteringServer. ``bzrlib`` users may encounter test failures that can
1053
be fixed by updating the related imports from ``bzrlib.transport.xxx`` to
1054
``bzrlib.tests.test_server``.
1057
* ``BranchReferenceFormat.initialize()`` now takes an optional name argument
1058
as its second parameter, for consistency with the initialize() method of
1059
other formats. (Jelmer Vernooij)
1064
* Added ``bzr remove-branch`` command that can remove a local or remote
1065
branch. (Jelmer Vernooij, #276295)
1067
* ``bzr export`` now takes an optional argument ``--per-file-timestamps``
1068
to set file mtimes to the last timestamp of the last revision in which
1069
they were changed rather than the current time. (Jelmer Vernooij)
1071
* If the Apport crash-reporting tool is available, bzr crashes are now
1072
stored into the ``/var/crash`` apport spool directory, and the user is
1073
invited to report them to the developers from there, either
1074
automatically or by running ``apport-bug``. No information is sent
1075
without specific permission from the user. (Martin Pool, #515052)
1077
* Parsing of command lines, for example in ``diff --using``, no longer
1078
treats backslash as an escape character on Windows. (Gordon Tyler,
1081
* Plugins can be disabled by defining ``BZR_DISABLE_PLUGINS`` as
1082
a list of plugin names separated by ':' (';' on windows).
1083
(Vincent Ladeuil, #411413)
1085
* Plugins can be loaded from arbitrary locations by defining
1086
``BZR_PLUGINS_AT`` as a list of name@path separated by ':' (';' on
1087
windows). This takes precedence over ``BZR_PLUGIN_PATH`` for the
1088
specified plugins. This is targeted at plugin developers for punctual
1089
needs and *not* intended to replace ``BZR_PLUGIN_PATH``.
1090
(Vincent Ladeuil, #82693)
1092
* Tag names can now be determined automatically by ``automatic_tag_name``
1093
hooks on ``Branch`` if they are not specified on the command line.
1096
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
1097
``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
1098
as resolved is still accessible via the ``--done`` default action.
1101
* Merges can be proposed on Launchpad with the new lp-propose-merge command.
1102
(Aaron Bentley, Jonathan Lange)
1107
* Added docstring for ``Tree.iter_changes``
1108
(John Arbash Meinel, #304182)
1110
* Allow additional arguments to
1111
``RemoteRepository.add_inventory_by_delta()``. (Jelmer Vernooij, #532631)
1113
* Allow exporting a single file using ``bzr export``.
1114
(Michal Junák, #511987)
1116
* Allow syscalls to automatically restart when ``TextUIFactory``'s
1117
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
1118
IO, which are often poorly handled by Python's libraries and parts of
1119
bzrlib. (Andrew Bennetts, #496813)
1121
* Avoid infinite recursion when probing for apport.
1122
(Vincent Ladeuil, #516934)
1124
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
1125
(Martin Pool, #331095)
1127
* Avoid truncating svn URLs.
1128
(Martin Pool, Martin von Gagern, #545185)
1130
* ``bzr add`` will not add conflict related files unless explicitly required.
1131
(Vincent Ladeuil, #322767, #414589)
1133
* ``bzr dump-btree`` now works on ``*.cix`` and ``*.six`` files. Those
1134
indices do not have reference lists, so ``dump-btree`` will simply show
1135
``None`` instead. (Andrew Bennetts, #488607)
1137
* ``bzr help`` will no longer trigger the get_missing_command hook when
1138
doing a topic lookup. This avoids prompting (like 'no command plugins/loom,
1139
did you mean log?') when getting help. In future we may trigger the hook
1140
deliberately when no help topics match from any help index.
1141
(Robert Collins, #396261)
1143
* ``bzr log -n0 -r..A.B.C`` should not crash but just consider the None
1144
revspec as representing the first revision of the branch.
1145
(Vincent Ladeuil, #519862)
1147
* ``bzr remove-tree`` can now remove multiple working trees.
1148
(Jared Hance, Andrew Bennetts, #253137)
1150
* ``bzr resolve --take-this`` and ``--take-other`` now correctly renames
1151
the kept file on content conflicts where one side deleted the file.
1152
(Vincent Ladeuil, #529968)
1154
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
1155
permissions as ``.bzr`` directory on a POSIX OS.
1156
(Parth Malwankar, #262450)
1158
* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
1159
of ``backup.bzr``. This directory is ignored by bzr commands such as
1161
(Parth Malwankar, #335033, #300001)
1163
* Cope with non-utf8 characters inside ``.bzrignore``.
1164
(Jason Spashett, #183504)
1166
* Correctly interpret "451 Rename/move failure: Directory not empty" from
1167
ftp servers while trying to take a lock.
1168
(Martin Pool, #528722)
1170
* DirStateRevisionTree.kind() was returning wrong result when 'kind'
1171
changes occured between the workingtree and one of its parents.
1172
(Vincent Ladeuil, #535547)
1174
* Fix ``log`` to better check ancestors even if merged revisions are involved.
1175
(Vincent Ladeuil, #476293)
1177
* Loading a plugin from a given path with ``BZR_PLUGINS_AT`` doesn't depend
1178
on os.lisdir() order and is now reliable.
1179
(Vincent Ladeuil, #552922).
1181
* Many IO operations that returned ``EINTR`` were retried even if it
1182
wasn't safe to do so via careless use of ``until_no_eintr``. Bazaar now
1183
only retries operations that are safe to retry, and in some cases has
1184
switched to operations that can be retried (e.g. ``sock.send`` rather than
1186
(Andrew Bennetts, Martin <gzlist@googlemail.com>, #496813)
1188
* Path conflicts now support --take-this and --take-other even when a
1189
deletion is involved.
1190
(Vincent Ladeuil, #531967)
1192
* Network transfer amounts and rates are now displayed in SI units according
1193
to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
1194
(Gordon Tyler, #514399)
1196
* Support kind markers for socket and fifo filesystem objects. This
1197
prevents ``bzr status --short`` from crashing when those files are
1198
present. (John Arbash Meinel, #303275)
1200
* ``bzr mkdir DIR`` will not create DIR unless DIR's parent is a versioned
1201
directory. (Parth Malwankar, #138600)
1203
* SSH child processes will now ignore SIGQUIT on nix systems so breaking into
1204
the debugger won't kill the session.
1205
(Martin <gzlist@googlemail.com>, #162502)
1207
* Tolerate patches with leading noise in ``bzr-handle-patch``.
1208
(Toshio Kuratomi, Martin Pool, #502076)
1210
* ``update -r`` now supports updating to revisions that are not on
1211
mainline (i.e. it supports dotted revisions).
1212
(Parth Malwankar, #517800)
1214
* Use first apparent author not committer in GNU Changelog format.
1215
(Martin von Gagern, #513322)
1220
* ``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
1221
``bzrlib.merge_directive.BaseMergeDirective`` and is now public.
1224
* ``BranchFormat.initialize`` now takes an optional ``name`` of the colocated
1225
branch to create. (Jelmer Vernooij)
1227
* ``BzrDir.get_branch_transport`` now takes an optional ``name`` of the
1228
colocated branch to open. (Jelmer Vernooij)
1230
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
1231
can set a signal handler and call ``signal.siginterrupt(signum,
1232
False)`` for it, if the platform and Python version supports it.
1233
(Andrew Bennetts, #496813)
1235
* New ``bzrlib.initialize`` is recommended for programs using bzrlib to
1236
run when starting up; it sets up several things that previously needed
1237
to be done separately.
1238
(Martin Pool, #507710)
1240
* Exporters now support a ``per_file_timestamps`` argument to write out the
1241
timestamp of the commit in which a file revision was introduced.
1244
* New method ``BzrDir.list_branches()`` that returns a sequence of branches
1245
present in a control directory. (Jelmer Vernooij)
1247
* New method ``Repository.get_known_graph_ancestry()``.
1248
(Jelmer Vernooij, #495502)
1250
* New transport methods ``readlink``, ``symlink`` and ``hardlink``.
1253
* Remove unused ``CommandFailed`` exception.
1259
* ``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
1260
``message_callback`` in the same way that commit does. (Robert Collins)
1262
* ``bzrlib.builtins.Commit.run`` raises ``bzrlib.errors.BoundBranchOutOfDate``
1263
rather than ``bzrlib.errors.BzrCommandError`` when the bound branch is out
1264
of date. (Gary van der Merwe)
1266
* ``bzrlib.commands.run_bzr`` is more extensible: callers can supply the
1267
functions to load or disable plugins if they wish to use a different
1268
plugin mechanism; the --help, --version and no-command name code paths
1269
now use the generic pluggable command lookup infrastructure.
1272
* ``bzrlib.errors.BoundBranchOutOfDate`` has a new field ``extra_help``
1273
which can be set to add extra help to the error. (Gary van der Merwe)
1275
* New method ``Branch.automatic_tag_name`` that can be used to find the
1276
tag name for a particular revision automatically. (Jelmer Vernooij)
1278
* The methods ``BzrDir.create_branch()``, ``BzrDir.destroy_branch()`` and
1279
``BzrDir.open_branch()`` now take an optional ``name`` argument.
1285
* bzr now has a ``.testr.conf`` file in its source tree configured
1286
appropriately for running tests with Testrepository
1287
(``https://launchpad.net/testrepository``). (Robert Collins)
1289
* Documentation about testing with ``subunit`` has been tweaked.
1292
* Known failures has been added for resolve --take-other on ParentLoop
1293
conflicts. This reflects bug #537956 without fixing it.
1296
* New ``bzrlib.tests.test_import_tariff`` can make assertions about what
1297
Python modules are loaded, to guard against startup time or library
1298
dependency regressions.
1301
* PQM will now run with subunit output. To analyze a PQM error use
1302
tribunal, or cat log | subunit-filter | subunit2pyunit. (Robert Collins)
1304
* Stop sending apport crash files to ``.cache`` in the directory from
1305
which ``bzr selftest`` was run. (Martin Pool, #422350)
1307
* Tests no longer fail if "close() called during concurrent
1308
operation on the same file object" occurs when closing the log file
1309
(which can happen if a thread tries to write to the log file at the
1310
wrong moment). An warning will be written to ``stderr`` when this
1311
happens, and another warning will be written if the log file could not
1312
be closed after retrying 100 times. (Andrew Bennetts, #531746)
1317
:Codename: Do run run
1318
:2.1.3: NOT RELEASED YET
1320
Compatibility Breaks
1321
********************
1329
* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
1330
previously-unversioned directory within the tree: the directory is
1331
marked versioned too.
1332
(Martin Pool, #192859)
1334
* Configuration files in ``${BZR_HOME}`` are now written in an atomic
1335
way which should help avoid problems with concurrent writers.
1336
(Vincent Ladeuil, #525571)
1338
* Don't traceback trying to unversion children files of an already
1339
unversioned directory. (Vincent Ladeuil, #494221)
1341
* Fix ``AttributeError on parent.children`` when adding a file under a
1342
directory that was a symlink in the previous commit.
1343
(Martin Pool, #192859)
1345
* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
1346
which can result in "missing referenced chk root keys" errors when
1347
fetching from repositories with affected revisions.
1348
(Andrew Bennetts, #522637)
1350
* Progress bars prefer to truncate the text message rather than the
1351
counters. The spinner is shown between the network transfer indicator
1352
and the progress message. (Martin Pool)
1354
* Raise ValueError instead of a string exception.
1355
(John Arbash Meinel, #586926)
1357
* Recursive binding for checkouts is now detected by bzr. A clear error
1358
message is shown to the user. (Parth Malwankar, #405192)
1363
* Add ``bzrlib.merge.MergeIntoMerger``, which can merge part or all of a
1364
tree, and works with unrelated branches. (Andrew Bennetts)
1369
* ``bzr help patterns`` now explains case insensitive patterns and
1370
points to Python regular expression documentation.
1371
(Parth Malwankar, #594386)
1376
* Delete ``ProgressTask.note``, which was deprecated in 2.1.
1384
* Unit test added to ensure that "message" is not uses as a format variable
1385
name in BzrError subclasses as this conflicts with some Python versions.
1386
(Parth Malwankar, #603461)
1393
This release fixes two critical networking issues with older servers and
1394
with interrupted system call errors when pushing or pulling. We recommend
1395
upgrading to anyone running a 2.1.x version of bzr.
1400
* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
1401
support of bzr-externals and scmproj plugins.
1402
(Alexander Belchenko, bug #572098)
1404
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
1405
(Aaron Bentley, #559436)
1407
* Do not register a SIGWINCH signal handler, instead just poll for the
1408
terminal width as needed. This avoids the "Interrupted System Call"
1409
problems that occur on POSIX with all currently released versions of
1411
(Andrew Bennetts, #583941)
1413
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
1414
versions before 1.6.
1415
(Andrew Bennetts, #528041)
1417
* Reset ``siginterrupt`` flag to False every time we handle a signal
1418
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
1419
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
1420
errors compared to registering ``signal.signal`` directly.
1423
* Reduce peak memory by one copy of compressed text.
1424
(John Arbash Meinel, #566940)
1426
* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
1427
(John Arbash Meinel, #582656)
1429
* When passing a file to ``UTF8DirReader`` make sure to close the current
1430
directory file handle after the chdir fails. Otherwise when passing many
1431
filenames into a command line ``bzr status`` we would leak descriptors.
1432
(John Arbash Meinel, #583486)
1437
* ``_remember_remote_is_before`` no longer raises AssertionError when
1438
suboptimal network behaviour is noticed; instead it just mutters to the
1439
log file (and warns the user if they have set the ``hpss`` debug flag).
1440
This was causing unnecessary aborts for performance bugs that are minor
1442
(Andrew Bennetts, #528041)
1450
This is a small bugfix release. Upgrading is recommended for anyone
1451
running 2.1.0 or earlier.
1456
* Allow syscalls to automatically restart when ``TextUIFactory``'s
1457
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
1458
IO, which are often poorly handled by Python's libraries and parts of
1459
bzrlib. (Andrew Bennetts, #496813)
1461
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
1462
(Martin Pool, #331095)
1464
* Fix plugin packaging on Windows. (Ian Clatworthy, #524162)
1466
* Fix stub sftp test server to call os.getcwdu().
1467
(Vincent Ladeuil, #526221, #526353)
1469
* Fixed CHM generation by moving the NEWS section template into
1470
a separate file. (Ian Clatworthy, #524184)
1472
* Merge correctly when this_tree is not a WorkingTree. (Aaron Bentley)
1474
* Register SIGWINCH handler only when creating a ``TextUIFactory``; avoids
1475
problems importing bzrlib from a non-main thread.
1476
(Elliot Murphy, #521989)
1478
* Repositories accessed via a smart server now reject being stacked on a
1479
repository in an incompatible format, as is the case when accessing them
1480
via other methods. This was causing fetches from those repositories via
1481
a smart server (e.g. using ``bzr branch``) to receive invalid data.
1482
(Andrew Bennetts, #562380)
1484
* Standardize the error handling when creating a new ``StaticTuple``
1485
(problems will raise TypeError). (Matt Nordhoff, #457979)
1487
* Warn if pyrex is too old to compile the new ``SimpleSet`` and
1488
``StaticTuple`` extensions, rather than having the build fail randomly.
1489
(John Arbash Meinel, #449776)
1494
* Added a link to the Desktop Guide. (Ian Clatworthy)
1496
* Added What's New in Bazaar 2.1 document. (Ian Clatworthy)
1498
* Drop Google Analytics from the core docs as they caused problems
1499
in the CHM files. (Ian Clatworthy, #502010)
1504
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
1505
can set a signal handler and call ``signal.siginterrupt(signum,
1506
False)`` for it, if the platform and Python version supports it.
1507
(Andrew Bennetts, #496813)
1513
:Codename: Strasbourg
1516
This release marks our second long-term-stable series. The Bazaar team
1517
has decided that we will continue to make bugfix-only 2.0.x and 2.1.x
1518
releases, along with 2.2 development releases.
1520
This is a fairly incremental update, focusing on polish and bugfixing.
1521
There are no changes for supported disk formats. Key updates include
1522
reduced memory consumption for many operations, a new per-file merge
1523
hook, ignore patterns can now include '!' to exclude files, globbing
1524
support for all commands on Windows, and support for addressing home
1525
directories via ``bzr+ssh://host/~/`` syntax.
1527
Users are encouraged to upgrade from the 2.0 stable series.
1532
* Don't require testtools to use sftp.
1533
(Vincent Ladeuil, #516183)
1535
* Fix "AttributeError in Inter1and2Helper" during fetch.
1536
(Martin Pool, #513432)
1538
* ``bzr update`` performs the two merges in a more logical order and will stop
1539
when it encounters conflicts.
1540
(Gerard Krol, #113809)
1542
* Give a better error message when doing ``bzr bind`` in an already bound
1543
branch. (Neil Martinsen-Burrell, #513063)
1545
* Ignore ``KeyError`` from ``remove_index`` during ``_abort_write_group``
1546
in a pack repository, which can happen harmlessly if the abort occurs during
1547
finishing the write group. Also use ``bzrlib.cleanup`` so that any
1548
other errors that occur while aborting the individual packs won't be
1549
hidden by secondary failures when removing the corresponding indices.
1550
(Andrew Bennetts, #423015)
1552
* Set the mtime of files exported to a directory by ``bzr export`` all to
1553
the same value to avoid confusing ``make`` and other date-based build
1554
systems. (Robert Collins, #515631)
1559
* Fetching into experimental formats will now print a warning. (Jelmer
1565
* ``Repository.deserialise_inventory`` has been renamed to
1566
``Repository._deserialise_inventory`` to indicate it is private.
1569
* ``Repository.get_inventory_xml`` has been renamed to
1570
``Repository._get_inventory_xml`` to indicate it is private.
1573
* ``Repository.serialise_inventory`` has been renamed to
1574
``Repository._serialise_inventory`` to indicate it is private.
1576
* Using the ``bzrlib.chk_map`` module from within multiple threads at the
1577
same time was broken due to race conditions with a module level page
1578
cache. This shows up as a KeyError in the ``bzrlib.lru_cache`` code with
1579
``bzrlib.chk_map`` in the backtrace, and can be triggered without using
1580
the same high level objects such as ``bzrlib.repository.Repository``
1581
from different threads. chk_map now uses a thread local cache which may
1582
increase memory pressure on processes using threads.
1583
(Robert Collins, John Arbash Meinel, #514090)
1585
* The new ``merge_file_content`` should now be ok with tests to avoid
1587
(Vincent Ladeuil, #515597)
1592
* Use ``bzrlib.cleanup`` rather than less robust ``try``/``finally``
1593
blocks in several places in ``bzrlib.merge``. This avoids masking prior
1594
errors when errors like ``ImmortalPendingDeletion`` occur during cleanup
1596
(Andrew Bennetts, #517275)
1601
* The ``remove_index`` method of
1602
``bzrlib.repofmt.pack_repo.AggregateIndex`` no longer takes a ``pack``
1603
argument. This argument was always ignored.
1604
(Andrew Bennetts, #423015)
1609
:Codename: after the bubbles
1610
:2.1.0rc2: 2010-01-29
1612
This is a quick-turn-around to update a small issue with our new per-file
1613
merge hook. We expect no major changes from this to the final 2.1.0.
1618
* The new ``merge_file_content`` hook point has been altered to provide a
1619
better API where state for extensions can be stored rather than the
1620
too-simple function based approach. This fixes a performance regression
1621
where branch configuration would be parsed per-file during merge. As
1622
part of this the included news_merger has been refactored into a base
1623
helper class ``bzrlib.merge.ConfigurableFileMerger``.
1624
(Robert Collins, John Arbash Meinel, #513822)
1630
:Codename: the 'new' stable
1631
:2.1.0rc1: 2009-01-21
1633
This is the first stable release candidate for Bazaar's 2.1 series. From
1634
this point onwards, the 2.1 series will be considered stable (as the 2.0
1635
series) and only bugfixes are expected to be incorporated. The dozen or so
1636
bugfixes in the 2.0.4 release are also included in this release (along
1637
with more than 15 more bugfixes). Some of the interesting features are
1638
support for per-file merge hooks, ``bzr unshelve --preview``, support
1639
for using ! in ignore files to exclude files from being ignored, a small
1640
memory leak was squashed, and many ``ObjectNotLocked`` errors were fixed.
1641
This looks to be a very good start for a new stable series.
1647
* Add bug information to log output when available.
1648
(Neil Martinsen-Burrell, Guillermo Gonzalez, #251729)
1650
* Added ``merge_file_content`` hook point to ``Merger``, allowing plugins
1651
to register custom merge logic, e.g. to provide smarter merging for
1654
* Bazaar now includes the ``news_merge`` plugin. It is disabled by
1655
default, to enable it add a ``news_merge_files`` option to your
1656
configuration. Consult ``bzr help news_merge`` for more information.
1659
* ``bzr branch`` now takes a ``--bind`` option. This lets you
1660
branch and bind all in one command. (Ian Clatworthy)
1662
* ``bzr switch`` now takes a ``--revision`` option, to allow switching to
1663
a specific revision of a branch. (Daniel Watkins, #183559)
1665
* ``bzr unshelve --preview`` can now be used to show how a patch on the
1666
shelf would be applied to the working tree.
1667
(Guilherme Salgado, #308122)
1669
* ``bzr update`` now takes a ``--revision`` argument. This lets you
1670
change the revision of the working tree to any revision in the
1671
ancestry of the current or master branch. (Matthieu Moy, Mark Hammond,
1672
Martin Pool, #45719)
1674
* ``-Dbytes`` can now be used to display the total number of bytes
1675
transferred for the current command. This information is always logged
1676
to ``.bzr.log`` for later inspection. (John Arbash Meinel)
1678
* New ignore patterns. Patterns prefixed with '!' are exceptions to
1679
ignore patterns and take precedence over regular ignores. Such
1680
exceptions are used to specify files that should be versioned which
1681
would otherwise be ignored. Patterns prefixed with '!!' act as regular
1682
ignore patterns, but have highest precedence, even over the '!'
1683
exception patterns. (John Whitley, #428031)
1685
* The ``supress_warnings`` configuration option has been introduced to disable
1686
various warnings (it currently only supports the ``format_deprecation``
1687
warning). The new option can be set in any of the following locations:
1688
``bazaar.conf``, ``locations.conf`` and/or ``branch.conf``.
1689
(Ted Gould, Matthew Fuller, Vincent Ladeuil)
1694
* Always show a message if an OS error occurs while trying to run a
1695
user-specified commit message editor.
1696
(Martin Pool, #504842)
1698
* ``bzr diff`` will now use the epoch when it is unable to determine
1699
the timestamp of a file, if the revision it was introduced in is a
1700
ghost. (Jelmer Vernooij, #295611)
1702
* ``bzr switch -b`` can now create branches that are located using directory
1703
services such as ``lp:``, even when the branch name doesn't contain a
1704
'/'. (Neil Martinsen-Burrell, #495263)
1706
* ``bzr unshelve`` has improved messages about what it is doing.
1707
(Neil Martinsen-Burrell, #496917)
1709
* Concurrent autopacking is more resilient to already-renamed pack files.
1710
If we find that a file we are about to obsolete is already obsoleted, we
1711
do not try to rename it, and we leave the file in ``obsolete_packs``.
1712
The code is also fault tolerant if a file goes missing, assuming that
1713
another process already removed the file.
1714
(John Arbash Meinel, Gareth White, #507557)
1716
* Fix "Too many concurrent requests" in reconcile when network connection
1717
fails. (Andrew Bennetts, #503878)
1719
* Fixed a side effect mutation of ``RemoteBzrDirFormat._network_name``
1720
that caused some tests to fail when run in a non-default order.
1721
Probably no user impact. (Martin Pool, #504102)
1723
* Fixed ``ObjectNotLocked`` error in ``bzr cat -rbranch:../foo FILE``.
1724
(Andrew Bennetts, #506274)
1726
* FTP transports support Unicode paths by encoding/decoding them as utf8.
1727
(Vincent Ladeuil, #472161)
1729
* Listen to the SIGWINCH signal to update the terminal width.
1730
(Vincent Ladeuil, #316357)
1732
* Progress bars are now hidden when ``--quiet`` is given.
1733
(Martin Pool, #320035)
1735
* ``SilentUIFactory`` now supports ``make_output_stream`` and discards
1736
whatever is written to it. This un-breaks some plugin tests that
1737
depended on this behaviour.
1738
(Martin Pool, #499757)
1740
* When operations update the working tree, all affected files should end
1741
up with the same mtime. (eg. when versioning a generated file, if you
1742
update the source and the generated file together, the generated file
1743
should appear up-to-date.)
1744
(John Arbash Meinel, Martin <gzlist>, #488724)
1749
* Added ``add_cleanup`` and ``cleanup_now`` to ``bzrlib.command.Command``.
1750
All the builtin commands now use ``add_cleanup`` rather than
1751
``try``/``finally`` blocks where applicable as it is simpler and more
1752
robust. (Andrew Bennetts)
1754
* All except a small number of storage formats are now hidden, making
1755
the help for numerous commands far more digestible. (Ian Clatworthy)
1757
* Attempts to open a shared repository as a branch (e.g. ``bzr branch
1758
path/to/repo``) will now include "location is a repository" as a hint in
1759
the error message. (Brian de Alwis, Andrew Bennetts, #440952)
1761
* Push will now inform the user when they are trying to push to a foreign
1762
VCS for which roundtripping is not supported, and will suggest them to
1763
use dpush. (Jelmer Vernooij)
1765
* The version of bzr being run is now written to the log file.
1766
(__monty__, #257170)
1768
* Transport network activity indicator is shown more of the time when
1769
Bazaar is doing network IO.
1775
* Add documentation on creating merges with more than one parent.
1776
(Neil Martinsen-Burrell, #481526)
1778
* Better explain the --uncommitted option of merge.
1779
(Neil Martinsen-Burrell, #505088)
1781
* Improve discussion of pending merges in the documentation for
1782
``revert``. (Neil Martinsen-Burrell, #505093)
1784
* Improved help for ``bzr send``.
1785
(Martin Pool, Bojan Nikolic)
1787
* There is a System Administrator's Guide in ``doc/en/admin-guide``,
1788
including discussions of installation, relevant plugins, security and
1789
backup. (Neil Martinsen-Burrell)
1791
* The ``conflicts`` help topic has been renamed to ``conflict-types``.
1794
* The User Reference is now presented as a series of topics.
1795
Many of the included topics have link and format tweaks applied.
1801
* Added ``cachedproperty`` decorator to ``bzrlib.decorators``.
1804
* Many test features were renamed from ``FooFeature`` to ``foo_feature``
1805
to be consistent with instances being lower case and classes being
1806
CamelCase. For the features that were more likely to be used, we added a
1807
deprecation thunk, but not all. (John Arbash Meinel)
1809
* Merger classes (such as ``Merge3Merger``) now expect a ``this_branch``
1810
parameter in their constructors, and provide ``this_branch`` as an
1811
attribute. (Andrew Bennetts)
1813
* The Branch hooks pre_change_branch_tip no longer masks exceptions raised
1814
by plugins - the original exceptions are now preserved. (Robert Collins)
1816
* The Transport ``Server.tearDown`` method is now renamed to
1817
``stop_server`` and ``setUp`` to ``start_server`` for consistency with
1818
our normal naming pattern, and to avoid confusion with Python's
1819
``TestCase.tearDown``. (Martin Pool)
1821
* ``WorkingTree.update`` implementations must now accept a ``revision``
1827
* Added ``BzrDir.open_branchV3`` smart server request, which can receive
1828
a string of details (such as "location is a repository") as part of a
1829
``nobranch`` response. (Andrew Bennetts, #440952)
1831
* New helper osutils.UnicodeOrBytesToBytesWriter which encodes unicode
1832
objects but passes str objects straight through. This is used for
1833
selftest but may be useful for diff and other operations that generate
1834
mixed output. (Robert Collins)
1836
* New exception ``NoRoundtrippingSupport``, for use by foreign branch
1837
plugins. (Jelmer Vernooij)
1842
* ``bzrlib.tests.permute_for_extension`` is a helper that simplifies
1843
running all tests in the current module, once against a pure python
1844
implementation, and once against an extension (pyrex/C) implementation.
1845
It can be used to dramatically simplify the implementation of
1846
``load_tests``. (John Arbash Meinel)
1848
* ``bzrlib.tests.TestCase`` now subclasses ``testtools.testcase.TestCase``.
1849
This permits features in testtools such as getUniqueInteger and
1850
getUniqueString to be used. Because of this, testtools version 0.9.2 or
1851
newer is now a dependency to run bzr selftest. Running with versions of
1852
testtools less than 0.9.2 will cause bzr to error while loading the test
1853
suite. (Robert Collins)
1855
* Shell-like tests now support the command "mv" for moving files. The
1856
syntax for ``mv file1 file2``, ``mv dir1 dir2`` and ``mv file dir`` is
1857
supported. (Neil Martinsen-Burrell)
1859
* The test progress bar no longer distinguishes tests that 'errored' from
1860
tests that 'failed' - they're all just failures.
1866
:2.0.6: NOT RELEASED YET
1871
* Additional merges after an unrelated branch has been merged with its
1872
history no longer crash when deleted files are involved.
1873
(Vincent Ladeuil, John Arbash Meinel, #375898)
1875
* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
1876
previously-unversioned directory within the tree: the directory is
1877
marked versioned too.
1878
(Martin Pool, #192859)
1880
* ``bzr commit SYMLINK`` now works, rather than trying to commit the
1881
target of the symlink.
1882
(Martin Pool, John Arbash Meinel, #128562)
1884
* ``bzr revert`` now only takes write lock on working tree, instead of on
1885
both working tree and branch.
1886
(Danny van Heumen, #498409)
1888
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
1889
permissions as ``.bzr`` directory on a POSIX OS.
1890
(Parth Malwankar, #262450)
1892
* Don't traceback trying to unversion children files of an already
1893
unversioned directory. (Vincent Ladeuil, #494221)
1895
* Fix ``AttributeError on parent.children`` when adding a file under a
1896
directory that was a symlink in the previous commit.
1897
(Martin Pool, #192859)
1899
* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
1900
which can result in "missing referenced chk root keys" errors when
1901
fetching from repositories with affected revisions.
1902
(Andrew Bennetts, #522637)
1904
* Raise ValueError instead of a string exception.
1905
(John Arbash Meinel, #586926)
1907
* Reduce peak memory by one copy of compressed text.
1908
(John Arbash Meinel, #566940)
1910
* Repositories accessed via a smart server now reject being stacked on a
1911
repository in an incompatible format, as is the case when accessing them
1912
via other methods. This was causing fetches from those repositories via
1913
a smart server (e.g. using ``bzr branch``) to receive invalid data.
1914
(Andrew Bennetts, #562380)
1916
* Selftest with versions of subunit that support ``stopTestRun`` will no longer
1917
error. This error was caused by 2.0 not being updated when upstream
1918
python merged the end of run patch, which chose ``stopTestRun`` rather than
1919
``done``. (Robert Collins, #571437)
1921
* When passing a file to ``UTF8DirReader`` make sure to close the current
1922
directory file handle after the chdir fails. Otherwise when passing many
1923
filenames into a command line ``bzr status`` we would leak descriptors.
1924
(John Arbash Meinel, #583486)
1930
* ``build_tree_contents`` can create symlinks.
1931
(Martin Pool, John Arbash Meinel)
1939
This fifth release in our 2.0 series addresses several user-inconvenience
1940
bugs. None are critical, but upgrading is recommended for all users on
1941
earlier 2.0 releases.
12
:2.0.5: NOT RELEASED YET
added
removed
NEWS
