/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

Implement GitDir.destroy_workingtree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
215
215
 
216
216
    @property
217
217
    def _matchingbzrdir(self):
218
 
        from bzrlib.plugins.git import LocalGitControlDirFormat
219
 
        return LocalGitControlDirFormat()
 
218
        from bzrlib.plugins.git import LocalGitBzrDirFormat
 
219
        return LocalGitBzrDirFormat()
220
220
 
221
221
    def get_format_description(self):
222
222
        return "Git Working Tree"
245
245
            self.source._repository._git.object_store.__getitem__,
246
246
            self.source.tree)
247
247
        if self.target.mapping.BZR_FILE_IDS_FILE is not None:
248
 
            file_id = self.target.path2id(
249
 
                self.target.mapping.BZR_FILE_IDS_FILE)
250
 
            if file_id is None:
 
248
            try:
 
249
                file_id = self.target.path2id(
 
250
                    self.target.mapping.BZR_FILE_IDS_FILE)
 
251
            except errors.NoSuchId:
251
252
                target_fileid_map = {}
252
253
            else:
253
 
                target_fileid_map = self.target.mapping.import_fileid_map(Blob.from_string(self.target.get_file_text(file_id)))
 
254
                target_fileid_map = self.import_fileid_map(Blob.from_string(self.target.file_text(file_id)))
254
255
        else:
255
256
            target_fileid_map = {}
256
257
        target_fileid_map = GitFileIdMap(target_fileid_map, self.target.mapping)
257
 
        ret = tree_delta_from_git_changes(changes, self.target.mapping,
 
258
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
258
259
            (source_fileid_map, target_fileid_map),
259
260
            specific_file=specific_files, require_versioned=require_versioned)
260
261
        if want_unversioned: