/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 object_store.py

Simply refer to bzr's docs in HACKING.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
18
18
 
19
19
from dulwich.objects import (
20
20
    Blob,
21
 
    Tree,
 
21
    sha_to_hex,
22
22
    )
23
23
from dulwich.object_store import (
24
24
    BaseObjectStore,
25
 
    ObjectStoreIterator,
26
25
    )
27
 
import stat
28
26
 
29
27
from bzrlib import (
30
28
    debug,
32
30
    trace,
33
31
    ui,
34
32
    )
35
 
 
36
 
from bzrlib.plugins.git.errors import (
37
 
    GhostRevision,
 
33
from bzrlib.revision import (
 
34
    NULL_REVISION,
38
35
    )
39
36
 
40
37
from bzrlib.plugins.git.mapping import (
41
38
    default_mapping,
42
39
    directory_to_tree,
 
40
    extract_unusual_modes,
43
41
    mapping_registry,
44
42
    revision_to_commit,
45
43
    )
93
91
        self._update_sha_map()
94
92
        return iter(self._idmap.sha1s())
95
93
 
 
94
    def _revision_to_commit(self, rev, tree_sha):
 
95
        def parent_lookup(revid):
 
96
            try:
 
97
                return self._lookup_revision_sha1(revid)
 
98
            except errors.NoSuchRevision:
 
99
                trace.warning("Ignoring ghost parent %s", revid)
 
100
                return None
 
101
        return revision_to_commit(rev, tree_sha, parent_lookup)
 
102
 
96
103
    def _update_sha_map_revision(self, revid):
97
104
        inv = self.repository.get_inventory(revid)
98
 
        tree_sha = self._get_ie_sha1(inv.root, inv)
99
105
        rev = self.repository.get_revision(revid)
100
 
        commit_obj = revision_to_commit(rev, tree_sha,
101
 
                                        self._idmap.lookup_commit)
 
106
        unusual_modes = extract_unusual_modes(rev)
 
107
        tree_sha = self._get_ie_sha1(inv.root, inv, unusual_modes)
 
108
        commit_obj = self._revision_to_commit(rev, tree_sha)
102
109
        try:
103
110
            foreign_revid, mapping = mapping_registry.parse_revision_id(revid)
104
111
        except errors.InvalidRevisionId:
112
119
    def _check_expected_sha(self, expected_sha, object):
113
120
        if expected_sha is None:
114
121
            return
115
 
        if expected_sha != object.id:
116
 
            raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha))
 
122
        if len(expected_sha) == 40:
 
123
            if expected_sha != object.sha().hexdigest():
 
124
                raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha))
 
125
        elif len(expected_sha) == 20:
 
126
            if expected_sha != object.sha().digest():
 
127
                raise AssertionError("Invalid sha for %r: %s" % (object, sha_to_hex(expected_sha)))
 
128
        else:
 
129
            raise AssertionError("Unknown length %d for %r" % (len(expected_sha), expected_sha))
117
130
 
118
 
    def _get_ie_object(self, entry, inv):  
 
131
    def _get_ie_object(self, entry, inv, unusual_modes):  
119
132
        if entry.kind == "directory":
120
 
            return self._get_tree(entry.file_id, inv.revision_id, inv=inv)
 
133
            return self._get_tree(entry.file_id, inv.revision_id, inv, unusual_modes)
121
134
        else:
122
135
            return self._get_blob(entry.file_id, entry.revision)
123
136
 
124
 
    def _get_ie_object_or_sha1(self, entry, inv):
 
137
    def _get_ie_object_or_sha1(self, entry, inv, unusual_modes):
125
138
        if entry.kind == "directory":
126
139
            try:
127
140
                return self._idmap.lookup_tree(entry.file_id, inv.revision_id), None
128
141
            except KeyError:
129
 
                ret = self._get_ie_object(entry, inv)
130
 
                self._idmap.add_entry(ret.id, "tree", (entry.file_id, inv.revision_id))
131
 
                return ret.id, ret
 
142
                ret = self._get_ie_object(entry, inv, unusual_modes)
 
143
                if ret is None:
 
144
                    hexsha = None
 
145
                else:
 
146
                    hexsha = ret.id
 
147
                self._idmap.add_entry(hexsha, "tree", (entry.file_id, inv.revision_id))
 
148
                return hexsha, ret
132
149
        else:
133
150
            try:
134
151
                return self._idmap.lookup_blob(entry.file_id, entry.revision), None
135
152
            except KeyError:
136
 
                ret = self._get_ie_object(entry, inv)
 
153
                ret = self._get_ie_object(entry, inv, unusual_modes)
137
154
                self._idmap.add_entry(ret.id, "blob", (entry.file_id, entry.revision))
138
155
                return ret.id, ret
139
156
 
140
 
    def _get_ie_sha1(self, entry, inv):
141
 
        return self._get_ie_object_or_sha1(entry, inv)[0]
 
157
    def _get_ie_sha1(self, entry, inv, unusual_modes):
 
158
        return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0]
142
159
 
143
160
    def _get_blob(self, fileid, revision, expected_sha=None):
144
161
        """Return a Git Blob object from a fileid and revision stored in bzr.
153
170
        self._check_expected_sha(expected_sha, blob)
154
171
        return blob
155
172
 
156
 
    def _get_tree(self, fileid, revid, inv=None, expected_sha=None):
 
173
    def _get_tree(self, fileid, revid, inv, unusual_modes, expected_sha=None):
157
174
        """Return a Git Tree object from a file id and a revision stored in bzr.
158
175
 
159
176
        :param fileid: fileid in the tree.
160
177
        :param revision: Revision of the tree.
161
178
        """
162
 
        if inv is None:
163
 
            inv = self.repository.get_inventory(revid)
164
 
        tree = directory_to_tree(inv[fileid], lambda ie: self._get_ie_sha1(ie, inv))
 
179
        tree = directory_to_tree(inv[fileid], 
 
180
            lambda ie: self._get_ie_sha1(ie, inv, unusual_modes),
 
181
            unusual_modes)
165
182
        self._check_expected_sha(expected_sha, tree)
166
183
        return tree
167
184
 
168
 
    def _get_commit(self, revid, tree_sha, expected_sha=None):
169
 
        rev = self.repository.get_revision(revid)
170
 
        try:
171
 
            commit = revision_to_commit(rev, tree_sha, self._lookup_revision_sha1)
172
 
        except errors.NoSuchRevision, e:
173
 
            raise GhostRevision(e.branch, e.revision)
 
185
    def _get_commit(self, rev, tree_sha, expected_sha=None):
 
186
        commit = self._revision_to_commit(rev, tree_sha)
174
187
        self._check_expected_sha(expected_sha, commit)
175
188
        return commit
176
189
 
184
197
 
185
198
    def _lookup_revision_sha1(self, revid):
186
199
        """Return the SHA1 matching a Bazaar revision."""
 
200
        if revid == NULL_REVISION:
 
201
            return "0" * 40
187
202
        try:
188
203
            return self._idmap.lookup_commit(revid)
189
204
        except KeyError:
195
210
 
196
211
        :param sha: SHA1 of the git object
197
212
        """
198
 
        return self[sha].as_raw_string()
 
213
        obj = self[sha]
 
214
        return (obj.type, obj.as_raw_string())
199
215
 
200
216
    def __contains__(self, sha):
201
217
        # See if sha is in map
202
218
        try:
203
 
            self._lookup_git_sha(sha)
 
219
            (type, type_data) = self._lookup_git_sha(sha)
 
220
            if type == "commit":
 
221
                return self.repository.has_revision(type_data[0])
 
222
            elif type == "blob":
 
223
                return self.repository.texts.has_version(type_data)
 
224
            elif type == "tree":
 
225
                return self.repository.has_revision(type_data[1])
 
226
            else:
 
227
                raise AssertionError("Unknown object type '%s'" % type)
204
228
        except KeyError:
205
229
            return False
206
230
        else:
221
245
        # convert object to git object
222
246
        if type == "commit":
223
247
            try:
224
 
                return self._get_commit(type_data[0], type_data[1], 
225
 
                                        expected_sha=sha)
 
248
                rev = self.repository.get_revision(type_data[0])
226
249
            except errors.NoSuchRevision:
227
250
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
228
251
                raise KeyError(sha)
 
252
            return self._get_commit(rev, type_data[1], expected_sha=sha)
229
253
        elif type == "blob":
230
254
            return self._get_blob(type_data[0], type_data[1], expected_sha=sha)
231
255
        elif type == "tree":
232
256
            try:
233
 
                return self._get_tree(type_data[0], type_data[1], 
 
257
                inv = self.repository.get_inventory(type_data[1])
 
258
                rev = self.repository.get_revision(type_data[1])
 
259
            except errors.NoSuchRevision:
 
260
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
 
261
                raise KeyError(sha)
 
262
            unusual_modes = extract_unusual_modes(rev)
 
263
            try:
 
264
                return self._get_tree(type_data[0], type_data[1], inv, unusual_modes,
234
265
                                      expected_sha=sha)
235
266
            except errors.NoSuchRevision:
236
267
                raise KeyError(sha)