1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
|
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Git Trees."""
from bzrlib import (
delta,
errors,
revisiontree,
tree,
)
from bzrlib.plugins.git.inventory import (
GitInventory,
)
from bzrlib.plugins.git.mapping import (
mode_is_executable,
mode_kind,
)
class GitRevisionTree(revisiontree.RevisionTree):
"""Revision tree implementation based on Git objects."""
def __init__(self, repository, revision_id):
self._revision_id = revision_id
self._repository = repository
store = repository._git.object_store
assert isinstance(revision_id, str)
git_id, self.mapping = repository.lookup_bzr_revision_id(revision_id)
try:
commit = store[git_id]
except KeyError, r:
raise errors.NoSuchRevision(repository, revision_id)
self.tree = commit.tree
fileid_map = self.mapping.get_fileid_map(store.__getitem__, self.tree)
self._inventory = GitInventory(self.tree, self.mapping, fileid_map,
store, revision_id)
def get_revision_id(self):
"""See RevisionTree.get_revision_id."""
return self._revision_id
def get_file_text(self, file_id, path=None):
"""See RevisionTree.get_file_text."""
if path is not None:
entry = self._inventory._get_ie(path)
else:
entry = self._inventory[file_id]
if entry.kind in ('directory', 'tree-reference'):
return ""
return entry.object.data
def tree_delta_from_git_changes(changes, mapping,
(old_fileid_map, new_fileid_map), specific_file=None,
require_versioned=False):
"""Create a TreeDelta from two git trees.
source and target are iterators over tuples with:
(filename, sha, mode)
"""
ret = delta.TreeDelta()
for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
if mapping.is_control_file(oldpath):
oldpath = None
if mapping.is_control_file(newpath):
newpath = None
if oldpath is None and newpath is None:
continue
if oldpath is None:
ret.added.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(newmode)))
elif newpath is None:
ret.removed.append((oldpath, old_fileid_map.lookup_file_id(oldpath.encode("utf-8")), mode_kind(oldmode)))
elif oldpath != newpath:
ret.renamed.append((oldpath, newpath, old_fileid_map.lookup_file_id(oldpath.encode("utf-8")), mode_kind(newmode), (oldsha != newsha), (oldmode != newmode)))
elif mode_kind(oldmode) != mode_kind(newmode):
ret.kind_changed.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(oldmode), mode_kind(newmode)))
elif oldsha != newsha or oldmode != newmode:
ret.modified.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(newmode), (oldsha != newsha), (oldmode != newmode)))
else:
ret.unchanged.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(newmode)))
return ret
def changes_from_git_changes(changes, mapping, specific_file=None,
require_versioned=False):
"""Create a iter_changes-like generator from a git stream.
source and target are iterators over tuples with:
(filename, sha, mode)
"""
for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
path = (oldpath, newpath)
if oldpath is None:
fileid = mapping.generate_file_id(newpath)
oldexe = None
oldkind = None
oldname = None
oldparent = None
else:
oldexe = mode_is_executable(oldmode)
oldkind = mode_kind(oldmode)
try:
(oldparentpath, oldname) = oldpath.rsplit("/", 1)
except ValueError:
oldparent = None
oldname = oldpath
else:
oldparent = mapping.generate_file_id(oldparentpath)
fileid = mapping.generate_file_id(oldpath)
if newpath is None:
newexe = None
newkind = None
newname = None
newparent = None
else:
newexe = mode_is_executable(newmode)
newkind = mode_kind(newmode)
try:
newparentpath, newname = newpath.rsplit("/", 1)
except ValueError:
newparent = None
newname = newpath
else:
newparent = mapping.generate_file_id(newparentpath)
yield (fileid, (oldpath, newpath), (oldsha != newsha),
(oldpath is not None, newpath is not None),
(oldparent, newparent), (oldname, newname),
(oldkind, newkind), (oldexe, newexe))
class InterGitRevisionTrees(tree.InterTree):
"""InterTree that works between two git revision trees."""
_matching_from_tree_format = None
_matching_to_tree_format = None
_test_mutable_trees_to_test_trees = None
@classmethod
def is_compatible(cls, source, target):
return (isinstance(source, GitRevisionTree) and
isinstance(target, GitRevisionTree))
def compare(self, want_unchanged=False, specific_files=None,
extra_trees=None, require_versioned=False, include_root=False,
want_unversioned=False):
if self.source._repository._git.object_store != self.target._repository._git.object_store:
raise AssertionError
changes = self.source._repository._git.object_store.tree_changes(
self.source.tree, self.target.tree, want_unchanged=want_unchanged)
source_fileid_map = self.source.mapping.get_fileid_map(
self.source._repository._git.object_store.__getitem__,
self.source.tree)
target_fileid_map = self.target.mapping.get_fileid_map(
self.target._repository._git.object_store.__getitem__,
self.target.tree)
return tree_delta_from_git_changes(changes, self.target.mapping,
(source_fileid_map, target_fileid_map),
specific_file=specific_files)
def iter_changes(self, include_unchanged=False, specific_files=None,
pb=None, extra_trees=[], require_versioned=True,
want_unversioned=False):
if self.source._repository._git.object_store != self.target._repository._git.object_store:
raise AssertionError
changes = self.source._repository._git.object_store.tree_changes(
self.source.tree, self.target.tree,
want_unchanged=include_unchanged)
return changes_from_git_changes(changes, self.target.mapping,
specific_file=specific_files)
tree.InterTree.register_optimiser(InterGitRevisionTrees)
|