/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

remove unnecessary parent_inv_shamap.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch.py
83
83
 
84
84
 
85
85
def import_git_blob(texts, mapping, path, name, (base_hexsha, hexsha), 
86
 
        base_inv, base_inv_shamap, parent_id, revision_id,
 
86
        base_inv, parent_id, revision_id,
87
87
        parent_invs, lookup_object, (base_mode, mode), store_updater):
88
88
    """Import a git blob object into a bzr repository.
89
89
 
194
194
 
195
195
 
196
196
def import_git_tree(texts, mapping, path, name, (base_hexsha, hexsha),
197
 
        base_inv, base_inv_shamap, parent_id, revision_id, parent_invs,
 
197
        base_inv, parent_id, revision_id, parent_invs,
198
198
    lookup_object, (base_mode, mode), store_updater, allow_submodules=False):
199
199
    """Import a git tree object into a bzr repository.
200
200
 
241
241
            subinvdelta, grandchildmodes = import_git_tree(
242
242
                    texts, mapping, child_path, name,
243
243
                    (child_base_hexsha, child_hexsha),
244
 
                    base_inv, base_inv_shamap, 
245
 
                    file_id, revision_id, parent_invs, lookup_object,
 
244
                    base_inv, file_id, revision_id, parent_invs, lookup_object,
246
245
                    (child_base_mode, child_mode), store_updater,
247
246
                    allow_submodules=allow_submodules)
248
247
        elif S_ISGITLINK(child_mode): # submodule
256
255
        else:
257
256
            subinvdelta = import_git_blob(texts, mapping,
258
257
                    child_path, name, (child_base_hexsha, child_hexsha),
259
 
                    base_inv, base_inv_shamap,
260
 
                    file_id,
261
 
                    revision_id, parent_invs, lookup_object,
 
258
                    base_inv, file_id, revision_id, parent_invs, lookup_object,
262
259
                    (child_base_mode, child_mode), store_updater)
263
260
            grandchildmodes = {}
264
261
        child_modes.update(grandchildmodes)
294
291
    store_updater.add_object(o, None)
295
292
    inv_delta, unusual_modes = import_git_tree(repo.texts,
296
293
            mapping, "", u"", (base_tree, o.tree), base_inv, 
297
 
            target_git_object_retriever._cache.idmap,
298
294
            None, rev.revision_id, parent_invs, lookup_object,
299
295
            (base_mode, stat.S_IFDIR), store_updater,
300
296
            allow_submodules=getattr(repo._format, "supports_tree_reference", False))