/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,
54
53
    changes_from_git_changes,
55
54
    tree_delta_from_git_changes,
56
55
    )
57
 
 
 
56
from bzrlib.plugins.git.mapping import (
 
57
    GitFileIdMap,
 
58
    )
58
59
 
59
60
IGNORE_FILENAME = ".gitignore"
60
61
 
149
150
        # TODO: Maybe this should only write on dirty ?
150
151
        if self._control_files._lock_mode != 'w':
151
152
            raise errors.NotWriteLocked(self)
152
 
        self._rewrite_index()           
 
153
        self._rewrite_index()
153
154
        self.index.write()
154
155
        self._inventory_is_modified = False
155
156
 
182
183
        basis_inv = self.repository.get_inventory(self.branch.lookup_foreign_revision_id(head))
183
184
        store = self.repository._git.object_store
184
185
        if head == ZERO_SHA:
185
 
            fileid_map = {}
186
 
            result = inventory.Inventory(root_id=None)
 
186
            fileid_map = GitFileIdMap({}, self.mapping)
 
187
            basis_inv = None
187
188
        else:
188
189
            fileid_map = self.mapping.get_fileid_map(store.__getitem__,
189
190
                store[head].tree)
190
 
            result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
 
191
        result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
191
192
        self._set_inventory(result, dirty=False)
192
193
 
193
194
    @needs_read_lock
214
215
 
215
216
    @property
216
217
    def _matchingbzrdir(self):
217
 
        from bzrlib.plugins.git import LocalGitBzrDirFormat
218
 
        return LocalGitBzrDirFormat()
 
218
        from bzrlib.plugins.git import LocalGitControlDirFormat
 
219
        return LocalGitControlDirFormat()
219
220
 
220
221
    def get_format_description(self):
221
222
        return "Git Working Tree"
244
245
            self.source._repository._git.object_store.__getitem__,
245
246
            self.source.tree)
246
247
        if self.target.mapping.BZR_FILE_IDS_FILE is not None:
247
 
            try:
248
 
                file_id = self.target.path2id(
249
 
                    self.target.mapping.BZR_FILE_IDS_FILE)
250
 
            except errors.NoSuchId:
 
248
            file_id = self.target.path2id(
 
249
                self.target.mapping.BZR_FILE_IDS_FILE)
 
250
            if file_id is None:
251
251
                target_fileid_map = {}
252
252
            else:
253
 
                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)))
254
254
        else:
255
255
            target_fileid_map = {}
256
 
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
 
256
        target_fileid_map = GitFileIdMap(target_fileid_map, self.target.mapping)
 
257
        ret = tree_delta_from_git_changes(changes, self.target.mapping,
257
258
            (source_fileid_map, target_fileid_map),
258
259
            specific_file=specific_files, require_versioned=require_versioned)
259
260
        if want_unversioned: