/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-09-21 17:08:09 UTC
  • mfrom: (7389 work)
  • mto: This revision was merged to the branch mainline in revision 7390.
  • Revision ID: jelmer@jelmer.uk-20190921170809-ejewbeue585deajo
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/fetch.py
402
402
        base_tree = lookup_object(o.parents[0]).tree
403
403
        base_mode = stat.S_IFDIR
404
404
    store_updater = target_git_object_retriever._get_updater(rev)
405
 
    tree_supplement = mapping.get_fileid_map(lookup_object, o.tree)
406
405
    inv_delta, unusual_modes = import_git_tree(
407
406
        repo.texts, mapping, b"", b"", (base_tree, o.tree), base_bzr_tree,
408
407
        None, rev.revision_id, parent_trees, lookup_object,
409
408
        (base_mode, stat.S_IFDIR), store_updater,
410
 
        tree_supplement.lookup_file_id,
 
409
        mapping.generate_file_id,
411
410
        allow_submodules=repo._format.supports_tree_reference)
412
411
    if unusual_modes != {}:
413
412
        for path, mode in unusual_modes.iteritems():