/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

Properly set InventoryEntry revision when changing symlink targets.

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