/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

More work on colocated branch support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tree.py
17
17
 
18
18
"""Git Trees."""
19
19
 
 
20
from dulwich.object_store import tree_lookup_path
 
21
import stat
 
22
import posixpath
 
23
 
20
24
from bzrlib import (
21
25
    delta,
22
26
    errors,
 
27
    inventory,
 
28
    osutils,
23
29
    revisiontree,
24
30
    tree,
25
31
    )
26
32
 
27
 
from bzrlib.plugins.git.inventory import (
28
 
    GitInventory,
29
 
    )
30
33
from bzrlib.plugins.git.mapping import (
31
34
    mode_is_executable,
32
35
    mode_kind,
39
42
    def __init__(self, repository, revision_id):
40
43
        self._revision_id = revision_id
41
44
        self._repository = repository
42
 
        store = repository._git.object_store
 
45
        self.store = repository._git.object_store
43
46
        assert isinstance(revision_id, str)
44
 
        git_id, self.mapping = repository.lookup_bzr_revision_id(revision_id)
 
47
        self.commit_id, self.mapping = repository.lookup_bzr_revision_id(revision_id)
45
48
        try:
46
 
            commit = store[git_id]
 
49
            commit = self.store[self.commit_id]
47
50
        except KeyError, r:
48
51
            raise errors.NoSuchRevision(repository, revision_id)
49
52
        self.tree = commit.tree
50
 
        fileid_map = self.mapping.get_fileid_map(store.__getitem__, self.tree)
51
 
        self._inventory = GitInventory(self.tree, self.mapping, fileid_map,
52
 
            store, revision_id)
 
53
        self.fileid_map = self.mapping.get_fileid_map(self.store.__getitem__, self.tree)
 
54
 
 
55
    def get_file_revision(self, file_id, path=None):
 
56
        if path is None:
 
57
            path = self.id2path(file_id)
 
58
        change_scanner = self._repository._file_change_scanner
 
59
        (path, commit_id) = change_scanner.find_last_change_revision(path,
 
60
            self.commit_id)
 
61
        return self._repository.lookup_foreign_revision_id(commit_id, self.mapping)
 
62
 
 
63
    def get_file_mtime(self, file_id, path=None):
 
64
        revid = self.get_file_revision(file_id, path)
 
65
        try:
 
66
            rev = self._repository.get_revision(revid)
 
67
        except errors.NoSuchRevision:
 
68
            raise errors.FileTimestampUnavailable(path)
 
69
        return rev.timestamp
 
70
 
 
71
    def id2path(self, file_id):
 
72
        return self.fileid_map.lookup_path(file_id)
 
73
 
 
74
    def path2id(self, path):
 
75
        return self.fileid_map.lookup_file_id(path.encode('utf-8'))
 
76
 
 
77
    def get_root_id(self):
 
78
        return self.path2id("")
 
79
 
 
80
    def has_or_had_id(self, file_id):
 
81
        return self.has_id(file_id)
 
82
 
 
83
    def has_id(self, file_id):
 
84
        try:
 
85
            path = self.id2path(file_id)
 
86
        except errors.NoSuchId:
 
87
            return False
 
88
        return self.has_filename(path)
 
89
 
 
90
    def kind(self, file_id, path=None):
 
91
        if path is None:
 
92
            path = self.id2path(file_id)
 
93
        try:
 
94
            (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,
 
95
                path)
 
96
        except KeyError:
 
97
            raise errors.NoSuchId(self, file_id)
 
98
        if mode is None:
 
99
            # the tree root is a directory
 
100
            return "directory"
 
101
        return mode_kind(mode)
 
102
 
 
103
    def has_filename(self, path):
 
104
        try:
 
105
            tree_lookup_path(self.store.__getitem__, self.tree,
 
106
                path.encode("utf-8"))
 
107
        except KeyError:
 
108
            return False
 
109
        else:
 
110
            return True
 
111
 
 
112
    def list_files(self, include_root=False, from_dir=None, recursive=True):
 
113
        if from_dir is None:
 
114
            from_dir = u""
 
115
        (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,
 
116
            from_dir.encode("utf-8"))
 
117
        if mode is None: # Root
 
118
            root_ie = self._get_dir_ie("", None)
 
119
        else:
 
120
            parent_path = posixpath.dirname(from_dir.encode("utf-8"))
 
121
            parent_id = self.fileid_map.lookup_file_id(parent_path)
 
122
            if mode_kind(mode) == 'directory':
 
123
                root_ie = self._get_dir_ie(from_dir.encode("utf-8"), parent_id)
 
124
            else:
 
125
                root_ie = self._get_file_ie(from_dir.encode("utf-8"),
 
126
                    posixpath.basename(from_dir), mode, hexsha)
 
127
        if from_dir != "" or include_root:
 
128
            yield (from_dir, "V", root_ie.kind, root_ie.file_id, root_ie)
 
129
        todo = set()
 
130
        if root_ie.kind == 'directory':
 
131
            todo.add((from_dir.encode("utf-8"), hexsha, root_ie.file_id))
 
132
        while todo:
 
133
            (path, hexsha, parent_id) = todo.pop()
 
134
            tree = self.store[hexsha]
 
135
            for name, mode, hexsha in tree.iteritems():
 
136
                child_path = posixpath.join(path, name)
 
137
                if stat.S_ISDIR(mode):
 
138
                    ie = self._get_dir_ie(child_path, parent_id)
 
139
                    if recursive:
 
140
                        todo.add((child_path, hexsha, ie.file_id))
 
141
                else:
 
142
                    ie = self._get_file_ie(child_path, name, mode, hexsha, parent_id)
 
143
                yield child_path, "V", ie.kind, ie.file_id, ie
 
144
 
 
145
    def _get_file_ie(self, path, name, mode, hexsha, parent_id):
 
146
        kind = mode_kind(mode)
 
147
        file_id = self.fileid_map.lookup_file_id(path)
 
148
        ie = inventory.entry_factory[kind](file_id, name.decode("utf-8"), parent_id)
 
149
        if kind == 'symlink':
 
150
            ie.symlink_target = self.store[hexsha].data
 
151
        else:
 
152
            data = self.store[hexsha].data
 
153
            ie.text_sha1 = osutils.sha_string(data)
 
154
            ie.text_size = len(data)
 
155
            ie.executable = mode_is_executable(mode)
 
156
        return ie
 
157
 
 
158
    def _get_dir_ie(self, path, parent_id):
 
159
        file_id = self.fileid_map.lookup_file_id(path)
 
160
        return inventory.InventoryDirectory(file_id,
 
161
            posixpath.basename(path).decode("utf-8"), parent_id)
 
162
 
 
163
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
 
164
        # FIXME: Support yield parents
 
165
        if specific_file_ids is not None:
 
166
            specific_paths = [self.id2path(file_id) for file_id in specific_file_ids]
 
167
            if specific_paths in ([u""], []):
 
168
                specific_paths = None
 
169
            else:
 
170
                specific_paths = set(specific_paths)
 
171
        else:
 
172
            specific_paths = None
 
173
        todo = set([("", self.tree, None)])
 
174
        while todo:
 
175
            path, tree_sha, parent_id = todo.pop()
 
176
            ie = self._get_dir_ie(path, parent_id)
 
177
            if specific_paths is None or path in specific_paths:
 
178
                yield path, ie
 
179
            tree = self.store[tree_sha]
 
180
            for name, mode, hexsha  in tree.iteritems():
 
181
                child_path = posixpath.join(path, name)
 
182
                if stat.S_ISDIR(mode):
 
183
                    if (specific_paths is None or
 
184
                        any(filter(lambda p: p.startswith(child_path), specific_paths))):
 
185
                        todo.add((child_path, hexsha, ie.file_id))
 
186
                elif specific_paths is None or child_path in specific_paths:
 
187
                    yield (child_path,
 
188
                            self._get_file_ie(child_path, name, mode, hexsha,
 
189
                           ie.file_id))
53
190
 
54
191
    def get_revision_id(self):
55
192
        """See RevisionTree.get_revision_id."""
56
193
        return self._revision_id
57
194
 
 
195
    def get_file_sha1(self, file_id, path=None):
 
196
        return osutils.sha_string(self.get_file_text(file_id, path))
 
197
 
 
198
    def get_file_verifier(self, file_id, path=None, stat_value=None):
 
199
        if path is None:
 
200
            path = self.id2path(file_id)
 
201
        (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,
 
202
            path)
 
203
        return ("GIT", hexsha)
 
204
 
58
205
    def get_file_text(self, file_id, path=None):
59
206
        """See RevisionTree.get_file_text."""
60
 
        if path is not None:
61
 
            entry = self._inventory._get_ie(path)
 
207
        if path is None:
 
208
            path = self.id2path(file_id)
 
209
        (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree, path)
 
210
        if stat.S_ISREG(mode):
 
211
            return self.store[hexsha].data
62
212
        else:
63
 
            entry = self._inventory[file_id]
64
 
        if entry.kind in ('directory', 'tree-reference'):
65
213
            return ""
66
 
        return entry.object.data
 
214
 
 
215
    def _comparison_data(self, entry, path):
 
216
        if entry is None:
 
217
            return None, False, None
 
218
        return entry.kind, entry.executable, None
67
219
 
68
220
 
69
221
def tree_delta_from_git_changes(changes, mapping,