To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to fetch.py
- browse files at revision 0.200.910
- compare with another revision
- download diff
- download tarball
- view history from revision 0.200.910
- Committer: Jelmer Vernooij
- Date: 2010-05-04 18:45:45 UTC
- mto: (0.312.1 master) (6883.23.1 bundle-git)
- mto: This revision was merged to the branch mainline in revision 6960.
- Revision ID: jelmer@samba.org-20100504184545-gvmg6gv2s0niiynq
update copyright years
- files added:
- hg.py
- files removed:
- foreign
- files renamed:
- converter.py => object_store.py
- files modified:
- HACKING
added
removed
fetch.py
1
# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
1
# Copyright (C) 2008-2010 Jelmer Vernooij <jelmer@samba.org>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
from cStringIO import (
18
StringIO,
19
)
20
import dulwich as git
21
from dulwich.client import (
22
SimpleFetchGraphWalker,
23
)
24
17
from dulwich.objects import (
25
18
Commit,
26
19
Tag,
20
Tree,
21
S_ISGITLINK,
27
22
)
28
23
from dulwich.object_store import (
29
24
tree_lookup_path,
30
25
)
26
from itertools import (
27
imap,
28
)
29
import posixpath
30
import re
31
31
import stat
32
32
33
33
from bzrlib import (
35
35
osutils,
36
36
trace,
37
37
ui,
38
urlutils,
39
38
)
40
39
from bzrlib.errors import (
41
InvalidRevisionId,
40
BzrError,
42
41
NoSuchId,
43
NoSuchRevision,
44
42
)
45
43
from bzrlib.inventory import (
46
44
Inventory,
47
45
InventoryDirectory,
48
46
InventoryFile,
49
47
InventoryLink,
50
)
51
from bzrlib.lru_cache import (
52
LRUCache,
48
TreeReference,
53
49
)
54
50
from bzrlib.repository import (
55
51
InterRepository,
57
53
from bzrlib.revision import (
58
54
NULL_REVISION,
59
55
)
56
from bzrlib.revisiontree import (
57
RevisionTree,
58
)
60
59
from bzrlib.tsort import (
61
60
topo_sort,
62
61
)
62
from bzrlib.versionedfile import (
63
ChunkedContentFactory,
64
)
63
65
64
from bzrlib.plugins.git.converter import (
65
BazaarObjectStore,
66
)
67
66
from bzrlib.plugins.git.mapping import (
68
67
DEFAULT_FILE_MODE,
69
inventory_to_tree_and_blobs,
70
text_to_blob,
68
mode_is_executable,
69
mode_kind,
70
squash_revision,
71
warn_unusual_mode,
72
)
73
from bzrlib.plugins.git.object_store import (
74
BazaarObjectStore,
75
LRUTreeCache,
76
_tree_to_objects,
77
)
78
from bzrlib.plugins.git.remote import (
79
RemoteGitRepository,
71
80
)
72
81
from bzrlib.plugins.git.repository import (
73
LocalGitRepository,
74
GitRepository,
82
GitRepository,
75
83
GitRepositoryFormat,
76
)
77
from bzrlib.plugins.git.remote import (
78
RemoteGitRepository,
79
)
80
81
82
class BzrFetchGraphWalker(object):
83
"""GraphWalker implementation that uses a Bazaar repository."""
84
85
def __init__(self, repository, mapping):
86
self.repository = repository
87
self.mapping = mapping
88
self.done = set()
89
self.heads = set(repository.all_revision_ids())
90
self.parents = {}
91
92
def __iter__(self):
93
return iter(self.next, None)
94
95
def ack(self, sha):
96
revid = self.mapping.revision_id_foreign_to_bzr(sha)
97
self.remove(revid)
98
99
def remove(self, revid):
100
self.done.add(revid)
101
if revid in self.heads:
102
self.heads.remove(revid)
103
if revid in self.parents:
104
for p in self.parents[revid]:
105
self.remove(p)
106
107
def next(self):
108
while self.heads:
109
ret = self.heads.pop()
110
ps = self.repository.get_parent_map([ret])[ret]
111
self.parents[ret] = ps
112
self.heads.update([p for p in ps if not p in self.done])
113
try:
114
self.done.add(ret)
115
return self.mapping.revision_id_bzr_to_foreign(ret)[0]
116
except InvalidRevisionId:
117
pass
118
return None
119
120
121
def import_git_blob(texts, mapping, path, hexsha, base_inv, parent_id,
122
revision_id, parent_invs, shagitmap, lookup_object, executable, symlink):
84
LocalGitRepository,
85
)
86
87
88
def import_git_blob(texts, mapping, path, name, (base_hexsha, hexsha),
89
base_inv, parent_id, revision_id,
90
parent_invs, lookup_object, (base_mode, mode), store_updater,
91
lookup_file_id):
123
92
"""Import a git blob object into a bzr repository.
124
93
125
94
:param texts: VersionedFiles to add to
127
96
:param blob: A git blob
128
97
:return: Inventory delta for this file
129
98
"""
130
file_id = mapping.generate_file_id(path)
131
if symlink:
99
if base_hexsha == hexsha and base_mode == mode:
100
# If nothing has changed since the base revision, we're done
101
return []
102
file_id = lookup_file_id(path)
103
if stat.S_ISLNK(mode):
132
104
cls = InventoryLink
133
105
else:
134
106
cls = InventoryFile
135
# We just have to hope this is indeed utf-8:
136
ie = cls(file_id, urlutils.basename(path).decode("utf-8"), parent_id)
137
ie.executable = executable
138
ie.text_id = hexsha
139
# See if this has changed at all
140
try:
141
base_ie = base_inv[file_id]
142
except NoSuchId:
143
base_ie = None
144
base_sha = None
145
else:
146
base_sha = base_ie.text_id
147
try:
148
if base_sha is None:
149
base_sha = shagitmap.lookup_blob(file_id, base_ie.revision)
150
except KeyError:
151
base_sha = None
152
else:
153
if (base_sha == hexsha and base_ie.executable == ie.executable
154
and base_ie.kind == ie.kind):
155
# If nothing has changed since the base revision, we're done
156
return [], []
157
if base_sha == hexsha:
107
ie = cls(file_id, name.decode("utf-8"), parent_id)
108
ie.executable = mode_is_executable(mode)
109
if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
110
base_ie = base_inv[base_inv.path2id(path)]
158
111
ie.text_size = base_ie.text_size
159
112
ie.text_sha1 = base_ie.text_sha1
160
113
ie.symlink_target = base_ie.symlink_target
161
ie.revision = base_ie.revision
114
if ie.executable == base_ie.executable:
115
ie.revision = base_ie.revision
116
else:
117
blob = lookup_object(hexsha)
162
118
else:
163
119
blob = lookup_object(hexsha)
164
120
if ie.kind == "symlink":
121
ie.revision = None
165
122
ie.symlink_target = blob.data
166
123
ie.text_size = None
167
124
ie.text_sha1 = None
168
125
else:
169
ie.text_size = len(blob.data)
170
ie.text_sha1 = osutils.sha_string(blob.data)
126
ie.text_size = sum(imap(len, blob.chunked))
127
ie.text_sha1 = osutils.sha_strings(blob.chunked)
171
128
# Check what revision we should store
172
129
parent_keys = []
173
130
for pinv in parent_invs:
174
if pinv.revision_id == base_inv.revision_id:
175
pie = base_ie
176
if pie is None:
177
continue
178
else:
179
try:
180
pie = pinv[file_id]
181
except NoSuchId:
182
continue
183
if pie.text_sha1 == ie.text_sha1:
131
try:
132
pie = pinv[file_id]
133
except NoSuchId:
134
continue
135
if pie.text_sha1 == ie.text_sha1 and pie.executable == ie.executable and pie.symlink_target == ie.symlink_target:
184
136
# found a revision in one of the parents to use
185
137
ie.revision = pie.revision
186
138
break
187
parent_keys.append((file_id, pie.revision))
139
parent_key = (file_id, pie.revision)
140
if not parent_key in parent_keys:
141
parent_keys.append(parent_key)
188
142
if ie.revision is None:
189
143
# Need to store a new revision
190
144
ie.revision = revision_id
191
assert file_id is not None
192
145
assert ie.revision is not None
193
texts.add_lines((file_id, ie.revision), tuple(parent_keys),
194
osutils.split_lines(blob.data))
195
shamap = [(hexsha, "blob", (ie.file_id, ie.revision))]
196
else:
197
shamap = []
198
if file_id in base_inv:
199
old_path = base_inv.id2path(file_id)
146
if ie.kind == 'symlink':
147
chunks = []
148
else:
149
chunks = blob.chunked
150
texts.insert_record_stream([ChunkedContentFactory((file_id, ie.revision), tuple(parent_keys), ie.text_sha1, chunks)])
151
invdelta = []
152
if base_hexsha is not None:
153
old_path = path # Renames are not supported yet
154
if stat.S_ISDIR(base_mode):
155
invdelta.extend(remove_disappeared_children(base_inv, old_path,
156
lookup_object(base_hexsha), [], lookup_object))
200
157
else:
201
158
old_path = None
202
return ([(old_path, path, file_id, ie)], shamap)
203
204
205
def import_git_tree(texts, mapping, path, hexsha, base_inv, parent_id,
206
revision_id, parent_invs, shagitmap, lookup_object):
159
invdelta.append((old_path, path, file_id, ie))
160
if base_hexsha != hexsha:
161
store_updater.add_object(blob, ie)
162
return invdelta
163
164
165
class SubmodulesRequireSubtrees(BzrError):
166
_fmt = """The repository you are fetching from contains submodules. To continue, upgrade your Bazaar repository to a format that supports nested trees, such as 'development-subtree'."""
167
internal = False
168
169
170
def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),
171
base_inv, parent_id, revision_id, parent_invs, lookup_object,
172
(base_mode, mode), store_updater, lookup_file_id):
173
if base_hexsha == hexsha and base_mode == mode:
174
return [], {}
175
file_id = lookup_file_id(path)
176
ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
177
ie.revision = revision_id
178
if base_hexsha is None:
179
oldpath = None
180
else:
181
oldpath = path
182
ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
183
texts.insert_record_stream([ChunkedContentFactory((file_id, ie.revision), (), None, [])])
184
invdelta = [(oldpath, path, file_id, ie)]
185
return invdelta, {}
186
187
188
def remove_disappeared_children(base_inv, path, base_tree, existing_children,
189
lookup_object):
190
ret = []
191
for name, mode, hexsha in base_tree.iteritems():
192
if name in existing_children:
193
continue
194
c_path = posixpath.join(path, name.decode("utf-8"))
195
ret.append((c_path, None, base_inv.path2id(c_path), None))
196
if stat.S_ISDIR(mode):
197
ret.extend(remove_disappeared_children(
198
base_inv, c_path, lookup_object(hexsha), [], lookup_object))
199
return ret
200
201
202
def import_git_tree(texts, mapping, path, name, (base_hexsha, hexsha),
203
base_inv, parent_id, revision_id, parent_invs,
204
lookup_object, (base_mode, mode), store_updater,
205
lookup_file_id, allow_submodules=False):
207
206
"""Import a git tree object into a bzr repository.
208
207
209
208
:param texts: VersionedFiles object to add to
212
211
:param base_inv: Base inventory against which to return inventory delta
213
212
:return: Inventory delta for this subtree
214
213
"""
214
if base_hexsha == hexsha and base_mode == mode:
215
# If nothing has changed since the base revision, we're done
216
return [], {}
215
217
invdelta = []
216
file_id = mapping.generate_file_id(path)
218
file_id = lookup_file_id(path)
217
219
# We just have to hope this is indeed utf-8:
218
ie = InventoryDirectory(file_id, urlutils.basename(path.decode("utf-8")),
219
parent_id)
220
ie.text_id = hexsha
221
try:
222
base_ie = base_inv[file_id]
223
except NoSuchId:
224
# Newly appeared here
225
base_ie = None
220
ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
221
tree = lookup_object(hexsha)
222
if base_hexsha is None:
223
base_tree = None
224
old_path = None # Newly appeared here
225
else:
226
base_tree = lookup_object(base_hexsha)
227
old_path = path # Renames aren't supported yet
228
if base_tree is None or type(base_tree) is not Tree:
226
229
ie.revision = revision_id
227
texts.add_lines((file_id, ie.revision), (), [])
228
invdelta.append((None, path, file_id, ie))
229
else:
230
base_sha = base_ie.text_id
231
# See if this has changed at all
232
try:
233
if base_sha is None:
234
base_sha = shagitmap.lookup_tree(file_id, base_inv.revision_id)
235
except KeyError:
236
pass
237
else:
238
if base_sha == hexsha:
239
# If nothing has changed since the base revision, we're done
240
return [], {}, []
230
invdelta.append((old_path, path, ie.file_id, ie))
231
texts.insert_record_stream([ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
241
232
# Remember for next time
242
233
existing_children = set()
243
234
child_modes = {}
244
shamap = []
245
tree = lookup_object(hexsha)
246
for mode, name, child_hexsha in tree.entries():
247
basename = name.decode("utf-8")
248
existing_children.add(basename)
249
child_path = osutils.pathjoin(path, name)
250
if stat.S_ISDIR(mode):
251
subinvdelta, grandchildmodes, subshamap = import_git_tree(texts,
252
mapping, child_path, child_hexsha, base_inv, file_id,
253
revision_id, parent_invs, shagitmap, lookup_object)
254
invdelta.extend(subinvdelta)
255
child_modes.update(grandchildmodes)
256
shamap.extend(subshamap)
257
else:
258
fs_mode = stat.S_IMODE(mode)
259
symlink = stat.S_ISLNK(mode)
260
subinvdelta, subshamap = import_git_blob(texts, mapping,
261
child_path, child_hexsha, base_inv, file_id, revision_id,
262
parent_invs, shagitmap, lookup_object,
263
bool(fs_mode & 0111), symlink)
264
invdelta.extend(subinvdelta)
265
shamap.extend(subshamap)
266
if mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
235
for child_mode, name, child_hexsha in tree.entries():
236
existing_children.add(name)
237
child_path = posixpath.join(path, name)
238
if type(base_tree) is Tree:
239
try:
240
child_base_mode, child_base_hexsha = base_tree[name]
241
except KeyError:
242
child_base_hexsha = None
243
child_base_mode = 0
244
else:
245
child_base_hexsha = None
246
child_base_mode = 0
247
if stat.S_ISDIR(child_mode):
248
subinvdelta, grandchildmodes = import_git_tree(
249
texts, mapping, child_path, name,
250
(child_base_hexsha, child_hexsha),
251
base_inv, file_id, revision_id, parent_invs, lookup_object,
252
(child_base_mode, child_mode), store_updater,
253
lookup_file_id, allow_submodules=allow_submodules)
254
elif S_ISGITLINK(child_mode): # submodule
255
if not allow_submodules:
256
raise SubmodulesRequireSubtrees()
257
subinvdelta, grandchildmodes = import_git_submodule(
258
texts, mapping, child_path, name,
259
(child_base_hexsha, child_hexsha),
260
base_inv, file_id, revision_id, parent_invs, lookup_object,
261
(child_base_mode, child_mode), store_updater,
262
lookup_file_id)
263
else:
264
subinvdelta = import_git_blob(texts, mapping,
265
child_path, name, (child_base_hexsha, child_hexsha),
266
base_inv, file_id, revision_id, parent_invs, lookup_object,
267
(child_base_mode, child_mode), store_updater,
268
lookup_file_id)
269
grandchildmodes = {}
270
child_modes.update(grandchildmodes)
271
invdelta.extend(subinvdelta)
272
if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
267
273
stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
268
child_modes[child_path] = mode
274
child_modes[child_path] = child_mode
269
275
# Remove any children that have disappeared
270
if base_ie is not None:
271
deletable = [v for k,v in base_ie.children.iteritems() if k not in existing_children]
272
while deletable:
273
ie = deletable.pop()
274
invdelta.append((base_inv.id2path(ie.file_id), None, ie.file_id, None))
275
if ie.kind == "directory":
276
deletable.extend(ie.children.values())
277
shamap.append((hexsha, "tree", (file_id, revision_id)))
278
return invdelta, child_modes, shamap
279
280
281
def import_git_objects(repo, mapping, object_iter, target_git_object_retriever,
282
heads, pb=None):
276
if base_tree is not None and type(base_tree) is Tree:
277
invdelta.extend(remove_disappeared_children(base_inv, old_path,
278
base_tree, existing_children, lookup_object))
279
store_updater.add_object(tree, ie)
280
return invdelta, child_modes
281
282
283
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
284
o, rev, ret_tree, parent_trees, mapping, unusual_modes):
285
new_unusual_modes = mapping.export_unusual_file_modes(rev)
286
if new_unusual_modes != unusual_modes:
287
raise AssertionError("unusual modes don't match: %r != %r" % (
288
unusual_modes, new_unusual_modes))
289
# Verify that we can reconstruct the commit properly
290
rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree)
291
if rec_o != o:
292
raise AssertionError("Reconstructed commit differs: %r != %r" % (
293
rec_o, o))
294
diff = []
295
new_objs = {}
296
for path, obj, ie in _tree_to_objects(ret_tree, parent_trees,
297
target_git_object_retriever._cache.idmap, unusual_modes):
298
old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
299
new_objs[path] = obj
300
if obj.id != old_obj_id:
301
diff.append((path, lookup_object(old_obj_id), obj))
302
for (path, old_obj, new_obj) in diff:
303
while (old_obj.type_name == "tree" and
304
new_obj.type_name == "tree" and
305
sorted(old_obj) == sorted(new_obj)):
306
for name in old_obj:
307
if old_obj[name][0] != new_obj[name][0]:
308
raise AssertionError("Modes for %s differ: %o != %o" % (path, old_obj[name][0], new_obj[name][0]))
309
if old_obj[name][1] != new_obj[name][1]:
310
# Found a differing child, delve deeper
311
path = posixpath.join(path, name)
312
old_obj = lookup_object(old_obj[name][1])
313
new_obj = new_objs[path]
314
break
315
raise AssertionError("objects differ for %s: %r != %r" % (path,
316
old_obj, new_obj))
317
318
319
def import_git_commit(repo, mapping, head, lookup_object,
320
target_git_object_retriever, trees_cache):
321
o = lookup_object(head)
322
rev = mapping.import_commit(o)
323
# We have to do this here, since we have to walk the tree and
324
# we need to make sure to import the blobs / trees with the right
325
# path; this may involve adding them more than once.
326
parent_trees = trees_cache.revision_trees(rev.parent_ids)
327
if parent_trees == []:
328
base_inv = Inventory(root_id=None)
329
base_tree = None
330
base_mode = None
331
else:
332
base_inv = parent_trees[0].inventory
333
base_tree = lookup_object(o.parents[0]).tree
334
base_mode = stat.S_IFDIR
335
store_updater = target_git_object_retriever._get_updater(rev)
336
store_updater.add_object(o, None)
337
inv_delta, unusual_modes = import_git_tree(repo.texts,
338
mapping, "", u"", (base_tree, o.tree), base_inv,
339
None, rev.revision_id, [p.inventory for p in parent_trees],
340
lookup_object, (base_mode, stat.S_IFDIR), store_updater,
341
mapping.generate_file_id,
342
allow_submodules=getattr(repo._format, "supports_tree_reference", False))
343
store_updater.finish()
344
if unusual_modes != {}:
345
for path, mode in unusual_modes.iteritems():
346
warn_unusual_mode(rev.foreign_revid, path, mode)
347
mapping.import_unusual_file_modes(rev, unusual_modes)
348
try:
349
basis_id = rev.parent_ids[0]
350
except IndexError:
351
basis_id = NULL_REVISION
352
base_inv = None
353
rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
354
inv_delta, rev.revision_id, rev.parent_ids,
355
base_inv)
356
ret_tree = RevisionTree(repo, inv, rev.revision_id)
357
trees_cache.add(ret_tree)
358
repo.add_revision(rev.revision_id, rev)
359
if "verify" in debug.debug_flags:
360
verify_commit_reconstruction(target_git_object_retriever,
361
lookup_object, o, rev, ret_tree, parent_trees, mapping,
362
unusual_modes)
363
364
365
def import_git_objects(repo, mapping, object_iter,
366
target_git_object_retriever, heads, pb=None, limit=None):
283
367
"""Import a set of git objects into a bzr repository.
284
368
285
:param repo: Bazaar repository
369
:param repo: Target Bazaar repository
286
370
:param mapping: Mapping to use
287
371
:param object_iter: Iterator over Git objects.
372
:return: Tuple with pack hints and last imported revision id
288
373
"""
289
# TODO: a more (memory-)efficient implementation of this
374
def lookup_object(sha):
375
try:
376
return object_iter[sha]
377
except KeyError:
378
return target_git_object_retriever[sha]
290
379
graph = []
291
root_trees = {}
292
revisions = {}
293
380
checked = set()
294
heads = list(heads)
295
parent_invs_cache = LRUCache(50)
381
heads = list(set(heads))
382
trees_cache = LRUTreeCache(repo)
296
383
# Find and convert commit objects
297
384
while heads:
298
385
if pb is not None:
300
387
head = heads.pop()
301
388
assert isinstance(head, str)
302
389
try:
303
o = object_iter[head]
390
o = lookup_object(head)
304
391
except KeyError:
305
392
continue
306
393
if isinstance(o, Commit):
307
394
rev = mapping.import_commit(o)
308
395
if repo.has_revision(rev.revision_id):
309
396
continue
310
root_trees[rev.revision_id] = o.tree
311
revisions[rev.revision_id] = rev
312
graph.append((rev.revision_id, rev.parent_ids))
313
target_git_object_retriever._idmap.add_entry(o.id, "commit",
314
(rev.revision_id, o.tree))
397
squash_revision(repo, rev)
398
graph.append((o.id, o.parents))
315
399
heads.extend([p for p in o.parents if p not in checked])
316
400
elif isinstance(o, Tag):
317
heads.append(o.object[1])
401
if o.object[1] not in checked:
402
heads.append(o.object[1])
318
403
else:
319
404
trace.warning("Unable to import head object %r" % o)
320
checked.add(head)
405
checked.add(o.id)
406
del checked
321
407
# Order the revisions
322
408
# Create the inventory objects
323
for i, revid in enumerate(topo_sort(graph)):
324
if pb is not None:
325
pb.update("fetching revisions", i, len(graph))
326
rev = revisions[revid]
327
# We have to do this here, since we have to walk the tree and
328
# we need to make sure to import the blobs / trees with the right
329
# path; this may involve adding them more than once.
330
def lookup_object(sha):
331
try:
332
return object_iter[sha]
333
except KeyError:
334
return target_git_object_retriever[sha]
335
parent_invs = []
336
for parent_id in rev.parent_ids:
337
try:
338
parent_invs.append(parent_invs_cache[parent_id])
339
except KeyError:
340
parent_inv = repo.get_inventory(parent_id)
341
parent_invs.append(parent_inv)
342
parent_invs_cache[parent_id] = parent_inv
343
if parent_invs == []:
344
base_inv = Inventory(root_id=None)
409
batch_size = 1000
410
revision_ids = topo_sort(graph)
411
pack_hints = []
412
if limit is not None:
413
revision_ids = revision_ids[:limit]
414
last_imported = None
415
for offset in range(0, len(revision_ids), batch_size):
416
target_git_object_retriever.start_write_group()
417
try:
418
repo.start_write_group()
419
try:
420
for i, head in enumerate(
421
revision_ids[offset:offset+batch_size]):
422
if pb is not None:
423
pb.update("fetching revisions", offset+i,
424
len(revision_ids))
425
import_git_commit(repo, mapping, head, lookup_object,
426
target_git_object_retriever,
427
trees_cache)
428
last_imported = head
429
except:
430
repo.abort_write_group()
431
raise
432
else:
433
hint = repo.commit_write_group()
434
if hint is not None:
435
pack_hints.extend(hint)
436
except:
437
target_git_object_retriever.abort_write_group()
438
raise
345
439
else:
346
base_inv = parent_invs[0]
347
inv_delta, unusual_modes, shamap = import_git_tree(repo.texts,
348
mapping, "", root_trees[revid], base_inv, None, revid,
349
parent_invs, target_git_object_retriever._idmap, lookup_object)
350
target_git_object_retriever._idmap.add_entries(shamap)
351
if unusual_modes != {}:
352
ret = "unusual modes: \n"
353
for item in unusual_modes.iteritems():
354
ret += "\t%s: %o\n" % item
355
raise AssertionError(ret)
356
try:
357
basis_id = rev.parent_ids[0]
358
except IndexError:
359
basis_id = NULL_REVISION
360
rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
361
inv_delta, rev.revision_id, rev.parent_ids)
362
parent_invs_cache[rev.revision_id] = inv
363
repo.add_revision(rev.revision_id, rev)
364
if "verify" in debug.debug_flags:
365
objs = inventory_to_tree_and_blobs(inv, repo.texts, mapping)
366
for sha1, newobj, path in objs:
367
assert path is not None
368
oldobj = tree_lookup_path(lookup_object, root_trees[revid], path)
369
assert oldobj == newobj, "%r != %r in %s" % (oldobj, newobj, path)
370
371
target_git_object_retriever._idmap.commit()
372
373
374
class InterGitNonGitRepository(InterRepository):
375
"""Base InterRepository that copies revisions from a Git into a non-Git
376
repository."""
440
target_git_object_retriever.commit_write_group()
441
return pack_hints, last_imported
442
443
444
class InterGitRepository(InterRepository):
377
445
378
446
_matching_repo_format = GitRepositoryFormat()
379
447
385
453
"""See InterRepository.copy_content."""
386
454
self.fetch(revision_id, pb, find_ghosts=False)
387
455
388
def fetch(self, revision_id=None, pb=None, find_ghosts=False, mapping=None,
389
fetch_spec=None):
390
self.fetch_refs(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts,
391
mapping=mapping, fetch_spec=fetch_spec)
392
393
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
456
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
457
mapping=None, fetch_spec=None):
458
self.fetch_refs(revision_id=revision_id, pb=pb,
459
find_ghosts=find_ghosts, mapping=mapping, fetch_spec=fetch_spec)
460
461
462
class InterGitNonGitRepository(InterGitRepository):
463
"""Base InterRepository that copies revisions from a Git into a non-Git
464
repository."""
465
466
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
394
467
mapping=None, fetch_spec=None):
395
468
if mapping is None:
396
469
mapping = self.source.get_mapping()
406
479
if interesting_heads is None:
407
480
ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
408
481
else:
409
ret = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in interesting_heads if revid != NULL_REVISION]
482
ret = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]
410
483
return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))]
411
self.fetch_objects(determine_wants, mapping, pb)
484
(pack_hint, _) = self.fetch_objects(determine_wants, mapping, pb)
485
if pack_hint is not None and self.target._format.pack_compresses:
486
self.target.pack(hint=pack_hint)
487
if interesting_heads is not None:
488
present_interesting_heads = self.target.has_revisions(interesting_heads)
489
missing_interesting_heads = set(interesting_heads) - present_interesting_heads
490
if missing_interesting_heads:
491
raise AssertionError("Missing interesting heads: %r" % missing_interesting_heads)
412
492
return self._refs
413
493
414
494
495
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
496
def report_git_progress(pb, text):
497
text = text.rstrip("\r\n")
498
g = _GIT_PROGRESS_RE.match(text)
499
if g is not None:
500
(text, pct, current, total) = g.groups()
501
pb.update(text, int(current), int(total))
502
else:
503
pb.update(text, 0, 0)
504
415
505
416
506
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
417
"""InterRepository that copies revisions from a remote Git into a non-Git
507
"""InterRepository that copies revisions from a remote Git into a non-Git
418
508
repository."""
419
509
420
def fetch_objects(self, determine_wants, mapping, pb=None):
510
def get_target_heads(self):
511
# FIXME: This should be more efficient
512
all_revs = self.target.all_revision_ids()
513
parent_map = self.target.get_parent_map(all_revs)
514
all_parents = set()
515
map(all_parents.update, parent_map.itervalues())
516
return set(all_revs) - all_parents
517
518
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
421
519
def progress(text):
422
pb.update("git: %s" % text.rstrip("\r\n"), 0, 0)
423
graph_walker = BzrFetchGraphWalker(self.target, mapping)
424
create_pb = None
425
if pb is None:
426
create_pb = pb = ui.ui_factory.nested_progress_bar()
427
target_git_object_retriever = BazaarObjectStore(self.target, mapping)
428
recorded_wants = []
429
430
def record_determine_wants(heads):
431
wants = determine_wants(heads)
432
recorded_wants.extend(wants)
433
return wants
434
520
report_git_progress(pb, text)
521
store = BazaarObjectStore(self.target, mapping)
522
self.target.lock_write()
435
523
try:
436
self.target.lock_write()
524
heads = self.get_target_heads()
525
graph_walker = store.get_graph_walker(
526
[store._lookup_revision_sha1(head) for head in heads])
527
recorded_wants = []
528
529
def record_determine_wants(heads):
530
wants = determine_wants(heads)
531
recorded_wants.extend(wants)
532
return wants
533
534
create_pb = None
535
if pb is None:
536
create_pb = pb = ui.ui_factory.nested_progress_bar()
437
537
try:
438
self.target.start_write_group()
439
try:
440
objects_iter = self.source.fetch_objects(
441
record_determine_wants,
442
graph_walker,
443
target_git_object_retriever.get_raw,
444
progress)
445
import_git_objects(self.target, mapping, objects_iter,
446
target_git_object_retriever, recorded_wants, pb)
447
finally:
448
self.target.commit_write_group()
538
objects_iter = self.source.fetch_objects(
539
record_determine_wants, graph_walker,
540
store.get_raw, progress)
541
return import_git_objects(self.target, mapping,
542
objects_iter, store, recorded_wants, pb, limit)
449
543
finally:
450
self.target.unlock()
544
if create_pb:
545
create_pb.finished()
451
546
finally:
452
if create_pb:
453
create_pb.finished()
547
self.target.unlock()
454
548
455
549
@staticmethod
456
550
def is_compatible(source, target):
457
551
"""Be compatible with GitRepository."""
458
# FIXME: Also check target uses VersionedFile
459
return (isinstance(source, RemoteGitRepository) and
552
return (isinstance(source, RemoteGitRepository) and
460
553
target.supports_rich_root() and
461
not isinstance(target, GitRepository))
554
not isinstance(target, GitRepository) and
555
target.texts is not None)
462
556
463
557
464
558
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
465
"""InterRepository that copies revisions from a remote Git into a non-Git
559
"""InterRepository that copies revisions from a local Git into a non-Git
466
560
repository."""
467
561
468
def fetch_objects(self, determine_wants, mapping, pb=None):
562
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
563
"""Fetch objects.
564
"""
469
565
wants = determine_wants(self.source._git.get_refs())
470
566
create_pb = None
471
567
if pb is None:
474
570
try:
475
571
self.target.lock_write()
476
572
try:
477
self.target.start_write_group()
478
try:
479
import_git_objects(self.target, mapping,
480
self.source._git.object_store,
481
target_git_object_retriever, wants, pb)
482
finally:
483
self.target.commit_write_group()
573
return import_git_objects(self.target, mapping,
574
self.source._git.object_store,
575
target_git_object_retriever, wants, pb, limit)
484
576
finally:
485
577
self.target.unlock()
486
578
finally:
490
582
@staticmethod
491
583
def is_compatible(source, target):
492
584
"""Be compatible with GitRepository."""
493
# FIXME: Also check target uses VersionedFile
494
return (isinstance(source, LocalGitRepository) and
585
return (isinstance(source, LocalGitRepository) and
495
586
target.supports_rich_root() and
496
not isinstance(target, GitRepository))
497
498
499
class InterGitRepository(InterRepository):
587
not isinstance(target, GitRepository) and
588
target.texts is not None)
589
590
591
class InterGitGitRepository(InterGitRepository):
500
592
"""InterRepository that copies between Git repositories."""
501
593
502
_matching_repo_format = GitRepositoryFormat()
503
504
@staticmethod
505
def _get_repo_format_to_test():
506
return None
507
508
def copy_content(self, revision_id=None, pb=None):
509
"""See InterRepository.copy_content."""
510
self.fetch(revision_id, pb, find_ghosts=False)
511
512
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
513
mapping=None, fetch_spec=None):
594
def fetch_objects(self, determine_wants, mapping, pb=None):
595
def progress(text):
596
trace.note("git: %s", text)
597
graphwalker = self.target._git.get_graph_walker()
598
if (isinstance(self.source, LocalGitRepository) and
599
isinstance(self.target, LocalGitRepository)):
600
return self.source._git.fetch(self.target._git, determine_wants,
601
progress)
602
elif (isinstance(self.source, LocalGitRepository) and
603
isinstance(self.target, RemoteGitRepository)):
604
raise NotImplementedError
605
elif (isinstance(self.source, RemoteGitRepository) and
606
isinstance(self.target, LocalGitRepository)):
607
f, commit = self.target._git.object_store.add_thin_pack()
608
try:
609
refs = self.source._git.fetch_pack(determine_wants,
610
graphwalker, f.write, progress)
611
commit()
612
return refs
613
except:
614
f.close()
615
raise
616
else:
617
raise AssertionError
618
619
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
620
mapping=None, fetch_spec=None, branches=None):
514
621
if mapping is None:
515
622
mapping = self.source.get_mapping()
516
def progress(text):
517
trace.info("git: %s", text)
518
623
r = self.target._git
519
624
if revision_id is not None:
520
625
args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
521
626
elif fetch_spec is not None:
522
627
args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in fetch_spec.heads]
523
if fetch_spec is None and revision_id is None:
628
if branches is not None:
629
determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store]
630
elif fetch_spec is None and revision_id is None:
524
631
determine_wants = r.object_store.determine_wants_all
525
632
else:
526
633
determine_wants = lambda x: [y for y in args if not y in r.object_store]
634
return self.fetch_objects(determine_wants, mapping)[0]
527
635
528
graphwalker = SimpleFetchGraphWalker(r.heads().values(), r.get_parents)
529
f, commit = r.object_store.add_thin_pack()
530
try:
531
self.source.fetch_pack(determine_wants, graphwalker, f.write, progress)
532
commit()
533
except:
534
f.close()
535
raise
536
636
537
637
@staticmethod
538
638
def is_compatible(source, target):
539
639
"""Be compatible with GitRepository."""
540
return (isinstance(source, GitRepository) and
640
return (isinstance(source, GitRepository) and
541
641
isinstance(target, GitRepository))
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0