[Pkg-bazaar-maint] Bug#577673: bzr-svn: Assertion error when pushing from SVN to remote

[Roland Mas]

Package: bzr-svn
Version: 1.0.2-2
Severity: normal

When pushing straight from SVN to a remote repository, I get the
following traceback:

$ bzr push -d svn://scm.fusionforge.org/fusionforge/branches/Branch_5_0 $p/fusionforge/Branch_5_0
bzr: ERROR: exceptions.TypeError: add_inventory_by_delta() takes exactly 5 arguments (6 given)                                                        

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 853, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1055, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 661, in run_argv_aliases
    return self.run_direct(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 665, in run_direct
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 1146, in run
    use_existing_dir=use_existing_dir)
  File "/usr/lib/python2.5/site-packages/bzrlib/push.py", line 141, in _show_push_branch
    remember, create_prefix)
  File "/usr/lib/python2.5/site-packages/bzrlib/bzrdir.py", line 1262, in push_branch
    repository_to.fetch(source.repository, revision_id=revision_id)
  File "/usr/lib/python2.5/site-packages/bzrlib/remote.py", line 1333, in fetch
    find_ghosts=find_ghosts, fetch_spec=fetch_spec)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/fetch.py", line 1307, in fetch
    pack_hint = self._fetch_revisions(needed, pb)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/fetch.py", line 1253, in _fetch_revisions
    use_replay=self._use_replay)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/fetch.py", line 1229, in _fetch_revisions_nochunks
    parent_revmeta)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/fetch.py", line 1171, in _fetch_revision_switch
    report_inventory_contents(reporter, parent_revnum, start_empty)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/errors.py", line 141, in convert
    return unbound(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/fetch.py", line 937, in report_inventory_contents
    reporter.finish()
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/transport.py", line 231, in update
    if self._last_progress > progress:
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/transport.py", line 231, in update
    if self._last_progress > progress:
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/fetch.py", line 302, in close
    self._close()
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/fetch.py", line 467, in _close
    self.editor._finish_commit()
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/fetch.py", line 712, in _finish_commit
    basis_inv)
TypeError: add_inventory_by_delta() takes exactly 5 arguments (6 given)

bzr 2.1.1 on python 2.5.5 (Linux-2.6.32-3-686-i686-with-debian-squeeze-sid)
arguments: ['/usr/bin/bzr', 'push', '-d', 'svn://scm.fusionforge.org/fusionforge/branches/Branch_5_0', 'bzr+ssh://scm.forge.projet-coclico.org/srv/bzr/coclico/upstreams/fusionforge/Branch_5_0']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'fr_FR.UTF-8'
plugins:
  bookmarks            /home/roland/.bazaar/plugins/bookmarks [unknown]
  bzrtools             /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [2.1.0]
  cvsps_import         /usr/lib/python2.5/site-packages/bzrlib/plugins/cvsps_import [unknown]
  dbus                 /usr/lib/python2.5/site-packages/bzrlib/plugins/dbus [0.1.0dev]
  diffstat             /home/roland/.bazaar/plugins/diffstat [0.2.0]
  email                /usr/lib/python2.5/site-packages/bzrlib/plugins/email [unknown]
  extcommand           /home/roland/.bazaar/plugins/extcommand [unknown]
  git                  /home/roland/.bazaar/plugins/git [0.4.4dev]
  gtk                  /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.98.0.final.1]
  launchpad            /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [2.1.1]
  netrc_credential_store /usr/lib/python2.5/site-packages/bzrlib/plugins/netrc_credential_store [2.1.1]
  news_merge           /usr/lib/python2.5/site-packages/bzrlib/plugins/news_merge [2.1.1]
  rewrite              /usr/lib/python2.5/site-packages/bzrlib/plugins/rewrite [0.6.0]
  svn                  /usr/lib/python2.5/site-packages/bzrlib/plugins/svn [1.0.2]

*** Bazaar has encountered an internal error.  This probably indicates a
    bug in Bazaar.  You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.

Looking around, I guess that _finish_commit() assumes that the
repository object comes from bzrlib/repository.py (where the
add_inventory_by_delta method accepts more arguments), while in my case
it comes from bzrlib/remote.py (where the method doesn't accept the
extra arguments).

Roland.

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-3-686 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages bzr-svn depends on:
ii  bzr                           2.1.1-1    easy to use distributed version co
ii  python                        2.5.4-9    An interactive high-level object-o
ii  python-central                0.6.16     register and build utility for Pyt
ii  python-subvertpy              0.7.2-2    Alternative Python bindings for Su

Versions of packages bzr-svn recommends:
ii  python-tdb                    1.2.1-2    Python bindings for TDB
ii  python-xdg                    0.19-1     Python library to access freedeskt

Versions of packages bzr-svn suggests:
ii  bzr-rebase                    0.6.0-1    transitional dummy package for bzr
ii  bzr-rewrite [bzr-rebase]      0.6.0-1    History rewriting plugin for Bazaa

-- no debconf information

-- 
Roland Mas

Homme qui plus rien à dire, citer proverbe chinois.
  -- Proverbe chinois.