~maria-captains/bzr-git/serg

« back to all changes in this revision

Viewing changes to fetch.py

  • Committer: Sergei Golubchik
  • Date: 2013-09-04 12:54:41 UTC
  • Revision ID: sergii@pisem.net-20130904125441-zqphnoym25uumidw
different approach for generating file-id's
that creates unique ids for all files and allows
to merge many repositories into one.

incompatible with the old file-id == file-path approach,
and with old branched (from git) repositories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
399
399
        base_tree = lookup_object(o.parents[0]).tree
400
400
        base_mode = stat.S_IFDIR
401
401
    store_updater = target_git_object_retriever._get_updater(rev)
 
402
    mapping.set_tree(base_bzr_tree)
 
403
    mapping.set_revid(rev.revision_id)
402
404
    tree_supplement = mapping.get_fileid_map(lookup_object, o.tree)
403
405
    inv_delta, unusual_modes = import_git_tree(repo.texts,
404
406
            mapping, "", "", (base_tree, o.tree), base_bzr_tree,