/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

Add more tests, simplify push code.

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