/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
23
23
    Tree,
24
24
    )
25
25
 
26
 
from bzrlib.revision import (
27
 
    NULL_REVISION,
 
26
from bzrlib import (
 
27
    annotate,
28
28
    )
 
29
 
29
30
from bzrlib.versionedfile import (
30
31
    AbsentContentFactory,
31
 
    FulltextContentFactory,
 
32
    ChunkedContentFactory,
32
33
    VersionedFiles,
33
34
    )
34
35
 
35
36
 
36
37
class GitRevisions(VersionedFiles):
37
38
 
38
 
    def __init__(self, object_store):
 
39
    def __init__(self, repository, object_store):
 
40
        self.repository = repository
39
41
        self.object_store = object_store
40
42
 
41
43
    def check(self, progressbar=None):
42
44
        return True
43
45
 
 
46
    def get_annotator(self):
 
47
        return annotate.Annotator(self)
 
48
 
44
49
    def iterkeys(self):
45
50
        for sha in self.object_store:
46
51
            if type(sha) == Commit:
54
59
 
55
60
    def get_record_stream(self, keys, ordering, include_delta_closure):
56
61
        for key in keys:
57
 
            (sha,) = key
 
62
            (revid,) = key
 
63
            (commit_id, mapping) = self.repository.lookup_bzr_revision_id(revid)
58
64
            try:
59
 
                text = self.object_store.get_raw(sha)
 
65
                commit = self.object_store[commit_id]
60
66
            except KeyError:
61
67
                yield AbsentContentFactory(key)
62
68
            else:
63
 
                yield FulltextContentFactory(key, None, None, text)
 
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())
64
72
 
65
73
    def get_parent_map(self, keys):
66
74
        ret = {}
67
 
        for (key,) in keys:
 
75
        for (revid,) in keys:
 
76
            (commit_id, mapping) = self.repository.lookup_bzr_revision_id(revid)
68
77
            try:
69
 
                ret[(key,)] = [(p,) for p in self.object_store[key].parents]
 
78
                ret[(revid,)] = [(self.repository.lookup_foreign_revision_id(p, mapping),) for p in self.object_store[commit_id].parents]
70
79
            except KeyError:
71
 
                ret[(key,)] = None
 
80
                ret[(revid,)] = None
72
81
        return ret
73
82
 
74
83
 
82
91
    def check(self, progressbar=None):
83
92
        return True
84
93
 
 
94
    def get_annotator(self):
 
95
        return annotate.Annotator(self)
 
96
 
85
97
    def add_mpdiffs(self, records):
86
98
        raise NotImplementedError(self.add_mpdiffs)
87
99
 
88
100
    def get_record_stream(self, keys, ordering, include_delta_closure):
89
101
        for key in keys:
90
102
            (fileid, revid) = key
91
 
            (foreign_revid, mapping) = self.repository.lookup_git_revid(revid)
92
 
            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
93
105
            path = mapping.parse_file_id(fileid)
94
106
            try:
95
 
                obj = tree_lookup_path(self.object_store.__getitem__, 
96
 
                                       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]
97
112
            except KeyError:
98
113
                yield AbsentContentFactory(key)
99
114
            else:
100
115
                if isinstance(obj, Tree):
101
 
                    yield FulltextContentFactory(key, None, None, "")
 
116
                    yield ChunkedContentFactory(key, None, None, [])
102
117
                elif isinstance(obj, Blob):
103
 
                    yield FulltextContentFactory(key, None, None, obj._text)
 
118
                    yield ChunkedContentFactory(key, None, None, obj.chunked)
104
119
                else:
105
 
                    yield AbsentContentFactory(key)
 
120
                    raise AssertionError("file text resolved to %r" % obj)
106
121
 
107
122
    def get_parent_map(self, keys):
108
123
        raise NotImplementedError(self.get_parent_map)