/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

Implement to_files() for git merge directives.

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,
36
34
    NULL_REVISION,
37
35
    )
38
36
 
39
 
from bzrlib.plugins.git.errors import (
40
 
    GhostRevision,
41
 
    )
42
 
 
43
37
from bzrlib.plugins.git.mapping import (
44
38
    default_mapping,
45
39
    directory_to_tree,
46
40
    extract_unusual_modes,
47
41
    mapping_registry,
48
 
    revision_to_commit,
49
42
    )
50
43
from bzrlib.plugins.git.shamap import (
51
44
    SqliteGitShaMap,
69
62
            self.mapping = default_mapping
70
63
        else:
71
64
            self.mapping = mapping
72
 
        try:
73
 
            self._idmap = TdbGitShaMap.from_repository(repository)
74
 
        except ImportError:
75
 
            self._idmap = SqliteGitShaMap.from_repository(repository)
 
65
        self._idmap = SqliteGitShaMap.from_repository(repository)
 
66
        self.start_write_group = self._idmap.start_write_group
 
67
        self.abort_write_group = self._idmap.abort_write_group
 
68
        self.commit_write_group = self._idmap.commit_write_group
76
69
 
77
70
    def _update_sha_map(self, stop_revision=None):
 
71
        graph = self.repository.get_graph()
78
72
        if stop_revision is None:
79
 
            all_revids = self.repository.all_revision_ids()
 
73
            heads = graph.heads(self.repository.all_revision_ids())
80
74
        else:
81
 
            all_revids = self.repository.get_ancestry(stop_revision)
82
 
            first = all_revids.pop(0) # Pop leading None
83
 
            assert first is None
84
 
        graph = self.repository.get_graph()
85
 
        present_revids = set(self._idmap.revids())
86
 
        missing_revids = [revid for revid in graph.iter_topo_order(all_revids) if revid not in present_revids]
87
 
        pb = ui.ui_factory.nested_progress_bar()
 
75
            heads = set([stop_revision])
 
76
        missing_revids = self._idmap.missing_revisions(heads)
 
77
        while heads:
 
78
            parents = graph.get_parent_map(heads)
 
79
            todo = set()
 
80
            for p in parents.values():
 
81
                todo.update([x for x in p if x not in missing_revids])
 
82
            heads = self._idmap.missing_revisions(todo)
 
83
            missing_revids.update(heads)
 
84
        if NULL_REVISION in missing_revids:
 
85
            missing_revids.remove(NULL_REVISION)
 
86
        self.start_write_group()
88
87
        try:
89
 
            for i, revid in enumerate(missing_revids):
90
 
                pb.update("updating git map", i, len(missing_revids))
91
 
                self._update_sha_map_revision(revid)
92
 
        finally:
93
 
            self._idmap.commit()
94
 
            pb.finished()
 
88
            pb = ui.ui_factory.nested_progress_bar()
 
89
            try:
 
90
                for i, revid in enumerate(graph.iter_topo_order(missing_revids)):
 
91
                    pb.update("updating git map", i, len(missing_revids))
 
92
                    self._update_sha_map_revision(revid)
 
93
            finally:
 
94
                pb.finished()
 
95
        except:
 
96
            self.abort_write_group()
 
97
            raise
 
98
        else:
 
99
            self.commit_write_group()
95
100
 
96
101
    def __iter__(self):
97
102
        self._update_sha_map()
98
103
        return iter(self._idmap.sha1s())
99
104
 
 
105
    def _revision_to_commit(self, rev, tree_sha):
 
106
        def parent_lookup(revid):
 
107
            try:
 
108
                return self._lookup_revision_sha1(revid)
 
109
            except errors.NoSuchRevision:
 
110
                trace.warning("Ignoring ghost parent %s", revid)
 
111
                return None
 
112
        return self.mapping.export_commit(rev, tree_sha, parent_lookup)
 
113
 
100
114
    def _update_sha_map_revision(self, revid):
101
115
        inv = self.repository.get_inventory(revid)
102
116
        rev = self.repository.get_revision(revid)
103
117
        unusual_modes = extract_unusual_modes(rev)
104
118
        tree_sha = self._get_ie_sha1(inv.root, inv, unusual_modes)
105
 
        commit_obj = revision_to_commit(rev, tree_sha,
106
 
                                        self._idmap.lookup_commit)
 
119
        commit_obj = self._revision_to_commit(rev, tree_sha)
107
120
        try:
108
121
            foreign_revid, mapping = mapping_registry.parse_revision_id(revid)
109
122
        except errors.InvalidRevisionId:
117
130
    def _check_expected_sha(self, expected_sha, object):
118
131
        if expected_sha is None:
119
132
            return
120
 
        if expected_sha != object.id:
121
 
            raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha))
 
133
        if len(expected_sha) == 40:
 
134
            if expected_sha != object.sha().hexdigest():
 
135
                raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha))
 
136
        elif len(expected_sha) == 20:
 
137
            if expected_sha != object.sha().digest():
 
138
                raise AssertionError("Invalid sha for %r: %s" % (object, sha_to_hex(expected_sha)))
 
139
        else:
 
140
            raise AssertionError("Unknown length %d for %r" % (len(expected_sha), expected_sha))
122
141
 
123
 
    def _get_ie_object(self, entry, inv, unusual_modes):  
 
142
    def _get_ie_object(self, entry, inv, unusual_modes):
124
143
        if entry.kind == "directory":
125
144
            return self._get_tree(entry.file_id, inv.revision_id, inv, unusual_modes)
 
145
        elif entry.kind == "symlink":
 
146
            return self._get_blob_for_symlink(entry.symlink_target)
 
147
        elif entry.kind == "file":
 
148
            return self._get_blob_for_file(entry.file_id, entry.revision)
126
149
        else:
127
 
            return self._get_blob(entry.file_id, entry.revision)
 
150
            raise AssertionError("unknown entry kind '%s'" % entry.kind)
128
151
 
129
152
    def _get_ie_object_or_sha1(self, entry, inv, unusual_modes):
130
153
        if entry.kind == "directory":
132
155
                return self._idmap.lookup_tree(entry.file_id, inv.revision_id), None
133
156
            except KeyError:
134
157
                ret = self._get_ie_object(entry, inv, unusual_modes)
135
 
                self._idmap.add_entry(ret.id, "tree", (entry.file_id, inv.revision_id))
136
 
                return ret.id, ret
137
 
        else:
 
158
                if ret is None:
 
159
                    # Empty directory
 
160
                    hexsha = None
 
161
                else:
 
162
                    hexsha = ret.id
 
163
                self._idmap.add_entry(hexsha, "tree", (entry.file_id, inv.revision_id))
 
164
                return hexsha, ret
 
165
        elif entry.kind in ("file", "symlink"):
138
166
            try:
139
167
                return self._idmap.lookup_blob(entry.file_id, entry.revision), None
140
168
            except KeyError:
141
169
                ret = self._get_ie_object(entry, inv, unusual_modes)
142
170
                self._idmap.add_entry(ret.id, "blob", (entry.file_id, entry.revision))
143
171
                return ret.id, ret
 
172
        else:
 
173
            raise AssertionError("unknown entry kind '%s'" % entry.kind)
144
174
 
145
175
    def _get_ie_sha1(self, entry, inv, unusual_modes):
146
176
        return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0]
147
177
 
 
178
    def _get_blob_for_symlink(self, symlink_target, expected_sha=None):
 
179
        """Return a Git Blob object for symlink.
 
180
 
 
181
        :param symlink_target: target of symlink.
 
182
        """
 
183
        if type(symlink_target) == unicode:
 
184
            symlink_target = symlink_target.encode('utf-8')
 
185
        blob = Blob()
 
186
        blob._text = symlink_target
 
187
        self._check_expected_sha(expected_sha, blob)
 
188
        return blob
 
189
 
 
190
    def _get_blob_for_file(self, fileid, revision, expected_sha=None):
 
191
        """Return a Git Blob object from a fileid and revision stored in bzr.
 
192
 
 
193
        :param fileid: File id of the text
 
194
        :param revision: Revision of the text
 
195
        """
 
196
        blob = Blob()
 
197
        chunks = self.repository.iter_files_bytes([(fileid, revision, None)]).next()[1]
 
198
        blob._text = "".join(chunks)
 
199
        self._check_expected_sha(expected_sha, blob)
 
200
        return blob
 
201
 
148
202
    def _get_blob(self, fileid, revision, expected_sha=None):
149
203
        """Return a Git Blob object from a fileid and revision stored in bzr.
150
 
        
 
204
 
151
205
        :param fileid: File id of the text
152
206
        :param revision: Revision of the text
153
207
        """
154
 
        text = self.repository.texts.get_record_stream([(fileid, revision)],
155
 
            "unordered", True).next().get_bytes_as("fulltext")
156
 
        blob = Blob()
157
 
        blob._text = text
158
 
        self._check_expected_sha(expected_sha, blob)
159
 
        return blob
 
208
        inv = self.repository.get_inventory(revision)
 
209
        entry = inv[fileid]
 
210
 
 
211
        if entry.kind == 'file':
 
212
            return self._get_blob_for_file(entry.file_id, entry.revision,
 
213
                                           expected_sha=expected_sha)
 
214
        elif entry.kind == 'symlink':
 
215
            return self._get_blob_for_symlink(entry.symlink_target,
 
216
                                              expected_sha=expected_sha)
 
217
        else:
 
218
            raise AssertionError
160
219
 
161
220
    def _get_tree(self, fileid, revid, inv, unusual_modes, expected_sha=None):
162
221
        """Return a Git Tree object from a file id and a revision stored in bzr.
164
223
        :param fileid: fileid in the tree.
165
224
        :param revision: Revision of the tree.
166
225
        """
167
 
        tree = directory_to_tree(inv[fileid], 
 
226
        tree = directory_to_tree(inv[fileid],
168
227
            lambda ie: self._get_ie_sha1(ie, inv, unusual_modes),
169
228
            unusual_modes)
170
229
        self._check_expected_sha(expected_sha, tree)
171
230
        return tree
172
231
 
173
232
    def _get_commit(self, rev, tree_sha, expected_sha=None):
174
 
        try:
175
 
            commit = revision_to_commit(rev, tree_sha, self._lookup_revision_sha1)
176
 
        except errors.NoSuchRevision, e:
177
 
            raise GhostRevision(e.branch, e.revision)
 
233
        commit = self._revision_to_commit(rev, tree_sha)
178
234
        self._check_expected_sha(expected_sha, commit)
179
235
        return commit
180
236
 
193
249
        try:
194
250
            return self._idmap.lookup_commit(revid)
195
251
        except KeyError:
196
 
            self._update_sha_map(revid)
197
 
            return self._idmap.lookup_commit(revid)
 
252
            try:
 
253
                return mapping_registry.parse_revision_id(revid)[0]
 
254
            except errors.InvalidRevisionId:
 
255
                self._update_sha_map(revid)
 
256
                return self._idmap.lookup_commit(revid)
198
257
 
199
258
    def get_raw(self, sha):
200
259
        """Get the raw representation of a Git object by SHA1.
201
260
 
202
261
        :param sha: SHA1 of the git object
203
262
        """
204
 
        return self[sha].as_raw_string()
 
263
        obj = self[sha]
 
264
        return (obj.type, obj.as_raw_string())
205
265
 
206
266
    def __contains__(self, sha):
207
267
        # See if sha is in map
208
268
        try:
209
 
            self._lookup_git_sha(sha)
 
269
            (type, type_data) = self._lookup_git_sha(sha)
 
270
            if type == "commit":
 
271
                return self.repository.has_revision(type_data[0])
 
272
            elif type == "blob":
 
273
                return self.repository.texts.has_version(type_data)
 
274
            elif type == "tree":
 
275
                return self.repository.has_revision(type_data[1])
 
276
            else:
 
277
                raise AssertionError("Unknown object type '%s'" % type)
210
278
        except KeyError:
211
279
            return False
212
280
        else:
217
285
        try:
218
286
            return self._idmap.lookup_git_sha(sha)
219
287
        except KeyError:
220
 
            # if not, see if there are any unconverted revisions and add them 
 
288
            # if not, see if there are any unconverted revisions and add them
221
289
            # to the map, search for sha in map again
222
290
            self._update_sha_map()
223
291
            return self._idmap.lookup_git_sha(sha)
235
303
        elif type == "blob":
236
304
            return self._get_blob(type_data[0], type_data[1], expected_sha=sha)
237
305
        elif type == "tree":
238
 
            inv = self.repository.get_inventory(type_data[1])
239
 
            rev = self.repository.get_revision(type_data[1])
 
306
            try:
 
307
                inv = self.repository.get_inventory(type_data[1])
 
308
                rev = self.repository.get_revision(type_data[1])
 
309
            except errors.NoSuchRevision:
 
310
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
 
311
                raise KeyError(sha)
240
312
            unusual_modes = extract_unusual_modes(rev)
241
313
            try:
242
314
                return self._get_tree(type_data[0], type_data[1], inv, unusual_modes,