Comment 3 for bug 358037

John's fixes to PythonGroupCompress.pop gets it branching. Thanks for that pointer. So I'm now running with two patches, and not running with the pyrex extensions.

Two follow-ons, one minor, the other major.

Minor: 'bzr info' of the branch, which is in a dev6-rr repository, displays the format as unnamed:

$ /scratch/dev/bzr-1.14/bzr --no-plugins info
Repository tree (format: unnamed)
Location:
  shared repository: /private/tmp/pk
  repository branch: .

Related branches:
  parent branch: /scratch/dev/cvs-pkgsrc.org
$ cd ..
$ /scratch/dev/bzr-1.14/bzr --no-plugins info
Shared repository with trees (format: development6-rich-root)
Location:
  shared repository: .

Major problem: doing a 'bzr check' from either the branch or the repository throws an exception after about two minutes:

$ /scratch/dev/bzr-1.14/bzr --no-plugins check
Checking working tree at 'file:///private/tmp/pk/pkgsrc/'.
Checking repository at 'file:///private/tmp/pk/'.
bzr: ERROR: exceptions.ValueError: Delta claimed to be 535842 long, but ended up 560635 long

Traceback (most recent call last):
  File "/scratch/dev/bzr-1.14/bzrlib/commands.py", line 727, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/scratch/dev/bzr-1.14/bzrlib/commands.py", line 922, in run_bzr
    ret = run(*run_argv)
  File "/scratch/dev/bzr-1.14/bzrlib/commands.py", line 559, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/scratch/dev/bzr-1.14/bzrlib/builtins.py", line 2946, in run
    check_dwim(path, verbose, do_branch=branch, do_repo=repo, do_tree=tree)
  File "/scratch/dev/bzr-1.14/bzrlib/check.py", line 318, in check_dwim
    result = repo.check()
  File "/scratch/dev/bzr-1.14/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/scratch/dev/bzr-1.14/bzrlib/repository.py", line 2437, in check
    return self._check(revision_ids)
  File "/scratch/dev/bzr-1.14/bzrlib/repository.py", line 2441, in _check
    result.check()
  File "/scratch/dev/bzr-1.14/bzrlib/check.py", line 86, in check
    self.check_one_rev(rev_id)
  File "/scratch/dev/bzr-1.14/bzrlib/check.py", line 203, in check_one_rev
    self._check_revision_tree(rev_id)
  File "/scratch/dev/bzr-1.14/bzrlib/check.py", line 244, in _check_revision_tree
    ie.check(self, rev_id, inv, tree)
  File "/scratch/dev/bzr-1.14/bzrlib/inventory.py", line 283, in check
    self._check(checker, rev_id, tree)
  File "/scratch/dev/bzr-1.14/bzrlib/inventory.py", line 497, in _check
    if (self.text_sha1 != tree._repository.texts.get_sha1s([key])[key]):
  File "/scratch/dev/bzr-1.14/bzrlib/groupcompress.py", line 1275, in get_sha1s
    record.get_bytes_as('fulltext'))
  File "/scratch/dev/bzr-1.14/bzrlib/groupcompress.py", line 353, in get_bytes_as
    self._bytes = block.extract(self.key, self._start, self._end)
  File "/scratch/dev/bzr-1.14/bzrlib/groupcompress.py", line 273, in extract
    bytes = apply_delta_to_source(self._content, content_start, end)
  File "/scratch/dev/bzr-1.14/bzrlib/_groupcompress_py.py", line 392, in apply_delta_to_source
    return apply_delta(source, delta_bytes)
  File "/scratch/dev/bzr-1.14/bzrlib/_groupcompress_py.py", line 378, in apply_delta
    ' %d long' % (target_length, len(bytes)))
ValueError: Delta claimed to be 535842 long, but ended up 560635 long

bzr 1.14rc1 on python 2.5.2 (darwin)
arguments: ['/scratch/dev/bzr-1.14/bzr', '--no-plugins', 'check']
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'en_CA.UTF-8'
plugins:
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.