/brz/remove-bazaar

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 breezy/git/fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/fetch.py
29
29
from dulwich.object_store import (
30
30
    tree_lookup_path,
31
31
    )
32
 
from dulwich.walk import Walker
33
32
import posixpath
34
33
import stat
35
34
 
38
37
    errors,
39
38
    osutils,
40
39
    trace,
41
 
    ui,
42
40
    )
43
41
from ..errors import (
44
42
    BzrError,
49
47
    InventoryLink,
50
48
    TreeReference,
51
49
    )
52
 
from ..repository import (
53
 
    InterRepository,
54
 
    )
55
50
from ..revision import (
56
51
    NULL_REVISION,
57
52
    )
58
53
from ..bzr.inventorytree import InventoryRevisionTree
59
54
from ..sixish import text_type
60
 
from ..testament import (
 
55
from ..bzr.testament import (
61
56
    StrictTestament3,
62
57
    )
63
58
from ..tsort import (
77
72
    LRUTreeCache,
78
73
    _tree_to_objects,
79
74
    )
80
 
from .refs import (
81
 
    is_tag,
82
 
    )
83
 
from .remote import (
84
 
    RemoteGitRepository,
85
 
    )
86
 
from .repository import (
87
 
    GitRepository,
88
 
    GitRepositoryFormat,
89
 
    LocalGitRepository,
90
 
    )
91
75
 
92
76
 
93
77
def import_git_blob(texts, mapping, path, name, hexshas,
94
 
        base_bzr_tree, parent_id, revision_id,
95
 
        parent_bzr_trees, lookup_object, modes, store_updater,
96
 
        lookup_file_id):
 
78
                    base_bzr_tree, parent_id, revision_id,
 
79
                    parent_bzr_trees, lookup_object, modes, store_updater,
 
80
                    lookup_file_id):
97
81
    """Import a git blob object into a bzr repository.
98
82
 
99
83
    :param texts: VersionedFiles to add to
145
129
            ppath = ptree.id2path(file_id)
146
130
        except errors.NoSuchId:
147
131
            continue
148
 
        pkind = ptree.kind(ppath, file_id)
 
132
        pkind = ptree.kind(ppath)
149
133
        if (pkind == ie.kind and
150
 
            ((pkind == "symlink" and ptree.get_symlink_target(ppath, file_id) == ie.symlink_target) or
151
 
             (pkind == "file" and ptree.get_file_sha1(ppath, file_id) == ie.text_sha1 and
152
 
                ptree.is_executable(ppath, file_id) == ie.executable))):
 
134
            ((pkind == "symlink" and ptree.get_symlink_target(ppath) == ie.symlink_target) or
 
135
             (pkind == "file" and ptree.get_file_sha1(ppath) == ie.text_sha1 and
 
136
                ptree.is_executable(ppath) == ie.executable))):
153
137
            # found a revision in one of the parents to use
154
 
            ie.revision = ptree.get_file_revision(ppath, file_id)
 
138
            ie.revision = ptree.get_file_revision(ppath)
155
139
            break
156
 
        parent_key = (file_id, ptree.get_file_revision(ppath, file_id))
157
 
        if not parent_key in parent_keys:
 
140
        parent_key = (file_id, ptree.get_file_revision(ppath))
 
141
        if parent_key not in parent_keys:
158
142
            parent_keys.append(parent_key)
159
143
    if ie.revision is None:
160
144
        # Need to store a new revision
167
151
            chunks = blob.chunked
168
152
        texts.insert_record_stream([
169
153
            ChunkedContentFactory((file_id, ie.revision),
170
 
                tuple(parent_keys), ie.text_sha1, chunks)])
 
154
                                  tuple(parent_keys), ie.text_sha1, chunks)])
171
155
    invdelta = []
172
156
    if base_hexsha is not None:
173
 
        old_path = decoded_path # Renames are not supported yet
 
157
        old_path = decoded_path  # Renames are not supported yet
174
158
        if stat.S_ISDIR(base_mode):
175
 
            invdelta.extend(remove_disappeared_children(base_bzr_tree, old_path,
176
 
                lookup_object(base_hexsha), [], lookup_object))
 
159
            invdelta.extend(remove_disappeared_children(
 
160
                base_bzr_tree, old_path, lookup_object(base_hexsha), [],
 
161
                lookup_object))
177
162
    else:
178
163
        old_path = None
179
164
    invdelta.append((old_path, decoded_path, file_id, ie))
189
174
 
190
175
 
191
176
def import_git_submodule(texts, mapping, path, name, hexshas,
192
 
    base_bzr_tree, parent_id, revision_id, parent_bzr_trees, lookup_object,
193
 
    modes, store_updater, lookup_file_id):
 
177
                         base_bzr_tree, parent_id, revision_id,
 
178
                         parent_bzr_trees, lookup_object,
 
179
                         modes, store_updater, lookup_file_id):
194
180
    """Import a git submodule."""
195
181
    (base_hexsha, hexsha) = hexshas
196
182
    (base_mode, mode) = modes
201
187
    ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
202
188
    ie.revision = revision_id
203
189
    if base_hexsha is not None:
204
 
        old_path = path.decode("utf-8") # Renames are not supported yet
 
190
        old_path = path.decode("utf-8")  # Renames are not supported yet
205
191
        if stat.S_ISDIR(base_mode):
206
 
            invdelta.extend(remove_disappeared_children(base_bzr_tree, old_path,
207
 
                lookup_object(base_hexsha), [], lookup_object))
 
192
            invdelta.extend(remove_disappeared_children(
 
193
                base_bzr_tree, old_path, lookup_object(base_hexsha), [],
 
194
                lookup_object))
208
195
    else:
209
196
        old_path = None
210
197
    ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
214
201
    return invdelta, {}
215
202
 
216
203
 
217
 
def remove_disappeared_children(base_bzr_tree, path, base_tree, existing_children,
218
 
        lookup_object):
 
204
def remove_disappeared_children(base_bzr_tree, path, base_tree,
 
205
                                existing_children, lookup_object):
219
206
    """Generate an inventory delta for removed children.
220
207
 
221
208
    :param base_bzr_tree: Base bzr tree against which to generate the
239
226
        ret.append((c_path, None, file_id, None))
240
227
        if stat.S_ISDIR(mode):
241
228
            ret.extend(remove_disappeared_children(
242
 
                base_bzr_tree, c_path, lookup_object(hexsha), [], lookup_object))
 
229
                base_bzr_tree, c_path, lookup_object(hexsha), [],
 
230
                lookup_object))
243
231
    return ret
244
232
 
245
233
 
246
234
def import_git_tree(texts, mapping, path, name, hexshas,
247
 
        base_bzr_tree, parent_id, revision_id, parent_bzr_trees,
248
 
        lookup_object, modes, store_updater,
249
 
        lookup_file_id, allow_submodules=False):
 
235
                    base_bzr_tree, parent_id, revision_id, parent_bzr_trees,
 
236
                    lookup_object, modes, store_updater,
 
237
                    lookup_file_id, allow_submodules=False):
250
238
    """Import a git tree object into a bzr repository.
251
239
 
252
240
    :param texts: VersionedFiles object to add to
253
241
    :param path: Path in the tree (str)
254
242
    :param name: Name of the tree (str)
255
243
    :param tree: A git tree object
256
 
    :param base_bzr_tree: Base inventory against which to return inventory delta
 
244
    :param base_bzr_tree: Base inventory against which to return inventory
 
245
        delta
257
246
    :return: Inventory delta for this subtree
258
247
    """
259
248
    (base_hexsha, hexsha) = hexshas
272
261
    tree = lookup_object(hexsha)
273
262
    if base_hexsha is None:
274
263
        base_tree = None
275
 
        old_path = None # Newly appeared here
 
264
        old_path = None  # Newly appeared here
276
265
    else:
277
266
        base_tree = lookup_object(base_hexsha)
278
 
        old_path = path.decode("utf-8") # Renames aren't supported yet
 
267
        old_path = path.decode("utf-8")  # Renames aren't supported yet
279
268
    new_path = path.decode("utf-8")
280
269
    if base_tree is None or type(base_tree) is not Tree:
281
270
        ie.revision = revision_id
298
287
            child_base_hexsha = None
299
288
            child_base_mode = 0
300
289
        if stat.S_ISDIR(child_mode):
301
 
            subinvdelta, grandchildmodes = import_git_tree(texts, mapping,
302
 
                child_path, name, (child_base_hexsha, child_hexsha),
303
 
                base_bzr_tree, file_id, revision_id, parent_bzr_trees,
304
 
                lookup_object, (child_base_mode, child_mode), store_updater,
305
 
                lookup_file_id, allow_submodules=allow_submodules)
306
 
        elif S_ISGITLINK(child_mode): # submodule
 
290
            subinvdelta, grandchildmodes = import_git_tree(
 
291
                texts, mapping, child_path, name,
 
292
                (child_base_hexsha, child_hexsha), base_bzr_tree, file_id,
 
293
                revision_id, parent_bzr_trees, lookup_object,
 
294
                (child_base_mode, child_mode), store_updater, lookup_file_id,
 
295
                allow_submodules=allow_submodules)
 
296
        elif S_ISGITLINK(child_mode):  # submodule
307
297
            if not allow_submodules:
308
298
                raise SubmodulesRequireSubtrees()
309
 
            subinvdelta, grandchildmodes = import_git_submodule(texts, mapping,
310
 
                child_path, name, (child_base_hexsha, child_hexsha),
 
299
            subinvdelta, grandchildmodes = import_git_submodule(
 
300
                texts, mapping, child_path, name,
 
301
                (child_base_hexsha, child_hexsha),
311
302
                base_bzr_tree, file_id, revision_id, parent_bzr_trees,
312
303
                lookup_object, (child_base_mode, child_mode), store_updater,
313
304
                lookup_file_id)
314
305
        else:
315
306
            if not mapping.is_special_file(name):
316
 
                subinvdelta = import_git_blob(texts, mapping, child_path, name,
 
307
                subinvdelta = import_git_blob(
 
308
                    texts, mapping, child_path, name,
317
309
                    (child_base_hexsha, child_hexsha), base_bzr_tree, file_id,
318
310
                    revision_id, parent_bzr_trees, lookup_object,
319
 
                    (child_base_mode, child_mode), store_updater, lookup_file_id)
 
311
                    (child_base_mode, child_mode), store_updater,
 
312
                    lookup_file_id)
320
313
            else:
321
314
                subinvdelta = []
322
315
            grandchildmodes = {}
323
316
        child_modes.update(grandchildmodes)
324
317
        invdelta.extend(subinvdelta)
325
318
        if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
326
 
                        stat.S_IFLNK, DEFAULT_FILE_MODE|0o111,
327
 
                        S_IFGITLINK):
 
319
                              stat.S_IFLNK, DEFAULT_FILE_MODE | 0o111,
 
320
                              S_IFGITLINK):
328
321
            child_modes[child_path] = child_mode
329
322
    # Remove any children that have disappeared
330
323
    if base_tree is not None and type(base_tree) is Tree:
331
 
        invdelta.extend(remove_disappeared_children(base_bzr_tree, old_path,
332
 
            base_tree, existing_children, lookup_object))
 
324
        invdelta.extend(remove_disappeared_children(
 
325
            base_bzr_tree, old_path, base_tree, existing_children,
 
326
            lookup_object))
333
327
    store_updater.add_object(tree, (file_id, revision_id), path)
334
328
    return invdelta, child_modes
335
329
 
336
330
 
337
331
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
338
 
    o, rev, ret_tree, parent_trees, mapping, unusual_modes, verifiers):
 
332
                                 o, rev, ret_tree, parent_trees, mapping,
 
333
                                 unusual_modes, verifiers):
339
334
    new_unusual_modes = mapping.export_unusual_file_modes(rev)
340
335
    if new_unusual_modes != unusual_modes:
341
336
        raise AssertionError("unusual modes don't match: %r != %r" % (
342
337
            unusual_modes, new_unusual_modes))
343
338
    # Verify that we can reconstruct the commit properly
344
339
    rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True,
345
 
        verifiers)
 
340
                                                            verifiers)
346
341
    if rec_o != o:
347
342
        raise AssertionError("Reconstructed commit differs: %r != %r" % (
348
343
            rec_o, o))
349
344
    diff = []
350
345
    new_objs = {}
351
 
    for path, obj, ie in _tree_to_objects(ret_tree, parent_trees,
352
 
        target_git_object_retriever._cache.idmap, unusual_modes,
353
 
        mapping.BZR_DUMMY_FILE):
 
346
    for path, obj, ie in _tree_to_objects(
 
347
            ret_tree, parent_trees, target_git_object_retriever._cache.idmap,
 
348
            unusual_modes, mapping.BZR_DUMMY_FILE):
354
349
        old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
355
350
        new_objs[path] = obj
356
351
        if obj.id != old_obj_id:
357
352
            diff.append((path, lookup_object(old_obj_id), obj))
358
353
    for (path, old_obj, new_obj) in diff:
359
 
        while (old_obj.type_name == "tree" and
360
 
               new_obj.type_name == "tree" and
361
 
               sorted(old_obj) == sorted(new_obj)):
 
354
        while (old_obj.type_name == "tree"
 
355
               and new_obj.type_name == "tree"
 
356
               and sorted(old_obj) == sorted(new_obj)):
362
357
            for name in old_obj:
363
358
                if old_obj[name][0] != new_obj[name][0]:
364
 
                    raise AssertionError("Modes for %s differ: %o != %o" %
 
359
                    raise AssertionError(
 
360
                        "Modes for %s differ: %o != %o" %
365
361
                        (path, old_obj[name][0], new_obj[name][0]))
366
362
                if old_obj[name][1] != new_obj[name][1]:
367
363
                    # Found a differing child, delve deeper
369
365
                    old_obj = lookup_object(old_obj[name][1])
370
366
                    new_obj = new_objs[path]
371
367
                    break
372
 
        raise AssertionError("objects differ for %s: %r != %r" % (path,
373
 
            old_obj, new_obj))
 
368
        raise AssertionError(
 
369
            "objects differ for %s: %r != %r" % (path, old_obj, new_obj))
374
370
 
375
371
 
376
372
def ensure_inventories_in_repo(repo, trees):
407
403
        base_mode = stat.S_IFDIR
408
404
    store_updater = target_git_object_retriever._get_updater(rev)
409
405
    tree_supplement = mapping.get_fileid_map(lookup_object, o.tree)
410
 
    inv_delta, unusual_modes = import_git_tree(repo.texts,
411
 
            mapping, b"", b"", (base_tree, o.tree), base_bzr_tree,
412
 
            None, rev.revision_id, parent_trees,
413
 
            lookup_object, (base_mode, stat.S_IFDIR), store_updater,
414
 
            tree_supplement.lookup_file_id,
415
 
            allow_submodules=repo._format.supports_tree_reference)
 
406
    inv_delta, unusual_modes = import_git_tree(
 
407
        repo.texts, mapping, b"", b"", (base_tree, o.tree), base_bzr_tree,
 
408
        None, rev.revision_id, parent_trees, lookup_object,
 
409
        (base_mode, stat.S_IFDIR), store_updater,
 
410
        tree_supplement.lookup_file_id,
 
411
        allow_submodules=repo._format.supports_tree_reference)
416
412
    if unusual_modes != {}:
417
413
        for path, mode in unusual_modes.iteritems():
418
414
            warn_unusual_mode(rev.foreign_revid, path, mode)
424
420
        base_bzr_inventory = None
425
421
    else:
426
422
        base_bzr_inventory = base_bzr_tree.root_inventory
427
 
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
428
 
              inv_delta, rev.revision_id, rev.parent_ids,
429
 
              base_bzr_inventory)
 
423
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(
 
424
        basis_id, inv_delta, rev.revision_id, rev.parent_ids,
 
425
        base_bzr_inventory)
430
426
    ret_tree = InventoryRevisionTree(repo, inv, rev.revision_id)
431
427
    # Check verifiers
432
428
    if verifiers and roundtrip_revid is not None:
433
429
        testament = StrictTestament3(rev, ret_tree)
434
 
        calculated_verifiers = { "testament3-sha1": testament.as_sha1() }
 
430
        calculated_verifiers = {"testament3-sha1": testament.as_sha1()}
435
431
        if calculated_verifiers != verifiers:
436
432
            trace.mutter("Testament SHA1 %r for %r did not match %r.",
437
433
                         calculated_verifiers["testament3-sha1"],
438
434
                         rev.revision_id, verifiers["testament3-sha1"])
439
435
            rev.revision_id = original_revid
440
 
            rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
441
 
              inv_delta, rev.revision_id, rev.parent_ids, base_bzr_tree)
 
436
            rev.inventory_sha1, inv = repo.add_inventory_by_delta(
 
437
                basis_id, inv_delta, rev.revision_id, rev.parent_ids,
 
438
                base_bzr_tree)
442
439
            ret_tree = InventoryRevisionTree(repo, inv, rev.revision_id)
443
440
    else:
444
441
        calculated_verifiers = {}
447
444
    trees_cache.add(ret_tree)
448
445
    repo.add_revision(rev.revision_id, rev)
449
446
    if "verify" in debug.debug_flags:
450
 
        verify_commit_reconstruction(target_git_object_retriever,
451
 
            lookup_object, o, rev, ret_tree, parent_trees, mapping,
452
 
            unusual_modes, verifiers)
 
447
        verify_commit_reconstruction(
 
448
            target_git_object_retriever, lookup_object, o, rev, ret_tree,
 
449
            parent_trees, mapping, unusual_modes, verifiers)
453
450
 
454
451
 
455
452
def import_git_objects(repo, mapping, object_iter,
456
 
    target_git_object_retriever, heads, pb=None, limit=None):
 
453
                       target_git_object_retriever, heads, pb=None,
 
454
                       limit=None):
457
455
    """Import a set of git objects into a bzr repository.
458
456
 
459
457
    :param repo: Target Bazaar repository
484
482
        except KeyError:
485
483
            continue
486
484
        if isinstance(o, Commit):
487
 
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
488
 
                mapping.revision_id_foreign_to_bzr)
489
 
            if (repo.has_revision(rev.revision_id) or
490
 
                (roundtrip_revid and repo.has_revision(roundtrip_revid))):
 
485
            rev, roundtrip_revid, verifiers = mapping.import_commit(
 
486
                o, mapping.revision_id_foreign_to_bzr)
 
487
            if (repo.has_revision(rev.revision_id)
 
488
                    or (roundtrip_revid and
 
489
                        repo.has_revision(roundtrip_revid))):
491
490
                continue
492
491
            graph.append((o.id, o.parents))
493
492
            heads.extend([p for p in o.parents if p not in checked])
512
511
            repo.start_write_group()
513
512
            try:
514
513
                for i, head in enumerate(
515
 
                    revision_ids[offset:offset+batch_size]):
 
514
                        revision_ids[offset:offset + batch_size]):
516
515
                    if pb is not None:
517
 
                        pb.update("fetching revisions", offset+i,
 
516
                        pb.update("fetching revisions", offset + i,
518
517
                                  len(revision_ids))
519
518
                    import_git_commit(repo, mapping, head, lookup_object,
520
 
                        target_git_object_retriever, trees_cache)
 
519
                                      target_git_object_retriever, trees_cache)
521
520
                    last_imported = head
522
 
            except:
 
521
            except BaseException:
523
522
                repo.abort_write_group()
524
523
                raise
525
524
            else:
526
525
                hint = repo.commit_write_group()
527
526
                if hint is not None:
528
527
                    pack_hints.extend(hint)
529
 
        except:
 
528
        except BaseException:
530
529
            target_git_object_retriever.abort_write_group()
531
530
            raise
532
531
        else:
547
546
        self.remote_refs = refs
548
547
        self.wants = self.actual(refs)
549
548
        return self.wants
550
 
 
551
 
 
552