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

Update docs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
29
29
from bzrlib import (
30
30
    debug,
31
31
    errors,
32
 
    trace,
33
32
    ui,
34
33
    )
35
 
from bzrlib.revision import (
36
 
    NULL_REVISION,
37
 
    )
38
 
 
39
 
from bzrlib.plugins.git.errors import (
40
 
    GhostRevision,
41
 
    )
42
34
 
43
35
from bzrlib.plugins.git.mapping import (
44
36
    default_mapping,
45
37
    directory_to_tree,
46
 
    extract_unusual_modes,
47
38
    mapping_registry,
48
39
    revision_to_commit,
49
40
    )
50
41
from bzrlib.plugins.git.shamap import (
51
42
    SqliteGitShaMap,
52
 
    TdbGitShaMap,
53
43
    )
54
44
 
55
45
 
69
59
            self.mapping = default_mapping
70
60
        else:
71
61
            self.mapping = mapping
72
 
        try:
73
 
            self._idmap = TdbGitShaMap.from_repository(repository)
74
 
        except ImportError:
75
 
            self._idmap = SqliteGitShaMap.from_repository(repository)
 
62
        self._idmap = SqliteGitShaMap.from_repository(repository)
76
63
 
77
64
    def _update_sha_map(self, stop_revision=None):
78
65
        if stop_revision is None:
99
86
 
100
87
    def _update_sha_map_revision(self, revid):
101
88
        inv = self.repository.get_inventory(revid)
 
89
        tree_sha = self._get_ie_sha1(inv.root, inv)
102
90
        rev = self.repository.get_revision(revid)
103
 
        unusual_modes = extract_unusual_modes(rev)
104
 
        tree_sha = self._get_ie_sha1(inv.root, inv, unusual_modes)
105
91
        commit_obj = revision_to_commit(rev, tree_sha,
106
 
                                        self._idmap.lookup_commit)
 
92
            self._idmap._parent_lookup)
107
93
        try:
108
94
            foreign_revid, mapping = mapping_registry.parse_revision_id(revid)
109
95
        except errors.InvalidRevisionId:
120
106
        if expected_sha != object.id:
121
107
            raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha))
122
108
 
123
 
    def _get_ie_object(self, entry, inv, unusual_modes):  
 
109
    def _get_ie_object(self, entry, inv):  
124
110
        if entry.kind == "directory":
125
 
            return self._get_tree(entry.file_id, inv.revision_id, inv, unusual_modes)
 
111
            return self._get_tree(entry.file_id, inv.revision_id, inv=inv)
126
112
        else:
127
113
            return self._get_blob(entry.file_id, entry.revision)
128
114
 
129
 
    def _get_ie_object_or_sha1(self, entry, inv, unusual_modes):
 
115
    def _get_ie_object_or_sha1(self, entry, inv):
130
116
        if entry.kind == "directory":
131
117
            try:
132
118
                return self._idmap.lookup_tree(entry.file_id, inv.revision_id), None
133
119
            except KeyError:
134
 
                ret = self._get_ie_object(entry, inv, unusual_modes)
 
120
                ret = self._get_ie_object(entry, inv)
135
121
                self._idmap.add_entry(ret.id, "tree", (entry.file_id, inv.revision_id))
136
122
                return ret.id, ret
137
123
        else:
138
124
            try:
139
125
                return self._idmap.lookup_blob(entry.file_id, entry.revision), None
140
126
            except KeyError:
141
 
                ret = self._get_ie_object(entry, inv, unusual_modes)
 
127
                ret = self._get_ie_object(entry, inv)
142
128
                self._idmap.add_entry(ret.id, "blob", (entry.file_id, entry.revision))
143
129
                return ret.id, ret
144
130
 
145
 
    def _get_ie_sha1(self, entry, inv, unusual_modes):
146
 
        return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0]
 
131
    def _get_ie_sha1(self, entry, inv):
 
132
        return self._get_ie_object_or_sha1(entry, inv)[0]
147
133
 
148
134
    def _get_blob(self, fileid, revision, expected_sha=None):
149
135
        """Return a Git Blob object from a fileid and revision stored in bzr.
158
144
        self._check_expected_sha(expected_sha, blob)
159
145
        return blob
160
146
 
161
 
    def _get_tree(self, fileid, revid, inv, unusual_modes, expected_sha=None):
 
147
    def _get_tree(self, fileid, revid, inv=None, expected_sha=None):
162
148
        """Return a Git Tree object from a file id and a revision stored in bzr.
163
149
 
164
150
        :param fileid: fileid in the tree.
165
151
        :param revision: Revision of the tree.
166
152
        """
167
 
        tree = directory_to_tree(inv[fileid], 
168
 
            lambda ie: self._get_ie_sha1(ie, inv, unusual_modes),
169
 
            unusual_modes)
 
153
        if inv is None:
 
154
            inv = self.repository.get_inventory(revid)
 
155
        tree = directory_to_tree(inv[fileid], lambda ie: self._get_ie_sha1(ie, inv))
170
156
        self._check_expected_sha(expected_sha, tree)
171
157
        return tree
172
158
 
173
 
    def _get_commit(self, rev, tree_sha, expected_sha=None):
174
 
        try:
175
 
            commit = revision_to_commit(rev, tree_sha, self._lookup_revision_sha1)
176
 
        except errors.NoSuchRevision, e:
177
 
            raise GhostRevision(e.branch, e.revision)
 
159
    def _get_commit(self, revid, tree_sha, expected_sha=None):
 
160
        rev = self.repository.get_revision(revid)
 
161
        commit = revision_to_commit(rev, tree_sha, self._lookup_revision_sha1)
178
162
        self._check_expected_sha(expected_sha, commit)
179
163
        return commit
180
164
 
188
172
 
189
173
    def _lookup_revision_sha1(self, revid):
190
174
        """Return the SHA1 matching a Bazaar revision."""
191
 
        if revid == NULL_REVISION:
192
 
            return "0" * 40
193
175
        try:
194
 
            return self._idmap.lookup_commit(revid)
 
176
            return self._idmap._parent_lookup(revid)
195
177
        except KeyError:
196
 
            self._update_sha_map(revid)
197
 
            return self._idmap.lookup_commit(revid)
 
178
            inv = self.repository.get_inventory(revid)
 
179
            tree_sha = self._get_ie_sha1(inv.root, inv)
 
180
            ret = self._get_commit(revid, tree_sha).id
 
181
            self._idmap.add_entry(ret, "commit", (revid, tree_sha))
 
182
            return ret
198
183
 
199
184
    def get_raw(self, sha):
200
185
        """Get the raw representation of a Git object by SHA1.
226
211
        (type, type_data) = self._lookup_git_sha(sha)
227
212
        # convert object to git object
228
213
        if type == "commit":
229
 
            try:
230
 
                rev = self.repository.get_revision(type_data[0])
231
 
            except errors.NoSuchRevision:
232
 
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
233
 
                raise KeyError(sha)
234
 
            return self._get_commit(rev, type_data[1], expected_sha=sha)
 
214
            return self._get_commit(type_data[0], type_data[1], 
 
215
                                    expected_sha=sha)
235
216
        elif type == "blob":
236
217
            return self._get_blob(type_data[0], type_data[1], expected_sha=sha)
237
218
        elif type == "tree":
238
 
            inv = self.repository.get_inventory(type_data[1])
239
 
            rev = self.repository.get_revision(type_data[1])
240
 
            unusual_modes = extract_unusual_modes(rev)
241
 
            try:
242
 
                return self._get_tree(type_data[0], type_data[1], inv, unusual_modes,
243
 
                                      expected_sha=sha)
244
 
            except errors.NoSuchRevision:
245
 
                raise KeyError(sha)
 
219
            return self._get_tree(type_data[0], type_data[1], expected_sha=sha)
246
220
        else:
247
221
            raise AssertionError("Unknown object type '%s'" % type)