/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

Implement to_files() for git merge directives.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
58
58
class GitWorkingTree(workingtree.WorkingTree):
59
59
    """A Git working tree."""
60
60
 
61
 
    def __init__(self, bzrdir, repo, branch, index):
 
61
    def __init__(self, bzrdir, repo, branch):
62
62
        self.basedir = bzrdir.root_transport.local_abspath('.')
63
63
        self.bzrdir = bzrdir
64
64
        self.repository = repo
77
77
        self._control_files = lockable_files.LockableFiles(
78
78
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
79
79
        self._format = GitWorkingTreeFormat()
80
 
        self.index = index
 
80
        self.index = self.repository._git.open_index()
81
81
        self.views = self._make_views()
82
82
        self._detect_case_handling()
83
83
 
171
171
 
172
172
    def _reset_data(self):
173
173
        self._inventory_is_modified = False
174
 
        try:
175
 
            head = self.repository._git.head()
176
 
        except KeyError, name:
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))
 
174
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(self.repository._git.head()))
179
175
        result = GitIndexInventory(basis_inv, self.mapping, self.index,
180
176
            self.repository._git.object_store)
181
177
        self._set_inventory(result, dirty=False)