/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,
22
21
    sha_to_hex,
23
22
    )
24
23
from dulwich.object_store import (
26
25
    )
27
26
 
28
27
from bzrlib import (
 
28
    debug,
29
29
    errors,
30
 
    lru_cache,
31
30
    trace,
32
31
    ui,
33
 
    urlutils,
34
32
    )
35
33
from bzrlib.revision import (
36
34
    NULL_REVISION,
41
39
    directory_to_tree,
42
40
    extract_unusual_modes,
43
41
    mapping_registry,
44
 
    symlink_to_blob,
45
42
    )
46
43
from bzrlib.plugins.git.shamap import (
47
 
    from_repository as cache_from_repository,
 
44
    SqliteGitShaMap,
 
45
    TdbGitShaMap,
48
46
    )
49
47
 
50
48
 
55
53
    return BazaarObjectStore(repo, mapping)
56
54
 
57
55
 
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, idmap,
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 idmap: id map
122
 
    :param unusual_modes: Unusual file modes
123
 
    :param iter_files_bytes: Repository.iter_files_bytes-like callback
124
 
    :return: Yields (path, object, ie) 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 in parent_invs:
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] = idmap.lookup_blob_id(
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, ie
159
 
                new_trees[urlutils.dirname(path)] = ie.parent_id
160
 
            shamap[ie.file_id] = blob.id
161
 
        elif ie.kind == "directory":
162
 
            for pinv in parent_invs:
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] = idmap.lookup_tree_id(
172
 
                                ie.file_id, inv.revision_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, ie), chunks in iter_files_bytes(
183
 
        [(ie.file_id, ie.revision, (path, ie))
184
 
            for (path, ie) in new_blobs]):
185
 
        obj = Blob()
186
 
        obj.chunked = chunks
187
 
        yield path, obj, ie
188
 
        shamap[ie.file_id] = 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, ie
221
 
            shamap[ie.file_id] = obj.id
222
 
 
223
 
 
224
56
class BazaarObjectStore(BaseObjectStore):
225
57
    """A Git-style object store backed onto a Bazaar repository."""
226
58
 
230
62
            self.mapping = default_mapping
231
63
        else:
232
64
            self.mapping = mapping
233
 
        self._cache = cache_from_repository(repository)
234
 
        self._content_cache_types = ("tree")
235
 
        self.start_write_group = self._cache.idmap.start_write_group
236
 
        self.abort_write_group = self._cache.idmap.abort_write_group
237
 
        self.commit_write_group = self._cache.idmap.commit_write_group
238
 
        self.parent_invs_cache = LRUInventoryCache(self.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
239
69
 
240
70
    def _update_sha_map(self, stop_revision=None):
241
71
        graph = self.repository.get_graph()
243
73
            heads = graph.heads(self.repository.all_revision_ids())
244
74
        else:
245
75
            heads = set([stop_revision])
246
 
        missing_revids = self._cache.idmap.missing_revisions(heads)
 
76
        missing_revids = self._idmap.missing_revisions(heads)
247
77
        while heads:
248
78
            parents = graph.get_parent_map(heads)
249
79
            todo = set()
250
80
            for p in parents.values():
251
81
                todo.update([x for x in p if x not in missing_revids])
252
 
            heads = self._cache.idmap.missing_revisions(todo)
 
82
            heads = self._idmap.missing_revisions(todo)
253
83
            missing_revids.update(heads)
254
84
        if NULL_REVISION in missing_revids:
255
85
            missing_revids.remove(NULL_REVISION)
256
 
        missing_revids = self.repository.has_revisions(missing_revids)
257
 
        if not missing_revids:
258
 
            return
259
86
        self.start_write_group()
260
87
        try:
261
88
            pb = ui.ui_factory.nested_progress_bar()
262
89
            try:
263
90
                for i, revid in enumerate(graph.iter_topo_order(missing_revids)):
264
 
                    trace.mutter('processing %r', revid)
265
91
                    pb.update("updating git map", i, len(missing_revids))
266
92
                    self._update_sha_map_revision(revid)
267
93
            finally:
274
100
 
275
101
    def __iter__(self):
276
102
        self._update_sha_map()
277
 
        return iter(self._cache.idmap.sha1s())
 
103
        return iter(self._idmap.sha1s())
278
104
 
279
105
    def _revision_to_commit(self, rev, tree_sha):
280
106
        def parent_lookup(revid):
285
111
                return None
286
112
        return self.mapping.export_commit(rev, tree_sha, parent_lookup)
287
113
 
288
 
    def _revision_to_objects(self, rev, inv):
 
114
    def _update_sha_map_revision(self, revid):
 
115
        inv = self.repository.get_inventory(revid)
 
116
        rev = self.repository.get_revision(revid)
289
117
        unusual_modes = extract_unusual_modes(rev)
290
 
        present_parents = self.repository.has_revisions(rev.parent_ids)
291
 
        has_ghost_parents = (len(rev.parent_ids) < len(present_parents))
292
 
        parent_invs = self.parent_invs_cache.get_inventories(
293
 
            [p for p in rev.parent_ids if p in present_parents])
294
 
        tree_sha = None
295
 
        for path, obj, ie in _inventory_to_objects(inv, parent_invs,
296
 
                self._cache.idmap, unusual_modes,
297
 
                self.repository.iter_files_bytes, has_ghost_parents):
298
 
            yield path, obj, ie
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
 
                raise AssertionError
 
118
        tree_sha = self._get_ie_sha1(inv.root, inv, unusual_modes)
306
119
        commit_obj = self._revision_to_commit(rev, tree_sha)
307
120
        try:
308
 
            foreign_revid, mapping = mapping_registry.parse_revision_id(
309
 
                rev.revision_id)
 
121
            foreign_revid, mapping = mapping_registry.parse_revision_id(revid)
310
122
        except errors.InvalidRevisionId:
311
123
            pass
312
124
        else:
313
 
            _check_expected_sha(foreign_revid, commit_obj)
314
 
        yield None, commit_obj, None
315
 
 
316
 
    def _get_updater(self, rev):
317
 
        return self._cache.get_updater(rev)
318
 
 
319
 
    def _update_sha_map_revision(self, revid):
320
 
        rev = self.repository.get_revision(revid)
321
 
        inv = self.parent_invs_cache.get_inventory(rev.revision_id)
322
 
        updater = self._get_updater(rev)
323
 
        for path, obj, ie in self._revision_to_objects(rev, inv):
324
 
            updater.add_object(obj, ie)
325
 
        commit_obj = updater.finish()
326
 
        return commit_obj.id
327
 
 
328
 
    def _get_blob(self, fileid, revision, expected_sha):
 
125
            if foreign_revid != commit_obj.id:
 
126
                if not "fix-shamap" in debug.debug_flags:
 
127
                    raise AssertionError("recreated git commit had different sha1: expected %s, got %s" % (foreign_revid, commit_obj.id))
 
128
        self._idmap.add_entry(commit_obj.id, "commit", (revid, tree_sha))
 
129
 
 
130
    def _check_expected_sha(self, expected_sha, object):
 
131
        if expected_sha is None:
 
132
            return
 
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))
 
141
 
 
142
    def _get_ie_object(self, entry, inv, unusual_modes):
 
143
        if entry.kind == "directory":
 
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)
 
149
        else:
 
150
            raise AssertionError("unknown entry kind '%s'" % entry.kind)
 
151
 
 
152
    def _get_ie_object_or_sha1(self, entry, inv, unusual_modes):
 
153
        if entry.kind == "directory":
 
154
            try:
 
155
                return self._idmap.lookup_tree(entry.file_id, inv.revision_id), None
 
156
            except KeyError:
 
157
                ret = self._get_ie_object(entry, inv, unusual_modes)
 
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"):
 
166
            try:
 
167
                return self._idmap.lookup_blob(entry.file_id, entry.revision), None
 
168
            except KeyError:
 
169
                ret = self._get_ie_object(entry, inv, unusual_modes)
 
170
                self._idmap.add_entry(ret.id, "blob", (entry.file_id, entry.revision))
 
171
                return ret.id, ret
 
172
        else:
 
173
            raise AssertionError("unknown entry kind '%s'" % entry.kind)
 
174
 
 
175
    def _get_ie_sha1(self, entry, inv, unusual_modes):
 
176
        return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0]
 
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):
329
191
        """Return a Git Blob object from a fileid and revision stored in bzr.
330
192
 
331
193
        :param fileid: File id of the text
333
195
        """
334
196
        blob = Blob()
335
197
        chunks = self.repository.iter_files_bytes([(fileid, revision, None)]).next()[1]
336
 
        blob.chunked = chunks
337
 
        if blob.id != expected_sha:
338
 
            # Perhaps it's a symlink ?
339
 
            inv = self.parent_invs_cache.get_inventory(revision)
340
 
            entry = inv[fileid]
341
 
            assert entry.kind == 'symlink'
342
 
            blob = symlink_to_blob(entry)
343
 
        _check_expected_sha(expected_sha, blob)
 
198
        blob._text = "".join(chunks)
 
199
        self._check_expected_sha(expected_sha, blob)
344
200
        return blob
345
201
 
 
202
    def _get_blob(self, fileid, revision, expected_sha=None):
 
203
        """Return a Git Blob object from a fileid and revision stored in bzr.
 
204
 
 
205
        :param fileid: File id of the text
 
206
        :param revision: Revision of the text
 
207
        """
 
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
 
219
 
346
220
    def _get_tree(self, fileid, revid, inv, unusual_modes, expected_sha=None):
347
221
        """Return a Git Tree object from a file id and a revision stored in bzr.
348
222
 
349
223
        :param fileid: fileid in the tree.
350
224
        :param revision: Revision of the tree.
351
225
        """
352
 
        def get_ie_sha1(entry):
353
 
            if entry.kind == "directory":
354
 
                try:
355
 
                    return self._cache.idmap.lookup_tree_id(entry.file_id)
356
 
                except (NotImplementedError, KeyError):
357
 
                    obj = self._get_tree(entry.file_id, revid, inv,
358
 
                        unusual_modes)
359
 
                    if obj is None:
360
 
                        return None
361
 
                    else:
362
 
                        return obj.id
363
 
            elif entry.kind in ("file", "symlink"):
364
 
                return self._cache.idmap.lookup_blob_id(entry.file_id, entry.revision)
365
 
            else:
366
 
                raise AssertionError("unknown entry kind '%s'" % entry.kind)
367
 
        tree = directory_to_tree(inv[fileid], get_ie_sha1, unusual_modes)
368
 
        _check_expected_sha(expected_sha, tree)
 
226
        tree = directory_to_tree(inv[fileid],
 
227
            lambda ie: self._get_ie_sha1(ie, inv, unusual_modes),
 
228
            unusual_modes)
 
229
        self._check_expected_sha(expected_sha, tree)
369
230
        return tree
370
231
 
 
232
    def _get_commit(self, rev, tree_sha, expected_sha=None):
 
233
        commit = self._revision_to_commit(rev, tree_sha)
 
234
        self._check_expected_sha(expected_sha, commit)
 
235
        return commit
 
236
 
371
237
    def get_parents(self, sha):
372
238
        """Retrieve the parents of a Git commit by SHA1.
373
239
 
381
247
        if revid == NULL_REVISION:
382
248
            return "0" * 40
383
249
        try:
384
 
            return self._cache.idmap.lookup_commit(revid)
 
250
            return self._idmap.lookup_commit(revid)
385
251
        except KeyError:
386
252
            try:
387
253
                return mapping_registry.parse_revision_id(revid)[0]
388
254
            except errors.InvalidRevisionId:
389
255
                self._update_sha_map(revid)
390
 
                return self._cache.idmap.lookup_commit(revid)
 
256
                return self._idmap.lookup_commit(revid)
391
257
 
392
258
    def get_raw(self, sha):
393
259
        """Get the raw representation of a Git object by SHA1.
411
277
                raise AssertionError("Unknown object type '%s'" % type)
412
278
        except KeyError:
413
279
            return False
 
280
        else:
 
281
            return True
414
282
 
415
283
    def _lookup_git_sha(self, sha):
416
284
        # See if sha is in map
417
285
        try:
418
 
            return self._cache.idmap.lookup_git_sha(sha)
 
286
            return self._idmap.lookup_git_sha(sha)
419
287
        except KeyError:
420
288
            # if not, see if there are any unconverted revisions and add them
421
289
            # to the map, search for sha in map again
422
290
            self._update_sha_map()
423
 
            return self._cache.idmap.lookup_git_sha(sha)
 
291
            return self._idmap.lookup_git_sha(sha)
424
292
 
425
293
    def __getitem__(self, sha):
426
 
        if self._cache.content_cache is not None:
427
 
            try:
428
 
                return self._cache.content_cache[sha]
429
 
            except KeyError:
430
 
                pass
431
294
        (type, type_data) = self._lookup_git_sha(sha)
432
295
        # convert object to git object
433
296
        if type == "commit":
434
 
            (revid, tree_sha) = type_data
435
297
            try:
436
 
                rev = self.repository.get_revision(revid)
 
298
                rev = self.repository.get_revision(type_data[0])
437
299
            except errors.NoSuchRevision:
438
 
                trace.mutter('entry for %s %s in shamap: %r, but not found in '
439
 
                             'repository', type, sha, type_data)
 
300
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
440
301
                raise KeyError(sha)
441
 
            commit = self._revision_to_commit(rev, tree_sha)
442
 
            _check_expected_sha(sha, commit)
443
 
            return commit
 
302
            return self._get_commit(rev, type_data[1], expected_sha=sha)
444
303
        elif type == "blob":
445
 
            (fileid, revision) = type_data
446
 
            return self._get_blob(fileid, revision, expected_sha=sha)
 
304
            return self._get_blob(type_data[0], type_data[1], expected_sha=sha)
447
305
        elif type == "tree":
448
 
            (fileid, revid) = type_data
449
306
            try:
450
 
                inv = self.parent_invs_cache.get_inventory(revid)
451
 
                rev = self.repository.get_revision(revid)
 
307
                inv = self.repository.get_inventory(type_data[1])
 
308
                rev = self.repository.get_revision(type_data[1])
452
309
            except errors.NoSuchRevision:
453
310
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
454
311
                raise KeyError(sha)
455
312
            unusual_modes = extract_unusual_modes(rev)
456
313
            try:
457
 
                return self._get_tree(fileid, revid, inv, unusual_modes,
458
 
                    expected_sha=sha)
 
314
                return self._get_tree(type_data[0], type_data[1], inv, unusual_modes,
 
315
                                      expected_sha=sha)
459
316
            except errors.NoSuchRevision:
460
317
                raise KeyError(sha)
461
318
        else:
462
319
            raise AssertionError("Unknown object type '%s'" % type)
463
 
 
464
 
    def generate_pack_contents(self, have, want):
465
 
        """Iterate over the contents of a pack file.
466
 
 
467
 
        :param have: List of SHA1s of objects that should not be sent
468
 
        :param want: List of SHA1s of objects that should be sent
469
 
        """
470
 
        processed = set()
471
 
        for commit_sha in have:
472
 
            try:
473
 
                (type, (revid, tree_sha)) = self._lookup_git_sha(commit_sha)
474
 
            except KeyError:
475
 
                pass
476
 
            else:
477
 
                assert type == "commit"
478
 
                processed.add(revid)
479
 
        pending = set()
480
 
        for commit_sha in want:
481
 
            if commit_sha in have:
482
 
                continue
483
 
            (type, (revid, tree_sha)) = self._lookup_git_sha(commit_sha)
484
 
            assert type == "commit"
485
 
            pending.add(revid)
486
 
        todo = set()
487
 
        while pending:
488
 
            processed.update(pending)
489
 
            next_map = self.repository.get_parent_map(pending)
490
 
            next_pending = set()
491
 
            for item in next_map.iteritems():
492
 
                todo.add(item[0])
493
 
                next_pending.update(p for p in item[1] if p not in processed)
494
 
            pending = next_pending
495
 
        if NULL_REVISION in todo:
496
 
            todo.remove(NULL_REVISION)
497
 
        trace.mutter('sending revisions %r', todo)
498
 
        ret = []
499
 
        pb = ui.ui_factory.nested_progress_bar()
500
 
        try:
501
 
            for i, revid in enumerate(todo):
502
 
                pb.update("generating git objects", i, len(todo))
503
 
                rev = self.repository.get_revision(revid)
504
 
                inv = self.parent_invs_cache.get_inventory(revid)
505
 
                for path, obj, ie in self._revision_to_objects(rev, inv):
506
 
                    ret.append((obj, path))
507
 
        finally:
508
 
            pb.finished()
509
 
        return ret