/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

More test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch.py
292
292
                file_id, revision_id, parent_invs, lookup_object,
293
293
                (child_base_mode, child_mode), store_updater, lookup_file_id)
294
294
        else:
295
 
            subinvdelta = import_git_blob(texts, mapping, child_path, name,
296
 
                (child_base_hexsha, child_hexsha), base_inv, file_id,
297
 
                revision_id, parent_invs, lookup_object,
298
 
                (child_base_mode, child_mode), store_updater, lookup_file_id)
 
295
            if not mapping.is_special_file(name):
 
296
                subinvdelta = import_git_blob(texts, mapping, child_path, name,
 
297
                    (child_base_hexsha, child_hexsha), base_inv, file_id,
 
298
                    revision_id, parent_invs, lookup_object,
 
299
                    (child_base_mode, child_mode), store_updater, lookup_file_id)
 
300
            else:
 
301
                subinvdelta = []
299
302
            grandchildmodes = {}
300
303
        child_modes.update(grandchildmodes)
301
304
        invdelta.extend(subinvdelta)