Error while trying to push to bzr

[Mathieu Leduc-Hamel]

While trying to push new code from GIT to a bzr branch in launchpad the following error happen:

bzr: ERROR: exceptions.TypeError: add_inventory_by_delta() takes exactly 5 arguments (6 given)
Traceback (most recent call last):
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/builtins.py", line 1156, in run
    use_existing_dir=use_existing_dir)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/push.py", line 128, in _show_push_branch
    remember, create_prefix)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/bzrdir.py", line 1286, in push_branch
    overwrite, stop_revision=revision_id)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/branch.py", line 957, in push
    *args, **kwargs)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/branch.py", line 3109, in push
    _override_hook_source_branch=_override_hook_source_branch)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/branch.py", line 2925, in _run_with_write_locked_target
    result = callable(*args, **kwargs)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/branch.py", line 3148, in _push_with_bound_branches
    stop_revision)
  File "/Users/marrakis/.bazaar/plugins/git/branch.py", line 232, in _basic_push
    overwrite, stop_revision)
  File "/Users/marrakis/.bazaar/plugins/git/branch.py", line 445, in _basic_push
    self.update_revisions(stop_revision, overwrite=overwrite, graph=graph)
  File "/Users/marrakis/.bazaar/plugins/git/branch.py", line 384, in update_revisions
    interrepo.fetch_objects(determine_wants, self.source.mapping)
  File "/Users/marrakis/.bazaar/plugins/git/fetch.py", line 544, in fetch_objects
    wants, pb)
  File "/Users/marrakis/.bazaar/plugins/git/fetch.py", line 403, in import_git_objects
    parent_invs_cache)
  File "/Users/marrakis/.bazaar/plugins/git/fetch.py", line 329, in import_git_commit
    base_inv)
TypeError: add_inventory_by_delta() takes exactly 5 arguments (6 given)

bzr 2.0.1 on python 2.6.4 (Darwin-10.2.0-i386-64bit)
arguments: ['/opt/local/bin/bzr', 'push', 'lp:~savoirfairelinux/openobject-server/setup-clean']
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'fr_CA.UTF-8'
plugins:
  git /Users/marrakis/.bazaar/plugins/git [0.4.3]
  launchpad /opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/plugins/launchpad [2.0.1]
  netrc_credential_store /opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/plugins/netrc_credential_store [2.0.1]

*** 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.

It seems to be related to the same things like that https://bugs.launchpad.net/bzr-svn/+bug/513768

[Jelmer Vernooij (jelmer)]

We should fix RemoteRepository.add_inventory_by_delta() to support the
additional two arguments.

  affects bzr-git
  status invalid

  affects bzr
  status triaged
  importance medium

[Patrick Noffke (patrick-noffke)]

I made the same change as that proposed by jelmer to remote.py in my distro's bzr installation (Fedora 12, bzr 2.0.3), and it fixed a similar problem for me. I think this bug is a duplicate:

https://bugs.launchpad.net/bzr-svn/+bug/509386

[Jelmer Vernooij (jelmer)]

Yep, that's indeed a dupe. Thanks, Patrick.

[Jelmer Vernooij (jelmer)]

Hi Patrick,

This isn't actually a bug that affects bzr-svn, just in bzr.

[farfromrefuge (martin-guillon)]

Where are we on that bug?
I really need to be able to push to my svn repo.

Thanks

[Jelmer Vernooij (jelmer)]

This was merged into bzr.dev a while back.

[farfromrefuge (martin-guillon)]

What do you mean by a while back? I use 2.1.1 and i still get that error when doing pull or push to a svn repo

[Jelmer Vernooij (jelmer)]

I think in 2.2, but NEWS should know for sure.

[farfromrefuge (martin-guillon)]

Ok i ll wait for 2.2