5
5
.. contents:: List of Releases
8
bzr 2.2.0b1 (not released yet)
9
##############################
17
* ``Repository.get_inventory_sha1()`` has been removed. (Jelmer Vernooij)
11
:Codename: Monkey Magic
12
:2.2b4: NOT RELEASED YET
17
* URLs like ``foo:bar/baz`` are now always parsed as a URL with scheme "foo"
18
and path "bar/baz", even if bzr does not recognize "foo" as a known URL
19
scheme. Previously these URLs would be treated as local paths.
25
* Support ``--directory`` option for a number of additional commands:
26
conflicts, merge-directive, missing, resolve, shelve, switch,
27
unshelve, whoami. (Martin von Gagern, #527878)
32
* ``bzr init`` does not recursively scan directory contents anymore
33
leading to faster init for directories with existing content.
34
(Martin [gz], Parth Malwankar, #501307)
36
* ``bzr log --exclude-common-ancestry`` is now taken into account for
37
linear ancetries. (Vincent Ladeuil, #575631)
39
* ``bzr pull`` now works when a lp: URL is explicitly defined as the parent
40
or pull location in locations.conf or branch.conf.
41
(Gordon Tyler, #534787)
43
* Ensure that wrong path specifications in ``BZR_PLUGINS_AT`` display
44
proper error messages. (Vincent Ladeuil, #591215)
46
* Explicitly removing ``--profile-imports`` option from parsed command-line
47
arguments on Windows, because bzr script does the same.
48
(Alexander Belchenko, #588277)
50
* Fetching was slightly confused about the best code to use and was
51
using a new code path for all branches, resulting in more lookups than
52
necessary on old branches. (Robert Collins, #593515)
54
* Final fix for 'no help for command' issue. We now show a clean message
55
when a command has no help, document how to set help more clearly, and
56
test that all commands available to the test suite have help.
57
(Robert Collins, #177500)
59
* ``ScriptRunner`` now strips off leading indentation from test scripts,
60
which previously caused "SyntaxError: No command for line".
63
* Relative imports in plugins are now handled correctly when using
64
BZR_PLUGINS_AT. (Vincent Ladeuil, #588959)
69
* ``Branch.copy_content_into`` is now a convenience method dispatching to
70
a ``InterBranch`` multi-method. This permits ``bzr-loom`` and other
71
plugins to intercept this even when a ``RemoteBranch`` proxy is in use.
72
(Robert Collins, #201613)
74
* Use lazy imports in ``bzrlib/merge.py`` so that plugins like ``news_merge``
75
do not cause modules to be loaded unnecessarily just because the plugin
76
registers a merge hook. This improves ``bzr rocks`` time by about 25%
77
in a default installation (with just the core plugins).
83
* Added ``regression`` tag to our tags list. (Robert Collins)
85
* Improved our release checklist to have a bit less churn and leave things
86
ready-to-go for the next action (including other people doing
87
development). (Robert Collins)
92
* ``bzrlib.knit.KnitSequenceMatcher``, which has been deprecated since
93
2007, has been deleted. Use ``PatienceSequenceMatcher`` from
94
``bzrlib.patiencediff`` instead.
100
* Improved ``bzrlib.urlutils`` to handle lp:foo/bar URLs. (Gordon Tyler)
111
This third beta in the 2.2 series brings with it all the goodness of 2.1.2
112
and 2.0.6 (though it preceeds 2.0.6 slightly). Of particular note for
113
users are compatibility fixes with bzr 1.5 and below servers, a hopeful
114
end to the EINTR errors caused by SIGWINCH interactions, a shiny new
115
bash completion script and bzr will no longer guess at identity details -
116
it was too unreliable in reality. Use ``bzr whoami`` on every new install.
117
For developers we have some API changes which may impact plugins as well
118
as a bunch of our regular improvements to internal clarity and test
124
* An API break has been made to the lock_write method of ``Branch`` and
125
``Repository`` objects; they now return ``branch.BranchWriteLockResult``
126
and ``repository.RepositoryWriteLockResult`` objects. This makes
127
changing the API in future easier and permits some cleaner calling code.
128
The lock_read method has also changed from having no defined return
129
value to returning ``LogicalLockResult`` objects.
132
* ``bzr`` does not try to guess the username as ``username@hostname``
133
and requires it to be explictly set. This can be set using ``bzr
135
(Parth Malwankar, #549310)
137
* ``bzrlib.commands.Command`` will now raise ValueError during
138
construction if there is no __doc__ set. (Note, this will be reverted in
139
2.2b4) (Robert Collins)
141
* The source tree no longer contains a contrib/zsh/_bzr completion
142
script. The new file contrib/zsh/README suggests alternatives.
143
(Martin von Gagern, #560030)
148
* ``bzr commit`` accepts ``-p`` (for "patch") as a shorter name for
150
(Parth Malwankar, #571467)
152
* ``bzr ignore`` now supports a ``--default-rules`` option that displays
153
the default ignore rules used by bzr. The flag ``--old-default-rules``
154
is no longer supported by ``ignore``.
155
(Parth Malwankar, #538703)
157
* ``bzr pack`` now supports a ``--clean-obsolete-packs`` option that
158
can save disk space by deleting obsolete pack files created during the
160
(Parth Malwankar, #304320)
162
* New command line option ``--authors`` to ``bzr log`` allows users to
163
select which of the apparent authors and committer should be
164
included in the log. Defaults depend on format. (Martin von Gagern, #513322)
166
* Support ``--directory`` option for a number of additional commands:
167
added, annotate, bind, cat, cat-revision, clean-tree, deleted,
168
export, ignore, ignored, lookup-revision, ls, modified, nick,
169
re-sign, unbind, unknowns.
170
(Martin von Gagern, #527878)
172
* The bash_completion plugin from the bzr-bash-completion project has
173
been merged into the tree. It provides a bash-completion command and
174
replaces the outdated ``contrib/bash/bzr`` script with a version
175
using the plugin. (Martin von Gagern, #560030)
177
* A new transport based on GIO (the gnome i/o library) provides access to
178
samba shares, webdav using gio+smb and gio+dav. It is also possible to
179
use gio for some already existing transport methods as gio+file,
186
* Alias information shown by ``bzr help`` is now accurate. This
187
was showing an internal object name for some plugin aliases.
188
(Parth Malwankar, #584650)
190
* ``.bazaar``, ``.bazaar/bazaar.conf`` and ``.bzr.log`` inherit user and
191
group ownership from the containing directory. This allow bzr to work
193
(Martin <gzlist@googlemail.com>, Parth Malwankar, #376388)
195
* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
196
support of bzr-externals and scmproj plugins.
197
(Alexander Belchenko, bug #572098)
199
* ``bzr ignore`` will no longer add duplicate patterns to .bzrignore.
200
(Gordon Tyler, #572092)
202
* ``bzr log --exclude-common-ancestry -r X..Y`` displays the revisions that
203
are part of Y ancestry but not part of X ancestry (aka the graph
205
(Vincent Ladeuil, #320119)
207
* ``bzr lp-propose`` which was switched to use production Launchpad API
208
servers a few commits ago has been reverted to use edge: there is a
209
problem with using production which isn't trivially obvious, so we've
210
filed a bug to track it, and until thats fixed will be using edge.
211
(Robert Collins, #583667)
213
* ``bzr rm`` should not refuse to delete directories which contained a file
214
which has been moved elsewhere in the tree after the previous commit.
215
(Marius Kruger, Daniel Watkins, #129880)
217
* ``bzr selftest --parallel=fork`` wait for its children avoiding zombies.
218
(Vincent Ladeuil, #566670)
220
* ``bzr selftest`` should not use ui.note() since it's not unicode safe.
221
(Vincent Ladeuil, #563997)
223
* CommitBuilder refuses to create revisions whose trees have no root.
226
* Do not register a SIGWINCH signal handler, instead just poll for the
227
terminal width as needed. This avoids the "Interrupted System Call"
228
problems that occur on POSIX with all currently released versions of
230
(Andrew Bennetts, #583941)
232
* Don't mention --no-strict when we just issue the warning about unclean trees.
233
(Vincent Ladeuil, #401599)
235
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
237
(Andrew Bennetts, #528041)
239
* Improved progress bar for fetch (2a format only). Bazaar now shows an
240
estimate of the number of records to be fetched vs actually fetched.
241
(Parth Malwankar, #374740, #538868)
243
* Reduce peak memory by one copy of compressed text.
244
(John Arbash Meinel, #566940)
246
* ``RemoteBranch.lock_write`` raises ``ReadOnlyError`` if called during a
247
read lock, rather than causing an ``AttributeError``.
248
(Andrew Bennetts, Данило Шеган, #582781)
250
* Selftest was failing with testtools 0.9.3, which caused an
251
AssertionError raised from a cleanUp to be reported as a Failure, not an
252
Error, breaking on of our test hygiene tests.
253
(Robert Collins, Vincent Ladeuil).
255
* ``set_user_option`` with a dict on remote branches no longer fails with
256
an AttributeError. There is a new ``Branch.set_config_option_dict`` RPC
257
to support this efficiently.
258
(Andrew Bennetts, #430382)
260
* Show the filenames when a file rename fails so that the error will be
262
(Martin Pool, #491763)
264
* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
265
(John Arbash Meinel, #582656)
267
* Unicode characters in aliases are now handled correctly and do not cause
268
UnicodeEncodeError exception. (Parth Malwankar, #529930)
270
* Unicode commit messages that are the same as a file name no longer cause
271
UnicodeEncodeError. ``ui.text.show_warning`` now handles unicode
273
(Parth Malwankar, #563646)
275
* Using bzr with `lp:` urls behind an http proxy should work.
276
(Robert Collins, #558343)
278
* When passing a file to ``UTF8DirReader`` make sure to close the current
279
directory file handle after the chdir fails. Otherwise when passing many
280
filenames into a command line ``bzr status`` we would leak descriptors.
281
(John Arbash Meinel, #583486)
286
* ``append_revisions_only`` will now be interpreted as a boolean and a
287
warning emitted if illegal values are used. Note that for projects
288
that needs to maintain compatibility with previsous bzr versions,
289
only 'True' and 'False' strings must be used (previous versions of
290
bzr will interpret all strings differing from 'True'
291
(case-sensitive) as false.
292
(Brian de Alwis, Vincent Ladeuil)
294
* ``bzr ls`` now supports short options for existing long options.
295
``-k/--kind``, ``-i/--ignored``, ``-u/--unknown`` and ``-0/--null``.
296
(Parth Malwankar, #181124)
298
* ``Config.get_user_option_as_bool`` will now warn if a value cannot
299
be interpreted as a boolean.
302
* The all-in-one Windows installer will now be built with docstrings stripped
303
from the library zip, reducing the size and slightly improving cold startup
304
time. Bundled plugins are unchanged for the moment, but if adding other new
305
plugins to an all-in-one installation, ensure they are compiled and
306
installed with -O1 or help may not work. (Martin [gz])
314
* Added ``bzrlib.merge.PerFileMerger``, a more convenient way to write
315
some kinds of ``merge_file_content`` hook functions.
318
* `BzrDir`, `Branch`, `Repository` and `WorkingTree` now all support `user_url`,
319
`user_transport`, `control_url` and `control_transport` members pointing
320
respectively to the directory containing the ``.bzr`` control directory,
321
and to the directory within ``.bzr`` used for the particular component.
322
All of them inherit from `ControlComponent` which provides default
326
* Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
327
expected to return an object which can be used to unlock them. This reduces
328
duplicate code when using cleanups. The previous 'tokens's returned by
329
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
330
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
331
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)
333
* ``Repository.refresh_data`` may now be called in a write group on
334
pack-based repositories. Older repositories will still raise an error
335
in this case. Subclasses of ``Repository`` can still override
336
``Repository._refresh_data``, but are now responsible for raising
337
``bzrlib.repository.IsInWriteGroupError`` if they do not support
338
``refresh_data`` during a write group.
339
(Andrew Bennetts, #574236)
344
* ``chk_map._bytes_to_text_key`` is now an optimized function to extract
345
the (file-id, revision-id) key from a CHKInventory entry. This can
346
potentially shave 5-10% time off during a large fetch. Related to bug
347
#562666. (John Arbash Meinel)
349
* ``log._get_info_for_log_files`` now takes an add_cleanup callable.
352
* ``_remember_remote_is_before`` no longer raises AssertionError when
353
suboptimal network behaviour is noticed; instead it just mutters to the
354
log file (and warns the user if they have set the ``hpss`` debug flag).
355
This was causing unnecessary aborts for performance bugs that are minor
357
(Andrew Bennetts, #528041)
359
* Permit bzr to run under ``python -OO`` which reduces the size of bytecode
360
files loaded from disk. To ensure docstrings needed for help are never
361
stripped, the prefix ``__doc__ =`` should now be used.
362
(Martin <gzlist@googlemail.com>)
364
* No longer require zlib headers to build extensions, and remove the need
365
for seperate copy of zlib library on windows.
366
(John Arbash Meinel, Martin <gzlist@googlemail.com>, #66923)
371
* Added ``bzrlib.tests.matchers`` as a place to put matchers, along with
372
our first in-tree matcher. See the module docstring for details.
375
* ``bzr selftest --parallel=subprocess`` now works correctly on win32.
376
(Gordon Tyler, #551332)
378
* Workaround ``Crypto.Random`` check leading to spurious test
379
failures on Lucid, FreeBSD and gentoo.
380
(Vincent Ladeuil, #528436)
382
* New class ``ExecutableFeature`` for checking the availability of
383
executables on the ``PATH``. Migrated from bash_completion plugin.
391
This is a somewhat early second beta of the 2.2 series, to fix a python2.4
392
incompatibility in the 2.2b1 release. It also includes a swag of
393
performance, usability and correctness improvements: test feedback on all
394
of these would be welcome.
400
* ``bzr diff`` now supports a --format option, which can be used to
401
select alternative diff formats. (Jelmer Vernooij, #555994)
406
* ``bzr dpush``, ``bzr push`` and ``bzr send`` will now issue a warning
407
instead of failing when dirty trees are involved. The corresponding
408
``dpush_strict``, ``push_strict`` and ``send_strict`` should be set to
409
True explicitly to get the previous behaviour.
410
(Vincent Ladeuil, #519319)
412
* ``bzr export`` to tar file does not fail if any parent directory
413
contains unicode characters. This works around upstream Python bug
414
http://bugs.python.org/issue8396 .
415
(Parth Malwankar, #413406)
417
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
418
(Aaron Bentley, #559436)
420
* ``bzr update`` when a pending merge in the working tree has been merged
421
into the master branch will no longer claim that old commits have become
422
pending merges. (Robert Collins, #562079)
424
* ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
425
config as in previous versions of bzrlib. (Robert Collins)
427
* Fix glitch in the warning about unclean trees display.
428
(Vincent Ladeuil, #562665)
430
* Fixed Python2.4 incompatibilities in the bzr2.2b1 source tarball.
433
* Help messages generated by ``RegistryOption.from_kwargs`` list the
434
switches in alphabetical order, rather than in an undefined order.
435
(Martin von Gagern, #559409)
437
* Make sure the ``ExecutablePath`` and ``InterpreterPath`` are set in
438
Apport crash reports, to avoid "This problem report applies to a program
439
which is not installed any more" error.
440
(Martin Pool, James Westby, #528114)
442
* Reset ``siginterrupt`` flag to False every time we handle a signal
443
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
444
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
445
errors compared to registering ``signal.signal`` directly.
448
* When invoked with a range revision, ``bzr log`` doesn't show revisions
449
that are not part of the Y revisions ancestry anymore when invoked with
451
(Vincent Ladeuil, #474807)
453
* Properly handle ``param_name`` attribute for ``ListOption``.
454
(Martin von Gagern, 387117)
459
* ``bzr commit`` will prompt before using a commit message that was
460
generated by a template and not edited by the user.
461
(Robert Collins, #530265)
463
* ``bzr diff`` read-locks the trees and branches only once, saving about
464
10-20ms on ``bzr diff`` in a bzr.dev tree.
467
* ``bzr missing`` read-locks the branches only once.
470
* ``bzr pull`` locks the branches and tree only once.
473
* Index lookups in pack repositories search recently hit pack files first.
474
In repositories with many pack files this can greatly reduce the
475
number of files accessed, the number of bytes read, and the number of
476
read calls. An incremental pull via plain HTTP takes half the time and
477
bytes for a moderately large repository. (Andrew Bennetts)
479
* Index lookups only re-order the indexes when the hit files aren't
480
already first. Reduces the cost of reordering
481
(John Arbash Meinel, #562429)
483
* Less code is loaded at startup. (Cold-cache start time is about 10-20%
485
(Martin Pool, #553017)
490
* ``bzrlib.diff.get_trees_and_branches_to_diff`` is deprecated. Use
491
``get_trees_and_branches_to_diff_locked`` instead.
494
* ``TreeTransform.commit`` supports the full set of commit parameters, and
495
auto-determines branch nick if not supplied. (Aaron Bentley)
500
* ``bzrlib.commands.Command.run_direct`` is no longer needed - the pre
501
2.1 method of calling run() to perform testing or direct use via the API
502
is now possible again. As part of this, the _operation attribute on
503
Command is now transient and only exists for the duration of ``run()``.
511
This is the first beta of the 2.2 series, leading up to a 2.2.0
512
release in July or August. Beta releases are suitable for everyday use
513
but may cause some incompatibilities with plugins. Some plugins may need
514
small updates to work with 2.2b1.
516
2.2b1 includes some changes to make merge conflicts easier to understand
517
and resolve. It also removes some old unnecessary code, and loads
518
somewhat less code at startup. It starts adding a common infrastructure
519
for dealing with colocated named branches, which can be implemented in
520
various ways in either bzr native or foreign formats. On Ubuntu and
521
other platforms with the apport bug-reporting library, there's an easier
522
path to report problems with bzr. We plan to continue with these themes
523
through the 2.2 series.
525
Over thirty bugs have been fixed, including in the log command, exporting
526
to tarballs, restarting interrupted system calls, portability of compiled
527
extensions, making backups during upgrade, and locking on ftp.
532
* BTreeGraphIndex can now take an offset to indicate that the data starts
533
somewhere other than then beginning of the file. (John Arbash Meinel)
535
* Deleted very old hidden commands ``versionedfile-list``,
536
``weave-plan-merge``, ``weave-merge-text``.
539
* ``Repository.get_inventory_sha1()`` and ``Repository.get_revision_xml()``
540
have been removed. (Jelmer Vernooij)
542
* ``Repository.get_revision_inventory()`` has been removed in favor of
543
``Repository.get_inventory()``. (Jelmer Vernooij)
545
* All test servers have been moved out of the bzrlib.transport hierarchy to
546
bzrlib.tests.test_server *except* for MemoryServer, ChrootServer and
547
PathFilteringServer. ``bzrlib`` users may encounter test failures that can
548
be fixed by updating the related imports from ``bzrlib.transport.xxx`` to
549
``bzrlib.tests.test_server``.
552
* ``BranchReferenceFormat.initialize()`` now takes an optional name argument
553
as its second parameter, for consistency with the initialize() method of
554
other formats. (Jelmer Vernooij)
559
* Added ``bzr remove-branch`` command that can remove a local or remote
560
branch. (Jelmer Vernooij, #276295)
562
* ``bzr export`` now takes an optional argument ``--per-file-timestamps``
563
to set file mtimes to the last timestamp of the last revision in which
564
they were changed rather than the current time. (Jelmer Vernooij)
566
* If the Apport crash-reporting tool is available, bzr crashes are now
567
stored into the ``/var/crash`` apport spool directory, and the user is
568
invited to report them to the developers from there, either
569
automatically or by running ``apport-bug``. No information is sent
570
without specific permission from the user. (Martin Pool, #515052)
572
* Parsing of command lines, for example in ``diff --using``, no longer
573
treats backslash as an escape character on Windows. (Gordon Tyler,
576
* Plugins can be disabled by defining ``BZR_DISABLE_PLUGINS`` as
577
a list of plugin names separated by ':' (';' on windows).
578
(Vincent Ladeuil, #411413)
580
* Plugins can be loaded from arbitrary locations by defining
581
``BZR_PLUGINS_AT`` as a list of name@path separated by ':' (';' on
582
windows). This takes precedence over ``BZR_PLUGIN_PATH`` for the
583
specified plugins. This is targeted at plugin developers for punctual
584
needs and *not* intended to replace ``BZR_PLUGIN_PATH``.
585
(Vincent Ladeuil, #82693)
587
* Tag names can now be determined automatically by ``automatic_tag_name``
588
hooks on ``Branch`` if they are not specified on the command line.
22
591
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
23
592
``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
24
593
as resolved is still accessible via the ``--done`` default action.
27
bzr 2.1.0 (not released yet)
28
############################
596
* Merges can be proposed on Launchpad with the new lp-propose-merge command.
597
(Aaron Bentley, Jonathan Lange)
602
* Added docstring for ``Tree.iter_changes``
603
(John Arbash Meinel, #304182)
605
* Allow additional arguments to
606
``RemoteRepository.add_inventory_by_delta()``. (Jelmer Vernooij, #532631)
608
* Allow exporting a single file using ``bzr export``.
609
(Michal Junák, #511987)
611
* Allow syscalls to automatically restart when ``TextUIFactory``'s
612
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
613
IO, which are often poorly handled by Python's libraries and parts of
614
bzrlib. (Andrew Bennetts, #496813)
616
* Avoid infinite recursion when probing for apport.
617
(Vincent Ladeuil, #516934)
619
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
620
(Martin Pool, #331095)
622
* Avoid truncating svn URLs.
623
(Martin Pool, Martin von Gagern, #545185)
625
* ``bzr add`` will not add conflict related files unless explicitly required.
626
(Vincent Ladeuil, #322767, #414589)
628
* ``bzr dump-btree`` now works on ``*.cix`` and ``*.six`` files. Those
629
indices do not have reference lists, so ``dump-btree`` will simply show
630
``None`` instead. (Andrew Bennetts, #488607)
632
* ``bzr help`` will no longer trigger the get_missing_command hook when
633
doing a topic lookup. This avoids prompting (like 'no command plugins/loom,
634
did you mean log?') when getting help. In future we may trigger the hook
635
deliberately when no help topics match from any help index.
636
(Robert Collins, #396261)
638
* ``bzr log -n0 -r..A.B.C`` should not crash but just consider the None
639
revspec as representing the first revision of the branch.
640
(Vincent Ladeuil, #519862)
642
* ``bzr remove-tree`` can now remove multiple working trees.
643
(Jared Hance, Andrew Bennetts, #253137)
645
* ``bzr resolve --take-this`` and ``--take-other`` now correctly renames
646
the kept file on content conflicts where one side deleted the file.
647
(Vincent Ladeuil, #529968)
649
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
650
permissions as ``.bzr`` directory on a POSIX OS.
651
(Parth Malwankar, #262450)
653
* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
654
of ``backup.bzr``. This directory is ignored by bzr commands such as
656
(Parth Malwankar, #335033, #300001)
658
* Cope with non-utf8 characters inside ``.bzrignore``.
659
(Jason Spashett, #183504)
661
* Correctly interpret "451 Rename/move failure: Directory not empty" from
662
ftp servers while trying to take a lock.
663
(Martin Pool, #528722)
665
* DirStateRevisionTree.kind() was returning wrong result when 'kind'
666
changes occured between the workingtree and one of its parents.
667
(Vincent Ladeuil, #535547)
669
* Fix ``log`` to better check ancestors even if merged revisions are involved.
670
(Vincent Ladeuil, #476293)
672
* Loading a plugin from a given path with ``BZR_PLUGINS_AT`` doesn't depend
673
on os.lisdir() order and is now reliable.
674
(Vincent Ladeuil, #552922).
676
* Many IO operations that returned ``EINTR`` were retried even if it
677
wasn't safe to do so via careless use of ``until_no_eintr``. Bazaar now
678
only retries operations that are safe to retry, and in some cases has
679
switched to operations that can be retried (e.g. ``sock.send`` rather than
681
(Andrew Bennetts, Martin <gzlist@googlemail.com>, #496813)
683
* Path conflicts now support --take-this and --take-other even when a
684
deletion is involved.
685
(Vincent Ladeuil, #531967)
687
* Network transfer amounts and rates are now displayed in SI units according
688
to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
689
(Gordon Tyler, #514399)
691
* Support kind markers for socket and fifo filesystem objects. This
692
prevents ``bzr status --short`` from crashing when those files are
693
present. (John Arbash Meinel, #303275)
695
* ``bzr mkdir DIR`` will not create DIR unless DIR's parent is a versioned
696
directory. (Parth Malwankar, #138600)
698
* SSH child processes will now ignore SIGQUIT on nix systems so breaking into
699
the debugger won't kill the session.
700
(Martin <gzlist@googlemail.com>, #162502)
702
* Tolerate patches with leading noise in ``bzr-handle-patch``.
703
(Toshio Kuratomi, Martin Pool, #502076)
705
* ``update -r`` now supports updating to revisions that are not on
706
mainline (i.e. it supports dotted revisions).
707
(Parth Malwankar, #517800)
709
* Use first apparent author not committer in GNU Changelog format.
710
(Martin von Gagern, #513322)
715
* ``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
716
``bzrlib.merge_directive.BaseMergeDirective`` and is now public.
719
* ``BranchFormat.initialize`` now takes an optional ``name`` of the colocated
720
branch to create. (Jelmer Vernooij)
722
* ``BzrDir.get_branch_transport`` now takes an optional ``name`` of the
723
colocated branch to open. (Jelmer Vernooij)
725
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
726
can set a signal handler and call ``signal.siginterrupt(signum,
727
False)`` for it, if the platform and Python version supports it.
728
(Andrew Bennetts, #496813)
730
* New ``bzrlib.initialize`` is recommended for programs using bzrlib to
731
run when starting up; it sets up several things that previously needed
732
to be done separately.
733
(Martin Pool, #507710)
735
* Exporters now support a ``per_file_timestamps`` argument to write out the
736
timestamp of the commit in which a file revision was introduced.
739
* New method ``BzrDir.list_branches()`` that returns a sequence of branches
740
present in a control directory. (Jelmer Vernooij)
742
* New method ``Repository.get_known_graph_ancestry()``.
743
(Jelmer Vernooij, #495502)
745
* New transport methods ``readlink``, ``symlink`` and ``hardlink``.
748
* Remove unused ``CommandFailed`` exception.
754
* ``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
755
``message_callback`` in the same way that commit does. (Robert Collins)
757
* ``bzrlib.builtins.Commit.run`` raises ``bzrlib.errors.BoundBranchOutOfDate``
758
rather than ``bzrlib.errors.BzrCommandError`` when the bound branch is out
759
of date. (Gary van der Merwe)
761
* ``bzrlib.commands.run_bzr`` is more extensible: callers can supply the
762
functions to load or disable plugins if they wish to use a different
763
plugin mechanism; the --help, --version and no-command name code paths
764
now use the generic pluggable command lookup infrastructure.
767
* ``bzrlib.errors.BoundBranchOutOfDate`` has a new field ``extra_help``
768
which can be set to add extra help to the error. (Gary van der Merwe)
770
* New method ``Branch.automatic_tag_name`` that can be used to find the
771
tag name for a particular revision automatically. (Jelmer Vernooij)
773
* The methods ``BzrDir.create_branch()``, ``BzrDir.destroy_branch()`` and
774
``BzrDir.open_branch()`` now take an optional ``name`` argument.
780
* bzr now has a ``.testr.conf`` file in its source tree configured
781
appropriately for running tests with Testrepository
782
(``https://launchpad.net/testrepository``). (Robert Collins)
784
* Documentation about testing with ``subunit`` has been tweaked.
787
* Known failures has been added for resolve --take-other on ParentLoop
788
conflicts. This reflects bug #537956 without fixing it.
791
* New ``bzrlib.tests.test_import_tariff`` can make assertions about what
792
Python modules are loaded, to guard against startup time or library
793
dependency regressions.
796
* PQM will now run with subunit output. To analyze a PQM error use
797
tribunal, or cat log | subunit-filter | subunit2pyunit. (Robert Collins)
799
* Stop sending apport crash files to ``.cache`` in the directory from
800
which ``bzr selftest`` was run. (Martin Pool, #422350)
802
* Tests no longer fail if "close() called during concurrent
803
operation on the same file object" occurs when closing the log file
804
(which can happen if a thread tries to write to the log file at the
805
wrong moment). An warning will be written to ``stderr`` when this
806
happens, and another warning will be written if the log file could not
807
be closed after retrying 100 times. (Andrew Bennetts, #531746)
814
This release fixes two critical networking issues with older servers and
815
with interrupted system call errors when pushing or pulling. We recommend
816
upgrading to anyone running a 2.1.x version of bzr.
821
* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
822
support of bzr-externals and scmproj plugins.
823
(Alexander Belchenko, bug #572098)
825
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
826
(Aaron Bentley, #559436)
828
* Do not register a SIGWINCH signal handler, instead just poll for the
829
terminal width as needed. This avoids the "Interrupted System Call"
830
problems that occur on POSIX with all currently released versions of
832
(Andrew Bennetts, #583941)
834
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
836
(Andrew Bennetts, #528041)
838
* Reset ``siginterrupt`` flag to False every time we handle a signal
839
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
840
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
841
errors compared to registering ``signal.signal`` directly.
844
* Reduce peak memory by one copy of compressed text.
845
(John Arbash Meinel, #566940)
847
* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
848
(John Arbash Meinel, #582656)
850
* When passing a file to ``UTF8DirReader`` make sure to close the current
851
directory file handle after the chdir fails. Otherwise when passing many
852
filenames into a command line ``bzr status`` we would leak descriptors.
853
(John Arbash Meinel, #583486)
858
* ``_remember_remote_is_before`` no longer raises AssertionError when
859
suboptimal network behaviour is noticed; instead it just mutters to the
860
log file (and warns the user if they have set the ``hpss`` debug flag).
861
This was causing unnecessary aborts for performance bugs that are minor
863
(Andrew Bennetts, #528041)
871
This is a small bugfix release. Upgrading is recommended for anyone
872
running 2.1.0 or earlier.
877
* Allow syscalls to automatically restart when ``TextUIFactory``'s
878
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
879
IO, which are often poorly handled by Python's libraries and parts of
880
bzrlib. (Andrew Bennetts, #496813)
882
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
883
(Martin Pool, #331095)
885
* Fix plugin packaging on Windows. (Ian Clatworthy, #524162)
887
* Fix stub sftp test server to call os.getcwdu().
888
(Vincent Ladeuil, #526221, #526353)
890
* Fixed CHM generation by moving the NEWS section template into
891
a separate file. (Ian Clatworthy, #524184)
893
* Merge correctly when this_tree is not a WorkingTree. (Aaron Bentley)
895
* Register SIGWINCH handler only when creating a ``TextUIFactory``; avoids
896
problems importing bzrlib from a non-main thread.
897
(Elliot Murphy, #521989)
899
* Repositories accessed via a smart server now reject being stacked on a
900
repository in an incompatible format, as is the case when accessing them
901
via other methods. This was causing fetches from those repositories via
902
a smart server (e.g. using ``bzr branch``) to receive invalid data.
903
(Andrew Bennetts, #562380)
905
* Standardize the error handling when creating a new ``StaticTuple``
906
(problems will raise TypeError). (Matt Nordhoff, #457979)
908
* Warn if pyrex is too old to compile the new ``SimpleSet`` and
909
``StaticTuple`` extensions, rather than having the build fail randomly.
910
(John Arbash Meinel, #449776)
915
* Added a link to the Desktop Guide. (Ian Clatworthy)
917
* Added What's New in Bazaar 2.1 document. (Ian Clatworthy)
919
* Drop Google Analytics from the core docs as they caused problems
920
in the CHM files. (Ian Clatworthy, #502010)
925
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
926
can set a signal handler and call ``signal.siginterrupt(signum,
927
False)`` for it, if the platform and Python version supports it.
928
(Andrew Bennetts, #496813)
934
:Codename: Strasbourg
937
This release marks our second long-term-stable series. The Bazaar team
938
has decided that we will continue to make bugfix-only 2.0.x and 2.1.x
939
releases, along with 2.2 development releases.
941
This is a fairly incremental update, focusing on polish and bugfixing.
942
There are no changes for supported disk formats. Key updates include
943
reduced memory consumption for many operations, a new per-file merge
944
hook, ignore patterns can now include '!' to exclude files, globbing
945
support for all commands on Windows, and support for addressing home
946
directories via ``bzr+ssh://host/~/`` syntax.
948
Users are encouraged to upgrade from the 2.0 stable series.
953
* Don't require testtools to use sftp.
954
(Vincent Ladeuil, #516183)
36
956
* Fix "AttributeError in Inter1and2Helper" during fetch.
37
957
(Martin Pool, #513432)
959
* ``bzr update`` performs the two merges in a more logical order and will stop
960
when it encounters conflicts.
961
(Gerard Krol, #113809)
963
* Give a better error message when doing ``bzr bind`` in an already bound
964
branch. (Neil Martinsen-Burrell, #513063)
966
* Ignore ``KeyError`` from ``remove_index`` during ``_abort_write_group``
967
in a pack repository, which can happen harmlessly if the abort occurs during
968
finishing the write group. Also use ``bzrlib.cleanup`` so that any
969
other errors that occur while aborting the individual packs won't be
970
hidden by secondary failures when removing the corresponding indices.
971
(Andrew Bennetts, #423015)
39
973
* Set the mtime of files exported to a directory by ``bzr export`` all to
40
974
the same value to avoid confusing ``make`` and other date-based build
41
975
systems. (Robert Collins, #515631)
added
removed
NEWS
