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

  • Committer: Jelmer Vernooij
  • Date: 2018-06-21 17:34:49 UTC
  • mfrom: (6989.2.8 inter-git-tests)
  • Revision ID: jelmer@jelmer.uk-20180621173449-lytzb1fg5gplhqwz
Merge lp:~jelmer/brz/inter-git-tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/fetch.py
375
375
    for t in trees:
376
376
        revid = t.get_revision_id()
377
377
        if not real_inv_vf.get_parent_map([(revid, )]):
378
 
            repo.add_inventory(revid, t.inventory, t.get_parent_ids())
 
378
            repo.add_inventory(revid, t.root_inventory, t.get_parent_ids())
379
379
 
380
380
 
381
381
def import_git_commit(repo, mapping, head, lookup_object,
409
409
            None, rev.revision_id, parent_trees,
410
410
            lookup_object, (base_mode, stat.S_IFDIR), store_updater,
411
411
            tree_supplement.lookup_file_id,
412
 
            allow_submodules=getattr(repo._format, "supports_tree_reference",
413
 
                False))
 
412
            allow_submodules=repo._format.supports_tree_reference)
414
413
    if unusual_modes != {}:
415
414
        for path, mode in unusual_modes.iteritems():
416
415
            warn_unusual_mode(rev.foreign_revid, path, mode)
421
420
        basis_id = NULL_REVISION
422
421
        base_bzr_inventory = None
423
422
    else:
424
 
        try:
425
 
            base_bzr_inventory = base_bzr_tree.root_inventory
426
 
        except AttributeError: # bzr < 2.6
427
 
            base_bzr_inventory = base_bzr_tree.inventory
 
423
        base_bzr_inventory = base_bzr_tree.root_inventory
428
424
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
429
425
              inv_delta, rev.revision_id, rev.parent_ids,
430
426
              base_bzr_inventory)