/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

Remove explicit use of rich root formats.

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
 
from dulwich.index import (
25
 
    Index,
26
 
    )
 
24
import errno
27
25
from dulwich.objects import (
28
26
    Blob,
29
27
    )
33
31
from bzrlib import (
34
32
    errors,
35
33
    ignores,
36
 
    inventory,
37
34
    lockable_files,
38
35
    lockdir,
39
36
    osutils,
40
37
    transport,
41
38
    tree,
42
 
    urlutils,
43
39
    workingtree,
44
40
    )
45
41
from bzrlib.decorators import (
46
42
    needs_read_lock,
47
 
    needs_write_lock,
48
43
    )
49
44
 
50
45
 
51
46
from bzrlib.plugins.git.inventory import (
52
47
    GitIndexInventory,
53
48
    )
 
49
from bzrlib.plugins.git.tree import (
 
50
    changes_from_git_changes,
 
51
    tree_delta_from_git_changes,
 
52
    )
54
53
 
55
54
 
56
55
IGNORE_FILENAME = ".gitignore"
59
58
class GitWorkingTree(workingtree.WorkingTree):
60
59
    """A Git working tree."""
61
60
 
62
 
    def __init__(self, bzrdir, repo, branch):
 
61
    def __init__(self, bzrdir, repo, branch, index):
63
62
        self.basedir = bzrdir.root_transport.local_abspath('.')
64
63
        self.bzrdir = bzrdir
65
64
        self.repository = repo
67
66
        self._branch = branch
68
67
        self._transport = bzrdir.transport
69
68
 
70
 
        self.controldir = urlutils.join(self.repository._git._controldir, 'bzr')
 
69
        self.controldir = self.bzrdir.transport.local_abspath('bzr')
71
70
 
72
71
        try:
73
72
            os.makedirs(self.controldir)
78
77
        self._control_files = lockable_files.LockableFiles(
79
78
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
80
79
        self._format = GitWorkingTreeFormat()
81
 
        self.index = self.repository._git.open_index()
 
80
        self.index = index
82
81
        self.views = self._make_views()
83
82
        self._detect_case_handling()
84
83
 
 
84
    def extras(self):
 
85
        """Yield all unversioned files in this WorkingTree.
 
86
        """
 
87
        for (dirpath, dirnames, filenames) in os.walk(self.basedir):
 
88
            if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
 
89
                continue
 
90
            for filename in filenames:
 
91
                relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
 
92
                if not relpath in self.index:
 
93
                    yield relpath
 
94
 
 
95
 
85
96
    def unlock(self):
86
97
        # non-implementation specific cleanup
87
98
        self._cleanup()
108
119
                except (errors.NoSuchFile, IOError):
109
120
                    # TODO: Rather than come up with something here, use the old index
110
121
                    file = StringIO()
111
 
                    stat_val = (0, 0, 0, 0, stat.S_IFREG | 0644, 0, 0, 0, 0, 0)
 
122
                    from posix import stat_result
 
123
                    stat_val = stat_result((stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
112
124
                blob.set_raw_string(file.read())
113
125
            elif entry.kind == "symlink":
114
126
                blob = Blob()
117
129
                except (errors.NoSuchFile, OSError):
118
130
                    # TODO: Rather than come up with something here, use the 
119
131
                    # old index
120
 
                    stat_val = (0, 0, 0, 0, stat.S_IFLNK, 0, 0, 0, 0, 0)
 
132
                    from posix import stat_result
 
133
                    stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
121
134
                blob.set_raw_string(entry.symlink_target)
 
135
            else:
 
136
                raise AssertionError("unknown kind '%s'" % entry.kind)
122
137
            # Add object to the repository if it didn't exist yet
123
138
            if not blob.id in self.repository._git.object_store:
124
139
                self.repository._git.object_store.add_object(blob)
156
171
 
157
172
    def _reset_data(self):
158
173
        self._inventory_is_modified = False
159
 
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(self.repository._git.head()))
160
 
        result = GitIndexInventory(basis_inv, self.mapping, self.index,
161
 
            self.repository._git.object_store)
 
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.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)
162
183
        self._set_inventory(result, dirty=False)
163
184
 
164
185
    @needs_read_lock
165
186
    def get_file_sha1(self, file_id, path=None, stat_value=None):
166
187
        if not path:
167
188
            path = self._inventory.id2path(file_id)
168
 
        return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
169
 
 
170
 
    def iter_changes(self, from_tree, include_unchanged=False,
171
 
                     specific_files=None, pb=None, extra_trees=None,
172
 
                     require_versioned=True, want_unversioned=False):
173
 
 
174
 
        intertree = tree.InterTree.get(from_tree, self)
175
 
        return intertree.iter_changes(include_unchanged, specific_files, pb,
176
 
            extra_trees, require_versioned, want_unversioned=want_unversioned)
 
189
        try:
 
190
            return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
 
191
        except OSError, (num, msg):
 
192
            if num in (errno.EISDIR, errno.ENOENT):
 
193
                return None
 
194
            raise
 
195
 
 
196
    def revision_tree(self, revid):
 
197
        return self.repository.revision_tree(revid)
 
198
 
 
199
    @needs_read_lock
 
200
    def conflicts(self):
 
201
        # FIXME:
 
202
        return []
177
203
 
178
204
 
179
205
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
180
206
 
 
207
    @property
 
208
    def _matchingbzrdir(self):
 
209
        from bzrlib.plugins.git import LocalGitBzrDirFormat
 
210
        return LocalGitBzrDirFormat()
 
211
 
181
212
    def get_format_description(self):
182
213
        return "Git Working Tree"
 
214
 
 
215
 
 
216
class InterIndexGitTree(tree.InterTree):
 
217
    """InterTree that works between a Git revision tree and an index."""
 
218
 
 
219
    def __init__(self, source, target):
 
220
        super(InterIndexGitTree, self).__init__(source, target)
 
221
        self._index = target.index
 
222
 
 
223
    @classmethod
 
224
    def is_compatible(cls, source, target):
 
225
        from bzrlib.plugins.git.repository import GitRevisionTree
 
226
        return (isinstance(source, GitRevisionTree) and 
 
227
                isinstance(target, GitWorkingTree))
 
228
 
 
229
    def compare(self, want_unchanged=False, specific_files=None,
 
230
                extra_trees=None, require_versioned=False, include_root=False,
 
231
                want_unversioned=False):
 
232
        changes = self._index.changes_from_tree(
 
233
            self.source._repository._git.object_store, self.source.tree, 
 
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
        if self.target.mapping.BZR_FILE_IDS_FILE is not None:
 
239
            try:
 
240
                file_id = self.target.path2id(
 
241
                    self.target.mapping.BZR_FILE_IDS_FILE)
 
242
            except errors.NoSuchId:
 
243
                target_fileid_map = {}
 
244
            else:
 
245
                target_fileid_map = self.import_fileid_map(Blob.from_string(self.target.file_text(file_id)))
 
246
        else:
 
247
            target_fileid_map = {}
 
248
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
 
249
            (source_fileid_map, target_fileid_map),
 
250
            specific_file=specific_files, require_versioned=require_versioned)
 
251
        if want_unversioned:
 
252
            for e in self.target.extras():
 
253
                ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
 
254
        return ret
 
255
 
 
256
    def iter_changes(self, include_unchanged=False, specific_files=None,
 
257
        pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
 
258
        changes = self._index.changes_from_tree(
 
259
            self.source._repository._git.object_store, self.source.tree, 
 
260
            want_unchanged=include_unchanged)
 
261
        # FIXME: Handle want_unversioned
 
262
        return changes_from_git_changes(changes, self.target.mapping, 
 
263
            specific_file=specific_files)
 
264
 
 
265
tree.InterTree.register_optimiser(InterIndexGitTree)