/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

Cope with ghosts.

Show diffs side-by-side

added added

removed removed

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