/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
18
"""Git Trees."""
19
0.200.1594 by Jelmer Vernooij
Use absolute_import everywhere.
20
from __future__ import absolute_import
21
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
22
from dulwich.object_store import tree_lookup_path
23
import stat
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
24
import posixpath
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
25
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
26
from ... import (
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
27
    delta,
28
    errors,
0.264.10 by Jelmer Vernooij
Yield inventory entries.
29
    osutils,
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
30
    revisiontree,
31
    tree,
32
    )
0.200.1731 by Jelmer Vernooij
Add support for checking untracked changes.
33
from ...revision import NULL_REVISION
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
34
from ...bzr import (
35
    inventory,
36
    )
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
37
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
38
from .mapping import (
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
39
    mode_is_executable,
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
40
    mode_kind,
0.200.1731 by Jelmer Vernooij
Add support for checking untracked changes.
41
    GitFileIdMap,
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
42
    )
43
44
45
class GitRevisionTree(revisiontree.RevisionTree):
0.200.959 by Jelmer Vernooij
Improve docstrings.
46
    """Revision tree implementation based on Git objects."""
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
47
48
    def __init__(self, repository, revision_id):
49
        self._revision_id = revision_id
50
        self._repository = repository
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
51
        self.store = repository._git.object_store
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
52
        assert isinstance(revision_id, str)
0.200.1283 by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision().
53
        self.commit_id, self.mapping = repository.lookup_bzr_revision_id(revision_id)
0.200.1731 by Jelmer Vernooij
Add support for checking untracked changes.
54
        if revision_id == NULL_REVISION:
55
            self.tree = None
56
            self._fileid_map = GitFileIdMap({}, None)
57
        else:
58
            try:
59
                commit = self.store[self.commit_id]
60
            except KeyError, r:
61
                raise errors.NoSuchRevision(repository, revision_id)
62
            self.tree = commit.tree
63
            self._fileid_map = self.mapping.get_fileid_map(self.store.__getitem__, self.tree)
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
64
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
65
    def get_file_revision(self, path, file_id=None):
0.200.1283 by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision().
66
        change_scanner = self._repository._file_change_scanner
67
        (path, commit_id) = change_scanner.find_last_change_revision(path,
68
            self.commit_id)
69
        return self._repository.lookup_foreign_revision_id(commit_id, self.mapping)
70
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
71
    def get_file_mtime(self, path, file_id=None):
72
        revid = self.get_file_revision(path, file_id)
0.200.1283 by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision().
73
        try:
74
            rev = self._repository.get_revision(revid)
75
        except errors.NoSuchRevision:
76
            raise errors.FileTimestampUnavailable(path)
77
        return rev.timestamp
78
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
79
    def id2path(self, file_id):
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
80
        try:
81
            return self._fileid_map.lookup_path(file_id)
82
        except ValueError:
0.200.1714 by Jelmer Vernooij
Fix NoSuchId raising.
83
            raise errors.NoSuchId(self, file_id)
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
84
85
    def path2id(self, path):
0.200.1328 by Jelmer Vernooij
More test fixes.
86
        if self.mapping.is_special_file(path):
87
            return None
88
        return self._fileid_map.lookup_file_id(path.encode('utf-8'))
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
89
0.200.1569 by Jelmer Vernooij
Implement GitRevisionTree.all_file_ids().
90
    def all_file_ids(self):
91
        return set(self._fileid_map.all_file_ids())
92
0.200.1724 by Jelmer Vernooij
Add GitRevisionTree.all_versioned_paths implementation.
93
    def all_versioned_paths(self):
94
        ret = set()
95
        todo = set([('', self.tree)])
96
        while todo:
97
            (path, tree_id) = todo.pop()
98
            tree = self.store[tree_id]
99
            for name, mode, hexsha in tree.iteritems():
100
                subpath = posixpath.join(path, name)
101
                if stat.S_ISDIR(mode):
102
                    todo.add((subpath, hexsha))
103
                else:
104
                    ret.add(subpath)
105
        return ret
106
0.200.1204 by Jelmer Vernooij
Implement GitRevisionTree.get_root_id().
107
    def get_root_id(self):
108
        return self.path2id("")
109
0.200.1208 by Jelmer Vernooij
Add GitWorkingTree.has_id and GitWorkingTree.has_or_had_id.
110
    def has_or_had_id(self, file_id):
111
        return self.has_id(file_id)
112
113
    def has_id(self, file_id):
114
        try:
115
            path = self.id2path(file_id)
116
        except errors.NoSuchId:
117
            return False
118
        return self.has_filename(path)
119
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
120
    def is_executable(self, path, file_id=None):
0.200.1615 by Jelmer Vernooij
Implement GitRevisionTree.is_executable.:
121
        try:
122
            (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,
123
                path)
124
        except KeyError:
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
125
            raise errors.NoSuchId(self, path)
0.200.1615 by Jelmer Vernooij
Implement GitRevisionTree.is_executable.:
126
        if mode is None:
127
            # the tree root is a directory
128
            return False
129
        return mode_is_executable(mode)
130
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
131
    def kind(self, path, file_id=None):
0.200.1283 by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision().
132
        try:
133
            (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,
134
                path)
135
        except KeyError:
136
            raise errors.NoSuchId(self, file_id)
0.200.1253 by Jelmer Vernooij
Fix Tree.kind(TREE_ROOT).
137
        if mode is None:
138
            # the tree root is a directory
139
            return "directory"
0.200.1241 by Jelmer Vernooij
Implement GitRevisionTree.kind.
140
        return mode_kind(mode)
141
0.200.1197 by Jelmer Vernooij
Implement GitRevisionTree.has_filename.
142
    def has_filename(self, path):
143
        try:
144
            tree_lookup_path(self.store.__getitem__, self.tree,
145
                path.encode("utf-8"))
146
        except KeyError:
147
            return False
148
        else:
149
            return True
150
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
151
    def list_files(self, include_root=False, from_dir=None, recursive=True):
152
        if from_dir is None:
0.200.1197 by Jelmer Vernooij
Implement GitRevisionTree.has_filename.
153
            from_dir = u""
154
        (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,
155
            from_dir.encode("utf-8"))
0.264.9 by Jelmer Vernooij
Implement basic GitWorkingTree.iter_entries_by_dir.
156
        if mode is None: # Root
0.264.10 by Jelmer Vernooij
Yield inventory entries.
157
            root_ie = self._get_dir_ie("", None)
0.264.9 by Jelmer Vernooij
Implement basic GitWorkingTree.iter_entries_by_dir.
158
        else:
0.264.10 by Jelmer Vernooij
Yield inventory entries.
159
            parent_path = posixpath.dirname(from_dir.encode("utf-8"))
0.200.1328 by Jelmer Vernooij
More test fixes.
160
            parent_id = self._fileid_map.lookup_file_id(parent_path)
0.264.10 by Jelmer Vernooij
Yield inventory entries.
161
            if mode_kind(mode) == 'directory':
162
                root_ie = self._get_dir_ie(from_dir.encode("utf-8"), parent_id)
163
            else:
164
                root_ie = self._get_file_ie(from_dir.encode("utf-8"),
165
                    posixpath.basename(from_dir), mode, hexsha)
166
        if from_dir != "" or include_root:
167
            yield (from_dir, "V", root_ie.kind, root_ie.file_id, root_ie)
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
168
        todo = set()
0.264.10 by Jelmer Vernooij
Yield inventory entries.
169
        if root_ie.kind == 'directory':
170
            todo.add((from_dir.encode("utf-8"), hexsha, root_ie.file_id))
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
171
        while todo:
0.264.10 by Jelmer Vernooij
Yield inventory entries.
172
            (path, hexsha, parent_id) = todo.pop()
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
173
            tree = self.store[hexsha]
174
            for name, mode, hexsha in tree.iteritems():
0.200.1328 by Jelmer Vernooij
More test fixes.
175
                if self.mapping.is_special_file(name):
176
                    continue
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
177
                child_path = posixpath.join(path, name)
0.264.10 by Jelmer Vernooij
Yield inventory entries.
178
                if stat.S_ISDIR(mode):
179
                    ie = self._get_dir_ie(child_path, parent_id)
180
                    if recursive:
181
                        todo.add((child_path, hexsha, ie.file_id))
182
                else:
183
                    ie = self._get_file_ie(child_path, name, mode, hexsha, parent_id)
184
                yield child_path, "V", ie.kind, ie.file_id, ie
185
186
    def _get_file_ie(self, path, name, mode, hexsha, parent_id):
187
        kind = mode_kind(mode)
0.200.1328 by Jelmer Vernooij
More test fixes.
188
        file_id = self._fileid_map.lookup_file_id(path)
0.264.10 by Jelmer Vernooij
Yield inventory entries.
189
        ie = inventory.entry_factory[kind](file_id, name.decode("utf-8"), parent_id)
190
        if kind == 'symlink':
191
            ie.symlink_target = self.store[hexsha].data
0.200.1401 by Jelmer Vernooij
Cope with submodules in working trees.
192
        elif kind == 'tree-reference':
193
            ie.reference_revision = self.mapping.revision_id_foreign_to_bzr(hexsha)
0.264.10 by Jelmer Vernooij
Yield inventory entries.
194
        else:
195
            data = self.store[hexsha].data
196
            ie.text_sha1 = osutils.sha_string(data)
197
            ie.text_size = len(data)
198
            ie.executable = mode_is_executable(mode)
199
        return ie
200
201
    def _get_dir_ie(self, path, parent_id):
0.200.1328 by Jelmer Vernooij
More test fixes.
202
        file_id = self._fileid_map.lookup_file_id(path)
0.264.10 by Jelmer Vernooij
Yield inventory entries.
203
        return inventory.InventoryDirectory(file_id,
204
            posixpath.basename(path).decode("utf-8"), parent_id)
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
205
206
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
0.200.1285 by Jelmer Vernooij
Support specific_file_ids argument to Tree.iter_entries_by_dir.
207
        # FIXME: Support yield parents
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
208
        if specific_file_ids is not None:
0.200.1285 by Jelmer Vernooij
Support specific_file_ids argument to Tree.iter_entries_by_dir.
209
            specific_paths = [self.id2path(file_id) for file_id in specific_file_ids]
210
            if specific_paths in ([u""], []):
211
                specific_paths = None
212
            else:
213
                specific_paths = set(specific_paths)
214
        else:
215
            specific_paths = None
0.264.10 by Jelmer Vernooij
Yield inventory entries.
216
        todo = set([("", self.tree, None)])
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
217
        while todo:
0.264.10 by Jelmer Vernooij
Yield inventory entries.
218
            path, tree_sha, parent_id = todo.pop()
219
            ie = self._get_dir_ie(path, parent_id)
0.200.1285 by Jelmer Vernooij
Support specific_file_ids argument to Tree.iter_entries_by_dir.
220
            if specific_paths is None or path in specific_paths:
0.200.1715 by Jelmer Vernooij
Fix some more tests.
221
                yield path.decode("utf-8"), ie
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
222
            tree = self.store[tree_sha]
223
            for name, mode, hexsha  in tree.iteritems():
0.200.1328 by Jelmer Vernooij
More test fixes.
224
                if self.mapping.is_special_file(name):
225
                    continue
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
226
                child_path = posixpath.join(path, name)
227
                if stat.S_ISDIR(mode):
0.200.1285 by Jelmer Vernooij
Support specific_file_ids argument to Tree.iter_entries_by_dir.
228
                    if (specific_paths is None or
229
                        any(filter(lambda p: p.startswith(child_path), specific_paths))):
230
                        todo.add((child_path, hexsha, ie.file_id))
231
                elif specific_paths is None or child_path in specific_paths:
0.200.1715 by Jelmer Vernooij
Fix some more tests.
232
                    yield (child_path.decode("utf-8"),
0.200.1307 by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions.
233
                            self._get_file_ie(child_path, name, mode, hexsha,
0.200.1285 by Jelmer Vernooij
Support specific_file_ids argument to Tree.iter_entries_by_dir.
234
                           ie.file_id))
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
235
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
236
    def get_revision_id(self):
0.200.959 by Jelmer Vernooij
Improve docstrings.
237
        """See RevisionTree.get_revision_id."""
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
238
        return self._revision_id
239
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
240
    def get_file_sha1(self, path, file_id=None, stat_value=None):
241
        return osutils.sha_string(self.get_file_text(path, file_id))
0.200.1255 by Jelmer Vernooij
Implement GitRevisionTree.get_file_sha1.
242
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
243
    def get_file_verifier(self, path, file_id=None, stat_value=None):
0.200.1302 by Jelmer Vernooij
Significantly improve performance of WorkingTree.extras().
244
        (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,
245
            path)
246
        return ("GIT", hexsha)
247
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
248
    def get_file_text(self, path, file_id=None):
0.200.959 by Jelmer Vernooij
Improve docstrings.
249
        """See RevisionTree.get_file_text."""
0.200.1302 by Jelmer Vernooij
Significantly improve performance of WorkingTree.extras().
250
        (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree, path)
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
251
        if stat.S_ISREG(mode):
252
            return self.store[hexsha].data
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
253
        else:
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
254
            return ""
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
255
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
256
    def get_symlink_target(self, path, file_id=None):
0.200.1466 by Jelmer Vernooij
Implement GitRevisionTree.get_symlink_target.
257
        """See RevisionTree.get_symlink_target."""
0.200.1701 by Jelmer Vernooij
Fix a few tests.
258
        (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree, path.encode('utf-8'))
0.200.1466 by Jelmer Vernooij
Implement GitRevisionTree.get_symlink_target.
259
        if stat.S_ISLNK(mode):
0.200.1701 by Jelmer Vernooij
Fix a few tests.
260
            return self.store[hexsha].data.decode('utf-8')
0.200.1466 by Jelmer Vernooij
Implement GitRevisionTree.get_symlink_target.
261
        else:
262
            return None
263
0.264.10 by Jelmer Vernooij
Yield inventory entries.
264
    def _comparison_data(self, entry, path):
265
        if entry is None:
266
            return None, False, None
267
        return entry.kind, entry.executable, None
268
0.200.1568 by Jelmer Vernooij
Implement GitRevisionTree.path_content_summary.
269
    def path_content_summary(self, path):
270
        """See Tree.path_content_summary."""
271
        try:
272
            (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree, path)
273
        except KeyError:
274
            return ('missing', None, None, None)
275
        kind = mode_kind(mode)
276
        if kind == 'file':
277
            executable = mode_is_executable(mode)
278
            contents = self.store[hexsha].data
279
            return (kind, len(contents), executable, osutils.sha_string(contents))
280
        elif kind == 'symlink':
281
            return (kind, None, None, self.store[hexsha].data)
282
        else:
283
            return (kind, None, None, None)
284
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
285
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
286
def tree_delta_from_git_changes(changes, mapping,
287
        (old_fileid_map, new_fileid_map), specific_file=None,
288
        require_versioned=False):
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
289
    """Create a TreeDelta from two git trees.
0.200.959 by Jelmer Vernooij
Improve docstrings.
290
291
    source and target are iterators over tuples with:
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
292
        (filename, sha, mode)
293
    """
294
    ret = delta.TreeDelta()
295
    for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
296
        if mapping.is_control_file(oldpath):
297
            oldpath = None
298
        if mapping.is_control_file(newpath):
299
            newpath = None
300
        if oldpath is None and newpath is None:
301
            continue
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
302
        if oldpath is None:
0.200.1613 by Jelmer Vernooij
Handle encoding better in working tree iter changes.
303
            file_id = new_fileid_map.lookup_file_id(newpath)
304
            ret.added.append((newpath.decode('utf-8'), file_id, mode_kind(newmode)))
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
305
        elif newpath is None:
0.200.1613 by Jelmer Vernooij
Handle encoding better in working tree iter changes.
306
            file_id = old_fileid_map.lookup_file_id(oldpath)
307
            ret.removed.append((oldpath.decode('utf-8'), file_id, mode_kind(oldmode)))
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
308
        elif oldpath != newpath:
0.200.1613 by Jelmer Vernooij
Handle encoding better in working tree iter changes.
309
            file_id = old_fileid_map.lookup_file_id(oldpath)
310
            ret.renamed.append((oldpath.decode('utf-8'), newpath.decode('utf-8'), file_id, mode_kind(newmode), (oldsha != newsha), (oldmode != newmode)))
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
311
        elif mode_kind(oldmode) != mode_kind(newmode):
0.200.1613 by Jelmer Vernooij
Handle encoding better in working tree iter changes.
312
            file_id = new_fileid_map.lookup_file_id(newpath)
313
            ret.kind_changed.append((newpath.decode('utf-8'), file_id, mode_kind(oldmode), mode_kind(newmode)))
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
314
        elif oldsha != newsha or oldmode != newmode:
0.200.1613 by Jelmer Vernooij
Handle encoding better in working tree iter changes.
315
            file_id = new_fileid_map.lookup_file_id(newpath)
316
            ret.modified.append((newpath.decode('utf-8'), file_id, mode_kind(newmode), (oldsha != newsha), (oldmode != newmode)))
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
317
        else:
0.200.1613 by Jelmer Vernooij
Handle encoding better in working tree iter changes.
318
            file_id = new_fileid_map.lookup_file_id(newpath)
319
            ret.unchanged.append((newpath.decode('utf-8'), file_id, mode_kind(newmode)))
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
320
    return ret
321
322
0.200.959 by Jelmer Vernooij
Improve docstrings.
323
def changes_from_git_changes(changes, mapping, specific_file=None,
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
324
                                require_versioned=False):
325
    """Create a iter_changes-like generator from a git stream.
0.200.959 by Jelmer Vernooij
Improve docstrings.
326
327
    source and target are iterators over tuples with:
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
328
        (filename, sha, mode)
329
    """
330
    for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
331
        path = (oldpath, newpath)
0.200.1328 by Jelmer Vernooij
More test fixes.
332
        if mapping.is_special_file(oldpath) or mapping.is_special_file(newpath):
333
            continue
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
334
        if oldpath is None:
335
            fileid = mapping.generate_file_id(newpath)
336
            oldexe = None
337
            oldkind = None
338
            oldname = None
339
            oldparent = None
340
        else:
0.200.1345 by Jelmer Vernooij
paths should be unicode when yielded by iter_changes.
341
            oldpath = oldpath.decode("utf-8")
0.200.1576 by Jelmer Vernooij
Merge a bunch of fixes from store-roundtrip-info.
342
            assert oldmode is not None
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
343
            oldexe = mode_is_executable(oldmode)
344
            oldkind = mode_kind(oldmode)
345
            try:
346
                (oldparentpath, oldname) = oldpath.rsplit("/", 1)
347
            except ValueError:
348
                oldparent = None
349
                oldname = oldpath
350
            else:
351
                oldparent = mapping.generate_file_id(oldparentpath)
352
            fileid = mapping.generate_file_id(oldpath)
353
        if newpath is None:
354
            newexe = None
355
            newkind = None
356
            newname = None
357
            newparent = None
358
        else:
0.200.1345 by Jelmer Vernooij
paths should be unicode when yielded by iter_changes.
359
            newpath = newpath.decode("utf-8")
0.200.1576 by Jelmer Vernooij
Merge a bunch of fixes from store-roundtrip-info.
360
            if newmode is not None:
361
                newexe = mode_is_executable(newmode)
362
                newkind = mode_kind(newmode)
363
            else:
364
                newexe = False
365
                newkind = None
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
366
            try:
367
                newparentpath, newname = newpath.rsplit("/", 1)
368
            except ValueError:
369
                newparent = None
370
                newname = newpath
371
            else:
372
                newparent = mapping.generate_file_id(newparentpath)
0.200.959 by Jelmer Vernooij
Improve docstrings.
373
        yield (fileid, (oldpath, newpath), (oldsha != newsha),
374
             (oldpath is not None, newpath is not None),
375
             (oldparent, newparent), (oldname, newname),
376
             (oldkind, newkind), (oldexe, newexe))
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
377
378
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
379
class InterGitRevisionTrees(tree.InterTree):
380
    """InterTree that works between two git revision trees."""
381
0.200.659 by Jelmer Vernooij
Prevent tests using InterGitRevisionTrees.
382
    _matching_from_tree_format = None
383
    _matching_to_tree_format = None
384
    _test_mutable_trees_to_test_trees = None
385
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
386
    @classmethod
387
    def is_compatible(cls, source, target):
0.200.959 by Jelmer Vernooij
Improve docstrings.
388
        return (isinstance(source, GitRevisionTree) and
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
389
                isinstance(target, GitRevisionTree))
390
391
    def compare(self, want_unchanged=False, specific_files=None,
392
                extra_trees=None, require_versioned=False, include_root=False,
393
                want_unversioned=False):
394
        if self.source._repository._git.object_store != self.target._repository._git.object_store:
395
            raise AssertionError
396
        changes = self.source._repository._git.object_store.tree_changes(
397
            self.source.tree, self.target.tree, want_unchanged=want_unchanged)
0.200.1731 by Jelmer Vernooij
Add support for checking untracked changes.
398
        source_fileid_map = self.source._fileid_map
399
        target_fileid_map = self.target._fileid_map
0.200.959 by Jelmer Vernooij
Improve docstrings.
400
        return tree_delta_from_git_changes(changes, self.target.mapping,
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
401
            (source_fileid_map, target_fileid_map),
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
402
            specific_file=specific_files)
403
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
404
    def iter_changes(self, include_unchanged=False, specific_files=None,
0.200.959 by Jelmer Vernooij
Improve docstrings.
405
        pb=None, extra_trees=[], require_versioned=True,
406
        want_unversioned=False):
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
407
        if self.source._repository._git.object_store != self.target._repository._git.object_store:
408
            raise AssertionError
409
        changes = self.source._repository._git.object_store.tree_changes(
0.200.959 by Jelmer Vernooij
Improve docstrings.
410
            self.source.tree, self.target.tree,
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
411
            want_unchanged=include_unchanged)
0.200.959 by Jelmer Vernooij
Improve docstrings.
412
        return changes_from_git_changes(changes, self.target.mapping,
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
413
            specific_file=specific_files)
414
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
415
416
tree.InterTree.register_optimiser(InterGitRevisionTrees)