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.247.2
- compare with another revision
- download diff
- download tarball
- view history from revision 0.247.2
- Committer: Michael Hudson
- Date: 2010-02-17 02:04:25 UTC
- mto: (0.200.721 trunk)
- mto: This revision was merged to the branch mainline in revision 6960.
- Revision ID: michael.hudson@canonical.com-20100217020425-1i19smhkatqsrg3v
this works for my tests, but i'm pretty sure it's wrong in general
- files removed:
- notes/git-serve.txt
- files modified:
- NEWS
added
removed
fetch.py
1
# Copyright (C) 2008-2010 Jelmer Vernooij <jelmer@samba.org>
1
# Copyright (C) 2008 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
17
17
from dulwich.objects import (
18
18
Commit,
19
19
Tag,
20
Tree,
21
20
S_ISGITLINK,
22
21
)
23
22
from dulwich.object_store import (
24
23
tree_lookup_path,
25
24
)
26
from itertools import (
27
imap,
28
)
29
import posixpath
30
25
import re
31
26
import stat
32
27
33
28
from bzrlib import (
34
29
debug,
30
lru_cache,
35
31
osutils,
36
32
trace,
37
33
ui,
34
urlutils,
38
35
)
39
36
from bzrlib.errors import (
40
37
BzrError,
53
50
from bzrlib.revision import (
54
51
NULL_REVISION,
55
52
)
56
from bzrlib.revisiontree import (
57
RevisionTree,
58
)
59
53
from bzrlib.tsort import (
60
54
topo_sort,
61
55
)
62
56
from bzrlib.versionedfile import (
63
ChunkedContentFactory,
57
FulltextContentFactory,
64
58
)
65
59
66
60
from bzrlib.plugins.git.mapping import (
67
61
DEFAULT_FILE_MODE,
68
GitFileIdMap,
62
inventory_to_tree_and_blobs,
69
63
mode_is_executable,
70
mode_kind,
71
64
squash_revision,
72
65
warn_unusual_mode,
73
66
)
74
67
from bzrlib.plugins.git.object_store import (
75
68
BazaarObjectStore,
76
LRUTreeCache,
77
_tree_to_objects,
78
69
)
79
70
from bzrlib.plugins.git.remote import (
80
71
RemoteGitRepository,
86
77
)
87
78
88
79
89
def import_git_blob(texts, mapping, path, name, (base_hexsha, hexsha),
90
base_inv, parent_id, revision_id,
91
parent_invs, lookup_object, (base_mode, mode), store_updater,
92
lookup_file_id):
80
MAX_INV_CACHE_SIZE = 50 * 1024 * 1024
81
82
83
def import_git_blob(texts, mapping, path, hexsha, base_inv, base_ie, parent_id,
84
revision_id, parent_invs, shagitmap, lookup_object, executable, symlink):
93
85
"""Import a git blob object into a bzr repository.
94
86
95
87
:param texts: VersionedFiles to add to
97
89
:param blob: A git blob
98
90
:return: Inventory delta for this file
99
91
"""
100
if mapping.is_control_file(path):
101
return []
102
if base_hexsha == hexsha and base_mode == mode:
103
# If nothing has changed since the base revision, we're done
104
return []
105
file_id = lookup_file_id(path)
106
if stat.S_ISLNK(mode):
92
file_id = mapping.generate_file_id(path)
93
if symlink:
107
94
cls = InventoryLink
108
95
else:
109
96
cls = InventoryFile
110
ie = cls(file_id, name.decode("utf-8"), parent_id)
111
ie.executable = mode_is_executable(mode)
112
if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
113
base_ie = base_inv[base_inv.path2id(path)]
97
# We just have to hope this is indeed utf-8:
98
ie = cls(file_id, urlutils.basename(path).decode("utf-8"), parent_id)
99
ie.executable = executable
100
# See if this has changed at all
101
if base_ie is None:
102
base_sha = None
103
else:
104
try:
105
base_sha = shagitmap.lookup_blob(file_id, base_ie.revision)
106
except KeyError:
107
base_sha = None
108
else:
109
if (base_sha == hexsha and base_ie.executable == ie.executable
110
and base_ie.kind == ie.kind):
111
# If nothing has changed since the base revision, we're done
112
return [], []
113
if base_sha == hexsha and base_ie.kind == ie.kind:
114
114
ie.text_size = base_ie.text_size
115
115
ie.text_sha1 = base_ie.text_sha1
116
116
ie.symlink_target = base_ie.symlink_target
126
126
ie.text_size = None
127
127
ie.text_sha1 = None
128
128
else:
129
ie.text_size = sum(imap(len, blob.chunked))
130
ie.text_sha1 = osutils.sha_strings(blob.chunked)
129
ie.text_size = len(blob.data)
130
ie.text_sha1 = osutils.sha_string(blob.data)
131
131
# Check what revision we should store
132
132
parent_keys = []
133
133
for pinv in parent_invs:
134
try:
135
pie = pinv[file_id]
136
except NoSuchId:
137
continue
138
if (pie.text_sha1 == ie.text_sha1 and
139
pie.executable == ie.executable and
140
pie.symlink_target == ie.symlink_target):
134
if pinv.revision_id == base_inv.revision_id:
135
pie = base_ie
136
if pie is None:
137
continue
138
else:
139
try:
140
pie = pinv[file_id]
141
except NoSuchId:
142
continue
143
if pie.text_sha1 == ie.text_sha1 and pie.executable == ie.executable and pie.symlink_target == ie.symlink_target:
141
144
# found a revision in one of the parents to use
142
145
ie.revision = pie.revision
143
146
break
144
parent_key = (file_id, pie.revision)
145
if not parent_key in parent_keys:
146
parent_keys.append(parent_key)
147
parent_keys.append((file_id, pie.revision))
147
148
if ie.revision is None:
148
149
# Need to store a new revision
149
150
ie.revision = revision_id
151
assert file_id is not None
150
152
assert ie.revision is not None
151
153
if ie.kind == 'symlink':
152
chunks = []
154
data = ''
153
155
else:
154
chunks = blob.chunked
155
texts.insert_record_stream([
156
ChunkedContentFactory((file_id, ie.revision),
157
tuple(parent_keys), ie.text_sha1, chunks)])
156
data = blob.data
157
texts.insert_record_stream([FulltextContentFactory((file_id, ie.revision), tuple(parent_keys), ie.text_sha1, data)])
158
shamap = [(hexsha, "blob", (ie.file_id, ie.revision))]
159
else:
160
shamap = []
158
161
invdelta = []
159
if base_hexsha is not None:
160
old_path = path # Renames are not supported yet
161
if stat.S_ISDIR(base_mode):
162
invdelta.extend(remove_disappeared_children(base_inv, old_path,
163
lookup_object(base_hexsha), [], lookup_object))
162
if base_ie is not None:
163
old_path = base_inv.id2path(file_id)
164
if base_ie.kind == "directory":
165
invdelta.extend(remove_disappeared_children(old_path, base_ie.children, []))
164
166
else:
165
167
old_path = None
166
168
invdelta.append((old_path, path, file_id, ie))
167
if base_hexsha != hexsha:
168
store_updater.add_object(blob, ie)
169
return invdelta
169
return (invdelta, shamap)
170
170
171
171
172
172
class SubmodulesRequireSubtrees(BzrError):
174
174
internal = False
175
175
176
176
177
def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),
178
base_inv, parent_id, revision_id, parent_invs, lookup_object,
179
(base_mode, mode), store_updater, lookup_file_id):
180
if base_hexsha == hexsha and base_mode == mode:
181
return [], {}
182
file_id = lookup_file_id(path)
183
ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
177
def import_git_submodule(texts, mapping, path, hexsha, base_inv, base_ie,
178
parent_id, revision_id, parent_invs, shagitmap, lookup_object):
179
file_id = mapping.generate_file_id(path)
180
ie = TreeReference(file_id, urlutils.basename(path.decode("utf-8")),
181
parent_id)
184
182
ie.revision = revision_id
185
if base_hexsha is None:
183
if base_ie is None:
186
184
oldpath = None
187
185
else:
188
186
oldpath = path
187
if (base_ie.kind == ie.kind and
188
base_ie.reference_revision == ie.reference_revision):
189
ie.revision = base_ie.revision
189
190
ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
190
texts.insert_record_stream([
191
ChunkedContentFactory((file_id, ie.revision), (), None, [])])
191
texts.insert_record_stream([FulltextContentFactory((file_id, ie.revision), (), None, "")])
192
192
invdelta = [(oldpath, path, file_id, ie)]
193
return invdelta, {}
194
195
196
def remove_disappeared_children(base_inv, path, base_tree, existing_children,
197
lookup_object):
193
return invdelta, {}, {}
194
195
196
def remove_disappeared_children(path, base_children, existing_children):
198
197
ret = []
199
for name, mode, hexsha in base_tree.iteritems():
200
if name in existing_children:
201
continue
202
c_path = posixpath.join(path, name.decode("utf-8"))
203
ret.append((c_path, None, base_inv.path2id(c_path), None))
204
if stat.S_ISDIR(mode):
205
ret.extend(remove_disappeared_children(
206
base_inv, c_path, lookup_object(hexsha), [], lookup_object))
198
deletable = [(osutils.pathjoin(path, k), v) for k,v in base_children.iteritems() if k not in existing_children]
199
while deletable:
200
(path, ie) = deletable.pop()
201
ret.append((path, None, ie.file_id, None))
202
if ie.kind == "directory":
203
for name, child_ie in ie.children.iteritems():
204
deletable.append((osutils.pathjoin(path, name), child_ie))
207
205
return ret
208
206
209
207
210
def import_git_tree(texts, mapping, path, name, (base_hexsha, hexsha),
211
base_inv, parent_id, revision_id, parent_invs,
212
lookup_object, (base_mode, mode), store_updater,
213
lookup_file_id, allow_submodules=False):
208
def import_git_tree(texts, mapping, path, hexsha, base_inv, base_ie, parent_id,
209
revision_id, parent_invs, shagitmap, lookup_object, allow_submodules=False):
214
210
"""Import a git tree object into a bzr repository.
215
211
216
212
:param texts: VersionedFiles object to add to
219
215
:param base_inv: Base inventory against which to return inventory delta
220
216
:return: Inventory delta for this subtree
221
217
"""
222
if base_hexsha == hexsha and base_mode == mode:
223
# If nothing has changed since the base revision, we're done
224
return [], {}
225
218
invdelta = []
226
file_id = lookup_file_id(path)
219
file_id = mapping.generate_file_id(path)
227
220
# We just have to hope this is indeed utf-8:
228
ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
229
tree = lookup_object(hexsha)
230
if base_hexsha is None:
231
base_tree = None
232
old_path = None # Newly appeared here
233
else:
234
base_tree = lookup_object(base_hexsha)
235
old_path = path # Renames aren't supported yet
236
if base_tree is None or type(base_tree) is not Tree:
221
ie = InventoryDirectory(file_id, urlutils.basename(path.decode("utf-8")),
222
parent_id)
223
if base_ie is None:
224
# Newly appeared here
237
225
ie.revision = revision_id
238
invdelta.append((old_path, path, ie.file_id, ie))
239
texts.insert_record_stream([
240
ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
226
texts.insert_record_stream([FulltextContentFactory((file_id, ie.revision), (), None, "")])
227
invdelta.append((None, path, file_id, ie))
228
else:
229
# See if this has changed at all
230
try:
231
base_sha = shagitmap.lookup_tree(file_id, base_inv.revision_id)
232
except KeyError:
233
pass
234
else:
235
if base_sha == hexsha:
236
# If nothing has changed since the base revision, we're done
237
return [], {}, []
238
if base_ie.kind != "directory":
239
ie.revision = revision_id
240
texts.insert_record_stream([FulltextContentFactory((ie.file_id, ie.revision), (), None, "")])
241
invdelta.append((base_inv.id2path(ie.file_id), path, ie.file_id, ie))
242
if base_ie is not None and base_ie.kind == "directory":
243
base_children = base_ie.children
244
else:
245
base_children = {}
241
246
# Remember for next time
242
247
existing_children = set()
243
248
child_modes = {}
244
for child_mode, name, child_hexsha in tree.entries():
245
existing_children.add(name)
246
child_path = posixpath.join(path, name)
247
if type(base_tree) is Tree:
248
try:
249
child_base_mode, child_base_hexsha = base_tree[name]
250
except KeyError:
251
child_base_hexsha = None
252
child_base_mode = 0
253
else:
254
child_base_hexsha = None
255
child_base_mode = 0
256
if stat.S_ISDIR(child_mode):
257
subinvdelta, grandchildmodes = import_git_tree(texts, mapping,
258
child_path, name, (child_base_hexsha, child_hexsha), base_inv,
259
file_id, revision_id, parent_invs, lookup_object,
260
(child_base_mode, child_mode), store_updater, lookup_file_id,
261
allow_submodules=allow_submodules)
262
elif S_ISGITLINK(child_mode): # submodule
249
shamap = []
250
tree = lookup_object(hexsha)
251
for mode, name, child_hexsha in tree.entries():
252
basename = name.decode("utf-8")
253
existing_children.add(basename)
254
child_path = osutils.pathjoin(path, name)
255
if stat.S_ISDIR(mode):
256
subinvdelta, grandchildmodes, subshamap = import_git_tree(
257
texts, mapping, child_path, child_hexsha, base_inv,
258
base_children.get(basename), file_id, revision_id,
259
parent_invs, shagitmap, lookup_object,
260
allow_submodules=allow_submodules)
261
invdelta.extend(subinvdelta)
262
child_modes.update(grandchildmodes)
263
shamap.extend(subshamap)
264
elif S_ISGITLINK(mode): # submodule
263
265
if not allow_submodules:
264
266
raise SubmodulesRequireSubtrees()
265
subinvdelta, grandchildmodes = import_git_submodule(texts, mapping,
266
child_path, name, (child_base_hexsha, child_hexsha), base_inv,
267
file_id, revision_id, parent_invs, lookup_object,
268
(child_base_mode, child_mode), store_updater, lookup_file_id)
267
subinvdelta, grandchildmodes, subshamap = import_git_submodule(
268
texts, mapping, child_path, child_hexsha, base_inv, base_children.get(basename),
269
file_id, revision_id, parent_invs, shagitmap, lookup_object)
270
invdelta.extend(subinvdelta)
271
child_modes.update(grandchildmodes)
272
shamap.extend(subshamap)
269
273
else:
270
subinvdelta = import_git_blob(texts, mapping, child_path, name,
271
(child_base_hexsha, child_hexsha), base_inv, file_id,
272
revision_id, parent_invs, lookup_object,
273
(child_base_mode, child_mode), store_updater, lookup_file_id)
274
grandchildmodes = {}
275
child_modes.update(grandchildmodes)
276
invdelta.extend(subinvdelta)
277
if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
274
subinvdelta, subshamap = import_git_blob(texts, mapping,
275
child_path, child_hexsha, base_inv, base_children.get(basename), file_id,
276
revision_id, parent_invs, shagitmap, lookup_object,
277
mode_is_executable(mode), stat.S_ISLNK(mode))
278
invdelta.extend(subinvdelta)
279
shamap.extend(subshamap)
280
if mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
278
281
stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
279
child_modes[child_path] = child_mode
282
child_modes[child_path] = mode
280
283
# Remove any children that have disappeared
281
if base_tree is not None and type(base_tree) is Tree:
282
invdelta.extend(remove_disappeared_children(base_inv, old_path,
283
base_tree, existing_children, lookup_object))
284
store_updater.add_object(tree, ie)
285
return invdelta, child_modes
286
287
288
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
289
o, rev, ret_tree, parent_trees, mapping, unusual_modes):
290
new_unusual_modes = mapping.export_unusual_file_modes(rev)
291
if new_unusual_modes != unusual_modes:
292
raise AssertionError("unusual modes don't match: %r != %r" % (
293
unusual_modes, new_unusual_modes))
294
# Verify that we can reconstruct the commit properly
295
rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree)
296
if rec_o != o:
297
raise AssertionError("Reconstructed commit differs: %r != %r" % (
298
rec_o, o))
299
diff = []
300
new_objs = {}
301
for path, obj, ie in _tree_to_objects(ret_tree, parent_trees,
302
target_git_object_retriever._cache.idmap, unusual_modes, mapping.BZR_DUMMY_FILE):
303
old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
304
new_objs[path] = obj
305
if obj.id != old_obj_id:
306
diff.append((path, lookup_object(old_obj_id), obj))
307
for (path, old_obj, new_obj) in diff:
308
while (old_obj.type_name == "tree" and
309
new_obj.type_name == "tree" and
310
sorted(old_obj) == sorted(new_obj)):
311
for name in old_obj:
312
if old_obj[name][0] != new_obj[name][0]:
313
raise AssertionError("Modes for %s differ: %o != %o" %
314
(path, old_obj[name][0], new_obj[name][0]))
315
if old_obj[name][1] != new_obj[name][1]:
316
# Found a differing child, delve deeper
317
path = posixpath.join(path, name)
318
old_obj = lookup_object(old_obj[name][1])
319
new_obj = new_objs[path]
320
break
321
raise AssertionError("objects differ for %s: %r != %r" % (path,
322
old_obj, new_obj))
284
if base_ie is not None and base_ie.kind == "directory":
285
invdelta.extend(remove_disappeared_children(base_inv.id2path(file_id),
286
base_children, existing_children))
287
shamap.append((hexsha, "tree", (file_id, revision_id)))
288
return invdelta, child_modes, shamap
289
290
291
def approx_inv_size(inv):
292
# Very rough estimate, 1k per inventory entry
293
return len(inv) * 1024
323
294
324
295
325
296
def import_git_commit(repo, mapping, head, lookup_object,
326
target_git_object_retriever, trees_cache):
297
target_git_object_retriever, parent_invs_cache):
327
298
o = lookup_object(head)
328
299
rev = mapping.import_commit(o)
329
300
# We have to do this here, since we have to walk the tree and
330
301
# we need to make sure to import the blobs / trees with the right
331
302
# path; this may involve adding them more than once.
332
parent_trees = trees_cache.revision_trees(rev.parent_ids)
333
if parent_trees == []:
303
parent_invs = []
304
for parent_id in rev.parent_ids:
305
try:
306
parent_invs.append(parent_invs_cache[parent_id])
307
except KeyError:
308
parent_inv = repo.get_inventory(parent_id)
309
parent_invs.append(parent_inv)
310
parent_invs_cache[parent_id] = parent_inv
311
if parent_invs == []:
334
312
base_inv = Inventory(root_id=None)
335
base_tree = None
336
base_mode = None
337
else:
338
base_inv = parent_trees[0].inventory
339
base_tree = lookup_object(o.parents[0]).tree
340
base_mode = stat.S_IFDIR
341
store_updater = target_git_object_retriever._get_updater(rev)
342
store_updater.add_object(o, None)
343
root_tree = lookup_object(o.tree)
344
try:
345
file_id_map_sha = root_tree[mapping.BZR_FILE_IDS_FILE][1]
346
except KeyError:
347
file_ids = {}
348
else:
349
file_ids = mapping.import_fileid_map(lookup_object(file_id_map_sha))
350
lookup_file_id = GitFileIdMap(file_ids, mapping).lookup_file_id
351
inv_delta, unusual_modes = import_git_tree(repo.texts,
352
mapping, "", u"", (base_tree, o.tree), base_inv,
353
None, rev.revision_id, [p.inventory for p in parent_trees],
354
lookup_object, (base_mode, stat.S_IFDIR), store_updater,
355
lookup_file_id,
313
base_ie = None
314
else:
315
base_inv = parent_invs[0]
316
base_ie = base_inv.root
317
inv_delta, unusual_modes, shamap = import_git_tree(repo.texts,
318
mapping, "", o.tree, base_inv, base_ie, None, rev.revision_id,
319
parent_invs, target_git_object_retriever._idmap, lookup_object,
356
320
allow_submodules=getattr(repo._format, "supports_tree_reference", False))
357
store_updater.finish()
321
target_git_object_retriever._idmap.add_entries(shamap)
358
322
if unusual_modes != {}:
359
323
for path, mode in unusual_modes.iteritems():
360
324
warn_unusual_mode(rev.foreign_revid, path, mode)
367
331
rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
368
332
inv_delta, rev.revision_id, rev.parent_ids,
369
333
base_inv)
370
ret_tree = RevisionTree(repo, inv, rev.revision_id)
371
trees_cache.add(ret_tree)
334
parent_invs_cache[rev.revision_id] = inv
372
335
repo.add_revision(rev.revision_id, rev)
373
336
if "verify" in debug.debug_flags:
374
verify_commit_reconstruction(target_git_object_retriever,
375
lookup_object, o, rev, ret_tree, parent_trees, mapping,
376
unusual_modes)
377
378
379
def import_git_objects(repo, mapping, object_iter,
380
target_git_object_retriever, heads, pb=None, limit=None):
337
new_unusual_modes = mapping.export_unusual_file_modes(rev)
338
if new_unusual_modes != unusual_modes:
339
raise AssertionError("unusual modes don't match: %r != %r" % (unusual_modes, new_unusual_modes))
340
objs = inventory_to_tree_and_blobs(inv, repo.texts, mapping, unusual_modes)
341
for sha1, newobj, path in objs:
342
assert path is not None
343
oldobj = tree_lookup_path(lookup_object, o.tree, path)
344
if oldobj != newobj:
345
raise AssertionError("%r != %r in %s" % (oldobj, newobj, path))
346
347
348
def import_git_objects(repo, mapping, object_iter, target_git_object_retriever,
349
heads, pb=None, limit=None):
381
350
"""Import a set of git objects into a bzr repository.
382
351
383
352
:param repo: Target Bazaar repository
384
353
:param mapping: Mapping to use
385
354
:param object_iter: Iterator over Git objects.
386
:return: Tuple with pack hints and last imported revision id
387
355
"""
356
target_git_object_retriever._idmap.start_write_group() # FIXME: try/finally
388
357
def lookup_object(sha):
389
358
try:
390
359
return object_iter[sha]
391
360
except KeyError:
392
361
return target_git_object_retriever[sha]
362
# TODO: a more (memory-)efficient implementation of this
393
363
graph = []
394
364
checked = set()
395
heads = list(set(heads))
396
trees_cache = LRUTreeCache(repo)
365
heads = list(heads)
366
parent_invs_cache = lru_cache.LRUSizeCache(compute_size=approx_inv_size,
367
max_size=MAX_INV_CACHE_SIZE)
397
368
# Find and convert commit objects
398
369
while heads:
399
370
if pb is not None:
403
374
try:
404
375
o = lookup_object(head)
405
376
except KeyError:
377
trace.mutter('missing head %s', head)
406
378
continue
407
379
if isinstance(o, Commit):
408
380
rev = mapping.import_commit(o)
410
382
continue
411
383
squash_revision(repo, rev)
412
384
graph.append((o.id, o.parents))
385
target_git_object_retriever._idmap.add_entry(o.id, "commit",
386
(rev.revision_id, o.tree))
413
387
heads.extend([p for p in o.parents if p not in checked])
414
388
elif isinstance(o, Tag):
415
if o.object[1] not in checked:
416
heads.append(o.object[1])
389
heads.append(o.object[1])
417
390
else:
418
391
trace.warning("Unable to import head object %r" % o)
419
392
checked.add(o.id)
420
393
del checked
421
394
# Order the revisions
422
395
# Create the inventory objects
423
batch_size = 1000
396
batch_size = 100
424
397
revision_ids = topo_sort(graph)
425
398
pack_hints = []
426
399
if limit is not None:
427
400
revision_ids = revision_ids[:limit]
428
last_imported = None
429
401
for offset in range(0, len(revision_ids), batch_size):
430
target_git_object_retriever.start_write_group()
402
repo.start_write_group()
431
403
try:
432
repo.start_write_group()
433
try:
434
for i, head in enumerate(
435
revision_ids[offset:offset+batch_size]):
436
if pb is not None:
437
pb.update("fetching revisions", offset+i,
438
len(revision_ids))
439
import_git_commit(repo, mapping, head, lookup_object,
440
target_git_object_retriever, trees_cache)
441
last_imported = head
442
except:
443
repo.abort_write_group()
444
raise
445
else:
446
hint = repo.commit_write_group()
447
if hint is not None:
448
pack_hints.extend(hint)
404
for i, head in enumerate(revision_ids[offset:offset+batch_size]):
405
if pb is not None:
406
pb.update("fetching revisions", offset+i, len(revision_ids))
407
import_git_commit(repo, mapping, head, lookup_object,
408
target_git_object_retriever,
409
parent_invs_cache)
410
last_imported = head
449
411
except:
450
target_git_object_retriever.abort_write_group()
412
repo.abort_write_group()
451
413
raise
452
414
else:
453
target_git_object_retriever.commit_write_group()
415
hint = repo.commit_write_group()
416
if hint is not None:
417
pack_hints.extend(hint)
418
target_git_object_retriever._idmap.commit_write_group()
454
419
return pack_hints, last_imported
455
420
456
421
466
431
"""See InterRepository.copy_content."""
467
432
self.fetch(revision_id, pb, find_ghosts=False)
468
433
469
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
470
mapping=None, fetch_spec=None):
471
self.fetch_refs(revision_id=revision_id, pb=pb,
472
find_ghosts=find_ghosts, mapping=mapping, fetch_spec=fetch_spec)
434
def fetch(self, revision_id=None, pb=None, find_ghosts=False, mapping=None,
435
fetch_spec=None):
436
self.fetch_refs(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts,
437
mapping=mapping, fetch_spec=fetch_spec)
473
438
474
439
475
440
class InterGitNonGitRepository(InterGitRepository):
494
459
else:
495
460
ret = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]
496
461
return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))]
497
(pack_hint, _) = self.fetch_objects(determine_wants, mapping, pb)
462
pack_hint = self.fetch_objects(determine_wants, mapping, pb)[0]
498
463
if pack_hint is not None and self.target._format.pack_compresses:
499
464
self.target.pack(hint=pack_hint)
500
465
if interesting_heads is not None:
501
466
present_interesting_heads = self.target.has_revisions(interesting_heads)
502
467
missing_interesting_heads = set(interesting_heads) - present_interesting_heads
503
468
if missing_interesting_heads:
504
raise AssertionError("Missing interesting heads: %r" %
505
missing_interesting_heads)
469
raise AssertionError("Missing interesting heads: %r" % missing_interesting_heads)
506
470
return self._refs
507
471
508
472
549
513
if pb is None:
550
514
create_pb = pb = ui.ui_factory.nested_progress_bar()
551
515
try:
552
objects_iter = self.source.fetch_objects(record_determine_wants,
553
graph_walker, store.get_raw, progress)
516
objects_iter = self.source.fetch_objects(
517
record_determine_wants, graph_walker,
518
store.get_raw, progress)
554
519
return import_git_objects(self.target, mapping,
555
520
objects_iter, store, recorded_wants, pb, limit)
556
521
finally:
562
527
@staticmethod
563
528
def is_compatible(source, target):
564
529
"""Be compatible with GitRepository."""
530
# FIXME: Also check target uses VersionedFile
565
531
return (isinstance(source, RemoteGitRepository) and
566
532
target.supports_rich_root() and
567
not isinstance(target, GitRepository) and
568
target.texts is not None)
533
not isinstance(target, GitRepository))
569
534
570
535
571
536
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
573
538
repository."""
574
539
575
540
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
576
"""Fetch objects.
577
"""
578
541
wants = determine_wants(self.source._git.get_refs())
579
542
create_pb = None
580
543
if pb is None:
584
547
self.target.lock_write()
585
548
try:
586
549
return import_git_objects(self.target, mapping,
587
self.source._git.object_store,
588
target_git_object_retriever, wants, pb, limit)
550
self.source._git.object_store, target_git_object_retriever,
551
wants, pb, limit)
589
552
finally:
590
553
self.target.unlock()
591
554
finally:
595
558
@staticmethod
596
559
def is_compatible(source, target):
597
560
"""Be compatible with GitRepository."""
561
# FIXME: Also check target uses VersionedFile
598
562
return (isinstance(source, LocalGitRepository) and
599
563
target.supports_rich_root() and
600
not isinstance(target, GitRepository) and
601
target.texts is not None)
564
not isinstance(target, GitRepository))
602
565
603
566
604
567
class InterGitGitRepository(InterGitRepository):
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0