1
# Copyright (C) 2008 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
17
from cStringIO import StringIO
19
from dulwich.client import (
20
SimpleFetchGraphWalker,
22
from dulwich.objects import (
32
from bzrlib.errors import (
36
from bzrlib.inventory import (
39
from bzrlib.repository import (
42
from bzrlib.tsort import topo_sort
44
from bzrlib.plugins.git.converter import (
47
from bzrlib.plugins.git.repository import (
52
from bzrlib.plugins.git.remote import (
57
class BzrFetchGraphWalker(object):
58
"""GraphWalker implementation that uses a Bazaar repository."""
60
def __init__(self, repository, mapping):
61
self.repository = repository
62
self.mapping = mapping
64
self.heads = set(repository.all_revision_ids())
68
return iter(self.next, None)
71
revid = self.mapping.revision_id_foreign_to_bzr(sha)
74
def remove(self, revid):
76
if revid in self.heads:
77
self.heads.remove(revid)
78
if revid in self.parents:
79
for p in self.parents[revid]:
84
ret = self.heads.pop()
85
ps = self.repository.get_parent_map([ret])[ret]
86
self.parents[ret] = ps
87
self.heads.update([p for p in ps if not p in self.done])
90
return self.mapping.revision_id_bzr_to_foreign(ret)[0]
91
except InvalidRevisionId:
96
def import_git_blob(texts, mapping, path, blob, inv, parent_invs, shagitmap,
98
"""Import a git blob object into a bzr repository.
100
:param texts: VersionedFiles to add to
101
:param path: Path in the tree
102
:param blob: A git blob
104
file_id = mapping.generate_file_id(path)
105
text_revision = inv.revision_id
106
assert file_id is not None
107
assert text_revision is not None
108
texts.add_lines((file_id, text_revision),
109
[(file_id, p[file_id].revision) for p in parent_invs if file_id in p],
110
osutils.split_lines(blob.data))
111
ie = inv.add_path(path, "file", file_id)
112
ie.revision = text_revision
113
ie.text_size = len(blob.data)
114
ie.text_sha1 = osutils.sha_string(blob.data)
115
ie.executable = executable
116
shagitmap.add_entry(blob.sha().hexdigest(), "blob",
117
(ie.file_id, ie.revision))
120
def import_git_tree(texts, mapping, path, tree, inv, parent_invs, shagitmap,
122
"""Import a git tree object into a bzr repository.
124
:param texts: VersionedFiles object to add to
125
:param path: Path in the tree
126
:param tree: A git tree object
127
:param inv: Inventory object
129
file_id = mapping.generate_file_id(path)
130
text_revision = inv.revision_id
131
texts.add_lines((file_id, text_revision),
132
[(file_id, p[file_id].revision) for p in parent_invs if file_id in p],
134
ie = inv.add_path(path, "directory", file_id)
135
ie.revision = text_revision
136
shagitmap.add_entry(tree.id, "tree", (file_id, text_revision))
137
for mode, name, hexsha in tree.entries():
138
entry_kind = (mode & 0700000) / 0100000
139
basename = name.decode("utf-8")
143
child_path = urlutils.join(path, name)
144
obj = lookup_object(hexsha)
146
import_git_tree(texts, mapping, child_path, obj, inv, parent_invs,
147
shagitmap, lookup_object)
148
elif entry_kind == 1:
149
fs_mode = mode & 0777
150
import_git_blob(texts, mapping, child_path, obj, inv, parent_invs,
151
shagitmap, bool(fs_mode & 0111))
153
raise AssertionError("Unknown blob kind, perms=%r." % (mode,))
156
def import_git_objects(repo, mapping, object_iter, target_git_object_retriever,
158
"""Import a set of git objects into a bzr repository.
160
:param repo: Bazaar repository
161
:param mapping: Mapping to use
162
:param object_iter: Iterator over Git objects.
164
# TODO: a more (memory-)efficient implementation of this
168
# Find and convert commit objects
169
for o in object_iter.iterobjects():
170
if isinstance(o, Commit):
171
rev = mapping.import_commit(o)
172
root_trees[rev.revision_id] = object_iter[o.tree]
173
revisions[rev.revision_id] = rev
174
graph.append((rev.revision_id, rev.parent_ids))
175
target_git_object_retriever._idmap.add_entry(o.sha().hexdigest(),
176
"commit", (rev.revision_id, o._tree))
177
# Order the revisions
178
# Create the inventory objects
179
for i, revid in enumerate(topo_sort(graph)):
181
pb.update("fetching revisions", i, len(graph))
182
root_tree = root_trees[revid]
183
rev = revisions[revid]
184
# We have to do this here, since we have to walk the tree and
185
# we need to make sure to import the blobs / trees with the riht
186
# path; this may involve adding them more than once.
188
inv.revision_id = rev.revision_id
189
def lookup_object(sha):
190
if sha in object_iter:
191
return object_iter[sha]
192
return target_git_object_retriever[sha]
193
parent_invs = [repo.get_inventory(r) for r in rev.parent_ids]
194
import_git_tree(repo.texts, mapping, "", root_tree, inv, parent_invs,
195
target_git_object_retriever._idmap, lookup_object)
196
repo.add_revision(rev.revision_id, rev, inv)
197
target_git_object_retriever._idmap.commit()
200
class InterGitNonGitRepository(InterRepository):
202
_matching_repo_format = GitFormat()
205
def _get_repo_format_to_test():
208
def copy_content(self, revision_id=None, pb=None):
209
"""See InterRepository.copy_content."""
210
self.fetch(revision_id, pb, find_ghosts=False)
212
def fetch_objects(self, determine_wants, mapping, pb=None):
214
pb.update("git: %s" % text.rstrip("\r\n"), 0, 0)
215
graph_walker = BzrFetchGraphWalker(self.target, mapping)
218
create_pb = pb = ui.ui_factory.nested_progress_bar()
219
target_git_object_retriever = GitObjectConverter(self.target, mapping)
222
self.target.lock_write()
224
self.target.start_write_group()
226
objects_iter = self.source.fetch_objects(determine_wants,
228
target_git_object_retriever.__getitem__,
230
import_git_objects(self.target, mapping, objects_iter,
231
target_git_object_retriever, pb)
233
self.target.commit_write_group()
240
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
241
mapping=None, fetch_spec=None):
242
self.fetch_refs(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts,
243
mapping=mapping, fetch_spec=fetch_spec)
245
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
246
mapping=None, fetch_spec=None):
248
mapping = self.source.get_mapping()
249
if revision_id is not None:
250
interesting_heads = [revision_id]
251
elif fetch_spec is not None:
252
interesting_heads = fetch_spec.heads
254
interesting_heads = None
256
def determine_wants(refs):
258
if interesting_heads is None:
259
ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
261
ret = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in interesting_heads]
262
return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))]
263
self.fetch_objects(determine_wants, mapping, pb)
267
def is_compatible(source, target):
268
"""Be compatible with GitRepository."""
269
# FIXME: Also check target uses VersionedFile
270
return (isinstance(source, GitRepository) and
271
target.supports_rich_root() and
272
not isinstance(target, GitRepository))
275
class InterGitRepository(InterRepository):
277
_matching_repo_format = GitFormat()
280
def _get_repo_format_to_test():
283
def copy_content(self, revision_id=None, pb=None):
284
"""See InterRepository.copy_content."""
285
self.fetch(revision_id, pb, find_ghosts=False)
287
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
288
mapping=None, fetch_spec=None):
290
mapping = self.source.get_mapping()
292
trace.info("git: %s", text)
294
if revision_id is not None:
295
args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
296
elif fetch_spec is not None:
297
args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in fetch_spec.heads]
298
if fetch_spec is None and revision_id is None:
299
determine_wants = r.object_store.determine_wants_all
301
determine_wants = lambda x: [y for y in args if not y in r.object_store]
303
graphwalker = SimpleFetchGraphWalker(r.heads().values(), r.get_parents)
304
f, commit = r.object_store.add_pack()
306
self.source._git.fetch_pack(path, determine_wants, graphwalker, f.write, progress)
314
def is_compatible(source, target):
315
"""Be compatible with GitRepository."""
316
return (isinstance(source, GitRepository) and
317
isinstance(target, GitRepository))
added
removed
fetch.py
