1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
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.
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.
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
27
from bzrlib.plugins.git.inventory import (
30
from bzrlib.plugins.git.mapping import (
36
class GitRevisionTree(revisiontree.RevisionTree):
37
"""Revision tree implementation based on Git objects."""
39
def __init__(self, repository, revision_id):
40
self._revision_id = revision_id
41
self._repository = repository
42
store = repository._git.object_store
43
assert isinstance(revision_id, str)
44
git_id, self.mapping = repository.lookup_bzr_revision_id(revision_id)
46
commit = store[git_id]
48
raise errors.NoSuchRevision(repository, revision_id)
49
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,
54
def get_revision_id(self):
55
"""See RevisionTree.get_revision_id."""
56
return self._revision_id
58
def get_file_text(self, file_id, path=None):
59
"""See RevisionTree.get_file_text."""
61
entry = self._inventory._get_ie(path)
63
entry = self._inventory[file_id]
64
if entry.kind in ('directory', 'tree-reference'):
66
return entry.object.data
69
def tree_delta_from_git_changes(changes, mapping,
70
(old_fileid_map, new_fileid_map), specific_file=None,
71
require_versioned=False):
72
"""Create a TreeDelta from two git trees.
74
source and target are iterators over tuples with:
77
ret = delta.TreeDelta()
78
for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
79
if mapping.is_control_file(oldpath):
81
if mapping.is_control_file(newpath):
83
if oldpath is None and newpath is None:
86
ret.added.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(newmode)))
88
ret.removed.append((oldpath, old_fileid_map.lookup_file_id(oldpath.encode("utf-8")), mode_kind(oldmode)))
89
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)))
91
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)))
93
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)))
96
ret.unchanged.append((newpath, new_fileid_map.lookup_file_id(newpath.encode("utf-8")), mode_kind(newmode)))
100
def changes_from_git_changes(changes, mapping, specific_file=None,
101
require_versioned=False):
102
"""Create a iter_changes-like generator from a git stream.
104
source and target are iterators over tuples with:
105
(filename, sha, mode)
107
for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
108
path = (oldpath, newpath)
110
fileid = mapping.generate_file_id(newpath)
116
oldexe = mode_is_executable(oldmode)
117
oldkind = mode_kind(oldmode)
119
(oldparentpath, oldname) = oldpath.rsplit("/", 1)
124
oldparent = mapping.generate_file_id(oldparentpath)
125
fileid = mapping.generate_file_id(oldpath)
132
newexe = mode_is_executable(newmode)
133
newkind = mode_kind(newmode)
135
newparentpath, newname = newpath.rsplit("/", 1)
140
newparent = mapping.generate_file_id(newparentpath)
141
yield (fileid, (oldpath, newpath), (oldsha != newsha),
142
(oldpath is not None, newpath is not None),
143
(oldparent, newparent), (oldname, newname),
144
(oldkind, newkind), (oldexe, newexe))
147
class InterGitRevisionTrees(tree.InterTree):
148
"""InterTree that works between two git revision trees."""
150
_matching_from_tree_format = None
151
_matching_to_tree_format = None
152
_test_mutable_trees_to_test_trees = None
155
def is_compatible(cls, source, target):
156
return (isinstance(source, GitRevisionTree) and
157
isinstance(target, GitRevisionTree))
159
def compare(self, want_unchanged=False, specific_files=None,
160
extra_trees=None, require_versioned=False, include_root=False,
161
want_unversioned=False):
162
if self.source._repository._git.object_store != self.target._repository._git.object_store:
164
changes = self.source._repository._git.object_store.tree_changes(
165
self.source.tree, self.target.tree, want_unchanged=want_unchanged)
166
source_fileid_map = self.source.mapping.get_fileid_map(
167
self.source._repository._git.object_store.__getitem__,
169
target_fileid_map = self.target.mapping.get_fileid_map(
170
self.target._repository._git.object_store.__getitem__,
172
return tree_delta_from_git_changes(changes, self.target.mapping,
173
(source_fileid_map, target_fileid_map),
174
specific_file=specific_files)
176
def iter_changes(self, include_unchanged=False, specific_files=None,
177
pb=None, extra_trees=[], require_versioned=True,
178
want_unversioned=False):
179
if self.source._repository._git.object_store != self.target._repository._git.object_store:
181
changes = self.source._repository._git.object_store.tree_changes(
182
self.source.tree, self.target.tree,
183
want_unchanged=include_unchanged)
184
return changes_from_git_changes(changes, self.target.mapping,
185
specific_file=specific_files)
188
tree.InterTree.register_optimiser(InterGitRevisionTrees)
added
removed
tree.py
