/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

  • Committer: Jelmer Vernooij
  • Author(s): Chadrik
  • Date: 2010-07-26 14:02:05 UTC
  • mto: (0.312.1 master) (6883.23.1 bundle-git)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100726140205-m45dyrhi1ifg0fck
https://launchpad.net/bugs/603800
Fix 'bzr status' after 'bzr add' in native git working trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
54
54
    changes_from_git_changes,
55
55
    tree_delta_from_git_changes,
56
56
    )
57
 
 
 
57
from bzrlib.plugins.git.mapping import (
 
58
    GitFileIdMap,
 
59
    )
58
60
 
59
61
IGNORE_FILENAME = ".gitignore"
60
62
 
253
255
                target_fileid_map = self.import_fileid_map(Blob.from_string(self.target.file_text(file_id)))
254
256
        else:
255
257
            target_fileid_map = {}
 
258
        target_fileid_map = GitFileIdMap(target_fileid_map, self.target.mapping)
256
259
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
257
260
            (source_fileid_map, target_fileid_map),
258
261
            specific_file=specific_files, require_versioned=require_versioned)