/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 roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
34
34
from bzrlib import (
35
35
    errors,
36
36
    ignores,
37
 
    inventory,
38
37
    lockable_files,
39
38
    lockdir,
40
39
    osutils,
151
150
        # TODO: Maybe this should only write on dirty ?
152
151
        if self._control_files._lock_mode != 'w':
153
152
            raise errors.NotWriteLocked(self)
154
 
        self._rewrite_index()           
 
153
        self._rewrite_index()
155
154
        self.index.write()
156
155
        self._inventory_is_modified = False
157
156
 
184
183
        basis_inv = self.repository.get_inventory(self.branch.lookup_foreign_revision_id(head))
185
184
        store = self.repository._git.object_store
186
185
        if head == ZERO_SHA:
187
 
            fileid_map = {}
188
 
            result = inventory.Inventory(root_id=None)
 
186
            fileid_map = GitFileIdMap({}, self.mapping)
 
187
            basis_inv = None
189
188
        else:
190
189
            fileid_map = self.mapping.get_fileid_map(store.__getitem__,
191
190
                store[head].tree)
192
 
            result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
 
191
        result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
193
192
        self._set_inventory(result, dirty=False)
194
193
 
195
194
    @needs_read_lock
216
215
 
217
216
    @property
218
217
    def _matchingbzrdir(self):
219
 
        from bzrlib.plugins.git import LocalGitBzrDirFormat
220
 
        return LocalGitBzrDirFormat()
 
218
        from bzrlib.plugins.git import LocalGitControlDirFormat
 
219
        return LocalGitControlDirFormat()
221
220
 
222
221
    def get_format_description(self):
223
222
        return "Git Working Tree"
246
245
            self.source._repository._git.object_store.__getitem__,
247
246
            self.source.tree)
248
247
        if self.target.mapping.BZR_FILE_IDS_FILE is not None:
249
 
            try:
250
 
                file_id = self.target.path2id(
251
 
                    self.target.mapping.BZR_FILE_IDS_FILE)
252
 
            except errors.NoSuchId:
 
248
            file_id = self.target.path2id(
 
249
                self.target.mapping.BZR_FILE_IDS_FILE)
 
250
            if file_id is None:
253
251
                target_fileid_map = {}
254
252
            else:
255
 
                target_fileid_map = self.import_fileid_map(Blob.from_string(self.target.file_text(file_id)))
 
253
                target_fileid_map = self.target.mapping.import_fileid_map(Blob.from_string(self.target.get_file_text(file_id)))
256
254
        else:
257
255
            target_fileid_map = {}
258
256
        target_fileid_map = GitFileIdMap(target_fileid_map, self.target.mapping)
259
 
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
 
257
        ret = tree_delta_from_git_changes(changes, self.target.mapping,
260
258
            (source_fileid_map, target_fileid_map),
261
259
            specific_file=specific_files, require_versioned=require_versioned)
262
260
        if want_unversioned: