/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/groupcompress_repo.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-21 21:19:41 UTC
  • mto: This revision was merged to the branch mainline in revision 4771.
  • Revision ID: john@arbash-meinel.com-20091021211941-3kldzti7r77q9q74
Cleanup some code paths. Make _check_key a helper that can be used
but isn't currently used.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/groupcompress_repo.py
55
55
    )
56
56
from bzrlib.static_tuple import StaticTuple
57
57
 
58
 
_check_key = chk_map._check_key
59
58
 
60
59
class GCPack(NewPack):
61
60
 
816
815
                                 ' no new_path %r' % (file_id,))
817
816
            if new_path == '':
818
817
                new_inv.root_id = file_id
819
 
                parent_id_basename_key = StaticTuple('', '')
 
818
                parent_id_basename_key = StaticTuple('', '').intern()
820
819
            else:
821
820
                utf8_entry_name = entry.name.encode('utf-8')
822
821
                parent_id_basename_key = StaticTuple(entry.parent_id,
823
 
                                                     utf8_entry_name)
 
822
                                                     utf8_entry_name).intern()
824
823
            new_value = entry_to_bytes(entry)
825
824
            # Populate Caches?
826
825
            # new_inv._path_to_fileid_cache[new_path] = file_id
1174
1173
    for inv in repo.iter_inventories(inventory_ids, 'unordered'):
1175
1174
        root_key = inv.id_to_entry.key()
1176
1175
        pid_root_key = inv.parent_id_basename_to_file_id.key()
1177
 
        _check_key(root_key)
1178
 
        _check_key(pid_root_key)
1179
1176
        if inv.revision_id in parent_only_inv_ids:
1180
1177
            result.uninteresting_root_keys.add(root_key)
1181
1178
            result.uninteresting_pid_root_keys.add(pid_root_key)