/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

Clean up trailing whitespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
36
36
    osutils,
37
37
    transport,
38
38
    tree,
 
39
    urlutils,
39
40
    workingtree,
40
41
    )
41
42
from bzrlib.decorators import (
58
59
class GitWorkingTree(workingtree.WorkingTree):
59
60
    """A Git working tree."""
60
61
 
61
 
    def __init__(self, bzrdir, repo, branch, index):
 
62
    def __init__(self, bzrdir, repo, branch):
62
63
        self.basedir = bzrdir.root_transport.local_abspath('.')
63
64
        self.bzrdir = bzrdir
64
65
        self.repository = repo
66
67
        self._branch = branch
67
68
        self._transport = bzrdir.transport
68
69
 
69
 
        self.controldir = self.bzrdir.transport.local_abspath('bzr')
 
70
        self.controldir = urlutils.join(self.repository._git._controldir, 'bzr')
70
71
 
71
72
        try:
72
73
            os.makedirs(self.controldir)
77
78
        self._control_files = lockable_files.LockableFiles(
78
79
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
79
80
        self._format = GitWorkingTreeFormat()
80
 
        self.index = index
 
81
        self.index = self.repository._git.open_index()
81
82
        self.views = self._make_views()
82
83
        self._detect_case_handling()
83
84
 
171
172
 
172
173
    def _reset_data(self):
173
174
        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))
 
175
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(self.repository._git.head()))
179
176
        result = GitIndexInventory(basis_inv, self.mapping, self.index,
180
177
            self.repository._git.object_store)
181
178
        self._set_inventory(result, dirty=False)