/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

Abstract out kind mapping a bit, initial work on support tree-references.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch.py
64
64
from bzrlib.plugins.git.mapping import (
65
65
    DEFAULT_FILE_MODE,
66
66
    inventory_to_tree_and_blobs,
 
67
    mode_is_executable,
67
68
    text_to_blob,
68
69
    warn_unusual_mode,
69
70
    )
216
217
            child_modes.update(grandchildmodes)
217
218
            shamap.extend(subshamap)
218
219
        else:
219
 
            fs_mode = stat.S_IMODE(mode)
220
220
            subinvdelta, subshamap = import_git_blob(texts, mapping, 
221
221
                    child_path, child_hexsha, base_inv, file_id, revision_id, 
222
222
                    parent_invs, shagitmap, lookup_object, 
223
 
                    bool(fs_mode & 0111), stat.S_ISLNK(mode))
 
223
                    mode_is_executable(mode), stat.S_ISLNK(mode))
224
224
            invdelta.extend(subinvdelta)
225
225
            shamap.extend(subshamap)
226
226
        if mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,