/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

Default to using global user id rather than making one up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
32
32
    trace,
33
33
    ui,
34
34
    )
35
 
from bzrlib.revision import (
36
 
    NULL_REVISION,
37
 
    )
38
35
 
39
36
from bzrlib.plugins.git.errors import (
40
37
    GhostRevision,
43
40
from bzrlib.plugins.git.mapping import (
44
41
    default_mapping,
45
42
    directory_to_tree,
46
 
    extract_unusual_modes,
47
43
    mapping_registry,
48
44
    revision_to_commit,
49
45
    )
99
95
 
100
96
    def _update_sha_map_revision(self, revid):
101
97
        inv = self.repository.get_inventory(revid)
 
98
        tree_sha = self._get_ie_sha1(inv.root, inv)
102
99
        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
100
        commit_obj = revision_to_commit(rev, tree_sha,
106
101
                                        self._idmap.lookup_commit)
107
102
        try:
120
115
        if expected_sha != object.id:
121
116
            raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha))
122
117
 
123
 
    def _get_ie_object(self, entry, inv, unusual_modes):  
 
118
    def _get_ie_object(self, entry, inv):  
124
119
        if entry.kind == "directory":
125
 
            return self._get_tree(entry.file_id, inv.revision_id, inv, unusual_modes)
 
120
            return self._get_tree(entry.file_id, inv.revision_id, inv=inv)
126
121
        else:
127
122
            return self._get_blob(entry.file_id, entry.revision)
128
123
 
129
 
    def _get_ie_object_or_sha1(self, entry, inv, unusual_modes):
 
124
    def _get_ie_object_or_sha1(self, entry, inv):
130
125
        if entry.kind == "directory":
131
126
            try:
132
127
                return self._idmap.lookup_tree(entry.file_id, inv.revision_id), None
133
128
            except KeyError:
134
 
                ret = self._get_ie_object(entry, inv, unusual_modes)
 
129
                ret = self._get_ie_object(entry, inv)
135
130
                self._idmap.add_entry(ret.id, "tree", (entry.file_id, inv.revision_id))
136
131
                return ret.id, ret
137
132
        else:
138
133
            try:
139
134
                return self._idmap.lookup_blob(entry.file_id, entry.revision), None
140
135
            except KeyError:
141
 
                ret = self._get_ie_object(entry, inv, unusual_modes)
 
136
                ret = self._get_ie_object(entry, inv)
142
137
                self._idmap.add_entry(ret.id, "blob", (entry.file_id, entry.revision))
143
138
                return ret.id, ret
144
139
 
145
 
    def _get_ie_sha1(self, entry, inv, unusual_modes):
146
 
        return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0]
 
140
    def _get_ie_sha1(self, entry, inv):
 
141
        return self._get_ie_object_or_sha1(entry, inv)[0]
147
142
 
148
143
    def _get_blob(self, fileid, revision, expected_sha=None):
149
144
        """Return a Git Blob object from a fileid and revision stored in bzr.
158
153
        self._check_expected_sha(expected_sha, blob)
159
154
        return blob
160
155
 
161
 
    def _get_tree(self, fileid, revid, inv, unusual_modes, expected_sha=None):
 
156
    def _get_tree(self, fileid, revid, inv=None, expected_sha=None):
162
157
        """Return a Git Tree object from a file id and a revision stored in bzr.
163
158
 
164
159
        :param fileid: fileid in the tree.
165
160
        :param revision: Revision of the tree.
166
161
        """
167
 
        tree = directory_to_tree(inv[fileid], 
168
 
            lambda ie: self._get_ie_sha1(ie, inv, unusual_modes),
169
 
            unusual_modes)
 
162
        if inv is None:
 
163
            inv = self.repository.get_inventory(revid)
 
164
        tree = directory_to_tree(inv[fileid], lambda ie: self._get_ie_sha1(ie, inv))
170
165
        self._check_expected_sha(expected_sha, tree)
171
166
        return tree
172
167
 
173
 
    def _get_commit(self, rev, tree_sha, expected_sha=None):
 
168
    def _get_commit(self, revid, tree_sha, expected_sha=None):
 
169
        rev = self.repository.get_revision(revid)
174
170
        try:
175
171
            commit = revision_to_commit(rev, tree_sha, self._lookup_revision_sha1)
176
172
        except errors.NoSuchRevision, e:
188
184
 
189
185
    def _lookup_revision_sha1(self, revid):
190
186
        """Return the SHA1 matching a Bazaar revision."""
191
 
        if revid == NULL_REVISION:
192
 
            return "0" * 40
193
187
        try:
194
188
            return self._idmap.lookup_commit(revid)
195
189
        except KeyError:
227
221
        # convert object to git object
228
222
        if type == "commit":
229
223
            try:
230
 
                rev = self.repository.get_revision(type_data[0])
 
224
                return self._get_commit(type_data[0], type_data[1], 
 
225
                                        expected_sha=sha)
231
226
            except errors.NoSuchRevision:
232
227
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
233
228
                raise KeyError(sha)
234
 
            return self._get_commit(rev, type_data[1], expected_sha=sha)
235
229
        elif type == "blob":
236
230
            return self._get_blob(type_data[0], type_data[1], expected_sha=sha)
237
231
        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
232
            try:
242
 
                return self._get_tree(type_data[0], type_data[1], inv, unusual_modes,
 
233
                return self._get_tree(type_data[0], type_data[1], 
243
234
                                      expected_sha=sha)
244
235
            except errors.NoSuchRevision:
245
236
                raise KeyError(sha)