/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

Cope with Dulwich returning KeyError when a commit is not found.

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
 
    )
31
28
import os
32
29
import stat
33
30
 
39
36
    osutils,
40
37
    transport,
41
38
    tree,
 
39
    urlutils,
42
40
    workingtree,
43
41
    )
44
42
from bzrlib.decorators import (
49
47
from bzrlib.plugins.git.inventory import (
50
48
    GitIndexInventory,
51
49
    )
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
 
    )
 
50
 
59
51
 
60
52
IGNORE_FILENAME = ".gitignore"
61
53
 
63
55
class GitWorkingTree(workingtree.WorkingTree):
64
56
    """A Git working tree."""
65
57
 
66
 
    def __init__(self, bzrdir, repo, branch, index):
 
58
    def __init__(self, bzrdir, repo, branch):
67
59
        self.basedir = bzrdir.root_transport.local_abspath('.')
68
60
        self.bzrdir = bzrdir
69
61
        self.repository = repo
71
63
        self._branch = branch
72
64
        self._transport = bzrdir.transport
73
65
 
74
 
        self.controldir = self.bzrdir.transport.local_abspath('bzr')
 
66
        self.controldir = urlutils.join(self.repository._git._controldir, 'bzr')
75
67
 
76
68
        try:
77
69
            os.makedirs(self.controldir)
82
74
        self._control_files = lockable_files.LockableFiles(
83
75
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
84
76
        self._format = GitWorkingTreeFormat()
85
 
        self.index = index
 
77
        self.index = self.repository._git.open_index()
86
78
        self.views = self._make_views()
87
79
        self._detect_case_handling()
88
80
 
89
81
    def extras(self):
90
82
        """Yield all unversioned files in this WorkingTree.
91
83
        """
92
 
        for (dirpath, dirnames, filenames) in os.walk(self.basedir):
93
 
            if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
 
84
        for (relroot, top), entries in osutils.walkdirs(self.basedir, ""):
 
85
            if self.bzrdir.is_control_filename(relroot):
94
86
                continue
95
 
            for filename in filenames:
96
 
                relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
97
 
                if not relpath in self.index:
 
87
            for (relpath, basename, kind, lstat, path_from_top) in entries:
 
88
                if self.bzrdir.is_control_filename(basename):
 
89
                    continue
 
90
                if not self.inventory.has_filename(relpath) and kind in ('file', 'symlink'):
98
91
                    yield relpath
99
92
 
100
93
 
137
130
                    from posix import stat_result
138
131
                    stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
139
132
                blob.set_raw_string(entry.symlink_target)
140
 
            else:
141
 
                raise AssertionError("unknown kind '%s'" % entry.kind)
142
133
            # Add object to the repository if it didn't exist yet
143
134
            if not blob.id in self.repository._git.object_store:
144
135
                self.repository._git.object_store.add_object(blob)
150
141
        # TODO: Maybe this should only write on dirty ?
151
142
        if self._control_files._lock_mode != 'w':
152
143
            raise errors.NotWriteLocked(self)
153
 
        self._rewrite_index()
 
144
        self._rewrite_index()           
154
145
        self.index.write()
155
146
        self._inventory_is_modified = False
156
147
 
176
167
 
177
168
    def _reset_data(self):
178
169
        self._inventory_is_modified = False
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)
 
170
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(self.repository._git.head()))
 
171
        result = GitIndexInventory(basis_inv, self.mapping, self.index,
 
172
            self.repository._git.object_store)
192
173
        self._set_inventory(result, dirty=False)
193
174
 
194
175
    @needs_read_lock
205
186
    def revision_tree(self, revid):
206
187
        return self.repository.revision_tree(revid)
207
188
 
208
 
    @needs_read_lock
209
 
    def conflicts(self):
210
 
        # FIXME:
211
 
        return []
 
189
    def iter_changes(self, from_tree, include_unchanged=False,
 
190
                     specific_files=None, pb=None, extra_trees=None,
 
191
                     require_versioned=True, want_unversioned=False):
 
192
 
 
193
        intertree = tree.InterTree.get(from_tree, self)
 
194
        return intertree.iter_changes(include_unchanged, specific_files, pb,
 
195
            extra_trees, require_versioned, want_unversioned=want_unversioned)
212
196
 
213
197
 
214
198
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
215
199
 
216
 
    @property
217
 
    def _matchingbzrdir(self):
218
 
        from bzrlib.plugins.git import LocalGitControlDirFormat
219
 
        return LocalGitControlDirFormat()
220
 
 
221
200
    def get_format_description(self):
222
201
        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)