"AssertionError: type was None" on a dpush to svn

[Sam Ruby]

Reproduction instructions:

bzr get http://intertwingly.net/code/venus bzr-venus
mkdir git-venus
cd git-venus
git init
cd ..
cd bzr-venus
bzr dpush ../git-venus

Traceback:
 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 "/usr/lib/python2.6/dist-packages/bzrlib/foreign.py", line 351, in run
     push_result = source_branch.lossy_push(target_branch)
   File "/usr/lib/python2.6/dist-packages/bzrlib/branch.py", line 992, in lossy_push
     return lossy_push(stop_revision)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/branch.py", line 571, in lossy_push
     self.source.repository, refs)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/repository.py", line 95, in dfetch_refs
     return interrepo.dfetch_refs(stop_revision)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/push.py", line 173, in dfetch_refs
     revidmap, gitidmap = self.dfetch(refs.values())
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/push.py", line 198, in dfetch
     todo = list(self.missing_revisions(stop_revisions, check_revid))
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/push.py", line 165, in missing_revisions
     if not check_revid(revid):
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/push.py", line 194, in check_revid
     return (self.source_store._lookup_revision_sha1(revid) in target_store)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/object_store.py", line 213, in _lookup_revision_sha1
     self._update_sha_map(revid)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/object_store.py", line 87, in _update_sha_map
     self._update_sha_map_revision(revid)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/object_store.py", line 109, in _update_sha_map_revision
     tree_sha = self._get_ie_sha1(inv.root, inv, unusual_modes)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/object_store.py", line 164, in _get_ie_sha1
     return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0]
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/object_store.py", line 146, in _get_ie_object_or_sha1
     ret = self._get_ie_object(entry, inv, unusual_modes)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/object_store.py", line 135, in _get_ie_object
     return self._get_tree(entry.file_id, inv.revision_id, inv, unusual_modes)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/object_store.py", line 186, in _get_tree
     unusual_modes)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/mapping.py", line 411, in directory_to_tree
     hexsha = lookup_ie_sha1(ie)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/object_store.py", line 185, in <lambda>
     lambda ie: self._get_ie_sha1(ie, inv, unusual_modes),
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/object_store.py", line 164, in _get_ie_sha1
     return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0]
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/object_store.py", line 151, in _get_ie_object_or_sha1
     self._idmap.add_entry(hexsha, "tree", (entry.file_id, inv.revision_id))
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/shamap.py", line 243, in add_entry
     assert isinstance(sha, str), "type was %r" % sha
 AssertionError: type was None

[Jelmer Vernooij (jelmer)]

This is fixed in bzr-git trunk.

  status fixreleased