/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 breezy/git/memorytree.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/memorytree.py
41
41
    )
42
42
from breezy.transport.memory import MemoryTransport
43
43
 
 
44
from .mapping import GitFileIdMap
44
45
from .tree import MutableGitIndexTree
45
46
 
46
47
 
57
58
        self._lock_mode = None
58
59
        self._populate_from_branch()
59
60
 
60
 
    def _supports_executable(self):
61
 
        return True
62
 
 
63
61
    @property
64
62
    def controldir(self):
65
63
        return self.branch.controldir
88
86
        self._file_transport = MemoryTransport()
89
87
        if self.branch.head is None:
90
88
            tree = Tree()
 
89
            self._basis_fileid_map = GitFileIdMap({}, self.mapping)
91
90
        else:
92
91
            tree_id = self.store[self.branch.head].tree
 
92
            self._basis_fileid_map = self.mapping.get_fileid_map(
 
93
                self.store.__getitem__, tree_id)
93
94
            tree = self.store[tree_id]
 
95
        self._fileid_map = self._basis_fileid_map.copy()
94
96
 
95
97
        trees = [("", tree)]
96
98
        while trees: