/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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
25
25
from dulwich.objects import (
26
26
    Blob,
27
27
    )
 
28
from dulwich.protocol import (
 
29
    ZERO_SHA,
 
30
    )
28
31
import os
29
32
import stat
30
33
 
36
39
    osutils,
37
40
    transport,
38
41
    tree,
39
 
    urlutils,
40
42
    workingtree,
41
43
    )
42
44
from bzrlib.decorators import (
47
49
from bzrlib.plugins.git.inventory import (
48
50
    GitIndexInventory,
49
51
    )
50
 
 
 
52
from bzrlib.plugins.git.tree import (
 
53
    changes_from_git_changes,
 
54
    tree_delta_from_git_changes,
 
55
    )
 
56
from bzrlib.plugins.git.mapping import (
 
57
    GitFileIdMap,
 
58
    )
51
59
 
52
60
IGNORE_FILENAME = ".gitignore"
53
61
 
55
63
class GitWorkingTree(workingtree.WorkingTree):
56
64
    """A Git working tree."""
57
65
 
58
 
    def __init__(self, bzrdir, repo, branch):
 
66
    def __init__(self, bzrdir, repo, branch, index):
59
67
        self.basedir = bzrdir.root_transport.local_abspath('.')
60
68
        self.bzrdir = bzrdir
61
69
        self.repository = repo
63
71
        self._branch = branch
64
72
        self._transport = bzrdir.transport
65
73
 
66
 
        self.controldir = urlutils.join(self.repository._git._controldir, 'bzr')
 
74
        self.controldir = self.bzrdir.transport.local_abspath('bzr')
67
75
 
68
76
        try:
69
77
            os.makedirs(self.controldir)
74
82
        self._control_files = lockable_files.LockableFiles(
75
83
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
76
84
        self._format = GitWorkingTreeFormat()
77
 
        self.index = self.repository._git.open_index()
 
85
        self.index = index
78
86
        self.views = self._make_views()
79
87
        self._detect_case_handling()
80
88
 
 
89
    def extras(self):
 
90
        """Yield all unversioned files in this WorkingTree.
 
91
        """
 
92
        for (dirpath, dirnames, filenames) in os.walk(self.basedir):
 
93
            if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
 
94
                continue
 
95
            for filename in filenames:
 
96
                relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
 
97
                if not relpath in self.index:
 
98
                    yield relpath
 
99
 
 
100
 
81
101
    def unlock(self):
82
102
        # non-implementation specific cleanup
83
103
        self._cleanup()
117
137
                    from posix import stat_result
118
138
                    stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
119
139
                blob.set_raw_string(entry.symlink_target)
 
140
            else:
 
141
                raise AssertionError("unknown kind '%s'" % entry.kind)
120
142
            # Add object to the repository if it didn't exist yet
121
143
            if not blob.id in self.repository._git.object_store:
122
144
                self.repository._git.object_store.add_object(blob)
128
150
        # TODO: Maybe this should only write on dirty ?
129
151
        if self._control_files._lock_mode != 'w':
130
152
            raise errors.NotWriteLocked(self)
131
 
        self._rewrite_index()           
 
153
        self._rewrite_index()
132
154
        self.index.write()
133
155
        self._inventory_is_modified = False
134
156
 
154
176
 
155
177
    def _reset_data(self):
156
178
        self._inventory_is_modified = False
157
 
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(self.repository._git.head()))
158
 
        result = GitIndexInventory(basis_inv, self.mapping, self.index,
159
 
            self.repository._git.object_store)
 
179
        try:
 
180
            head = self.repository._git.head()
 
181
        except KeyError, name:
 
182
            raise errors.NotBranchError("branch %s at %s" % (name, self.repository.base))
 
183
        basis_inv = self.repository.get_inventory(self.branch.lookup_foreign_revision_id(head))
 
184
        store = self.repository._git.object_store
 
185
        if head == ZERO_SHA:
 
186
            fileid_map = GitFileIdMap({}, self.mapping)
 
187
            basis_inv = None
 
188
        else:
 
189
            fileid_map = self.mapping.get_fileid_map(store.__getitem__,
 
190
                store[head].tree)
 
191
        result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
160
192
        self._set_inventory(result, dirty=False)
161
193
 
162
194
    @needs_read_lock
170
202
                return None
171
203
            raise
172
204
 
173
 
    def iter_changes(self, from_tree, include_unchanged=False,
174
 
                     specific_files=None, pb=None, extra_trees=None,
175
 
                     require_versioned=True, want_unversioned=False):
 
205
    def revision_tree(self, revid):
 
206
        return self.repository.revision_tree(revid)
176
207
 
177
 
        intertree = tree.InterTree.get(from_tree, self)
178
 
        return intertree.iter_changes(include_unchanged, specific_files, pb,
179
 
            extra_trees, require_versioned, want_unversioned=want_unversioned)
 
208
    @needs_read_lock
 
209
    def conflicts(self):
 
210
        # FIXME:
 
211
        return []
180
212
 
181
213
 
182
214
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
183
215
 
 
216
    @property
 
217
    def _matchingbzrdir(self):
 
218
        from bzrlib.plugins.git import LocalGitControlDirFormat
 
219
        return LocalGitControlDirFormat()
 
220
 
184
221
    def get_format_description(self):
185
222
        return "Git Working Tree"
 
223
 
 
224
 
 
225
class InterIndexGitTree(tree.InterTree):
 
226
    """InterTree that works between a Git revision tree and an index."""
 
227
 
 
228
    def __init__(self, source, target):
 
229
        super(InterIndexGitTree, self).__init__(source, target)
 
230
        self._index = target.index
 
231
 
 
232
    @classmethod
 
233
    def is_compatible(cls, source, target):
 
234
        from bzrlib.plugins.git.repository import GitRevisionTree
 
235
        return (isinstance(source, GitRevisionTree) and 
 
236
                isinstance(target, GitWorkingTree))
 
237
 
 
238
    def compare(self, want_unchanged=False, specific_files=None,
 
239
                extra_trees=None, require_versioned=False, include_root=False,
 
240
                want_unversioned=False):
 
241
        changes = self._index.changes_from_tree(
 
242
            self.source._repository._git.object_store, self.source.tree, 
 
243
            want_unchanged=want_unchanged)
 
244
        source_fileid_map = self.source.mapping.get_fileid_map(
 
245
            self.source._repository._git.object_store.__getitem__,
 
246
            self.source.tree)
 
247
        if self.target.mapping.BZR_FILE_IDS_FILE is not None:
 
248
            file_id = self.target.path2id(
 
249
                self.target.mapping.BZR_FILE_IDS_FILE)
 
250
            if file_id is None:
 
251
                target_fileid_map = {}
 
252
            else:
 
253
                target_fileid_map = self.target.mapping.import_fileid_map(Blob.from_string(self.target.get_file_text(file_id)))
 
254
        else:
 
255
            target_fileid_map = {}
 
256
        target_fileid_map = GitFileIdMap(target_fileid_map, self.target.mapping)
 
257
        ret = tree_delta_from_git_changes(changes, self.target.mapping,
 
258
            (source_fileid_map, target_fileid_map),
 
259
            specific_file=specific_files, require_versioned=require_versioned)
 
260
        if want_unversioned:
 
261
            for e in self.target.extras():
 
262
                ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
 
263
        return ret
 
264
 
 
265
    def iter_changes(self, include_unchanged=False, specific_files=None,
 
266
        pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
 
267
        changes = self._index.changes_from_tree(
 
268
            self.source._repository._git.object_store, self.source.tree, 
 
269
            want_unchanged=include_unchanged)
 
270
        # FIXME: Handle want_unversioned
 
271
        return changes_from_git_changes(changes, self.target.mapping, 
 
272
            specific_file=specific_files)
 
273
 
 
274
tree.InterTree.register_optimiser(InterIndexGitTree)