/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 versionedfiles.py

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
versionedfiles.py
19
19
    )
20
20
from dulwich.objects import (
21
21
    Blob,
 
22
    Commit,
22
23
    Tree,
23
24
    )
24
25
 
25
 
from bzrlib.revision import (
26
 
    NULL_REVISION,
 
26
from bzrlib import (
 
27
    annotate,
27
28
    )
 
29
 
28
30
from bzrlib.versionedfile import (
29
31
    AbsentContentFactory,
30
 
    FulltextContentFactory,
 
32
    ChunkedContentFactory,
31
33
    VersionedFiles,
32
34
    )
33
35
 
34
36
 
 
37
class GitRevisions(VersionedFiles):
 
38
 
 
39
    def __init__(self, repository, object_store):
 
40
        self.repository = repository
 
41
        self.object_store = object_store
 
42
 
 
43
    def check(self, progressbar=None):
 
44
        return True
 
45
 
 
46
    def get_annotator(self):
 
47
        return annotate.Annotator(self)
 
48
 
 
49
    def iterkeys(self):
 
50
        for sha in self.object_store:
 
51
            if type(sha) == Commit:
 
52
                yield (sha,)
 
53
 
 
54
    def keys(self):
 
55
        return list(self.iterkeys())
 
56
 
 
57
    def add_mpdiffs(self, records):
 
58
        raise NotImplementedError(self.add_mpdiffs)
 
59
 
 
60
    def get_record_stream(self, keys, ordering, include_delta_closure):
 
61
        for key in keys:
 
62
            (revid,) = key
 
63
            (commit_id, mapping) = self.repository.lookup_bzr_revision_id(revid)
 
64
            try:
 
65
                commit = self.object_store[commit_id]
 
66
            except KeyError:
 
67
                yield AbsentContentFactory(key)
 
68
            else:
 
69
                yield ChunkedContentFactory(key, 
 
70
                    tuple([(self.repository.lookup_foreign_revision_id(p, mapping),) for p in commit.parents]), None, 
 
71
                    commit.as_raw_chunks())
 
72
 
 
73
    def get_parent_map(self, keys):
 
74
        ret = {}
 
75
        for (revid,) in keys:
 
76
            (commit_id, mapping) = self.repository.lookup_bzr_revision_id(revid)
 
77
            try:
 
78
                ret[(revid,)] = [(self.repository.lookup_foreign_revision_id(p, mapping),) for p in self.object_store[commit_id].parents]
 
79
            except KeyError:
 
80
                ret[(revid,)] = None
 
81
        return ret
 
82
 
 
83
 
35
84
class GitTexts(VersionedFiles):
36
85
    """A texts VersionedFiles instance that is backed onto a Git object store."""
37
86
 
42
91
    def check(self, progressbar=None):
43
92
        return True
44
93
 
 
94
    def get_annotator(self):
 
95
        return annotate.Annotator(self)
 
96
 
45
97
    def add_mpdiffs(self, records):
46
98
        raise NotImplementedError(self.add_mpdiffs)
47
99
 
48
100
    def get_record_stream(self, keys, ordering, include_delta_closure):
49
101
        for key in keys:
50
102
            (fileid, revid) = key
51
 
            (foreign_revid, mapping) = self.repository.lookup_git_revid(revid)
52
 
            root_tree = self.object_store[foreign_revid].tree
 
103
            (commit_id, mapping) = self.repository.lookup_bzr_revision_id(revid)
 
104
            root_tree = self.object_store[commit_id].tree
53
105
            path = mapping.parse_file_id(fileid)
54
106
            try:
55
 
                obj = tree_lookup_path(self.object_store.__getitem__, 
56
 
                                       root_tree, path)
 
107
                obj = tree_lookup_path(
 
108
                    self.object_store.__getitem__, root_tree, path)
 
109
                if isinstance(obj, tuple):
 
110
                    (mode, item_id) = obj
 
111
                    obj = self.object_store[item_id]
57
112
            except KeyError:
58
113
                yield AbsentContentFactory(key)
59
114
            else:
60
115
                if isinstance(obj, Tree):
61
 
                    yield FulltextContentFactory(key, None, None, "")
 
116
                    yield ChunkedContentFactory(key, None, None, [])
62
117
                elif isinstance(obj, Blob):
63
 
                    yield FulltextContentFactory(key, None, None, obj._text)
 
118
                    yield ChunkedContentFactory(key, None, None, obj.chunked)
64
119
                else:
65
 
                    yield AbsentContentFactory(key)
 
120
                    raise AssertionError("file text resolved to %r" % obj)
66
121
 
67
122
    def get_parent_map(self, keys):
68
123
        raise NotImplementedError(self.get_parent_map)