Code review comment for lp:~jameinel/bzr/2.1-static-tuple-chk-map

I just tried this branch (well, + r4762 of bzr.dev), on my client and
server. Pushing to the server gave a traceback:

Thu 2009-10-22 03:35:30 +0000
0.357 bzr arguments: [u'serve', u'--inet', u'--directory=/',
u'--allow-writes']
0.372 looking for plugins in /home/mnordhoff/.bazaar/plugins
0.372 looking for plugins in /usr/local/co/bzr/bzr/bzr.dev/bzrlib/plugins
0.568 looking for plugins in
/usr/lib/python2.5/site-packages/bzrlib/plugins
0.571 encoding stdout as osutils.get_user_encoding() 'UTF-8'
2.439 bzr-svn: using Subversion 1.4.6 ()
10.883 Traceback (most recent call last):
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/smart/request.py", line
317, in _call_converting_errors
    return callable(*args, **kwargs)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/smart/repository.py", line
727, in _inserter_thread
    stream, src_format, self.tokens)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/repository.py", line 4242,
in insert_stream
    return self._locked_insert_stream(stream, src_format, is_resume)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/repository.py", line 4343,
in _locked_insert_stream
    hint = self.target_repo.commit_write_group()
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/repository.py", line 1557,
in commit_write_group
    result = self._commit_write_group()
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/repofmt/pack_repo.py", line
2269, in _commit_write_group
    hint = self._pack_collection._commit_write_group()
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/repofmt/pack_repo.py", line
2097, in _commit_write_group
    problems = self._check_new_inventories()
  File
"/usr/local/co/bzr/bzr/bzr.dev/bzrlib/repofmt/groupcompress_repo.py",
line 653, in _check_new_inventories
    for record in _filter_text_keys(chk_diff, text_keys, bytes_to_info):
  File
"/usr/local/co/bzr/bzr/bzr.dev/bzrlib/repofmt/groupcompress_repo.py",
line 1189, in _filter_text_keys
    for record, items in interesting_nodes_iterable:
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/chk_map.py", line 1642, in
process
    for record in self._read_all_roots():
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/chk_map.py", line 1566, in
_read_all_roots
    self._read_nodes_from_store(new_keys):
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/chk_map.py", line 1500, in
_read_nodes_from_store
    search_key_func=self._search_key_func)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/chk_map.py", line 1438, in
_deserialise
    search_key_func=search_key_func)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/chk_map.py", line 1023, in
deserialise
    ' StaticTuple not %s' % (type(key),))
AssertionError: deserialise should be called with a StaticTuple not
<type 'tuple'>

A local "bzr merge" did too:

Thu 2009-10-22 03:40:07 +0000
0.035 bzr arguments: [u'merge', u'/srv/bzr/bzr/statictuple-pickling/']
0.047 looking for plugins in /home/mnordhoff/.bazaar/plugins
0.047 looking for plugins in /usr/local/co/bzr/bzr/bzr.dev/bzrlib/plugins
0.162 looking for plugins in
/usr/lib/python2.5/site-packages/bzrlib/plugins
0.218 opening working tree '/usr/local/co/bzr/bzr/bzr.dev'
0.288 Using fetch logic to copy between
CHKInventoryRepository('file:///srv/bzr/bzr/.bzr/repository/')(<RepositoryFormat2a>)
and
CHKInventoryRepository('file:///usr/local/co/bzr/bzr/.bzr/repository/')(<RepositoryFormat2a>)
0.289 fetch up to rev
{<email address hidden>}
0.595 Base revid: '<email address hidden>'
0.828 Traceback (most recent call last):
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/commands.py", line 842, in
exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/commands.py", line 1037, in
run_bzr
    ret = run(*run_argv)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/commands.py", line 654, in
run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/builtins.py", line 3735, in run
    verified)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/builtins.py", line 3755, in
_do_merge
    conflict_count = merger.do_merge()
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/merge.py", line 495, in
do_merge
    self._do_merge_to(merge)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/merge.py", line 467, in
_do_merge_to
    merge.do_merge()
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/merge.py", line 608, in
do_merge
    self._compute_transform()
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/merge.py", line 640, in
_compute_transform
    entries = self._entries3()
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/merge.py", line 692, in
_entries3
    executable) in iterator:
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/revisiontree.py", line 257,
in iter_changes
    for result in self.target.inventory.iter_changes(self.source.inventory):
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/inventory.py", line 2085,
in iter_changes
    self.id_to_entry.iter_changes(basis.id_to_entry):
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/chk_map.py", line 294, in
iter_changes
    self._ensure_root()
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/chk_map.py", line 140, in
_ensure_root
    self._root_node = self._get_node(self._root_node)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/chk_map.py", line 155, in
_get_node
    search_key_func=self._search_key_func)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/chk_map.py", line 1421, in
_deserialise
    search_key_func=search_key_func)
  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/chk_map.py", line 1008, in
deserialise
    search_key_func=search_key_func)
  File "_chk_map_pyx.pyx", line 368, in
_chk_map_pyx._deserialise_internal_node
TypeError: key ('sha1:e12a0f03e145bbabf18cc7b933cce82edfc005dd',) is not
a StaticTuple

Turning off plugins did not help the latter one; I didn't try it with
the first one.
--
Long e-mail is long.