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

Some formatting cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch.py
357
357
        base_mode = stat.S_IFDIR
358
358
    store_updater = target_git_object_retriever._get_updater(rev)
359
359
    store_updater.add_object(o, None, None)
360
 
    lookup_file_id = mapping.get_fileid_map(lookup_object, o.tree).lookup_file_id
 
360
    fileid_map = mapping.get_fileid_map(lookup_object, o.tree)
361
361
    inv_delta, unusual_modes = import_git_tree(repo.texts,
362
 
            mapping, "", "", (base_tree, o.tree), base_inv, 
 
362
            mapping, "", "", (base_tree, o.tree), base_inv,
363
363
            None, rev.revision_id, [p.inventory for p in parent_trees],
364
364
            lookup_object, (base_mode, stat.S_IFDIR), store_updater,
365
 
            lookup_file_id,
 
365
            fileid_map.lookup_file_id,
366
366
            allow_submodules=getattr(repo._format, "supports_tree_reference", False))
367
367
    store_updater.finish()
368
368
    if unusual_modes != {}:
375
375
        basis_id = NULL_REVISION
376
376
        base_inv = None
377
377
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
378
 
              inv_delta, rev.revision_id, rev.parent_ids,
379
 
              base_inv)
 
378
              inv_delta, rev.revision_id, rev.parent_ids, base_inv)
380
379
    ret_tree = RevisionTree(repo, inv, rev.revision_id)
381
380
    trees_cache.add(ret_tree)
382
381
    repo.add_revision(rev.revision_id, rev)