~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/btree_index.py

  • Committer: Jelmer Vernooij
  • Date: 2011-11-15 17:22:02 UTC
  • mfrom: (6260 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6262.
  • Revision ID: jelmer@samba.org-20111115172202-inumr89vw3eo5ffg
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
320
320
                optimize_for_size=self._optimize_for_size)
321
321
            rows[-1].writer.write(_LEAF_FLAG)
322
322
        if rows[-1].writer.write(line):
323
 
            # if we failed to write, despite having an empty page to write to,
324
 
            # then line is too big. len is 2 here because we've already written
325
 
            # some header. raising the error avoids infinite recursion searching
326
 
            # for a suitably large page that will not be found.
327
 
            if rows[-1].writer.bytes_out_len <= 2:
328
 
                raise errors.BadIndexKey(string_key)
329
323
            # this key did not fit in the node:
330
324
            rows[-1].finish_node()
331
325
            key_line = string_key + "\n"