Comment 41 for bug 347729

Revision history for this message
Gabriel Filion (gabriel-filion) wrote : Re: git-bzr doesn't work

I've put the status back to Confirmed since trunk is still affected, the "push_back_once.patch" file does not really fix the issue and Ian's branch nearly does so but there's still something with it.

I also tried replaying Ian's modification about changing the marks file format on top of trunk and the situation is the same. I get the error in generic_processor.py. After applying my patch on top of trunk + Ian's patch, I now get an error of the kind (originating from bzrlib?):

bzr: ERROR: exceptions.AttributeError: 'InMemoryGraphIndex' object has no attribute '_find_ancestors'

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 853, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1055, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 661, in run_argv_aliases
    return self.run_direct(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 665, in run_direct
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/gabster/.bazaar/plugins/fastimport/__init__.py", line 384, in run
    params, verbose, user_map=user_map)
  File "/home/gabster/.bazaar/plugins/fastimport/__init__.py", line 111, in _run
    return proc.process(p.iter_commands)
  File "/home/gabster/.bazaar/plugins/fastimport/processor.py", line 95, in process
    self._process(command_iter)
  File "/home/gabster/.bazaar/plugins/fastimport/processors/generic_processor.py", line 283, in _process
    processor.ImportProcessor._process(self, command_iter)
  File "/home/gabster/.bazaar/plugins/fastimport/processor.py", line 117, in _process
    handler(self, cmd)
  File "/home/gabster/.bazaar/plugins/fastimport/processors/generic_processor.py", line 493, in commit_handler
    handler.process()
  File "/home/gabster/.bazaar/plugins/fastimport/processor.py", line 208, in process
    self.post_process_files()
  File "/home/gabster/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 607, in post_process_files
    self._get_inventories)
  File "/home/gabster/.bazaar/plugins/fastimport/revision_store.py", line 374, in load_using_delta
    [(r,) for r in rev.parent_ids])
  File "/usr/lib/python2.6/dist-packages/bzrlib/knit.py", line 1196, in get_known_graph_ancestry
    parent_map, missing_keys = self._index.find_ancestry(keys)
  File "/usr/lib/python2.6/dist-packages/bzrlib/knit.py", line 3129, in find_ancestry
    return self._graph_index.find_ancestry(keys, 0)
  File "/usr/lib/python2.6/dist-packages/bzrlib/index.py", line 1405, in find_ancestry
    search_keys = index._find_ancestors(search_keys,
AttributeError: 'InMemoryGraphIndex' object has no attribute '_find_ancestors'

bzr 2.1.2 on python 2.6.6 (Linux-2.6.32-5-openvz-686-i686-with-debian-squeeze-sid)
arguments: ['/usr/bin/bzr', 'fast-import', '--export-marks=/home/gabster/test/reach.git/.git/bzr/origin.bzr.marks', '--import-marks=/home/gabster/test/reach.git/.git/bzr/origin.bzr.marks', '-', '/home/gabster/test/reach/']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_CA.UTF-8'
plugins:
  bzrtools /usr/lib/python2.6/dist-packages/bzrlib/plugins/bzrtools [2.1.0]
  fastimport /home/gabster/.bazaar/plugins/fastimport [0.9.0dev]
  launchpad /usr/lib/python2.6/dist-packages/bzrlib/plugins/launchpad [2.1.2]
  netrc_credential_store /usr/lib/python2.6/dist-packages/bzrlib/plugins/netrc_credential_store [2.1.2]
  news_merge /usr/lib/python2.6/dist-packages/bzrlib/plugins/news_merge [2.1.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.