/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

More work on supporting roundtripping push.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
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
 
            try:
249
 
                file_id = self.target.path2id(
250
 
                    self.target.mapping.BZR_FILE_IDS_FILE)
251
 
            except errors.NoSuchId:
 
248
            file_id = self.target.path2id(
 
249
                self.target.mapping.BZR_FILE_IDS_FILE)
 
250
            if file_id is None:
252
251
                target_fileid_map = {}
253
252
            else:
254
253
                target_fileid_map = self.target.mapping.import_fileid_map(Blob.from_string(self.target.get_file_text(file_id)))
255
254
        else:
256
255
            target_fileid_map = {}
257
256
        target_fileid_map = GitFileIdMap(target_fileid_map, self.target.mapping)
258
 
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
 
257
        ret = tree_delta_from_git_changes(changes, self.target.mapping,
259
258
            (source_fileid_map, target_fileid_map),
260
259
            specific_file=specific_files, require_versioned=require_versioned)
261
260
        if want_unversioned: