Bazaar 2.2b1

Milestone information

Project:
Bazaar
Series:
2.2
Version:
2.2b1
Released:
2010-04-01  
Registrant:
Martin Pool
Release registered:
2010-04-01
Active:
No. Drivers cannot target bugs and blueprints to this milestone.  

Download RDF metadata

Activities

Assigned to you:
No blueprints or bugs assigned to you.
Assignees:
1 Andrew Bennetts, 1 Gerard Krol, 3 Gordon Tyler, 1 John A Meinel, 1 Martin Packman, 14 Martin Pool, 1 Neil Martinsen-Burrell, 3 Parth Malwankar, 2 Robert Collins, 12 Vincent Ladeuil
Blueprints:
No blueprints are targeted to this milestone.
Bugs:
41 Fix Released

Download files for this release

After you've downloaded a file, you can verify its authenticity using its MD5 sum or signature. (How do I verify a download?)

File Description Downloads
download icon bzr-2.2b1.tar.gz (md5, sig) bzr 2.2b1 source 600
last downloaded 8 weeks ago
Total downloads: 600

Release notes 

This is the first beta of the 2.2 series, leading up to a 2.2.0 release in July or August. Beta releases are suitable for everyday use but may cause some incompatibilities with plugins. Some plugins may need small updates to work with 2.2b1.

2.2b1 includes some changes to make merge conflicts easier to understand and resolve. It also removes some old unnecessary code, and loads somewhat less code at startup. It starts adding a common infrastructure
for dealing with colocated named branches, which can be implemented in various ways in either bzr native or foreign formats. On Ubuntu and other platforms with the apport bug-reporting library, there's an easier
path to report problems with bzr. We plan to continue with these themes through the 2.2 series.

Over thirty bugs have been fixed, including in the log command, exporting to tarballs, restarting interrupted system calls, portability of compiled extensions, making backups during upgrade, and locking on ftp.

Changelog 

View the full changelog

bzr 2.2b1
#########

:2.2b1: 2010-04-01

This is the first beta of the 2.2 series, leading up to a 2.2.0
release in July or August. Beta releases are suitable for everyday use
but may cause some incompatibilities with plugins. Some plugins may need
small updates to work with 2.2b1.

2.2b1 includes some changes to make merge conflicts easier to understand
and resolve. It also removes some old unnecessary code, and loads
somewhat less code at startup. It starts adding a common infrastructure
for dealing with colocated named branches, which can be implemented in
various ways in either bzr native or foreign formats. On Ubuntu and
other platforms with the apport bug-reporting library, there's an easier
path to report problems with bzr. We plan to continue with these themes
through the 2.2 series.

Over thirty bugs have been fixed, including in the log command, exporting
to tarballs, restarting interrupted system calls, portability of compiled
extensions, making backups during upgrade, and locking on ftp.

Compatibility Breaks
********************

* BTreeGraphIndex can now take an offset to indicate that the data starts
  somewhere other than then beginning of the file. (John Arbash Meinel)

* Deleted very old hidden commands ``versionedfile-list``,
  ``weave-plan-merge``, ``weave-merge-text``.
  (Martin Pool)

* ``Repository.get_inventory_sha1()`` and ``Repository.get_revision_xml()``
  have been removed. (Jelmer Vernooij)

* ``Repository.get_revision_inventory()`` has been removed in favor of
  ``Repository.get_inventory()``. (Jelmer Vernooij)

* All test servers have been moved out of the bzrlib.transport hierarchy to
  bzrlib.tests.test_server *except* for MemoryServer, ChrootServer and
  PathFilteringServer. ``bzrlib`` users may encounter test failures that can
  be fixed by updating the related imports from ``bzrlib.transport.xxx`` to
  ``bzrlib.tests.test_server``.
  (Vincent Ladeuil)

* ``BranchReferenceFormat.initialize()`` now takes an optional name argument
  as its second parameter, for consistency with the initialize() method of
  other formats. (Jelmer Vernooij)

New Features
************

* Added ``bzr remove-branch`` command that can remove a local or remote
  branch. (Jelmer Vernooij, #276295)

* ``bzr export`` now takes an optional argument ``--per-file-timestamps``
  to set file mtimes to the last timestamp of the last revision in which
  they were changed rather than the current time. (Jelmer Vernooij)

* If the Apport crash-reporting tool is available, bzr crashes are now
  stored into the ``/var/crash`` apport spool directory, and the user is
  invited to report them to the developers from there, either
  automatically or by running ``apport-bug``. No information is sent
  without specific permission from the user. (Martin Pool, #515052)

* Parsing of command lines, for example in ``diff --using``, no longer
  treats backslash as an escape character on Windows. (Gordon Tyler,
  #392248)

* Plugins can be disabled by defining ``BZR_DISABLE_PLUGINS`` as
  a list of plugin names separated by ':' (';' on windows).
  (Vincent Ladeuil, #411413)

* Plugins can be loaded from arbitrary locations by defining
  ``BZR_PLUGINS_AT`` as a list of name@path separated by ':' (';' on
  windows). This takes precedence over ``BZR_PLUGIN_PATH`` for the
  specified plugins. This is targeted at plugin developers for punctual
  needs and *not* intended to replace ``BZR_PLUGIN_PATH``.
  (Vincent Ladeuil, #82693)

* Tag names can now be determined automatically by ``automatic_tag_name``
  hooks on ``Branch`` if they are not specified on the command line.
  (Jelmer Vernooij)

* Tree-shape conflicts can be resolved by providing ``--take-this`` and
  ``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
  as resolved is still accessible via the ``--done`` default action.
  (Vincent Ladeuil)

* Merges can be proposed on Launchpad with the new lp-propose-merge command.
  (Aaron Bentley, Jonathan Lange)

Bug Fixes
*********

* Added docstring for ``Tree.iter_changes``
  (John Arbash Meinel, #304182)

* Allow additional arguments to
  ``RemoteRepository.add_inventory_by_delta()``. (Jelmer Vernooij, #532631)

* Allow exporting a single file using ``bzr export``.
  (Michal Jun├ík, #511987)

* Allow syscalls to automatically restart when ``TextUIFactory``'s
  SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
  IO, which are often poorly handled by Python's libraries and parts of
  bzrlib. (Andrew Bennetts, #496813)

* Avoid infinite recursion when probing for apport.
  (Vincent Ladeuil, #516934)

* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
  (Martin Pool, #331095)

* Avoid truncating svn URLs.
  (Martin Pool, Martin von Gagern, #545185)

* ``bzr add`` will not add conflict related files unless explicitly required.
  (Vincent Ladeuil, #322767, #414589)

* ``bzr dump-btree`` now works on ``*.cix`` and ``*.six`` files. Those
  indices do not have reference lists, so ``dump-btree`` will simply show
  ``None`` instead. (Andrew Bennetts, #488607)

* ``bzr help`` will no longer trigger the get_missing_command hook when
  doing a topic lookup. This avoids prompting (like 'no command plugins/loom,
  did you mean log?') when getting help. In future we may trigger the hook
  deliberately when no help topics match from any help index.
  (Robert Collins, #396261)

* ``bzr log -n0 -r..A.B.C`` should not crash but just consider the None
  revspec as representing the first revision of the branch.
  (Vincent Ladeuil, #519862)

* ``bzr pull`` now uses the correct URL when a Launchpad URI is explicitly
  defined as the pull location in locations.conf. Strings like ``lp:bzr``
  can now be correctly joined to other URLs.
  (Gordon Tyler, #534787)

* ``bzr remove-tree`` can now remove multiple working trees.
  (Jared Hance, Andrew Bennetts, #253137)

* ``bzr resolve --take-this`` and ``--take-other`` now correctly renames
  the kept file on content conflicts where one side deleted the file.
  (Vincent Ladeuil, #529968)

* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
  permissions as ``.bzr`` directory on a POSIX OS.
  (Parth Malwankar, #262450)

* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
  of ``backup.bzr``. This directory is ignored by bzr commands such as
  ``add``.
  (Parth Malwankar, #335033, #300001)

* Correctly interpret "451 Rename/move failure: Directory not empty" from
  ftp servers while trying to take a lock.
  (Martin Pool, #528722)

* DirStateRevisionTree.kind() was returning wrong result when 'kind'
  changes occured between the workingtree and one of its parents.
  (Vincent Ladeuil, #535547)

* Fix ``log`` to better check ancestors even if merged revisions are involved.
  (Vincent Ladeuil, #476293)

* Many IO operations that returned ``EINTR`` were retried even if it
  wasn't safe to do so via careless use of ``until_no_eintr``. Bazaar now
  only retries operations that are safe to retry, and in some cases has
  switched to operations that can be retried (e.g. ``sock.send`` rather than
  ``sock.sendall``).
  (Andrew Bennetts, Martin <email address hidden>, #496813)

* Path conflicts now support --take-this and --take-other even when a
  deletion is involved.
  (Vincent Ladeuil, #531967)

* Network transfer amounts and rates are now displayed in SI units according
  to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
  (Gordon Tyler, #514399)

* Support kind markers for socket and fifo filesystem objects. This
  prevents ``bzr status --short`` from crashing when those files are
  present. (John Arbash Meinel, #303275)

* ``bzr mkdir DIR`` will not create DIR unless DIR's parent is a versioned
   directory. (Parth Malwankar, #138600)

* SSH child processes will now ignore SIGQUIT on nix systems so breaking into
  the debugger won't kill the session.
  (Martin <email address hidden>, #162502)

* Tolerate patches with leading noise in ``bzr-handle-patch``.
  (Toshio Kuratomi, Martin Pool, #502076)

* ``.bazaar``, ``.bazaar/bazaar.conf`` and ``.bzr.log`` inherit user and
  group ownership from the containing directory. This allow bzr to work
  better with sudo.
  (Parth Malwankar, #376388)

API Changes
***********

* ``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
  ``bzrlib.merge_directive.BaseMergeDirective`` and is now public.
  (Jelmer Vernooij)

* ``BranchFormat.initialize`` now takes an optional ``name`` of the colocated
  branch to create. (Jelmer Vernooij)

* ``BzrDir.get_branch_transport`` now takes an optional ``name`` of the
  colocated branch to open. (Jelmer Vernooij)

* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
  can set a signal handler and call ``signal.siginterrupt(signum,
  False)`` for it, if the platform and Python version supports it.
  (Andrew Bennetts, #496813)

* New ``bzrlib.initialize`` is recommended for programs using bzrlib to
  run when starting up; it sets up several things that previously needed
  to be done separately.
  (Martin Pool, #507710)

* Exporters now support a ``per_file_timestamps`` argument to write out the
  timestamp of the commit in which a file revision was introduced.
  (Jelmer Vernooij)

* New method ``BzrDir.list_branches()`` that returns a sequence of branches
  present in a control directory. (Jelmer Vernooij)

* New transport methods ``readlink``, ``symlink`` and ``hardlink``.
  (Neil Santos)

* Remove unused ``CommandFailed`` exception.
  (Martin Pool)

Internals
*********

* ``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
  ``message_callback`` in the same way that commit does. (Robert Collins)

* ``bzrlib.builtins.Commit.run`` raises ``bzrlib.errors.BoundBranchOutOfDate``
  rather than ``bzrlib.errors.BzrCommandError`` when the bound branch is out
  of date. (Gary van der Merwe)

* ``bzrlib.commands.run_bzr`` is more extensible: callers can supply the
  functions to load or disable plugins if they wish to use a different
  plugin mechanism; the --help, --version and no-command name code paths
  now use the generic pluggable command lookup infrastructure.
  (Robert Collins)

* ``bzrlib.errors.BoundBranchOutOfDate`` has a new field ``extra_help``
  which can be set to add extra help to the error. (Gary van der Merwe)

* New method ``Branch.automatic_tag_name`` that can be used to find the
  tag name for a particular revision automatically. (Jelmer Vernooij)

* The methods ``BzrDir.create_branch()``, ``BzrDir.destroy_branch()`` and
  ``BzrDir.open_branch()`` now take an optional ``name`` argument.
  (Jelmer Vernooij)

Testing
*******

* bzr now has a ``.testr.conf`` file in its source tree configured
  appropriately for running tests with Testrepository
  (``https://launchpad.net/testrepository``). (Robert Collins)

* Documentation about testing with ``subunit`` has been tweaked.
  (Robert Collins)

* Known failures has been added for resolve --take-other on ParentLoop
  conflicts. This reflects bug #537956 without fixing it.
  (Vincent Ladeuil)

* New ``bzrlib.tests.test_import_tariff`` can make assertions about what
  Python modules are loaded, to guard against startup time or library
  dependency regressions.
  (Martin Pool)

* Stop sending apport crash files to ``.cache`` in the directory from
  which ``bzr selftest`` was run. (Martin Pool, #422350)

* Tests no longer fail if "close() called during concurrent
  operation on the same file object" occurs when closing the log file
  (which can happen if a thread tries to write to the log file at the
  wrong moment). An warning will be written to ``stderr`` when this
  happens, and another warning will be written if the log file could not
  be closed after retrying 100 times. (Andrew Bennetts, #531746)

0 blueprints and 41 bugs targeted

Bug report Importance Assignee Status
516934 #516934 infinite recursion when apport is installed 2 Critical Vincent Ladeuil  10 Fix Released
113809 #113809 update performs two merges 3 High Gerard Krol  10 Fix Released
262450 #262450 backup.bzr directory is world readable 3 High Parth Malwankar  10 Fix Released
300001 #300001 existence of backup.bzr blocks running upgrade a second time 3 High Parth Malwankar  10 Fix Released
322767 #322767 MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files? 3 High Vincent Ladeuil  10 Fix Released
368931 #368931 Rename may fail when file and directory have the same name differing by case 3 High Martin Pool  10 Fix Released
414589 #414589 Bazaar doesn't notice/care if you try to version-control *.THIS, *.BASE, *.OTHER or *.moved 3 High Vincent Ladeuil  10 Fix Released
417881 #417881 bzr selftest should disable apport 3 High Martin Pool  10 Fix Released
456077 #456077 MYSQL/BZR P3: bzr doesn't explain it's doing a slow cross-format fetch 3 High Martin Pool  10 Fix Released
507710 #507710 want bzrlib.initialize() to do all typical setup 3 High Martin Pool  10 Fix Released
515052 #515052 bzr should use apport to actually file bugs 3 High Martin Pool  10 Fix Released
515356 #515356 unnecessary message about conversion during upgrade 3 High Martin Pool  10 Fix Released
515631 #515631 bzr should fix timestamps on export 3 High Robert Collins  10 Fix Released
519862 #519862 bzr log -r ..X fails with get_parent_map(None); bzr log -r revno:1..X is fine 3 High Vincent Ladeuil  10 Fix Released
521989 #521989 errors when importing WorkingTree on a thread due to signals 3 High Martin Pool  10 Fix Released
529968 #529968 bzr resolve --take-this fails to rename file.THIS to file on ContentConflict 3 High Vincent Ladeuil  10 Fix Released
531967 #531967 bzr resolve --take-this or --take-other fails for PathConflict if a dir is deleted 3 High Vincent Ladeuil  10 Fix Released
535547 #535547 DirStateRevisionTree.kind() works for basis_tree only 3 High Vincent Ladeuil  10 Fix Released
162502 #162502 SIGQUIT kills the child SSH process 4 Medium Martin Packman  10 Fix Released
331095 #331095 patiencediff tries to malloc 0 bytes; tests fail on AIX 4 Medium Martin Pool  10 Fix Released
335033 #335033 ignore backup.bzr 4 Medium   10 Fix Released
392428 #392428 `bzr diff --using C:\foo\bar` does not work 4 Medium Gordon Tyler  10 Fix Released
395997 #395997 should have deterministic effort tests for code loading and startup time 4 Medium Martin Pool  10 Fix Released
411413 #411413 want configuration items to disable/enable plugins 4 Medium Vincent Ladeuil  10 Fix Released
416720 #416720 apport should include relevant parts of bzr.log 4 Medium Martin Pool  10 Fix Released
422350 #422350 selftest creates & leaves .cache directory in branch 4 Medium Martin Pool  10 Fix Released
476293 #476293 MYSQL/BZR P3: "bzr log -rX..Y" should fail if X is not an ancestor of Y 4 Medium Vincent Ladeuil  10 Fix Released
513157 #513157 warning about on-the-fly upgrades to "(remote)", and when upgrading 4 Medium Martin Pool  10 Fix Released
526221 #526221 tests involving stub_sftp are broken on win32 4 Medium Vincent Ladeuil  10 Fix Released
526780 #526780 global name 'args' is not defined in trace.show_error 4 Medium Gordon Tyler  10 Fix Released
66336 #66336 Unportable test(1) construct 5 Low Martin Pool  10 Fix Released
138600 #138600 `bzr mkdir` create new dir before it checks is branch/checkout exists 5 Low Parth Malwankar  10 Fix Released
473099 #473099 Incorrect markup in centralized workflow tutorial 5 Low Martin Pool  10 Fix Released
514399 #514399 use 1000-byte kB for network traffic 5 Low Gordon Tyler  10 Fix Released
82693 #82693 want to run tests in a particular plugin without installing it 6 Wishlist Vincent Ladeuil  10 Fix Released
253137 #253137 remove-tree should be able to operate on multiple branches at once 6 Wishlist Andrew Bennetts  10 Fix Released
513063 #513063 Wrong error message on bind of already-bound branch 6 Wishlist Neil Martinsen-Burrell  10 Fix Released
302410 #302410 local commit is removed by permission error 1 Undecided   10 Fix Released
304182 #304182 bzrlib.tree.Tree.iter_changes has no docstring 1 Undecided John A Meinel  10 Fix Released
396261 #396261 Doesn't know about non-command help topics 1 Undecided Robert Collins  10 Fix Released
526353 #526353 selftest: thread.error: can't start new threadsts.test_put_file_non_atomic(RemoteTCPTransport,SmartTCPServer_for_testing) 1 Undecided Vincent Ladeuil  10 Fix Released
This milestone contains Public information
Everyone can see this information.