/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
21
21
from cStringIO import (
22
22
    StringIO,
23
23
    )
24
 
import errno
 
24
from dulwich.index import (
 
25
    Index,
 
26
    )
25
27
from dulwich.objects import (
26
28
    Blob,
27
29
    )
31
33
from bzrlib import (
32
34
    errors,
33
35
    ignores,
 
36
    inventory,
34
37
    lockable_files,
35
38
    lockdir,
36
39
    osutils,
37
40
    transport,
38
 
    tree,
39
41
    urlutils,
40
42
    workingtree,
41
43
    )
42
44
from bzrlib.decorators import (
43
45
    needs_read_lock,
 
46
    needs_write_lock,
44
47
    )
45
48
 
46
49
 
47
50
from bzrlib.plugins.git.inventory import (
48
51
    GitIndexInventory,
49
52
    )
50
 
from bzrlib.plugins.git.tree import (
51
 
    changes_from_git_changes,
52
 
    tree_delta_from_git_changes,
53
 
    )
54
53
 
55
54
 
56
55
IGNORE_FILENAME = ".gitignore"
82
81
        self.views = self._make_views()
83
82
        self._detect_case_handling()
84
83
 
85
 
    def extras(self):
86
 
        """Yield all unversioned files in this WorkingTree.
87
 
        """
88
 
        for (dirpath, dirnames, filenames) in os.walk(self.basedir):
89
 
            if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
90
 
                continue
91
 
            for filename in filenames:
92
 
                relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
93
 
                if not relpath in self.index:
94
 
                    yield relpath
95
 
 
96
 
 
97
84
    def unlock(self):
98
85
        # non-implementation specific cleanup
99
86
        self._cleanup()
120
107
                except (errors.NoSuchFile, IOError):
121
108
                    # TODO: Rather than come up with something here, use the old index
122
109
                    file = StringIO()
123
 
                    from posix import stat_result
124
 
                    stat_val = stat_result((stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
125
 
                blob.set_raw_string(file.read())
 
110
                    stat_val = (0, 0, 0, 0, stat.S_IFREG | 0644, 0, 0, 0, 0, 0)
 
111
                blob._text = file.read()
126
112
            elif entry.kind == "symlink":
127
113
                blob = Blob()
128
 
                try:
129
 
                    stat_val = os.lstat(self.abspath(path))
130
 
                except (errors.NoSuchFile, OSError):
131
 
                    # TODO: Rather than come up with something here, use the 
132
 
                    # old index
133
 
                    from posix import stat_result
134
 
                    stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
135
 
                blob.set_raw_string(entry.symlink_target)
136
 
            else:
137
 
                raise AssertionError("unknown kind '%s'" % entry.kind)
 
114
                stat_val = os.stat(self.abspath(path))
 
115
                blob._text = entry.symlink_target
138
116
            # Add object to the repository if it didn't exist yet
139
117
            if not blob.id in self.repository._git.object_store:
140
118
                self.repository._git.object_store.add_object(blob)
141
119
            # Add an entry to the index or update the existing entry
142
 
            flags = 0 # FIXME
143
 
            self.index[path.encode("utf-8")] = (stat_val.st_ctime, stat_val.st_mtime, stat_val.st_dev, stat_val.st_ino, stat_val.st_mode, stat_val.st_uid, stat_val.st_gid, stat_val.st_size, blob.id, flags)
 
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)
144
123
 
145
124
    def flush(self):
146
125
        # TODO: Maybe this should only write on dirty ?
167
146
        self._ignoreset = ignore_globs
168
147
        return ignore_globs
169
148
 
170
 
    def set_last_revision(self, revid):
171
 
        self._change_last_revision(revid)
172
 
 
173
149
    def _reset_data(self):
174
150
        self._inventory_is_modified = False
175
151
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(self.repository._git.head()))
176
 
        result = GitIndexInventory(basis_inv, self.mapping, self.index,
177
 
            self.repository._git.object_store)
 
152
        result = GitIndexInventory(basis_inv, self.mapping, self.index)
178
153
        self._set_inventory(result, dirty=False)
179
154
 
180
155
    @needs_read_lock
181
156
    def get_file_sha1(self, file_id, path=None, stat_value=None):
182
157
        if not path:
183
158
            path = self._inventory.id2path(file_id)
184
 
        try:
185
 
            return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
186
 
        except OSError, (num, msg):
187
 
            if num in (errno.EISDIR, errno.ENOENT):
188
 
                return None
189
 
            raise
190
 
 
191
 
    def revision_tree(self, revid):
192
 
        return self.repository.revision_tree(revid)
193
 
 
194
 
    @needs_read_lock
195
 
    def conflicts(self):
196
 
        # FIXME:
197
 
        return []
 
159
        return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
198
160
 
199
161
 
200
162
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
201
163
 
202
 
    @property
203
 
    def _matchingbzrdir(self):
204
 
        from bzrlib.plugins.git import LocalGitBzrDirFormat
205
 
        return LocalGitBzrDirFormat()
206
 
 
207
164
    def get_format_description(self):
208
165
        return "Git Working Tree"
209
 
 
210
 
 
211
 
class InterIndexGitTree(tree.InterTree):
212
 
    """InterTree that works between a Git revision tree and an index."""
213
 
 
214
 
    def __init__(self, source, target):
215
 
        super(InterIndexGitTree, self).__init__(source, target)
216
 
        self._index = target.index
217
 
 
218
 
    @classmethod
219
 
    def is_compatible(cls, source, target):
220
 
        from bzrlib.plugins.git.repository import GitRevisionTree
221
 
        return (isinstance(source, GitRevisionTree) and 
222
 
                isinstance(target, GitWorkingTree))
223
 
 
224
 
    def compare(self, want_unchanged=False, specific_files=None,
225
 
                extra_trees=None, require_versioned=False, include_root=False,
226
 
                want_unversioned=False):
227
 
        changes = self._index.changes_from_tree(
228
 
            self.source._repository._git.object_store, self.source.tree, 
229
 
            want_unchanged=want_unchanged)
230
 
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
231
 
            specific_file=specific_files, require_versioned=require_versioned)
232
 
        if want_unversioned:
233
 
            for e in self.target.extras():
234
 
                ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
235
 
        return ret
236
 
 
237
 
    def iter_changes(self, include_unchanged=False, specific_files=None,
238
 
        pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
239
 
        changes = self._index.changes_from_tree(
240
 
            self.source._repository._git.object_store, self.source.tree, 
241
 
            want_unchanged=include_unchanged)
242
 
        # FIXME: Handle want_unversioned
243
 
        return changes_from_git_changes(changes, self.target.mapping, 
244
 
            specific_file=specific_files)
245
 
 
246
 
tree.InterTree.register_optimiser(InterIndexGitTree)