/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

Fix some more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
175
175
            head = self.repository._git.head()
176
176
        except KeyError, name:
177
177
            raise errors.NotBranchError("branch %s at %s" % (name, self.repository.base))
178
 
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(head))
179
 
        result = GitIndexInventory(basis_inv, self.mapping, self.index,
180
 
            self.repository._git.object_store)
 
178
        basis_inv = self.repository.get_inventory(self.branch.lookup_foreign_revision_id(head))
 
179
        store = self.repository._git.object_store
 
180
        fileid_map = self.mapping.get_fileid_map(store.__getitem__,
 
181
            store[head].tree)
 
182
        result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
181
183
        self._set_inventory(result, dirty=False)
182
184
 
183
185
    @needs_read_lock
230
232
        changes = self._index.changes_from_tree(
231
233
            self.source._repository._git.object_store, self.source.tree, 
232
234
            want_unchanged=want_unchanged)
 
235
        source_fileid_map = self.source.mapping.get_fileid_map(
 
236
            self.source._repository._git.object_store.__getitem__,
 
237
            self.source.tree)
 
238
        target_fileid_map = self.target.mapping.get_fileid_map(
 
239
            self.target.repository._git.object_store.__getitem__,
 
240
            self.target.tree)
233
241
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
 
242
            (source_fileid_map, target_fileid_map),
234
243
            specific_file=specific_files, require_versioned=require_versioned)
235
244
        if want_unversioned:
236
245
            for e in self.target.extras():