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.264.3
by Jelmer Vernooij
 Make RevisionTree inventoryless.  | 
20  | 
from dulwich.object_store import tree_lookup_path  | 
21  | 
import stat  | 
|
| 
0.264.6
by Jelmer Vernooij
 Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.  | 
22  | 
import posixpath  | 
| 
0.264.3
by Jelmer Vernooij
 Make RevisionTree inventoryless.  | 
23  | 
|
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
24  | 
from bzrlib import (  | 
25  | 
delta,  | 
|
26  | 
errors,  | 
|
| 
0.264.10
by Jelmer Vernooij
 Yield inventory entries.  | 
27  | 
inventory,  | 
28  | 
osutils,  | 
|
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
29  | 
revisiontree,  | 
30  | 
tree,  | 
|
31  | 
    )
 | 
|
32  | 
||
33  | 
from bzrlib.plugins.git.mapping import (  | 
|
| 
0.200.622
by Jelmer Vernooij
 Implement InterTree.iter_changes() as well.  | 
34  | 
mode_is_executable,  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
35  | 
mode_kind,  | 
36  | 
    )
 | 
|
37  | 
||
38  | 
||
39  | 
class GitRevisionTree(revisiontree.RevisionTree):  | 
|
| 
0.200.959
by Jelmer Vernooij
 Improve docstrings.  | 
40  | 
"""Revision tree implementation based on Git objects."""  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
41  | 
|
42  | 
def __init__(self, repository, revision_id):  | 
|
43  | 
self._revision_id = revision_id  | 
|
44  | 
self._repository = repository  | 
|
| 
0.264.3
by Jelmer Vernooij
 Make RevisionTree inventoryless.  | 
45  | 
self.store = repository._git.object_store  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
46  | 
assert isinstance(revision_id, str)  | 
| 
0.200.1283
by Jelmer Vernooij
 Provide Repository.get_file_graph() and Tree.get_file_revision().  | 
47  | 
self.commit_id, self.mapping = repository.lookup_bzr_revision_id(revision_id)  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
48  | 
try:  | 
| 
0.200.1283
by Jelmer Vernooij
 Provide Repository.get_file_graph() and Tree.get_file_revision().  | 
49  | 
commit = self.store[self.commit_id]  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
50  | 
except KeyError, r:  | 
51  | 
raise errors.NoSuchRevision(repository, revision_id)  | 
|
52  | 
self.tree = commit.tree  | 
|
| 
0.200.1328
by Jelmer Vernooij
 More test fixes.  | 
53  | 
self._fileid_map = self.mapping.get_fileid_map(self.store.__getitem__, self.tree)  | 
| 
0.264.3
by Jelmer Vernooij
 Make RevisionTree inventoryless.  | 
54  | 
|
| 
0.200.1283
by Jelmer Vernooij
 Provide Repository.get_file_graph() and Tree.get_file_revision().  | 
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  | 
||
| 
0.264.3
by Jelmer Vernooij
 Make RevisionTree inventoryless.  | 
71  | 
def id2path(self, file_id):  | 
| 
0.200.1328
by Jelmer Vernooij
 More test fixes.  | 
72  | 
return self._fileid_map.lookup_path(file_id)  | 
| 
0.264.3
by Jelmer Vernooij
 Make RevisionTree inventoryless.  | 
73  | 
|
74  | 
def path2id(self, path):  | 
|
| 
0.200.1328
by Jelmer Vernooij
 More test fixes.  | 
75  | 
if self.mapping.is_special_file(path):  | 
76  | 
return None  | 
|
77  | 
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.  | 
78  | 
|
| 
0.200.1204
by Jelmer Vernooij
 Implement GitRevisionTree.get_root_id().  | 
79  | 
def get_root_id(self):  | 
80  | 
return self.path2id("")  | 
|
81  | 
||
| 
0.200.1208
by Jelmer Vernooij
 Add GitWorkingTree.has_id and GitWorkingTree.has_or_had_id.  | 
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  | 
||
| 
0.200.1241
by Jelmer Vernooij
 Implement GitRevisionTree.kind.  | 
92  | 
def kind(self, file_id, path=None):  | 
93  | 
if path is None:  | 
|
| 
0.200.1248
by Jelmer Vernooij
 Fix handling of path in Tree.kind.  | 
94  | 
path = self.id2path(file_id)  | 
| 
0.200.1283
by Jelmer Vernooij
 Provide Repository.get_file_graph() and Tree.get_file_revision().  | 
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)  | 
|
| 
0.200.1253
by Jelmer Vernooij
 Fix Tree.kind(TREE_ROOT).  | 
100  | 
if mode is None:  | 
101  | 
            # the tree root is a directory
 | 
|
102  | 
return "directory"  | 
|
| 
0.200.1241
by Jelmer Vernooij
 Implement GitRevisionTree.kind.  | 
103  | 
return mode_kind(mode)  | 
104  | 
||
| 
0.200.1197
by Jelmer Vernooij
 Implement GitRevisionTree.has_filename.  | 
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  | 
||
| 
0.264.6
by Jelmer Vernooij
 Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.  | 
114  | 
def list_files(self, include_root=False, from_dir=None, recursive=True):  | 
115  | 
if from_dir is None:  | 
|
| 
0.200.1197
by Jelmer Vernooij
 Implement GitRevisionTree.has_filename.  | 
116  | 
from_dir = u""  | 
117  | 
(mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,  | 
|
118  | 
from_dir.encode("utf-8"))  | 
|
| 
0.264.9
by Jelmer Vernooij
 Implement basic GitWorkingTree.iter_entries_by_dir.  | 
119  | 
if mode is None: # Root  | 
| 
0.264.10
by Jelmer Vernooij
 Yield inventory entries.  | 
120  | 
root_ie = self._get_dir_ie("", None)  | 
| 
0.264.9
by Jelmer Vernooij
 Implement basic GitWorkingTree.iter_entries_by_dir.  | 
121  | 
else:  | 
| 
0.264.10
by Jelmer Vernooij
 Yield inventory entries.  | 
122  | 
parent_path = posixpath.dirname(from_dir.encode("utf-8"))  | 
| 
0.200.1328
by Jelmer Vernooij
 More test fixes.  | 
123  | 
parent_id = self._fileid_map.lookup_file_id(parent_path)  | 
| 
0.264.10
by Jelmer Vernooij
 Yield inventory entries.  | 
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)  | 
|
| 
0.264.6
by Jelmer Vernooij
 Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.  | 
131  | 
todo = set()  | 
| 
0.264.10
by Jelmer Vernooij
 Yield inventory entries.  | 
132  | 
if root_ie.kind == 'directory':  | 
133  | 
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.  | 
134  | 
while todo:  | 
| 
0.264.10
by Jelmer Vernooij
 Yield inventory entries.  | 
135  | 
(path, hexsha, parent_id) = todo.pop()  | 
| 
0.264.6
by Jelmer Vernooij
 Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.  | 
136  | 
tree = self.store[hexsha]  | 
137  | 
for name, mode, hexsha in tree.iteritems():  | 
|
| 
0.200.1328
by Jelmer Vernooij
 More test fixes.  | 
138  | 
if self.mapping.is_special_file(name):  | 
139  | 
                    continue
 | 
|
| 
0.264.6
by Jelmer Vernooij
 Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.  | 
140  | 
child_path = posixpath.join(path, name)  | 
| 
0.264.10
by Jelmer Vernooij
 Yield inventory entries.  | 
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)  | 
|
| 
0.200.1328
by Jelmer Vernooij
 More test fixes.  | 
151  | 
file_id = self._fileid_map.lookup_file_id(path)  | 
| 
0.264.10
by Jelmer Vernooij
 Yield inventory entries.  | 
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):  | 
|
| 
0.200.1328
by Jelmer Vernooij
 More test fixes.  | 
163  | 
file_id = self._fileid_map.lookup_file_id(path)  | 
| 
0.264.10
by Jelmer Vernooij
 Yield inventory entries.  | 
164  | 
return inventory.InventoryDirectory(file_id,  | 
165  | 
posixpath.basename(path).decode("utf-8"), parent_id)  | 
|
| 
0.264.6
by Jelmer Vernooij
 Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.  | 
166  | 
|
167  | 
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.  | 
168  | 
        # FIXME: Support yield parents
 | 
| 
0.264.6
by Jelmer Vernooij
 Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.  | 
169  | 
if specific_file_ids is not None:  | 
| 
0.200.1285
by Jelmer Vernooij
 Support specific_file_ids argument to Tree.iter_entries_by_dir.  | 
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  | 
|
| 
0.264.10
by Jelmer Vernooij
 Yield inventory entries.  | 
177  | 
todo = set([("", self.tree, None)])  | 
| 
0.264.6
by Jelmer Vernooij
 Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.  | 
178  | 
while todo:  | 
| 
0.264.10
by Jelmer Vernooij
 Yield inventory entries.  | 
179  | 
path, tree_sha, parent_id = todo.pop()  | 
180  | 
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.  | 
181  | 
if specific_paths is None or path in specific_paths:  | 
182  | 
yield path, ie  | 
|
| 
0.264.6
by Jelmer Vernooij
 Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.  | 
183  | 
tree = self.store[tree_sha]  | 
184  | 
for name, mode, hexsha in tree.iteritems():  | 
|
| 
0.200.1328
by Jelmer Vernooij
 More test fixes.  | 
185  | 
if self.mapping.is_special_file(name):  | 
186  | 
                    continue
 | 
|
| 
0.264.6
by Jelmer Vernooij
 Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.  | 
187  | 
child_path = posixpath.join(path, name)  | 
188  | 
if stat.S_ISDIR(mode):  | 
|
| 
0.200.1285
by Jelmer Vernooij
 Support specific_file_ids argument to Tree.iter_entries_by_dir.  | 
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:  | 
|
| 
0.200.1307
by Jelmer Vernooij
 Formatting fixes, specify path to a couple more functions.  | 
193  | 
yield (child_path,  | 
194  | 
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.  | 
195  | 
ie.file_id))  | 
| 
0.264.6
by Jelmer Vernooij
 Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.  | 
196  | 
|
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
197  | 
def get_revision_id(self):  | 
| 
0.200.959
by Jelmer Vernooij
 Improve docstrings.  | 
198  | 
"""See RevisionTree.get_revision_id."""  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
199  | 
return self._revision_id  | 
200  | 
||
| 
0.200.1321
by Jelmer Vernooij
 More fixes for compatibility with bzr.dev testsuite.  | 
201  | 
def get_file_sha1(self, file_id, path=None, stat_value=None):  | 
| 
0.200.1255
by Jelmer Vernooij
 Implement GitRevisionTree.get_file_sha1.  | 
202  | 
return osutils.sha_string(self.get_file_text(file_id, path))  | 
203  | 
||
| 
0.200.1302
by Jelmer Vernooij
 Significantly improve performance of WorkingTree.extras().  | 
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  | 
||
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
211  | 
def get_file_text(self, file_id, path=None):  | 
| 
0.200.959
by Jelmer Vernooij
 Improve docstrings.  | 
212  | 
"""See RevisionTree.get_file_text."""  | 
| 
0.264.3
by Jelmer Vernooij
 Make RevisionTree inventoryless.  | 
213  | 
if path is None:  | 
214  | 
path = self.id2path(file_id)  | 
|
| 
0.200.1302
by Jelmer Vernooij
 Significantly improve performance of WorkingTree.extras().  | 
215  | 
(mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree, path)  | 
| 
0.264.3
by Jelmer Vernooij
 Make RevisionTree inventoryless.  | 
216  | 
if stat.S_ISREG(mode):  | 
217  | 
return self.store[hexsha].data  | 
|
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
218  | 
else:  | 
| 
0.200.664
by Jelmer Vernooij
 Support submodules during fetch.  | 
219  | 
return ""  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
220  | 
|
| 
0.264.10
by Jelmer Vernooij
 Yield inventory entries.  | 
221  | 
def _comparison_data(self, entry, path):  | 
222  | 
if entry is None:  | 
|
223  | 
return None, False, None  | 
|
224  | 
return entry.kind, entry.executable, None  | 
|
225  | 
||
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
226  | 
|
| 
0.252.43
by Jelmer Vernooij
 Some refactoring, support proper file ids in revision deltas.  | 
227  | 
def tree_delta_from_git_changes(changes, mapping,  | 
228  | 
(old_fileid_map, new_fileid_map), specific_file=None,  | 
|
229  | 
require_versioned=False):  | 
|
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
230  | 
"""Create a TreeDelta from two git trees.  | 
| 
0.200.959
by Jelmer Vernooij
 Improve docstrings.  | 
231  | 
|
232  | 
    source and target are iterators over tuples with:
 | 
|
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
233  | 
        (filename, sha, mode)
 | 
234  | 
    """
 | 
|
235  | 
ret = delta.TreeDelta()  | 
|
236  | 
for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:  | 
|
| 
0.252.43
by Jelmer Vernooij
 Some refactoring, support proper file ids in revision deltas.  | 
237  | 
if mapping.is_control_file(oldpath):  | 
238  | 
oldpath = None  | 
|
239  | 
if mapping.is_control_file(newpath):  | 
|
240  | 
newpath = None  | 
|
241  | 
if oldpath is None and newpath is None:  | 
|
242  | 
            continue
 | 
|
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
243  | 
if oldpath is None:  | 
| 
0.252.43
by Jelmer Vernooij
 Some refactoring, support proper file ids in revision deltas.  | 
244  | 
ret.added.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(newmode)))  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
245  | 
elif newpath is None:  | 
| 
0.252.43
by Jelmer Vernooij
 Some refactoring, support proper file ids in revision deltas.  | 
246  | 
ret.removed.append((oldpath, old_fileid_map.lookup_file_id(oldpath.encode("utf-8")), mode_kind(oldmode)))  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
247  | 
elif oldpath != newpath:  | 
| 
0.252.43
by Jelmer Vernooij
 Some refactoring, support proper file ids in revision deltas.  | 
248  | 
ret.renamed.append((oldpath, newpath, old_fileid_map.lookup_file_id(oldpath.encode("utf-8")), mode_kind(newmode), (oldsha != newsha), (oldmode != newmode)))  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
249  | 
elif mode_kind(oldmode) != mode_kind(newmode):  | 
| 
0.252.43
by Jelmer Vernooij
 Some refactoring, support proper file ids in revision deltas.  | 
250  | 
ret.kind_changed.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(oldmode), mode_kind(newmode)))  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
251  | 
elif oldsha != newsha or oldmode != newmode:  | 
| 
0.252.43
by Jelmer Vernooij
 Some refactoring, support proper file ids in revision deltas.  | 
252  | 
ret.modified.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(newmode), (oldsha != newsha), (oldmode != newmode)))  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
253  | 
else:  | 
| 
0.252.43
by Jelmer Vernooij
 Some refactoring, support proper file ids in revision deltas.  | 
254  | 
ret.unchanged.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(newmode)))  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
255  | 
return ret  | 
256  | 
||
257  | 
||
| 
0.200.959
by Jelmer Vernooij
 Improve docstrings.  | 
258  | 
def changes_from_git_changes(changes, mapping, specific_file=None,  | 
| 
0.200.622
by Jelmer Vernooij
 Implement InterTree.iter_changes() as well.  | 
259  | 
require_versioned=False):  | 
260  | 
"""Create a iter_changes-like generator from a git stream.  | 
|
| 
0.200.959
by Jelmer Vernooij
 Improve docstrings.  | 
261  | 
|
262  | 
    source and target are iterators over tuples with:
 | 
|
| 
0.200.622
by Jelmer Vernooij
 Implement InterTree.iter_changes() as well.  | 
263  | 
        (filename, sha, mode)
 | 
264  | 
    """
 | 
|
265  | 
for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:  | 
|
266  | 
path = (oldpath, newpath)  | 
|
| 
0.200.1328
by Jelmer Vernooij
 More test fixes.  | 
267  | 
if mapping.is_special_file(oldpath) or mapping.is_special_file(newpath):  | 
268  | 
            continue
 | 
|
| 
0.200.622
by Jelmer Vernooij
 Implement InterTree.iter_changes() as well.  | 
269  | 
if oldpath is None:  | 
270  | 
fileid = mapping.generate_file_id(newpath)  | 
|
271  | 
oldexe = None  | 
|
272  | 
oldkind = None  | 
|
273  | 
oldname = None  | 
|
274  | 
oldparent = None  | 
|
275  | 
else:  | 
|
276  | 
oldexe = mode_is_executable(oldmode)  | 
|
277  | 
oldkind = mode_kind(oldmode)  | 
|
278  | 
try:  | 
|
279  | 
(oldparentpath, oldname) = oldpath.rsplit("/", 1)  | 
|
280  | 
except ValueError:  | 
|
281  | 
oldparent = None  | 
|
282  | 
oldname = oldpath  | 
|
283  | 
else:  | 
|
284  | 
oldparent = mapping.generate_file_id(oldparentpath)  | 
|
285  | 
fileid = mapping.generate_file_id(oldpath)  | 
|
286  | 
if newpath is None:  | 
|
287  | 
newexe = None  | 
|
288  | 
newkind = None  | 
|
289  | 
newname = None  | 
|
290  | 
newparent = None  | 
|
291  | 
else:  | 
|
292  | 
newexe = mode_is_executable(newmode)  | 
|
293  | 
newkind = mode_kind(newmode)  | 
|
294  | 
try:  | 
|
295  | 
newparentpath, newname = newpath.rsplit("/", 1)  | 
|
296  | 
except ValueError:  | 
|
297  | 
newparent = None  | 
|
298  | 
newname = newpath  | 
|
299  | 
else:  | 
|
300  | 
newparent = mapping.generate_file_id(newparentpath)  | 
|
| 
0.200.959
by Jelmer Vernooij
 Improve docstrings.  | 
301  | 
yield (fileid, (oldpath, newpath), (oldsha != newsha),  | 
302  | 
(oldpath is not None, newpath is not None),  | 
|
303  | 
(oldparent, newparent), (oldname, newname),  | 
|
304  | 
(oldkind, newkind), (oldexe, newexe))  | 
|
| 
0.200.622
by Jelmer Vernooij
 Implement InterTree.iter_changes() as well.  | 
305  | 
|
306  | 
||
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
307  | 
class InterGitRevisionTrees(tree.InterTree):  | 
308  | 
"""InterTree that works between two git revision trees."""  | 
|
309  | 
||
| 
0.200.659
by Jelmer Vernooij
 Prevent tests using InterGitRevisionTrees.  | 
310  | 
_matching_from_tree_format = None  | 
311  | 
_matching_to_tree_format = None  | 
|
312  | 
_test_mutable_trees_to_test_trees = None  | 
|
313  | 
||
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
314  | 
    @classmethod
 | 
315  | 
def is_compatible(cls, source, target):  | 
|
| 
0.200.959
by Jelmer Vernooij
 Improve docstrings.  | 
316  | 
return (isinstance(source, GitRevisionTree) and  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
317  | 
isinstance(target, GitRevisionTree))  | 
318  | 
||
319  | 
def compare(self, want_unchanged=False, specific_files=None,  | 
|
320  | 
extra_trees=None, require_versioned=False, include_root=False,  | 
|
321  | 
want_unversioned=False):  | 
|
322  | 
if self.source._repository._git.object_store != self.target._repository._git.object_store:  | 
|
323  | 
raise AssertionError  | 
|
324  | 
changes = self.source._repository._git.object_store.tree_changes(  | 
|
325  | 
self.source.tree, self.target.tree, want_unchanged=want_unchanged)  | 
|
| 
0.252.43
by Jelmer Vernooij
 Some refactoring, support proper file ids in revision deltas.  | 
326  | 
source_fileid_map = self.source.mapping.get_fileid_map(  | 
327  | 
self.source._repository._git.object_store.__getitem__,  | 
|
328  | 
self.source.tree)  | 
|
329  | 
target_fileid_map = self.target.mapping.get_fileid_map(  | 
|
330  | 
self.target._repository._git.object_store.__getitem__,  | 
|
331  | 
self.target.tree)  | 
|
| 
0.200.959
by Jelmer Vernooij
 Improve docstrings.  | 
332  | 
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.  | 
333  | 
(source_fileid_map, target_fileid_map),  | 
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
334  | 
specific_file=specific_files)  | 
335  | 
||
| 
0.200.622
by Jelmer Vernooij
 Implement InterTree.iter_changes() as well.  | 
336  | 
def iter_changes(self, include_unchanged=False, specific_files=None,  | 
| 
0.200.959
by Jelmer Vernooij
 Improve docstrings.  | 
337  | 
pb=None, extra_trees=[], require_versioned=True,  | 
338  | 
want_unversioned=False):  | 
|
| 
0.200.622
by Jelmer Vernooij
 Implement InterTree.iter_changes() as well.  | 
339  | 
if self.source._repository._git.object_store != self.target._repository._git.object_store:  | 
340  | 
raise AssertionError  | 
|
341  | 
changes = self.source._repository._git.object_store.tree_changes(  | 
|
| 
0.200.959
by Jelmer Vernooij
 Improve docstrings.  | 
342  | 
self.source.tree, self.target.tree,  | 
| 
0.200.622
by Jelmer Vernooij
 Implement InterTree.iter_changes() as well.  | 
343  | 
want_unchanged=include_unchanged)  | 
| 
0.200.959
by Jelmer Vernooij
 Improve docstrings.  | 
344  | 
return changes_from_git_changes(changes, self.target.mapping,  | 
| 
0.200.622
by Jelmer Vernooij
 Implement InterTree.iter_changes() as well.  | 
345  | 
specific_file=specific_files)  | 
346  | 
||
| 
0.200.617
by Jelmer Vernooij
 Add custom InterTree for use between git revision trees.  | 
347  | 
|
348  | 
tree.InterTree.register_optimiser(InterGitRevisionTrees)  |