/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

  • Committer: Jelmer Vernooij
  • Date: 2009-09-10 13:13:15 UTC
  • mto: (0.200.602 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090910131315-6890xg58pl2jseml
Allow serving remote URLs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
versionedfiles.py
32
32
 
33
33
class GitRevisions(VersionedFiles):
34
34
 
35
 
    def __init__(self, repository, object_store):
36
 
        self.repository = repository
 
35
    def __init__(self, object_store):
37
36
        self.object_store = object_store
38
37
 
39
38
    def check(self, progressbar=None):
52
51
 
53
52
    def get_record_stream(self, keys, ordering, include_delta_closure):
54
53
        for key in keys:
55
 
            (revid,) = key
56
 
            (commit_id, mapping) = self.repository.lookup_bzr_revision_id(revid)
 
54
            (sha,) = key
57
55
            try:
58
 
                commit = self.object_store[commit_id]
 
56
                text = self.object_store.get_raw(sha)
59
57
            except KeyError:
60
58
                yield AbsentContentFactory(key)
61
59
            else:
62
 
                yield FulltextContentFactory(key, 
63
 
                    tuple([(self.repository.lookup_foreign_revision_id(p, mapping),) for p in commit.parents]), None, 
64
 
                    commit.as_raw_string())
 
60
                yield FulltextContentFactory(key, None, None, text)
65
61
 
66
62
    def get_parent_map(self, keys):
67
63
        ret = {}
68
 
        for (revid,) in keys:
69
 
            (commit_id, mapping) = self.repository.lookup_bzr_revision_id(revid)
 
64
        for (key,) in keys:
70
65
            try:
71
 
                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]
72
67
            except KeyError:
73
 
                ret[(revid,)] = None
 
68
                ret[(key,)] = None
74
69
        return ret
75
70
 
76
71
 
90
85
    def get_record_stream(self, keys, ordering, include_delta_closure):
91
86
        for key in keys:
92
87
            (fileid, revid) = key
93
 
            (commit_id, mapping) = self.repository.lookup_bzr_revision_id(revid)
94
 
            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
95
90
            path = mapping.parse_file_id(fileid)
96
91
            try:
97
 
                obj = tree_lookup_path(
98
 
                    self.object_store.__getitem__, root_tree, path)
99
 
                if isinstance(obj, tuple):
100
 
                    (mode, item_id) = obj
101
 
                    obj = self.object_store[item_id]
 
92
                obj = tree_lookup_path(self.object_store.__getitem__, 
 
93
                                       root_tree, path)
102
94
            except KeyError:
103
95
                yield AbsentContentFactory(key)
104
96
            else:
105
97
                if isinstance(obj, Tree):
106
98
                    yield FulltextContentFactory(key, None, None, "")
107
99
                elif isinstance(obj, Blob):
108
 
                    yield FulltextContentFactory(key, None, None, obj.data)
 
100
                    yield FulltextContentFactory(key, None, None, obj._text)
109
101
                else:
110
 
                    raise AssertionError("file text resolved to %r" % obj)
 
102
                    yield AbsentContentFactory(key)
111
103
 
112
104
    def get_parent_map(self, keys):
113
105
        raise NotImplementedError(self.get_parent_map)