/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 tree.py

  • Committer: Jelmer Vernooij
  • Date: 2010-05-05 09:58:55 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100505095855-i0165hooflvk9chy
Ignore control files in inventories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tree.py
28
28
    GitInventory,
29
29
    )
30
30
from bzrlib.plugins.git.mapping import (
 
31
    GitFileIdMap,
31
32
    mode_is_executable,
32
33
    mode_kind,
33
34
    )
46
47
        except KeyError, r:
47
48
            raise errors.NoSuchRevision(repository, revision_id)
48
49
        self.tree = commit.tree
49
 
        self._inventory = GitInventory(self.tree, self.mapping, store, 
 
50
        try:
 
51
            file_id_map_sha = store[self.tree][self.mapping.BZR_FILE_IDS_FILE][1]
 
52
        except KeyError:
 
53
            file_ids = {}
 
54
        else:
 
55
            file_ids = self.mapping.import_fileid_map(store[file_id_map_sha])
 
56
        fileid_map = GitFileIdMap(file_ids, self.mapping)
 
57
        self._inventory = GitInventory(self.tree, self.mapping, fileid_map, store, 
50
58
                                       revision_id)
51
59
 
52
60
    def get_revision_id(self):