← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/chk_map.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-25 19:30:55 UTC
  • mto: This revision was merged to the branch mainline in revision 4536.
  • Revision ID: john@arbash-meinel.com-20090625193055-t8px016os901v333
Properly handle when the two sides potentially have the same chk pages,
but one side addresses them directly, and the other side has an InternalNode in the way.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/chk_map.py
1496
1496
            for prefix, ref in prefix_refs:
1497
1497
                if ref in self._all_uninteresting_chks:
1498
1498
                    continue
1499
 
                interesting_prefixes.add(prefix)
1500
 
                # TODO: I think this is the actual correct value to use
1501
 
                #       basically, anything that *could* point to something
1502
 
                #       with this prefix, however, we need to add tests that
1503
 
                #       can trigger this, to ensure proper coverage
1504
 
                # for i in xrange(len(prefix)):
1505
 
                #     interesting_prefixes.add(prefix[:i+1])
 
1499
                interesting_prefixes.update(
 
1500
                    [prefix[:i+1] for i in xrange(len(prefix))])
1506
1501
                heapq.heappush(self._interesting_queue,
1507
1502
                               (prefix, None, ref))
1508
1503
            for item in items: