/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

Improve error message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
21
21
    Commit,
22
22
    Tree,
23
23
    sha_to_hex,
 
24
    ZERO_SHA,
24
25
    )
25
26
from dulwich.object_store import (
26
27
    BaseObjectStore,
33
34
    ui,
34
35
    urlutils,
35
36
    )
 
37
from bzrlib.lock import LogicalLockResult
36
38
from bzrlib.revision import (
37
39
    NULL_REVISION,
38
40
    )
40
42
    StrictTestament3,
41
43
    )
42
44
 
 
45
from bzrlib.plugins.git.cache import (
 
46
    from_repository as cache_from_repository,
 
47
    )
43
48
from bzrlib.plugins.git.mapping import (
44
49
    default_mapping,
45
50
    directory_to_tree,
47
52
    mapping_registry,
48
53
    symlink_to_blob,
49
54
    )
50
 
from bzrlib.plugins.git.cache import (
51
 
    from_repository as cache_from_repository,
 
55
from bzrlib.plugins.git.unpeel_map import (
 
56
    UnpeelMap,
52
57
    )
53
58
 
54
59
import posixpath
58
63
def get_object_store(repo, mapping=None):
59
64
    git = getattr(repo, "_git", None)
60
65
    if git is not None:
 
66
        git.object_store.unlock = lambda: None
 
67
        git.object_store.lock_read = lambda: LogicalLockResult(lambda: None)
 
68
        git.object_store.lock_write = lambda: LogicalLockResult(lambda: None)
61
69
        return git.object_store
62
70
    return BazaarObjectStore(repo, mapping)
63
71
 
81
89
        except KeyError:
82
90
            tree = self.repository.revision_tree(revid)
83
91
            self.add(tree)
84
 
        assert tree.get_revision_id() == tree.inventory.revision_id
85
92
        return tree
86
93
 
87
94
    def iter_revision_trees(self, revids):
94
101
                todo.append(revid)
95
102
            else:
96
103
                assert tree.get_revision_id() == revid
97
 
                assert tree.inventory.revision_id == revid
98
104
                trees[revid] = tree
99
105
        for tree in self.repository.revision_trees(todo):
100
106
            trees[tree.get_revision_id()] = tree
105
111
        return list(self.iter_revision_trees(revids))
106
112
 
107
113
    def add(self, tree):
108
 
        self._cache.add(tree.get_revision_id(), tree)
109
 
 
110
 
 
111
 
def _find_missing_bzr_revids(get_parent_map, want, have):
 
114
        self._cache[tree.get_revision_id()] = tree
 
115
 
 
116
 
 
117
def _find_missing_bzr_revids(graph, want, have):
112
118
    """Find the revisions that have to be pushed.
113
119
 
114
120
    :param get_parent_map: Function that returns the parents for a sequence
117
123
    :param have: Revisions the target already has
118
124
    :return: Set of revisions to fetch
119
125
    """
120
 
    pending = want - have
121
 
    processed = set()
 
126
    handled = set(have)
122
127
    todo = set()
123
 
    while pending:
124
 
        processed.update(pending)
125
 
        next_map = get_parent_map(pending)
126
 
        next_pending = set()
127
 
        for item in next_map.iteritems():
128
 
            if item[0] in have:
129
 
                continue
130
 
            todo.add(item[0])
131
 
            next_pending.update(p for p in item[1] if p not in processed)
132
 
        pending = next_pending
 
128
    for rev in want:
 
129
        extra_todo = graph.find_unique_ancestors(rev, handled)
 
130
        todo.update(extra_todo)
 
131
        handled.update(extra_todo)
133
132
    if NULL_REVISION in todo:
134
133
        todo.remove(NULL_REVISION)
135
134
    return todo
184
183
            except errors.NoSuchId:
185
184
                pass
186
185
            else:
187
 
                if (pie.text_sha1 == ie.text_sha1 and 
 
186
                if (pie.text_sha1 == ie.text_sha1 and
188
187
                    pie.kind == ie.kind and
189
188
                    pie.symlink_target == ie.symlink_target):
190
189
                    return pie
225
224
        elif kind[1] not in (None, "directory"):
226
225
            raise AssertionError(kind[1])
227
226
        if (path[0] not in (None, "") and
228
 
            parent[0] in tree.inventory and
 
227
            tree.has_id(parent[0]) and
229
228
            tree.inventory[parent[0]].kind == "directory"):
230
229
            # Removal
231
230
            new_trees[posixpath.dirname(path[0])] = parent[0]
232
 
    
 
231
 
233
232
    # Fetch contents of the blobs that were changed
234
233
    for (path, ie), chunks in tree.iter_files_bytes(
235
234
        [(ie.file_id, (path, ie)) for (path, ie) in new_blobs]):
287
286
            shamap[ie.file_id] = obj.id
288
287
 
289
288
 
 
289
class PackTupleIterable(object):
 
290
 
 
291
    def __init__(self, store):
 
292
        self.store = store
 
293
        self.store.lock_read()
 
294
        self.objects = {}
 
295
 
 
296
    def __del__(self):
 
297
        self.store.unlock()
 
298
 
 
299
    def add(self, sha, path):
 
300
        self.objects[sha] = path
 
301
 
 
302
    def __len__(self):
 
303
        return len(self.objects)
 
304
 
 
305
    def __iter__(self):
 
306
        return ((self.store[object_id], path) for (object_id, path) in
 
307
                self.objects.iteritems())
 
308
 
 
309
 
290
310
class BazaarObjectStore(BaseObjectStore):
291
311
    """A Git-style object store backed onto a Bazaar repository."""
292
312
 
293
313
    def __init__(self, repository, mapping=None):
294
314
        self.repository = repository
 
315
        self._map_updated = False
 
316
        self._locked = None
295
317
        if mapping is None:
296
318
            self.mapping = default_mapping
297
319
        else:
298
320
            self.mapping = mapping
299
321
        self._cache = cache_from_repository(repository)
300
 
        self._content_cache_types = ("tree")
 
322
        self._content_cache_types = ("tree",)
301
323
        self.start_write_group = self._cache.idmap.start_write_group
302
324
        self.abort_write_group = self._cache.idmap.abort_write_group
303
325
        self.commit_write_group = self._cache.idmap.commit_write_group
304
326
        self.tree_cache = LRUTreeCache(self.repository)
 
327
        self.unpeel_map = UnpeelMap.from_repository(self.repository)
 
328
 
 
329
    def _missing_revisions(self, revisions):
 
330
        return self._cache.idmap.missing_revisions(revisions)
305
331
 
306
332
    def _update_sha_map(self, stop_revision=None):
 
333
        if not self.is_locked():
 
334
            raise AssertionError()
 
335
        if self._map_updated:
 
336
            return
 
337
        if (stop_revision is not None and
 
338
            not self._missing_revisions([stop_revision])):
 
339
            return
307
340
        graph = self.repository.get_graph()
308
341
        if stop_revision is None:
309
 
            heads = graph.heads(self.repository.all_revision_ids())
 
342
            all_revids = self.repository.all_revision_ids()
 
343
            missing_revids = self._missing_revisions(all_revids)
310
344
        else:
311
345
            heads = set([stop_revision])
312
 
        missing_revids = self._cache.idmap.missing_revisions(heads)
313
 
        while heads:
314
 
            parents = graph.get_parent_map(heads)
315
 
            todo = set()
316
 
            for p in parents.values():
317
 
                todo.update([x for x in p if x not in missing_revids])
318
 
            heads = self._cache.idmap.missing_revisions(todo)
319
 
            missing_revids.update(heads)
 
346
            missing_revids = self._missing_revisions(heads)
 
347
            while heads:
 
348
                parents = graph.get_parent_map(heads)
 
349
                todo = set()
 
350
                for p in parents.values():
 
351
                    todo.update([x for x in p if x not in missing_revids])
 
352
                heads = self._missing_revisions(todo)
 
353
                missing_revids.update(heads)
320
354
        if NULL_REVISION in missing_revids:
321
355
            missing_revids.remove(NULL_REVISION)
322
356
        missing_revids = self.repository.has_revisions(missing_revids)
323
357
        if not missing_revids:
 
358
            if stop_revision is None:
 
359
                self._map_updated = True
324
360
            return
325
361
        self.start_write_group()
326
362
        try:
332
368
                    self._update_sha_map_revision(revid)
333
369
            finally:
334
370
                pb.finished()
 
371
            if stop_revision is None:
 
372
                self._map_updated = True
335
373
        except:
336
374
            self.abort_write_group()
337
375
            raise
342
380
        self._update_sha_map()
343
381
        return iter(self._cache.idmap.sha1s())
344
382
 
345
 
    def _reconstruct_commit(self, rev, tree_sha, roundtrip, verifiers):
 
383
    def _reconstruct_commit(self, rev, tree_sha, lossy, verifiers):
346
384
        """Reconstruct a Commit object.
347
385
 
348
386
        :param rev: Revision object
349
387
        :param tree_sha: SHA1 of the root tree object
350
 
        :param roundtrip: Whether or not to roundtrip bzr metadata
 
388
        :param lossy: Whether or not to roundtrip bzr metadata
351
389
        :param verifiers: Verifiers for the commits
352
390
        :return: Commit object
353
391
        """
357
395
            except errors.NoSuchRevision:
358
396
                return None
359
397
        return self.mapping.export_commit(rev, tree_sha, parent_lookup,
360
 
            roundtrip, verifiers)
 
398
            lossy, verifiers)
361
399
 
362
 
    def _create_fileid_map_blob(self, inv):
 
400
    def _create_fileid_map_blob(self, tree):
363
401
        # FIXME: This can probably be a lot more efficient, 
364
402
        # not all files necessarily have to be processed.
365
403
        file_ids = {}
366
 
        for (path, ie) in inv.iter_entries():
 
404
        for (path, ie) in tree.inventory.iter_entries():
367
405
            if self.mapping.generate_file_id(path) != ie.file_id:
368
406
                file_ids[path] = ie.file_id
369
407
        return self.mapping.export_fileid_map(file_ids)
370
408
 
371
 
    def _revision_to_objects(self, rev, tree, roundtrip):
 
409
    def _revision_to_objects(self, rev, tree, lossy):
372
410
        """Convert a revision to a set of git objects.
373
411
 
374
412
        :param rev: Bazaar revision object
375
413
        :param tree: Bazaar revision tree
376
 
        :param roundtrip: Whether to roundtrip all Bazaar revision data
 
414
        :param lossy: Whether to not roundtrip all Bazaar revision data
377
415
        """
378
416
        unusual_modes = extract_unusual_modes(rev)
379
417
        present_parents = self.repository.has_revisions(rev.parent_ids)
396
434
                base_sha1 = self._lookup_revision_sha1(rev.parent_ids[0])
397
435
                root_tree = self[self[base_sha1].tree]
398
436
            root_ie = tree.inventory.root
399
 
        if roundtrip and self.mapping.BZR_FILE_IDS_FILE is not None:
400
 
            b = self._create_fileid_map_blob(tree.inventory)
 
437
        if not lossy and self.mapping.BZR_FILE_IDS_FILE is not None:
 
438
            b = self._create_fileid_map_blob(tree)
401
439
            if b is not None:
402
 
                root_tree[self.mapping.BZR_FILE_IDS_FILE] = ((stat.S_IFREG | 0644), b.id)
 
440
                root_tree[self.mapping.BZR_FILE_IDS_FILE] = (
 
441
                    (stat.S_IFREG | 0644), b.id)
403
442
                yield self.mapping.BZR_FILE_IDS_FILE, b, None
404
443
        yield "", root_tree, root_ie
405
 
        if roundtrip:
406
 
            testament3 = StrictTestament3(rev, tree.inventory)
 
444
        if not lossy:
 
445
            testament3 = StrictTestament3(rev, tree)
407
446
            verifiers = { "testament3-sha1": testament3.as_sha1() }
408
447
        else:
409
448
            verifiers = {}
410
449
        commit_obj = self._reconstruct_commit(rev, root_tree.id,
411
 
            roundtrip=roundtrip, verifiers=verifiers)
 
450
            lossy=lossy, verifiers=verifiers)
412
451
        try:
413
452
            foreign_revid, mapping = mapping_registry.parse_revision_id(
414
453
                rev.revision_id)
425
464
        rev = self.repository.get_revision(revid)
426
465
        tree = self.tree_cache.revision_tree(rev.revision_id)
427
466
        updater = self._get_updater(rev)
428
 
        for path, obj, ie in self._revision_to_objects(rev, tree,
429
 
            roundtrip=True):
 
467
        # FIXME JRV 2011-12-15: Shouldn't we try both values for lossy ?
 
468
        for path, obj, ie in self._revision_to_objects(rev, tree, lossy=(not self.mapping.roundtripping)):
430
469
            if isinstance(obj, Commit):
431
 
                testament3 = StrictTestament3(rev, tree.inventory)
 
470
                testament3 = StrictTestament3(rev, tree)
432
471
                ie = { "testament3-sha1": testament3.as_sha1() }
433
472
            updater.add_object(obj, ie, path)
434
473
        commit_obj = updater.finish()
454
493
            _check_expected_sha(expected_sha, blob)
455
494
            yield blob
456
495
 
457
 
    def _reconstruct_tree(self, fileid, revid, inv, unusual_modes,
 
496
    def _reconstruct_tree(self, fileid, revid, bzr_tree, unusual_modes,
458
497
        expected_sha=None):
459
498
        """Return a Git Tree object from a file id and a revision stored in bzr.
460
499
 
467
506
                    return self._cache.idmap.lookup_tree_id(entry.file_id,
468
507
                        revid)
469
508
                except (NotImplementedError, KeyError):
470
 
                    obj = self._reconstruct_tree(entry.file_id, revid, inv,
 
509
                    obj = self._reconstruct_tree(entry.file_id, revid, bzr_tree,
471
510
                        unusual_modes)
472
511
                    if obj is None:
473
512
                        return None
481
520
                    # no-change merge?
482
521
                    return self._reconstruct_blobs(
483
522
                        [(entry.file_id, entry.revision, None)]).next().id
 
523
            elif entry.kind == 'tree-reference':
 
524
                # FIXME: Make sure the file id is the root id
 
525
                return self._lookup_revision_sha1(entry.reference_revision)
484
526
            else:
485
527
                raise AssertionError("unknown entry kind '%s'" % entry.kind)
486
 
        tree = directory_to_tree(inv[fileid], get_ie_sha1, unusual_modes,
 
528
        tree = directory_to_tree(bzr_tree.inventory[fileid], get_ie_sha1, unusual_modes,
487
529
            self.mapping.BZR_DUMMY_FILE)
488
 
        if (inv.root.file_id == fileid and
 
530
        if (bzr_tree.get_root_id() == fileid and
489
531
            self.mapping.BZR_FILE_IDS_FILE is not None):
490
 
            b = self._create_fileid_map_blob(inv)
 
532
            if tree is None:
 
533
                tree = Tree()
 
534
            b = self._create_fileid_map_blob(bzr_tree)
491
535
            # If this is the root tree, add the file ids
492
 
            tree[self.mapping.BZR_FILE_IDS_FILE] = ((stat.S_IFREG | 0644), b.id)
493
 
        _check_expected_sha(expected_sha, tree)
 
536
            tree[self.mapping.BZR_FILE_IDS_FILE] = (
 
537
                (stat.S_IFREG | 0644), b.id)
 
538
        if tree is not None:
 
539
            _check_expected_sha(expected_sha, tree)
494
540
        return tree
495
541
 
496
542
    def get_parents(self, sha):
503
549
 
504
550
    def _lookup_revision_sha1(self, revid):
505
551
        """Return the SHA1 matching a Bazaar revision."""
506
 
        from dulwich.protocol import ZERO_SHA
507
552
        if revid == NULL_REVISION:
508
553
            return ZERO_SHA
509
554
        try:
512
557
            try:
513
558
                return mapping_registry.parse_revision_id(revid)[0]
514
559
            except errors.InvalidRevisionId:
515
 
                self.repository.lock_read()
516
 
                try:
517
 
                    self._update_sha_map(revid)
518
 
                finally:
519
 
                    self.repository.unlock()
 
560
                self._update_sha_map(revid)
520
561
                return self._cache.idmap.lookup_commit(revid)
521
562
 
522
563
    def get_raw(self, sha):
530
571
    def __contains__(self, sha):
531
572
        # See if sha is in map
532
573
        try:
533
 
            (type, type_data) = self.lookup_git_sha(sha)
534
 
            if type == "commit":
535
 
                return self.repository.has_revision(type_data[0])
536
 
            elif type == "blob":
537
 
                return self.repository.texts.has_key(type_data)
538
 
            elif type == "tree":
539
 
                return self.repository.has_revision(type_data[1])
 
574
            for (type, type_data) in self.lookup_git_sha(sha):
 
575
                if type == "commit":
 
576
                    if self.repository.has_revision(type_data[0]):
 
577
                        return True
 
578
                elif type == "blob":
 
579
                    if self.repository.texts.has_key(type_data):
 
580
                        return True
 
581
                elif type == "tree":
 
582
                    if self.repository.has_revision(type_data[1]):
 
583
                        return True
 
584
                else:
 
585
                    raise AssertionError("Unknown object type '%s'" % type)
540
586
            else:
541
 
                raise AssertionError("Unknown object type '%s'" % type)
 
587
                return False
542
588
        except KeyError:
543
589
            return False
544
590
 
545
 
    def lookup_git_shas(self, shas, update_map=True):
546
 
        from dulwich.protocol import ZERO_SHA
 
591
    def lock_read(self):
 
592
        self._locked = 'r'
 
593
        self._map_updated = False
 
594
        self.repository.lock_read()
 
595
        return LogicalLockResult(self.unlock)
 
596
 
 
597
    def lock_write(self):
 
598
        self._locked = 'r'
 
599
        self._map_updated = False
 
600
        self.repository.lock_write()
 
601
        return LogicalLockResult(self.unlock)
 
602
 
 
603
    def is_locked(self):
 
604
        return (self._locked is not None)
 
605
 
 
606
    def unlock(self):
 
607
        self._locked = None
 
608
        self._map_updated = False
 
609
        self.repository.unlock()
 
610
 
 
611
    def lookup_git_shas(self, shas):
547
612
        ret = {}
548
613
        for sha in shas:
549
614
            if sha == ZERO_SHA:
550
 
                ret[sha] = ("commit", (NULL_REVISION, None, {}))
 
615
                ret[sha] = [("commit", (NULL_REVISION, None, {}))]
551
616
                continue
552
617
            try:
553
 
                ret[sha] = self._cache.idmap.lookup_git_sha(sha)
 
618
                ret[sha] = list(self._cache.idmap.lookup_git_sha(sha))
554
619
            except KeyError:
555
 
                if update_map:
556
 
                    # if not, see if there are any unconverted revisions and add
557
 
                    # them to the map, search for sha in map again
558
 
                    self._update_sha_map()
559
 
                    update_map = False
560
 
                    try:
561
 
                        ret[sha] = self._cache.idmap.lookup_git_sha(sha)
562
 
                    except KeyError:
563
 
                        pass
 
620
                # if not, see if there are any unconverted revisions and
 
621
                # add them to the map, search for sha in map again
 
622
                self._update_sha_map()
 
623
                try:
 
624
                    ret[sha] = list(self._cache.idmap.lookup_git_sha(sha))
 
625
                except KeyError:
 
626
                    pass
564
627
        return ret
565
628
 
566
 
    def lookup_git_sha(self, sha, update_map=True):
567
 
        return self.lookup_git_shas([sha], update_map=update_map)[sha]
 
629
    def lookup_git_sha(self, sha):
 
630
        return self.lookup_git_shas([sha])[sha]
568
631
 
569
632
    def __getitem__(self, sha):
570
633
        if self._cache.content_cache is not None:
572
635
                return self._cache.content_cache[sha]
573
636
            except KeyError:
574
637
                pass
575
 
        (type, type_data) = self.lookup_git_sha(sha)
576
 
        # convert object to git object
577
 
        if type == "commit":
578
 
            (revid, tree_sha, verifiers) = type_data
579
 
            try:
580
 
                rev = self.repository.get_revision(revid)
581
 
            except errors.NoSuchRevision:
582
 
                trace.mutter('entry for %s %s in shamap: %r, but not found in '
583
 
                             'repository', type, sha, type_data)
584
 
                raise KeyError(sha)
585
 
            commit = self._reconstruct_commit(rev, tree_sha, roundtrip=True,
586
 
                verifiers=verifiers)
587
 
            _check_expected_sha(sha, commit)
588
 
            return commit
589
 
        elif type == "blob":
590
 
            (fileid, revision) = type_data
591
 
            return self._reconstruct_blobs([(fileid, revision, sha)]).next()
592
 
        elif type == "tree":
593
 
            (fileid, revid) = type_data
594
 
            try:
595
 
                tree = self.tree_cache.revision_tree(revid)
596
 
                rev = self.repository.get_revision(revid)
597
 
            except errors.NoSuchRevision:
598
 
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
599
 
                raise KeyError(sha)
600
 
            unusual_modes = extract_unusual_modes(rev)
601
 
            try:
602
 
                return self._reconstruct_tree(fileid, revid, tree.inventory,
603
 
                    unusual_modes, expected_sha=sha)
604
 
            except errors.NoSuchRevision:
605
 
                raise KeyError(sha)
 
638
        for (kind, type_data) in self.lookup_git_sha(sha):
 
639
            # convert object to git object
 
640
            if kind == "commit":
 
641
                (revid, tree_sha, verifiers) = type_data
 
642
                try:
 
643
                    rev = self.repository.get_revision(revid)
 
644
                except errors.NoSuchRevision:
 
645
                    if revid == NULL_REVISION:
 
646
                        raise AssertionError(
 
647
                            "should not try to look up NULL_REVISION")
 
648
                    trace.mutter('entry for %s %s in shamap: %r, but not '
 
649
                                 'found in repository', kind, sha, type_data)
 
650
                    raise KeyError(sha)
 
651
                # FIXME: the type data should say whether conversion was lossless
 
652
                commit = self._reconstruct_commit(rev, tree_sha,
 
653
                    lossy=(not self.mapping.roundtripping), verifiers=verifiers)
 
654
                _check_expected_sha(sha, commit)
 
655
                return commit
 
656
            elif kind == "blob":
 
657
                (fileid, revision) = type_data
 
658
                blobs = self._reconstruct_blobs([(fileid, revision, sha)])
 
659
                return blobs.next()
 
660
            elif kind == "tree":
 
661
                (fileid, revid) = type_data
 
662
                try:
 
663
                    tree = self.tree_cache.revision_tree(revid)
 
664
                    rev = self.repository.get_revision(revid)
 
665
                except errors.NoSuchRevision:
 
666
                    trace.mutter('entry for %s %s in shamap: %r, but not found in '
 
667
                        'repository', kind, sha, type_data)
 
668
                    raise KeyError(sha)
 
669
                unusual_modes = extract_unusual_modes(rev)
 
670
                try:
 
671
                    return self._reconstruct_tree(fileid, revid,
 
672
                        tree, unusual_modes, expected_sha=sha)
 
673
                except errors.NoSuchRevision:
 
674
                    raise KeyError(sha)
 
675
            else:
 
676
                raise AssertionError("Unknown object type '%s'" % kind)
606
677
        else:
607
 
            raise AssertionError("Unknown object type '%s'" % type)
 
678
            raise KeyError(sha)
608
679
 
609
680
    def generate_lossy_pack_contents(self, have, want, progress=None,
610
681
            get_tagged=None):
621
692
        processed = set()
622
693
        ret = self.lookup_git_shas(have + want)
623
694
        for commit_sha in have:
 
695
            commit_sha = self.unpeel_map.peel_tag(commit_sha, commit_sha)
624
696
            try:
625
 
                (type, (revid, tree_sha)) = ret[commit_sha]
 
697
                for (type, type_data) in ret[commit_sha]:
 
698
                    assert type == "commit"
 
699
                    processed.add(type_data[0])
626
700
            except KeyError:
627
 
                pass
628
 
            else:
629
 
                assert type == "commit"
630
 
                processed.add(revid)
 
701
                trace.mutter("unable to find remote ref %s", commit_sha)
631
702
        pending = set()
632
703
        for commit_sha in want:
633
704
            if commit_sha in have:
634
705
                continue
635
706
            try:
636
 
                (type, (revid, tree_sha)) = ret[commit_sha]
 
707
                for (type, type_data) in ret[commit_sha]:
 
708
                    assert type == "commit"
 
709
                    pending.add(type_data[0])
637
710
            except KeyError:
638
711
                pass
639
 
            else:
640
 
                assert type == "commit"
641
 
                pending.add(revid)
642
712
 
643
 
        todo = _find_missing_bzr_revids(self.repository.get_parent_map, 
644
 
                                        pending, processed)
645
 
        trace.mutter('sending revisions %r', todo)
646
 
        ret = []
 
713
        graph = self.repository.get_graph()
 
714
        todo = _find_missing_bzr_revids(graph, pending, processed)
 
715
        ret = PackTupleIterable(self)
647
716
        pb = ui.ui_factory.nested_progress_bar()
648
717
        try:
649
718
            for i, revid in enumerate(todo):
650
719
                pb.update("generating git objects", i, len(todo))
651
 
                rev = self.repository.get_revision(revid)
 
720
                try:
 
721
                    rev = self.repository.get_revision(revid)
 
722
                except errors.NoSuchRevision:
 
723
                    continue
652
724
                tree = self.tree_cache.revision_tree(revid)
653
 
                for path, obj, ie in self._revision_to_objects(rev, tree,
654
 
                    roundtrip=not lossy):
655
 
                    ret.append((obj, path))
 
725
                for path, obj, ie in self._revision_to_objects(rev, tree, lossy=lossy):
 
726
                    ret.add(obj.id, path)
 
727
            return ret
656
728
        finally:
657
729
            pb.finished()
658
 
        return ret
659
730
 
660
731
    def add_thin_pack(self):
661
732
        import tempfile
677
748
            try:
678
749
                self.repository.start_write_group()
679
750
                try:
680
 
                    import_git_objects(self.repository, self.mapping, 
 
751
                    import_git_objects(self.repository, self.mapping,
681
752
                        p.iterobjects(get_raw=self.get_raw),
682
753
                        self.object_store)
683
754
                except: