/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

Merge python3-h.

Show diffs side-by-side

added added

removed removed

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