/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

Escape slashes.

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
        if self.mapping.is_special_file(path):
 
76
            return None
 
77
        return self._fileid_map.lookup_file_id(path.encode('utf-8'))
 
78
 
 
79
    def get_root_id(self):
 
80
        return self.path2id("")
 
81
 
 
82
    def has_or_had_id(self, file_id):
 
83
        return self.has_id(file_id)
 
84
 
 
85
    def has_id(self, file_id):
 
86
        try:
 
87
            path = self.id2path(file_id)
 
88
        except errors.NoSuchId:
 
89
            return False
 
90
        return self.has_filename(path)
 
91
 
 
92
    def kind(self, file_id, path=None):
 
93
        if path is None:
 
94
            path = self.id2path(file_id)
 
95
        try:
 
96
            (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,
 
97
                path)
 
98
        except KeyError:
 
99
            raise errors.NoSuchId(self, file_id)
 
100
        if mode is None:
 
101
            # the tree root is a directory
 
102
            return "directory"
 
103
        return mode_kind(mode)
 
104
 
 
105
    def has_filename(self, path):
 
106
        try:
 
107
            tree_lookup_path(self.store.__getitem__, self.tree,
 
108
                path.encode("utf-8"))
 
109
        except KeyError:
 
110
            return False
 
111
        else:
 
112
            return True
 
113
 
 
114
    def list_files(self, include_root=False, from_dir=None, recursive=True):
 
115
        if from_dir is None:
 
116
            from_dir = u""
 
117
        (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,
 
118
            from_dir.encode("utf-8"))
 
119
        if mode is None: # Root
 
120
            root_ie = self._get_dir_ie("", None)
 
121
        else:
 
122
            parent_path = posixpath.dirname(from_dir.encode("utf-8"))
 
123
            parent_id = self._fileid_map.lookup_file_id(parent_path)
 
124
            if mode_kind(mode) == 'directory':
 
125
                root_ie = self._get_dir_ie(from_dir.encode("utf-8"), parent_id)
 
126
            else:
 
127
                root_ie = self._get_file_ie(from_dir.encode("utf-8"),
 
128
                    posixpath.basename(from_dir), mode, hexsha)
 
129
        if from_dir != "" or include_root:
 
130
            yield (from_dir, "V", root_ie.kind, root_ie.file_id, root_ie)
 
131
        todo = set()
 
132
        if root_ie.kind == 'directory':
 
133
            todo.add((from_dir.encode("utf-8"), hexsha, root_ie.file_id))
 
134
        while todo:
 
135
            (path, hexsha, parent_id) = todo.pop()
 
136
            tree = self.store[hexsha]
 
137
            for name, mode, hexsha in tree.iteritems():
 
138
                if self.mapping.is_special_file(name):
 
139
                    continue
 
140
                child_path = posixpath.join(path, name)
 
141
                if stat.S_ISDIR(mode):
 
142
                    ie = self._get_dir_ie(child_path, parent_id)
 
143
                    if recursive:
 
144
                        todo.add((child_path, hexsha, ie.file_id))
 
145
                else:
 
146
                    ie = self._get_file_ie(child_path, name, mode, hexsha, parent_id)
 
147
                yield child_path, "V", ie.kind, ie.file_id, ie
 
148
 
 
149
    def _get_file_ie(self, path, name, mode, hexsha, parent_id):
 
150
        kind = mode_kind(mode)
 
151
        file_id = self._fileid_map.lookup_file_id(path)
 
152
        ie = inventory.entry_factory[kind](file_id, name.decode("utf-8"), parent_id)
 
153
        if kind == 'symlink':
 
154
            ie.symlink_target = self.store[hexsha].data
 
155
        else:
 
156
            data = self.store[hexsha].data
 
157
            ie.text_sha1 = osutils.sha_string(data)
 
158
            ie.text_size = len(data)
 
159
            ie.executable = mode_is_executable(mode)
 
160
        return ie
 
161
 
 
162
    def _get_dir_ie(self, path, parent_id):
 
163
        file_id = self._fileid_map.lookup_file_id(path)
 
164
        return inventory.InventoryDirectory(file_id,
 
165
            posixpath.basename(path).decode("utf-8"), parent_id)
 
166
 
 
167
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
 
168
        # FIXME: Support yield parents
 
169
        if specific_file_ids is not None:
 
170
            specific_paths = [self.id2path(file_id) for file_id in specific_file_ids]
 
171
            if specific_paths in ([u""], []):
 
172
                specific_paths = None
 
173
            else:
 
174
                specific_paths = set(specific_paths)
 
175
        else:
 
176
            specific_paths = None
 
177
        todo = set([("", self.tree, None)])
 
178
        while todo:
 
179
            path, tree_sha, parent_id = todo.pop()
 
180
            ie = self._get_dir_ie(path, parent_id)
 
181
            if specific_paths is None or path in specific_paths:
 
182
                yield path, ie
 
183
            tree = self.store[tree_sha]
 
184
            for name, mode, hexsha  in tree.iteritems():
 
185
                if self.mapping.is_special_file(name):
 
186
                    continue
 
187
                child_path = posixpath.join(path, name)
 
188
                if stat.S_ISDIR(mode):
 
189
                    if (specific_paths is None or
 
190
                        any(filter(lambda p: p.startswith(child_path), specific_paths))):
 
191
                        todo.add((child_path, hexsha, ie.file_id))
 
192
                elif specific_paths is None or child_path in specific_paths:
 
193
                    yield (child_path,
 
194
                            self._get_file_ie(child_path, name, mode, hexsha,
 
195
                           ie.file_id))
53
196
 
54
197
    def get_revision_id(self):
55
198
        """See RevisionTree.get_revision_id."""
56
199
        return self._revision_id
57
200
 
 
201
    def get_file_sha1(self, file_id, path=None, stat_value=None):
 
202
        return osutils.sha_string(self.get_file_text(file_id, path))
 
203
 
 
204
    def get_file_verifier(self, file_id, path=None, stat_value=None):
 
205
        if path is None:
 
206
            path = self.id2path(file_id)
 
207
        (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,
 
208
            path)
 
209
        return ("GIT", hexsha)
 
210
 
58
211
    def get_file_text(self, file_id, path=None):
59
212
        """See RevisionTree.get_file_text."""
60
 
        if path is not None:
61
 
            entry = self._inventory._get_ie(path)
 
213
        if path is None:
 
214
            path = self.id2path(file_id)
 
215
        (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree, path)
 
216
        if stat.S_ISREG(mode):
 
217
            return self.store[hexsha].data
62
218
        else:
63
 
            entry = self._inventory[file_id]
64
 
        if entry.kind in ('directory', 'tree-reference'):
65
219
            return ""
66
 
        return entry.object.data
 
220
 
 
221
    def _comparison_data(self, entry, path):
 
222
        if entry is None:
 
223
            return None, False, None
 
224
        return entry.kind, entry.executable, None
67
225
 
68
226
 
69
227
def tree_delta_from_git_changes(changes, mapping,
83
241
        if oldpath is None and newpath is None:
84
242
            continue
85
243
        if oldpath is None:
86
 
            ret.added.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(newmode)))
 
244
            file_id = new_fileid_map.lookup_file_id(newpath.encode("utf-8"))
 
245
            ret.added.append((newpath, file_id, mode_kind(newmode)))
87
246
        elif newpath is None:
88
 
            ret.removed.append((oldpath, old_fileid_map.lookup_file_id(oldpath.encode("utf-8")), mode_kind(oldmode)))
 
247
            file_id = old_fileid_map.lookup_file_id(oldpath.encode("utf-8"))
 
248
            ret.removed.append((oldpath, file_id, mode_kind(oldmode)))
89
249
        elif oldpath != newpath:
90
 
            ret.renamed.append((oldpath, newpath, old_fileid_map.lookup_file_id(oldpath.encode("utf-8")), mode_kind(newmode), (oldsha != newsha), (oldmode != newmode)))
 
250
            file_id = old_fileid_map.lookup_file_id(oldpath.encode("utf-8"))
 
251
            ret.renamed.append((oldpath, newpath, file_id, mode_kind(newmode), (oldsha != newsha), (oldmode != newmode)))
91
252
        elif mode_kind(oldmode) != mode_kind(newmode):
92
 
            ret.kind_changed.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(oldmode), mode_kind(newmode)))
 
253
            file_id = new_fileid_map.lookup_file_id(newpath.encode("utf-8"))
 
254
            ret.kind_changed.append((newpath, file_id, mode_kind(oldmode), mode_kind(newmode)))
93
255
        elif oldsha != newsha or oldmode != newmode:
94
 
            ret.modified.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(newmode), (oldsha != newsha), (oldmode != newmode)))
 
256
            file_id = new_fileid_map.lookup_file_id(newpath.encode("utf-8"))
 
257
            ret.modified.append((newpath, file_id, mode_kind(newmode), (oldsha != newsha), (oldmode != newmode)))
95
258
        else:
96
 
            ret.unchanged.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(newmode)))
 
259
            file_id = new_fileid_map.lookup_file_id(newpath.encode("utf-8"))
 
260
            ret.unchanged.append((newpath, file_id, mode_kind(newmode)))
97
261
    return ret
98
262
 
99
263
 
106
270
    """
107
271
    for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
108
272
        path = (oldpath, newpath)
 
273
        if mapping.is_special_file(oldpath) or mapping.is_special_file(newpath):
 
274
            continue
109
275
        if oldpath is None:
110
276
            fileid = mapping.generate_file_id(newpath)
111
277
            oldexe = None
113
279
            oldname = None
114
280
            oldparent = None
115
281
        else:
 
282
            oldpath = oldpath.decode("utf-8")
116
283
            oldexe = mode_is_executable(oldmode)
117
284
            oldkind = mode_kind(oldmode)
118
285
            try:
129
296
            newname = None
130
297
            newparent = None
131
298
        else:
 
299
            newpath = newpath.decode("utf-8")
132
300
            newexe = mode_is_executable(newmode)
133
301
            newkind = mode_kind(newmode)
134
302
            try: