/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

Extract unusual file modes from revision when reconstructing Trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
43
43
from bzrlib.plugins.git.mapping import (
44
44
    default_mapping,
45
45
    directory_to_tree,
 
46
    extract_unusual_modes,
46
47
    mapping_registry,
47
48
    revision_to_commit,
48
49
    )
98
99
 
99
100
    def _update_sha_map_revision(self, revid):
100
101
        inv = self.repository.get_inventory(revid)
101
 
        tree_sha = self._get_ie_sha1(inv.root, inv)
102
102
        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)
103
105
        commit_obj = revision_to_commit(rev, tree_sha,
104
106
                                        self._idmap.lookup_commit)
105
107
        try:
118
120
        if expected_sha != object.id:
119
121
            raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha))
120
122
 
121
 
    def _get_ie_object(self, entry, inv):  
 
123
    def _get_ie_object(self, entry, inv, unusual_modes):  
122
124
        if entry.kind == "directory":
123
 
            return self._get_tree(entry.file_id, inv.revision_id, inv=inv)
 
125
            return self._get_tree(entry.file_id, inv.revision_id, inv, unusual_modes)
124
126
        else:
125
127
            return self._get_blob(entry.file_id, entry.revision)
126
128
 
127
 
    def _get_ie_object_or_sha1(self, entry, inv):
 
129
    def _get_ie_object_or_sha1(self, entry, inv, unusual_modes):
128
130
        if entry.kind == "directory":
129
131
            try:
130
132
                return self._idmap.lookup_tree(entry.file_id, inv.revision_id), None
131
133
            except KeyError:
132
 
                ret = self._get_ie_object(entry, inv)
 
134
                ret = self._get_ie_object(entry, inv, unusual_modes)
133
135
                self._idmap.add_entry(ret.id, "tree", (entry.file_id, inv.revision_id))
134
136
                return ret.id, ret
135
137
        else:
136
138
            try:
137
139
                return self._idmap.lookup_blob(entry.file_id, entry.revision), None
138
140
            except KeyError:
139
 
                ret = self._get_ie_object(entry, inv)
 
141
                ret = self._get_ie_object(entry, inv, unusual_modes)
140
142
                self._idmap.add_entry(ret.id, "blob", (entry.file_id, entry.revision))
141
143
                return ret.id, ret
142
144
 
143
 
    def _get_ie_sha1(self, entry, inv):
144
 
        return self._get_ie_object_or_sha1(entry, inv)[0]
 
145
    def _get_ie_sha1(self, entry, inv, unusual_modes):
 
146
        return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0]
145
147
 
146
148
    def _get_blob(self, fileid, revision, expected_sha=None):
147
149
        """Return a Git Blob object from a fileid and revision stored in bzr.
156
158
        self._check_expected_sha(expected_sha, blob)
157
159
        return blob
158
160
 
159
 
    def _get_tree(self, fileid, revid, inv=None, expected_sha=None):
 
161
    def _get_tree(self, fileid, revid, inv, unusual_modes, expected_sha=None):
160
162
        """Return a Git Tree object from a file id and a revision stored in bzr.
161
163
 
162
164
        :param fileid: fileid in the tree.
163
165
        :param revision: Revision of the tree.
164
166
        """
165
 
        if inv is None:
166
 
            inv = self.repository.get_inventory(revid)
167
 
        tree = directory_to_tree(inv[fileid], lambda ie: self._get_ie_sha1(ie, inv))
 
167
        tree = directory_to_tree(inv[fileid], lambda ie: self._get_ie_sha1(ie, inv, unusual_modes))
168
168
        self._check_expected_sha(expected_sha, tree)
169
169
        return tree
170
170
 
171
 
    def _get_commit(self, revid, tree_sha, expected_sha=None):
172
 
        rev = self.repository.get_revision(revid)
 
171
    def _get_commit(self, rev, tree_sha, expected_sha=None):
173
172
        try:
174
173
            commit = revision_to_commit(rev, tree_sha, self._lookup_revision_sha1)
175
174
        except errors.NoSuchRevision, e:
226
225
        # convert object to git object
227
226
        if type == "commit":
228
227
            try:
229
 
                return self._get_commit(type_data[0], type_data[1], 
230
 
                                        expected_sha=sha)
 
228
                rev = self.repository.get_revision(type_data[0])
231
229
            except errors.NoSuchRevision:
232
230
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
233
231
                raise KeyError(sha)
 
232
            return self._get_commit(rev, type_data[1], expected_sha=sha)
234
233
        elif type == "blob":
235
234
            return self._get_blob(type_data[0], type_data[1], expected_sha=sha)
236
235
        elif type == "tree":
 
236
            inv = self.repository.get_inventory(type_data[1])
 
237
            rev = self._get_unusual_modes(type_data[1])
237
238
            try:
238
 
                return self._get_tree(type_data[0], type_data[1], 
 
239
                return self._get_tree(type_data[0], type_data[1], inv, unusual_modes,
239
240
                                      expected_sha=sha)
240
241
            except errors.NoSuchRevision:
241
242
                raise KeyError(sha)