/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

Fix unpeel map.

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 x: None
 
67
        git.object_store.lock_read = LogicalLockResult(lambda: None)
 
68
        git.object_store.lock_write = LogicalLockResult(lambda: None)
61
69
        return git.object_store
62
70
    return BazaarObjectStore(repo, mapping)
63
71
 
94
102
                todo.append(revid)
95
103
            else:
96
104
                assert tree.get_revision_id() == revid
97
 
                assert tree.inventory.revision_id == revid
98
105
                trees[revid] = tree
99
106
        for tree in self.repository.revision_trees(todo):
100
107
            trees[tree.get_revision_id()] = tree
108
115
        self._cache.add(tree.get_revision_id(), tree)
109
116
 
110
117
 
111
 
def _find_missing_bzr_revids(get_parent_map, want, have):
 
118
def _find_missing_bzr_revids(graph, want, have):
112
119
    """Find the revisions that have to be pushed.
113
120
 
114
121
    :param get_parent_map: Function that returns the parents for a sequence
117
124
    :param have: Revisions the target already has
118
125
    :return: Set of revisions to fetch
119
126
    """
120
 
    pending = want - have
121
 
    processed = set()
 
127
    handled = set(have)
122
128
    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
 
129
    for rev in want:
 
130
        extra_todo = graph.find_unique_ancestors(rev, handled)
 
131
        todo.update(extra_todo)
 
132
        handled.update(extra_todo)
133
133
    if NULL_REVISION in todo:
134
134
        todo.remove(NULL_REVISION)
135
135
    return todo
184
184
            except errors.NoSuchId:
185
185
                pass
186
186
            else:
187
 
                if (pie.text_sha1 == ie.text_sha1 and 
 
187
                if (pie.text_sha1 == ie.text_sha1 and
188
188
                    pie.kind == ie.kind and
189
189
                    pie.symlink_target == ie.symlink_target):
190
190
                    return pie
229
229
            tree.inventory[parent[0]].kind == "directory"):
230
230
            # Removal
231
231
            new_trees[posixpath.dirname(path[0])] = parent[0]
232
 
    
 
232
 
233
233
    # Fetch contents of the blobs that were changed
234
234
    for (path, ie), chunks in tree.iter_files_bytes(
235
235
        [(ie.file_id, (path, ie)) for (path, ie) in new_blobs]):
287
287
            shamap[ie.file_id] = obj.id
288
288
 
289
289
 
 
290
class PackTupleIterable(object):
 
291
 
 
292
    def __init__(self, store):
 
293
        self.store = store
 
294
        self.objects = {}
 
295
 
 
296
    def add(self, sha, path):
 
297
        self.objects[sha] = path
 
298
 
 
299
    def __len__(self):
 
300
        return len(self.objects)
 
301
 
 
302
    def __iter__(self):
 
303
        return ((self.store[object_id], path) for (object_id, path) in
 
304
                self.objects.iteritems())
 
305
 
 
306
 
290
307
class BazaarObjectStore(BaseObjectStore):
291
308
    """A Git-style object store backed onto a Bazaar repository."""
292
309
 
293
310
    def __init__(self, repository, mapping=None):
294
311
        self.repository = repository
 
312
        self._map_updated = False
 
313
        self._locked = None
295
314
        if mapping is None:
296
315
            self.mapping = default_mapping
297
316
        else:
298
317
            self.mapping = mapping
299
318
        self._cache = cache_from_repository(repository)
300
 
        self._content_cache_types = ("tree")
 
319
        self._content_cache_types = ("tree",)
301
320
        self.start_write_group = self._cache.idmap.start_write_group
302
321
        self.abort_write_group = self._cache.idmap.abort_write_group
303
322
        self.commit_write_group = self._cache.idmap.commit_write_group
304
323
        self.tree_cache = LRUTreeCache(self.repository)
 
324
        self.unpeel_map = UnpeelMap.from_repository(self.repository)
305
325
 
306
326
    def _update_sha_map(self, stop_revision=None):
 
327
        if not self.is_locked():
 
328
            raise AssertionError()
 
329
        if self._map_updated:
 
330
            return
 
331
        if (stop_revision is not None and
 
332
            not self._cache.idmap.missing_revisions([stop_revision])):
 
333
            return
307
334
        graph = self.repository.get_graph()
308
335
        if stop_revision is None:
309
336
            heads = graph.heads(self.repository.all_revision_ids())
321
348
            missing_revids.remove(NULL_REVISION)
322
349
        missing_revids = self.repository.has_revisions(missing_revids)
323
350
        if not missing_revids:
 
351
            if stop_revision is None:
 
352
                self._map_updated = True
324
353
            return
325
354
        self.start_write_group()
326
355
        try:
332
361
                    self._update_sha_map_revision(revid)
333
362
            finally:
334
363
                pb.finished()
 
364
            if stop_revision is None:
 
365
                self._map_updated = True
335
366
        except:
336
367
            self.abort_write_group()
337
368
            raise
399
430
        if roundtrip and self.mapping.BZR_FILE_IDS_FILE is not None:
400
431
            b = self._create_fileid_map_blob(tree.inventory)
401
432
            if b is not None:
402
 
                root_tree[self.mapping.BZR_FILE_IDS_FILE] = ((stat.S_IFREG | 0644), b.id)
 
433
                root_tree[self.mapping.BZR_FILE_IDS_FILE] = (
 
434
                    (stat.S_IFREG | 0644), b.id)
403
435
                yield self.mapping.BZR_FILE_IDS_FILE, b, None
404
436
        yield "", root_tree, root_ie
405
437
        if roundtrip:
406
 
            testament3 = StrictTestament3(rev, tree.inventory)
 
438
            if getattr(StrictTestament3, "from_revision_tree", None):
 
439
                testament3 = StrictTestament3(rev, tree)
 
440
            else: # bzr < 2.4
 
441
                testament3 = StrictTestament3(rev, tree.inventory)
407
442
            verifiers = { "testament3-sha1": testament3.as_sha1() }
408
443
        else:
409
444
            verifiers = {}
428
463
        for path, obj, ie in self._revision_to_objects(rev, tree,
429
464
            roundtrip=True):
430
465
            if isinstance(obj, Commit):
431
 
                testament3 = StrictTestament3(rev, tree.inventory)
 
466
                if getattr(StrictTestament3, "from_revision_tree", None):
 
467
                    testament3 = StrictTestament3(rev, tree)
 
468
                else: # bzr < 2.4
 
469
                    testament3 = StrictTestament3(rev, tree.inventory)
432
470
                ie = { "testament3-sha1": testament3.as_sha1() }
433
471
            updater.add_object(obj, ie, path)
434
472
        commit_obj = updater.finish()
487
525
            self.mapping.BZR_DUMMY_FILE)
488
526
        if (inv.root.file_id == fileid and
489
527
            self.mapping.BZR_FILE_IDS_FILE is not None):
 
528
            if tree is None:
 
529
                tree = Tree()
490
530
            b = self._create_fileid_map_blob(inv)
491
531
            # 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)
 
532
            tree[self.mapping.BZR_FILE_IDS_FILE] = (
 
533
                (stat.S_IFREG | 0644), b.id)
 
534
        if tree is not None:
 
535
            _check_expected_sha(expected_sha, tree)
494
536
        return tree
495
537
 
496
538
    def get_parents(self, sha):
503
545
 
504
546
    def _lookup_revision_sha1(self, revid):
505
547
        """Return the SHA1 matching a Bazaar revision."""
506
 
        from dulwich.protocol import ZERO_SHA
507
548
        if revid == NULL_REVISION:
508
549
            return ZERO_SHA
509
550
        try:
512
553
            try:
513
554
                return mapping_registry.parse_revision_id(revid)[0]
514
555
            except errors.InvalidRevisionId:
515
 
                self.repository.lock_read()
516
 
                try:
517
 
                    self._update_sha_map(revid)
518
 
                finally:
519
 
                    self.repository.unlock()
 
556
                self._update_sha_map(revid)
520
557
                return self._cache.idmap.lookup_commit(revid)
521
558
 
522
559
    def get_raw(self, sha):
530
567
    def __contains__(self, sha):
531
568
        # See if sha is in map
532
569
        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])
 
570
            for (type, type_data) in self.lookup_git_sha(sha):
 
571
                if type == "commit":
 
572
                    if self.repository.has_revision(type_data[0]):
 
573
                        return True
 
574
                elif type == "blob":
 
575
                    if self.repository.texts.has_key(type_data):
 
576
                        return True
 
577
                elif type == "tree":
 
578
                    if self.repository.has_revision(type_data[1]):
 
579
                        return True
 
580
                else:
 
581
                    raise AssertionError("Unknown object type '%s'" % type)
540
582
            else:
541
 
                raise AssertionError("Unknown object type '%s'" % type)
 
583
                return False
542
584
        except KeyError:
543
585
            return False
544
586
 
545
 
    def lookup_git_shas(self, shas, update_map=True):
546
 
        from dulwich.protocol import ZERO_SHA
 
587
    def lock_read(self):
 
588
        self._locked = 'r'
 
589
        self._map_updated = False
 
590
        self.repository.lock_read()
 
591
        return LogicalLockResult(self.unlock)
 
592
 
 
593
    def lock_write(self):
 
594
        self._locked = 'r'
 
595
        self._map_updated = False
 
596
        self.repository.lock_write()
 
597
        return LogicalLockResult(self.unlock)
 
598
 
 
599
    def is_locked(self):
 
600
        return (self._locked is not None)
 
601
 
 
602
    def unlock(self):
 
603
        self._locked = None
 
604
        self._map_updated = False
 
605
        self.repository.unlock()
 
606
 
 
607
    def lookup_git_shas(self, shas):
547
608
        ret = {}
548
609
        for sha in shas:
549
610
            if sha == ZERO_SHA:
550
 
                ret[sha] = ("commit", (NULL_REVISION, None, {}))
 
611
                ret[sha] = [("commit", (NULL_REVISION, None, {}))]
551
612
                continue
552
613
            try:
553
 
                ret[sha] = self._cache.idmap.lookup_git_sha(sha)
 
614
                ret[sha] = list(self._cache.idmap.lookup_git_sha(sha))
554
615
            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
 
616
                # if not, see if there are any unconverted revisions and
 
617
                # add them to the map, search for sha in map again
 
618
                self._update_sha_map()
 
619
                try:
 
620
                    ret[sha] = list(self._cache.idmap.lookup_git_sha(sha))
 
621
                except KeyError:
 
622
                    pass
564
623
        return ret
565
624
 
566
 
    def lookup_git_sha(self, sha, update_map=True):
567
 
        return self.lookup_git_shas([sha], update_map=update_map)[sha]
 
625
    def lookup_git_sha(self, sha):
 
626
        return self.lookup_git_shas([sha])[sha]
568
627
 
569
628
    def __getitem__(self, sha):
570
629
        if self._cache.content_cache is not None:
572
631
                return self._cache.content_cache[sha]
573
632
            except KeyError:
574
633
                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)
 
634
        for (kind, type_data) in self.lookup_git_sha(sha):
 
635
            # convert object to git object
 
636
            if kind == "commit":
 
637
                (revid, tree_sha, verifiers) = type_data
 
638
                try:
 
639
                    rev = self.repository.get_revision(revid)
 
640
                except errors.NoSuchRevision:
 
641
                    trace.mutter('entry for %s %s in shamap: %r, but not '
 
642
                                 'found in repository', kind, sha, type_data)
 
643
                    raise KeyError(sha)
 
644
                commit = self._reconstruct_commit(rev, tree_sha,
 
645
                    roundtrip=True, verifiers=verifiers)
 
646
                _check_expected_sha(sha, commit)
 
647
                return commit
 
648
            elif kind == "blob":
 
649
                (fileid, revision) = type_data
 
650
                blobs = self._reconstruct_blobs([(fileid, revision, sha)])
 
651
                return blobs.next()
 
652
            elif kind == "tree":
 
653
                (fileid, revid) = type_data
 
654
                try:
 
655
                    tree = self.tree_cache.revision_tree(revid)
 
656
                    rev = self.repository.get_revision(revid)
 
657
                except errors.NoSuchRevision:
 
658
                    trace.mutter('entry for %s %s in shamap: %r, but not found in repository', kind, sha, type_data)
 
659
                    raise KeyError(sha)
 
660
                unusual_modes = extract_unusual_modes(rev)
 
661
                try:
 
662
                    return self._reconstruct_tree(fileid, revid,
 
663
                        tree.inventory, unusual_modes, expected_sha=sha)
 
664
                except errors.NoSuchRevision:
 
665
                    raise KeyError(sha)
 
666
            else:
 
667
                raise AssertionError("Unknown object type '%s'" % kind)
606
668
        else:
607
 
            raise AssertionError("Unknown object type '%s'" % type)
 
669
            raise KeyError(sha)
608
670
 
609
671
    def generate_lossy_pack_contents(self, have, want, progress=None,
610
672
            get_tagged=None):
621
683
        processed = set()
622
684
        ret = self.lookup_git_shas(have + want)
623
685
        for commit_sha in have:
 
686
            commit_sha = self.unpeel_map.peel_tag(commit_sha, commit_sha)
624
687
            try:
625
 
                (type, (revid, tree_sha)) = ret[commit_sha]
 
688
                for (type, type_data) in ret[commit_sha]:
 
689
                    assert type == "commit"
 
690
                    processed.add(type_data[0])
626
691
            except KeyError:
627
 
                pass
628
 
            else:
629
 
                assert type == "commit"
630
 
                processed.add(revid)
 
692
                trace.mutter("unable to find remote ref %s", commit_sha)
631
693
        pending = set()
632
694
        for commit_sha in want:
633
695
            if commit_sha in have:
634
696
                continue
635
697
            try:
636
 
                (type, (revid, tree_sha)) = ret[commit_sha]
 
698
                for (type, type_data) in ret[commit_sha]:
 
699
                    assert type == "commit"
 
700
                    pending.add(type_data[0])
637
701
            except KeyError:
638
702
                pass
639
 
            else:
640
 
                assert type == "commit"
641
 
                pending.add(revid)
642
703
 
643
 
        todo = _find_missing_bzr_revids(self.repository.get_parent_map, 
644
 
                                        pending, processed)
 
704
        graph = self.repository.get_graph()
 
705
        todo = _find_missing_bzr_revids(graph, pending, processed)
645
706
        trace.mutter('sending revisions %r', todo)
646
 
        ret = []
 
707
        ret = PackTupleIterable(self)
647
708
        pb = ui.ui_factory.nested_progress_bar()
648
709
        try:
649
710
            for i, revid in enumerate(todo):
650
711
                pb.update("generating git objects", i, len(todo))
651
 
                rev = self.repository.get_revision(revid)
 
712
                try:
 
713
                    rev = self.repository.get_revision(revid)
 
714
                except errors.NoSuchRevision:
 
715
                    continue
652
716
                tree = self.tree_cache.revision_tree(revid)
653
717
                for path, obj, ie in self._revision_to_objects(rev, tree,
654
718
                    roundtrip=not lossy):
655
 
                    ret.append((obj, path))
 
719
                    ret.add(obj.id, path)
656
720
        finally:
657
721
            pb.finished()
658
722
        return ret
677
741
            try:
678
742
                self.repository.start_write_group()
679
743
                try:
680
 
                    import_git_objects(self.repository, self.mapping, 
 
744
                    import_git_objects(self.repository, self.mapping,
681
745
                        p.iterobjects(get_raw=self.get_raw),
682
746
                        self.object_store)
683
747
                except: