/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

Reduce number of round trips when fetching from Git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
 
17
18
"""An adapter between a Git index and a Bazaar Working Tree"""
18
19
 
 
20
 
 
21
from cStringIO import (
 
22
    StringIO,
 
23
    )
 
24
from dulwich.index import (
 
25
    Index,
 
26
    )
 
27
from dulwich.objects import (
 
28
    Blob,
 
29
    )
19
30
import os
 
31
import stat
20
32
 
21
33
from bzrlib import (
 
34
    errors,
 
35
    ignores,
22
36
    inventory,
23
37
    lockable_files,
24
38
    lockdir,
 
39
    osutils,
25
40
    transport,
26
41
    urlutils,
27
42
    workingtree,
28
43
    )
29
 
 
30
 
from dulwich.index import Index
 
44
from bzrlib.decorators import (
 
45
    needs_read_lock,
 
46
    needs_write_lock,
 
47
    )
 
48
 
 
49
 
 
50
from bzrlib.plugins.git.inventory import (
 
51
    GitIndexInventory,
 
52
    )
 
53
 
 
54
 
 
55
IGNORE_FILENAME = ".gitignore"
 
56
 
31
57
 
32
58
class GitWorkingTree(workingtree.WorkingTree):
33
59
    """A Git working tree."""
34
60
 
35
61
    def __init__(self, bzrdir, repo, branch):
36
 
        self.basedir = bzrdir.transport.base
 
62
        self.basedir = bzrdir.root_transport.local_abspath('.')
37
63
        self.bzrdir = bzrdir
38
64
        self.repository = repo
 
65
        self.mapping = self.repository.get_mapping()
39
66
        self._branch = branch
40
67
        self._transport = bzrdir.transport
41
68
 
42
 
        self.controldir = urlutils.join(self.repository._git.path, 'bzr')
 
69
        self.controldir = urlutils.join(self.repository._git._controldir, 'bzr')
43
70
 
44
71
        try:
45
72
            os.makedirs(self.controldir)
49
76
 
50
77
        self._control_files = lockable_files.LockableFiles(
51
78
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
52
 
 
53
79
        self._format = GitWorkingTreeFormat()
54
 
 
55
 
        self.index = Index(os.path.join(self.repository._git.controldir(), 
56
 
            "index"))
57
 
 
58
 
    def lock_read(self):
59
 
        pass
 
80
        self.index = self.repository._git.open_index()
 
81
        self.views = self._make_views()
 
82
        self._detect_case_handling()
60
83
 
61
84
    def unlock(self):
62
 
        pass
 
85
        # non-implementation specific cleanup
 
86
        self._cleanup()
 
87
 
 
88
        # reverse order of locking.
 
89
        try:
 
90
            return self._control_files.unlock()
 
91
        finally:
 
92
            self.branch.unlock()
63
93
 
64
94
    def is_control_filename(self, path):
65
95
        return os.path.basename(path) == ".git"
66
96
 
67
 
    def _get_inventory(self):
68
 
        return inventory.Inventory()
69
 
 
70
 
    inventory = property(_get_inventory,
71
 
                         doc="Inventory of this Tree")
 
97
    def _rewrite_index(self):
 
98
        self.index.clear()
 
99
        for path, entry in self._inventory.iter_entries():
 
100
            if entry.kind == "directory":
 
101
                # Git indexes don't contain directories
 
102
                continue
 
103
            if entry.kind == "file":
 
104
                blob = Blob()
 
105
                try:
 
106
                    file, stat_val = self.get_file_with_stat(entry.file_id, path)
 
107
                except (errors.NoSuchFile, IOError):
 
108
                    # TODO: Rather than come up with something here, use the old index
 
109
                    file = StringIO()
 
110
                    stat_val = (0, 0, 0, 0, stat.S_IFREG | 0644, 0, 0, 0, 0, 0)
 
111
                blob._text = file.read()
 
112
            elif entry.kind == "symlink":
 
113
                blob = Blob()
 
114
                stat_val = os.stat(self.abspath(path))
 
115
                blob._text = entry.symlink_target
 
116
            # Add object to the repository if it didn't exist yet
 
117
            if not blob.id in self.repository._git.object_store:
 
118
                self.repository._git.object_store.add_object(blob)
 
119
            # Add an entry to the index or update the existing entry
 
120
            (mode, ino, dev, links, uid, gid, size, atime, mtime, ctime) = stat_val
 
121
            flags = 0
 
122
            self.index[path.encode("utf-8")] = (ctime, mtime, ino, dev, mode, uid, gid, size, blob.id, flags)
 
123
 
 
124
    def flush(self):
 
125
        # TODO: Maybe this should only write on dirty ?
 
126
        if self._control_files._lock_mode != 'w':
 
127
            raise errors.NotWriteLocked(self)
 
128
        self._rewrite_index()           
 
129
        self.index.write()
 
130
        self._inventory_is_modified = False
 
131
 
 
132
    def get_ignore_list(self):
 
133
        ignoreset = getattr(self, '_ignoreset', None)
 
134
        if ignoreset is not None:
 
135
            return ignoreset
 
136
 
 
137
        ignore_globs = set()
 
138
        ignore_globs.update(ignores.get_runtime_ignores())
 
139
        ignore_globs.update(ignores.get_user_ignores())
 
140
        if self.has_filename(IGNORE_FILENAME):
 
141
            f = self.get_file_byname(IGNORE_FILENAME)
 
142
            try:
 
143
                ignore_globs.update(ignores.parse_ignore_file(f))
 
144
            finally:
 
145
                f.close()
 
146
        self._ignoreset = ignore_globs
 
147
        return ignore_globs
 
148
 
 
149
    def _reset_data(self):
 
150
        self._inventory_is_modified = False
 
151
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(self.repository._git.head()))
 
152
        result = GitIndexInventory(basis_inv, self.mapping, self.index)
 
153
        self._set_inventory(result, dirty=False)
 
154
 
 
155
    @needs_read_lock
 
156
    def get_file_sha1(self, file_id, path=None, stat_value=None):
 
157
        if not path:
 
158
            path = self._inventory.id2path(file_id)
 
159
        return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
72
160
 
73
161
 
74
162
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):