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

Simplify code for getting file id map.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
750
750
        changes = self._index.changes_from_tree(
751
751
            self.source.store, self.source.tree, 
752
752
            want_unchanged=want_unchanged)
753
 
        source_fileid_map = self.source.mapping.get_fileid_map(
754
 
            self.source.store.__getitem__,
755
 
            self.source.tree)
756
 
        if self.target.mapping.BZR_FILE_IDS_FILE is not None:
757
 
            file_id = self.target.path2id(
758
 
                self.target.mapping.BZR_FILE_IDS_FILE)
759
 
            if file_id is None:
760
 
                target_fileid_map = {}
761
 
            else:
762
 
                target_fileid_map = self.target.mapping.import_fileid_map(
763
 
                    Blob.from_string(self.target.get_file_text(file_id)))
764
 
        else:
765
 
            target_fileid_map = {}
766
 
        target_fileid_map = GitFileIdMap(target_fileid_map,
767
 
                self.target.mapping)
 
753
        source_fileid_map = self.source._fileid_map
 
754
        target_fileid_map = self.target._fileid_map
768
755
        ret = tree_delta_from_git_changes(changes, self.target.mapping,
769
756
            (source_fileid_map, target_fileid_map),
770
757
            specific_file=specific_files, require_versioned=require_versioned)