/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

Add tests for revspec.

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
22
    sha_to_hex,
22
23
    )
23
24
from dulwich.object_store import (
25
26
    )
26
27
 
27
28
from bzrlib import (
28
 
    debug,
29
29
    errors,
 
30
    lru_cache,
30
31
    trace,
31
32
    ui,
 
33
    urlutils,
32
34
    )
33
35
from bzrlib.revision import (
34
36
    NULL_REVISION,
39
41
    directory_to_tree,
40
42
    extract_unusual_modes,
41
43
    mapping_registry,
 
44
    symlink_to_blob,
42
45
    )
43
46
from bzrlib.plugins.git.shamap import (
44
 
    SqliteGitShaMap,
45
 
    TdbGitShaMap,
 
47
    from_repository as idmap_from_repository,
46
48
    )
47
49
 
48
50
 
53
55
    return BazaarObjectStore(repo, mapping)
54
56
 
55
57
 
 
58
MAX_INV_CACHE_SIZE = 50 * 1024 * 1024
 
59
 
 
60
 
 
61
class LRUInventoryCache(object):
 
62
 
 
63
    def __init__(self, repository):
 
64
        def approx_inv_size(inv):
 
65
            # Very rough estimate, 1k per inventory entry
 
66
            return len(inv) * 1024
 
67
        self.repository = repository
 
68
        self._cache = lru_cache.LRUSizeCache(max_size=MAX_INV_CACHE_SIZE,
 
69
            after_cleanup_size=None, compute_size=approx_inv_size)
 
70
 
 
71
    def get_inventory(self, revid):            
 
72
        try:
 
73
            return self._cache[revid] 
 
74
        except KeyError:
 
75
            inv = self.repository.get_inventory(revid)
 
76
            self._cache.add(revid, inv)
 
77
            return inv
 
78
 
 
79
    def iter_inventories(self, revids):
 
80
        invs = dict([(k, self._cache.get(k)) for k in revids]) 
 
81
        for inv in self.repository.iter_inventories(
 
82
                [r for r, v in invs.iteritems() if v is None]):
 
83
            invs[inv.revision_id] = inv
 
84
            self._cache.add(inv.revision_id, inv)
 
85
        return (invs[r] for r in revids)
 
86
 
 
87
    def get_inventories(self, revids):
 
88
        return list(self.iter_inventories(revids))
 
89
 
 
90
    def add(self, revid, inv):
 
91
        self._cache.add(revid, inv)
 
92
 
 
93
 
 
94
def _check_expected_sha(expected_sha, object):
 
95
    """Check whether an object matches an expected SHA.
 
96
 
 
97
    :param expected_sha: None or expected SHA as either binary or as hex digest
 
98
    :param object: Object to verify
 
99
    """
 
100
    if expected_sha is None:
 
101
        return
 
102
    if len(expected_sha) == 40:
 
103
        if expected_sha != object.sha().hexdigest():
 
104
            raise AssertionError("Invalid sha for %r: %s" % (object,
 
105
                expected_sha))
 
106
    elif len(expected_sha) == 20:
 
107
        if expected_sha != object.sha().digest():
 
108
            raise AssertionError("Invalid sha for %r: %s" % (object,
 
109
                sha_to_hex(expected_sha)))
 
110
    else:
 
111
        raise AssertionError("Unknown length %d for %r" % (len(expected_sha),
 
112
            expected_sha))
 
113
 
 
114
 
 
115
def _inventory_to_objects(inv, parent_invs, parent_invshamaps,
 
116
        unusual_modes, iter_files_bytes, has_ghost_parents):
 
117
    """Iterate over the objects that were introduced in a revision.
 
118
 
 
119
    :param inv: Inventory to process
 
120
    :param parent_invs: parent inventory SHA maps
 
121
    :param parent_invshamaps: parent inventory SHA Map
 
122
    :param unusual_modes: Unusual file modes
 
123
    :param iter_files_bytes: Repository.iter_files_bytes-like callback
 
124
    :return: Yields (path, object) entries
 
125
    """
 
126
    new_trees = {}
 
127
    new_blobs = []
 
128
    shamap = {}
 
129
    for path, ie in inv.entries():
 
130
        if ie.kind == "file":
 
131
            if ie.revision != inv.revision_id:
 
132
                for (pinv, pinvshamap) in zip(parent_invs, parent_invshamaps):
 
133
                    try:
 
134
                        pie = pinv[ie.file_id]
 
135
                    except errors.NoSuchId:
 
136
                        pass
 
137
                    else:
 
138
                        if (pie.text_sha1 == ie.text_sha1 and 
 
139
                            pie.kind == ie.kind):
 
140
                            shamap[ie.file_id] = pinvshamap.lookup_blob(
 
141
                                pie.file_id, pie.revision)
 
142
                            break
 
143
            if not ie.file_id in shamap:
 
144
                new_blobs.append((path, ie))
 
145
                new_trees[urlutils.dirname(path)] = ie.parent_id
 
146
        elif ie.kind == "symlink":
 
147
            blob = symlink_to_blob(ie)
 
148
            for pinv in parent_invs:
 
149
                try:
 
150
                    pie = pinv[ie.file_id]
 
151
                except errors.NoSuchId:
 
152
                    pass
 
153
                else:
 
154
                    if (ie.kind == pie.kind and
 
155
                        ie.symlink_target == pie.symlink_target):
 
156
                        break
 
157
            else:
 
158
                yield path, blob
 
159
                new_trees[urlutils.dirname(path)] = ie.parent_id
 
160
            shamap[ie.file_id] = blob.id
 
161
        elif ie.kind == "directory":
 
162
            for (pinv, pinvshamap) in zip(parent_invs, parent_invshamaps):
 
163
                try:
 
164
                    pie = pinv[ie.file_id]
 
165
                except errors.NoSuchId:
 
166
                    pass
 
167
                else:
 
168
                    if (pie.kind == ie.kind and 
 
169
                        pie.children.keys() == ie.children.keys()):
 
170
                        try:
 
171
                            shamap[ie.file_id] = pinvshamap.lookup_tree(
 
172
                                ie.file_id)
 
173
                        except (NotImplementedError, KeyError):
 
174
                            pass
 
175
                        else:
 
176
                            break
 
177
            else:
 
178
                new_trees[path] = ie.file_id
 
179
        else:
 
180
            raise AssertionError(ie.kind)
 
181
    
 
182
    for (path, fid), chunks in iter_files_bytes(
 
183
        [(ie.file_id, ie.revision, (path, ie.file_id))
 
184
            for (path, ie) in new_blobs]):
 
185
        obj = Blob()
 
186
        obj.data = "".join(chunks)
 
187
        yield path, obj
 
188
        shamap[fid] = obj.id
 
189
 
 
190
    for fid in unusual_modes:
 
191
        new_trees[inv.id2path(fid)] = inv[fid].parent_id
 
192
    
 
193
    trees = {}
 
194
    while new_trees:
 
195
        items = new_trees.items()
 
196
        new_trees = {}
 
197
        for path, file_id in items:
 
198
            parent_id = inv[file_id].parent_id
 
199
            if parent_id is not None:
 
200
                parent_path = urlutils.dirname(path)
 
201
                new_trees[parent_path] = parent_id
 
202
            trees[path] = file_id
 
203
 
 
204
    def ie_to_hexsha(ie):
 
205
        try:
 
206
            return shamap[ie.file_id]
 
207
        except KeyError:
 
208
            # Not all cache backends store the tree information, 
 
209
            # calculate again from scratch
 
210
            ret = directory_to_tree(ie, ie_to_hexsha, unusual_modes)
 
211
            if ret is None:
 
212
                return ret
 
213
            return ret.id
 
214
 
 
215
    for path in sorted(trees.keys(), reverse=True):
 
216
        ie = inv[trees[path]]
 
217
        assert ie.kind == "directory"
 
218
        obj = directory_to_tree(ie, ie_to_hexsha, unusual_modes)
 
219
        if obj is not None:
 
220
            yield path, obj
 
221
            shamap[ie.file_id] = obj.id
 
222
 
 
223
 
56
224
class BazaarObjectStore(BaseObjectStore):
57
225
    """A Git-style object store backed onto a Bazaar repository."""
58
226
 
62
230
            self.mapping = default_mapping
63
231
        else:
64
232
            self.mapping = mapping
65
 
        try:
66
 
            self._idmap = TdbGitShaMap.from_repository(repository)
67
 
        except ImportError:
68
 
            self._idmap = SqliteGitShaMap.from_repository(repository)
 
233
        self._idmap = idmap_from_repository(repository)
 
234
        self.start_write_group = self._idmap.start_write_group
 
235
        self.abort_write_group = self._idmap.abort_write_group
 
236
        self.commit_write_group = self._idmap.commit_write_group
 
237
        self.parent_invs_cache = LRUInventoryCache(self.repository)
69
238
 
70
239
    def _update_sha_map(self, stop_revision=None):
71
240
        graph = self.repository.get_graph()
83
252
            missing_revids.update(heads)
84
253
        if NULL_REVISION in missing_revids:
85
254
            missing_revids.remove(NULL_REVISION)
86
 
        pb = ui.ui_factory.nested_progress_bar()
 
255
        missing_revids = self.repository.has_revisions(missing_revids)
 
256
        if not missing_revids:
 
257
            return
 
258
        self.start_write_group()
87
259
        try:
88
 
            for i, revid in enumerate(graph.iter_topo_order(missing_revids)):
89
 
                pb.update("updating git map", i, len(missing_revids))
90
 
                self._update_sha_map_revision(revid)
91
 
        finally:
92
 
            pb.finished()
93
 
        self._idmap.commit_write_group()
 
260
            pb = ui.ui_factory.nested_progress_bar()
 
261
            try:
 
262
                for i, revid in enumerate(graph.iter_topo_order(missing_revids)):
 
263
                    trace.mutter('processing %r', revid)
 
264
                    pb.update("updating git map", i, len(missing_revids))
 
265
                    self._update_sha_map_revision(revid)
 
266
            finally:
 
267
                pb.finished()
 
268
        except:
 
269
            self.abort_write_group()
 
270
            raise
 
271
        else:
 
272
            self.commit_write_group()
94
273
 
95
274
    def __iter__(self):
96
275
        self._update_sha_map()
105
284
                return None
106
285
        return self.mapping.export_commit(rev, tree_sha, parent_lookup)
107
286
 
108
 
    def _update_sha_map_revision(self, revid):
109
 
        inv = self.repository.get_inventory(revid)
110
 
        rev = self.repository.get_revision(revid)
 
287
    def _revision_to_objects(self, rev, inv):
111
288
        unusual_modes = extract_unusual_modes(rev)
112
 
        tree_sha = self._get_ie_sha1(inv.root, inv, unusual_modes)
 
289
        present_parents = self.repository.has_revisions(rev.parent_ids)
 
290
        has_ghost_parents = (len(rev.parent_ids) < len(present_parents))
 
291
        parent_invs = self.parent_invs_cache.get_inventories(
 
292
            [p for p in rev.parent_ids if p in present_parents])
 
293
        parent_invshamaps = [self._idmap.get_inventory_sha_map(r) for r in rev.parent_ids if r in present_parents]
 
294
        tree_sha = None
 
295
        for path, obj in _inventory_to_objects(inv, parent_invs,
 
296
                parent_invshamaps, unusual_modes,
 
297
                self.repository.iter_files_bytes, has_ghost_parents):
 
298
            yield path, obj
 
299
            if path == "":
 
300
                tree_sha = obj.id
 
301
        if tree_sha is None:
 
302
            if not rev.parent_ids:
 
303
                tree_sha = Tree().id
 
304
            else:
 
305
                tree_sha = parent_invshamaps[0][inv.root.file_id]
113
306
        commit_obj = self._revision_to_commit(rev, tree_sha)
114
307
        try:
115
 
            foreign_revid, mapping = mapping_registry.parse_revision_id(revid)
 
308
            foreign_revid, mapping = mapping_registry.parse_revision_id(rev.revision_id)
116
309
        except errors.InvalidRevisionId:
117
310
            pass
118
311
        else:
119
 
            if foreign_revid != commit_obj.id:
120
 
                if not "fix-shamap" in debug.debug_flags:
121
 
                    raise AssertionError("recreated git commit had different sha1: expected %s, got %s" % (foreign_revid, commit_obj.id))
122
 
        self._idmap.add_entry(commit_obj.id, "commit", (revid, tree_sha))
123
 
 
124
 
    def _check_expected_sha(self, expected_sha, object):
125
 
        if expected_sha is None:
126
 
            return
127
 
        if len(expected_sha) == 40:
128
 
            if expected_sha != object.sha().hexdigest():
129
 
                raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha))
130
 
        elif len(expected_sha) == 20:
131
 
            if expected_sha != object.sha().digest():
132
 
                raise AssertionError("Invalid sha for %r: %s" % (object, sha_to_hex(expected_sha)))
133
 
        else:
134
 
            raise AssertionError("Unknown length %d for %r" % (len(expected_sha), expected_sha))
135
 
 
136
 
    def _get_ie_object(self, entry, inv, unusual_modes):
137
 
        if entry.kind == "directory":
138
 
            return self._get_tree(entry.file_id, inv.revision_id, inv, unusual_modes)
139
 
        elif entry.kind in ("file", "symlink"):
140
 
            return self._get_blob(entry.file_id, entry.revision)
141
 
        else:
142
 
            raise AssertionError("unknown entry kind '%s'" % entry.kind)
143
 
 
144
 
    def _get_ie_object_or_sha1(self, entry, inv, unusual_modes):
145
 
        if entry.kind == "directory":
146
 
            try:
147
 
                return self._idmap.lookup_tree(entry.file_id, inv.revision_id), None
148
 
            except KeyError:
149
 
                ret = self._get_ie_object(entry, inv, unusual_modes)
150
 
                if ret is None:
151
 
                    hexsha = None
 
312
            _check_expected_sha(foreign_revid, commit_obj)
 
313
        yield None, commit_obj
 
314
 
 
315
    def _update_sha_map_revision(self, revid):
 
316
        rev = self.repository.get_revision(revid)
 
317
        inv = self.parent_invs_cache.get_inventory(rev.revision_id)
 
318
        commit_obj = None
 
319
        entries = []
 
320
        for path, obj in self._revision_to_objects(rev, inv):
 
321
            if obj._type == "commit":
 
322
                commit_obj = obj
 
323
            elif obj._type in ("blob", "tree"):
 
324
                file_id = inv.path2id(path)
 
325
                ie = inv[file_id]
 
326
                if obj._type == "blob":
 
327
                    revision = ie.revision
152
328
                else:
153
 
                    hexsha = ret.id
154
 
                self._idmap.add_entry(hexsha, "tree", (entry.file_id, inv.revision_id))
155
 
                return hexsha, ret
156
 
        elif entry.kind in ("file", "symlink"):
157
 
            try:
158
 
                return self._idmap.lookup_blob(entry.file_id, entry.revision), None
159
 
            except KeyError:
160
 
                ret = self._get_ie_object(entry, inv, unusual_modes)
161
 
                self._idmap.add_entry(ret.id, "blob", (entry.file_id, entry.revision))
162
 
                return ret.id, ret
163
 
        else:
164
 
            raise AssertionError("unknown entry kind '%s'" % entry.kind)
165
 
 
166
 
    def _get_ie_sha1(self, entry, inv, unusual_modes):
167
 
        return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0]
168
 
 
169
 
    def _get_blob(self, fileid, revision, expected_sha=None):
 
329
                    revision = revid
 
330
                entries.append((file_id, obj._type, obj.id, revision))
 
331
            else:
 
332
                raise AssertionError
 
333
        self._idmap.add_entries(revid, rev.parent_ids, commit_obj.id, 
 
334
            commit_obj.tree, entries)
 
335
        return commit_obj.id
 
336
 
 
337
    def _get_blob(self, fileid, revision, expected_sha):
170
338
        """Return a Git Blob object from a fileid and revision stored in bzr.
171
339
 
172
340
        :param fileid: File id of the text
173
341
        :param revision: Revision of the text
174
342
        """
 
343
        blob = Blob()
175
344
        chunks = self.repository.iter_files_bytes([(fileid, revision, None)]).next()[1]
176
 
        blob = Blob()
177
 
        blob._text = "".join(chunks)
178
 
        self._check_expected_sha(expected_sha, blob)
 
345
        blob.data = "".join(chunks)
 
346
        if blob.id != expected_sha:
 
347
            # Perhaps it's a symlink ?
 
348
            inv = self.parent_invs_cache.get_inventory(revision)
 
349
            entry = inv[fileid]
 
350
            assert entry.kind == 'symlink'
 
351
            blob = symlink_to_blob(entry)
 
352
        _check_expected_sha(expected_sha, blob)
179
353
        return blob
180
354
 
181
355
    def _get_tree(self, fileid, revid, inv, unusual_modes, expected_sha=None):
184
358
        :param fileid: fileid in the tree.
185
359
        :param revision: Revision of the tree.
186
360
        """
187
 
        tree = directory_to_tree(inv[fileid],
188
 
            lambda ie: self._get_ie_sha1(ie, inv, unusual_modes),
189
 
            unusual_modes)
190
 
        self._check_expected_sha(expected_sha, tree)
 
361
        invshamap = self._idmap.get_inventory_sha_map(inv.revision_id)
 
362
        def get_ie_sha1(entry):
 
363
            if entry.kind == "directory":
 
364
                try:
 
365
                    return invshamap.lookup_tree(entry.file_id)
 
366
                except (NotImplementedError, KeyError):
 
367
                    obj = self._get_tree(entry.file_id, revid, inv,
 
368
                        unusual_modes)
 
369
                    if obj is None:
 
370
                        return None
 
371
                    else:
 
372
                        return obj.id
 
373
            elif entry.kind in ("file", "symlink"):
 
374
                return invshamap.lookup_blob(entry.file_id, entry.revision)
 
375
            else:
 
376
                raise AssertionError("unknown entry kind '%s'" % entry.kind)
 
377
        tree = directory_to_tree(inv[fileid], get_ie_sha1, unusual_modes)
 
378
        _check_expected_sha(expected_sha, tree)
191
379
        return tree
192
380
 
193
 
    def _get_commit(self, rev, tree_sha, expected_sha=None):
194
 
        commit = self._revision_to_commit(rev, tree_sha)
195
 
        self._check_expected_sha(expected_sha, commit)
196
 
        return commit
197
 
 
198
381
    def get_parents(self, sha):
199
382
        """Retrieve the parents of a Git commit by SHA1.
200
383
 
238
421
                raise AssertionError("Unknown object type '%s'" % type)
239
422
        except KeyError:
240
423
            return False
241
 
        else:
242
 
            return True
243
424
 
244
425
    def _lookup_git_sha(self, sha):
245
426
        # See if sha is in map
255
436
        (type, type_data) = self._lookup_git_sha(sha)
256
437
        # convert object to git object
257
438
        if type == "commit":
 
439
            (revid, tree_sha) = type_data
258
440
            try:
259
 
                rev = self.repository.get_revision(type_data[0])
 
441
                rev = self.repository.get_revision(revid)
260
442
            except errors.NoSuchRevision:
261
443
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
262
444
                raise KeyError(sha)
263
 
            return self._get_commit(rev, type_data[1], expected_sha=sha)
 
445
            commit = self._revision_to_commit(rev, tree_sha)
 
446
            _check_expected_sha(sha, commit)
 
447
            return commit
264
448
        elif type == "blob":
265
 
            return self._get_blob(type_data[0], type_data[1], expected_sha=sha)
 
449
            (fileid, revision) = type_data
 
450
            return self._get_blob(fileid, revision, expected_sha=sha)
266
451
        elif type == "tree":
 
452
            (fileid, revid) = type_data
267
453
            try:
268
 
                inv = self.repository.get_inventory(type_data[1])
269
 
                rev = self.repository.get_revision(type_data[1])
 
454
                inv = self.parent_invs_cache.get_inventory(revid)
 
455
                rev = self.repository.get_revision(revid)
270
456
            except errors.NoSuchRevision:
271
457
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
272
458
                raise KeyError(sha)
273
459
            unusual_modes = extract_unusual_modes(rev)
274
460
            try:
275
 
                return self._get_tree(type_data[0], type_data[1], inv, unusual_modes,
276
 
                                      expected_sha=sha)
 
461
                return self._get_tree(fileid, revid, inv,
 
462
                    unusual_modes, expected_sha=sha)
277
463
            except errors.NoSuchRevision:
278
464
                raise KeyError(sha)
279
465
        else:
280
466
            raise AssertionError("Unknown object type '%s'" % type)
 
467
 
 
468
    def generate_pack_contents(self, have, want):
 
469
        """Iterate over the contents of a pack file.
 
470
 
 
471
        :param have: List of SHA1s of objects that should not be sent
 
472
        :param want: List of SHA1s of objects that should be sent
 
473
        """
 
474
        processed = set()
 
475
        for commit_sha in have:
 
476
            try:
 
477
                (type, (revid, tree_sha)) = self._lookup_git_sha(commit_sha)
 
478
            except KeyError:
 
479
                pass
 
480
            else:
 
481
                assert type == "commit"
 
482
                processed.add(revid)
 
483
        pending = set()
 
484
        for commit_sha in want:
 
485
            if commit_sha in have:
 
486
                continue
 
487
            (type, (revid, tree_sha)) = self._lookup_git_sha(commit_sha)
 
488
            assert type == "commit"
 
489
            pending.add(revid)
 
490
        todo = set()
 
491
        while pending:
 
492
            processed.update(pending)
 
493
            next_map = self.repository.get_parent_map(pending)
 
494
            next_pending = set()
 
495
            for item in next_map.iteritems():
 
496
                todo.add(item[0])
 
497
                next_pending.update(p for p in item[1] if p not in processed)
 
498
            pending = next_pending
 
499
        if NULL_REVISION in todo:
 
500
            todo.remove(NULL_REVISION)
 
501
        trace.mutter('sending revisions %r', todo)
 
502
        ret = []
 
503
        pb = ui.ui_factory.nested_progress_bar()
 
504
        try:
 
505
            for i, revid in enumerate(todo):
 
506
                pb.update("generating git objects", i, len(todo))
 
507
                rev = self.repository.get_revision(revid)
 
508
                inv = self.parent_invs_cache.get_inventory(revid)
 
509
                for path, obj in self._revision_to_objects(rev, inv):
 
510
                    ret.append((obj, path))
 
511
        finally:
 
512
            pb.finished()
 
513
        return ret