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

Rely less on command-line git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
converter.py
21
21
    Tree,
22
22
    )
23
23
from dulwich.object_store import (
24
 
    BaseObjectStore,
25
24
    ObjectStoreIterator,
26
25
    )
27
26
import stat
29
28
from bzrlib import (
30
29
    debug,
31
30
    errors,
32
 
    trace,
33
31
    ui,
34
32
    )
35
 
from bzrlib.revision import (
36
 
    NULL_REVISION,
37
 
    )
38
 
 
39
 
from bzrlib.plugins.git.errors import (
40
 
    GhostRevision,
41
 
    )
42
33
 
43
34
from bzrlib.plugins.git.mapping import (
44
 
    default_mapping,
45
35
    directory_to_tree,
46
 
    extract_unusual_modes,
47
36
    mapping_registry,
48
37
    revision_to_commit,
49
38
    )
50
39
from bzrlib.plugins.git.shamap import (
51
40
    SqliteGitShaMap,
52
 
    TdbGitShaMap,
53
41
    )
54
42
 
55
43
 
56
 
def get_object_store(repo, mapping=None):
57
 
    git = getattr(repo, "_git", None)
58
 
    if git is not None:
59
 
        return git.object_store
60
 
    return BazaarObjectStore(repo, mapping)
61
 
 
62
 
 
63
 
class BazaarObjectStore(BaseObjectStore):
 
44
class BazaarObjectStore(object):
64
45
    """A Git-style object store backed onto a Bazaar repository."""
65
46
 
66
47
    def __init__(self, repository, mapping=None):
67
48
        self.repository = repository
68
49
        if mapping is None:
69
 
            self.mapping = default_mapping
 
50
            self.mapping = self.repository.get_mapping()
70
51
        else:
71
52
            self.mapping = mapping
72
 
        try:
73
 
            self._idmap = TdbGitShaMap.from_repository(repository)
74
 
        except ImportError:
75
 
            self._idmap = SqliteGitShaMap.from_repository(repository)
 
53
        self._idmap = SqliteGitShaMap.from_repository(repository)
 
54
 
 
55
    def iter_shas(self, shas):
 
56
        return ObjectStoreIterator(self, shas)
76
57
 
77
58
    def _update_sha_map(self, stop_revision=None):
78
59
        if stop_revision is None:
99
80
 
100
81
    def _update_sha_map_revision(self, revid):
101
82
        inv = self.repository.get_inventory(revid)
 
83
        tree_sha = self._get_ie_sha1(inv.root, inv)
102
84
        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
85
        commit_obj = revision_to_commit(rev, tree_sha,
106
 
                                        self._idmap.lookup_commit)
 
86
            self._idmap._parent_lookup)
107
87
        try:
108
88
            foreign_revid, mapping = mapping_registry.parse_revision_id(revid)
109
89
        except errors.InvalidRevisionId:
120
100
        if expected_sha != object.id:
121
101
            raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha))
122
102
 
123
 
    def _get_ie_object(self, entry, inv, unusual_modes):  
 
103
    def _get_ie_object(self, entry, inv):  
124
104
        if entry.kind == "directory":
125
 
            return self._get_tree(entry.file_id, inv.revision_id, inv, unusual_modes)
 
105
            return self._get_tree(entry.file_id, inv.revision_id, inv=inv)
126
106
        else:
127
107
            return self._get_blob(entry.file_id, entry.revision)
128
108
 
129
 
    def _get_ie_object_or_sha1(self, entry, inv, unusual_modes):
 
109
    def _get_ie_object_or_sha1(self, entry, inv):
130
110
        if entry.kind == "directory":
131
111
            try:
132
112
                return self._idmap.lookup_tree(entry.file_id, inv.revision_id), None
133
113
            except KeyError:
134
 
                ret = self._get_ie_object(entry, inv, unusual_modes)
 
114
                ret = self._get_ie_object(entry, inv)
135
115
                self._idmap.add_entry(ret.id, "tree", (entry.file_id, inv.revision_id))
136
116
                return ret.id, ret
137
117
        else:
138
118
            try:
139
119
                return self._idmap.lookup_blob(entry.file_id, entry.revision), None
140
120
            except KeyError:
141
 
                ret = self._get_ie_object(entry, inv, unusual_modes)
 
121
                ret = self._get_ie_object(entry, inv)
142
122
                self._idmap.add_entry(ret.id, "blob", (entry.file_id, entry.revision))
143
123
                return ret.id, ret
144
124
 
145
 
    def _get_ie_sha1(self, entry, inv, unusual_modes):
146
 
        return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0]
 
125
    def _get_ie_sha1(self, entry, inv):
 
126
        return self._get_ie_object_or_sha1(entry, inv)[0]
147
127
 
148
128
    def _get_blob(self, fileid, revision, expected_sha=None):
149
129
        """Return a Git Blob object from a fileid and revision stored in bzr.
158
138
        self._check_expected_sha(expected_sha, blob)
159
139
        return blob
160
140
 
161
 
    def _get_tree(self, fileid, revid, inv, unusual_modes, expected_sha=None):
 
141
    def _get_tree(self, fileid, revid, inv=None, expected_sha=None):
162
142
        """Return a Git Tree object from a file id and a revision stored in bzr.
163
143
 
164
144
        :param fileid: fileid in the tree.
165
145
        :param revision: Revision of the tree.
166
146
        """
167
 
        tree = directory_to_tree(inv[fileid], 
168
 
            lambda ie: self._get_ie_sha1(ie, inv, unusual_modes),
169
 
            unusual_modes)
 
147
        if inv is None:
 
148
            inv = self.repository.get_inventory(revid)
 
149
        tree = directory_to_tree(inv[fileid], lambda ie: self._get_ie_sha1(ie, inv))
170
150
        self._check_expected_sha(expected_sha, tree)
171
151
        return tree
172
152
 
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)
 
153
    def _get_commit(self, revid, tree_sha, expected_sha=None):
 
154
        rev = self.repository.get_revision(revid)
 
155
        commit = revision_to_commit(rev, tree_sha, self._lookup_revision_sha1)
178
156
        self._check_expected_sha(expected_sha, commit)
179
157
        return commit
180
158
 
181
159
    def get_parents(self, sha):
182
 
        """Retrieve the parents of a Git commit by SHA1.
183
 
 
184
 
        :param sha: SHA1 of the commit
185
 
        :raises: KeyError, NotCommitError
186
 
        """
187
160
        return self[sha].parents
188
161
 
189
162
    def _lookup_revision_sha1(self, revid):
190
 
        """Return the SHA1 matching a Bazaar revision."""
191
 
        if revid == NULL_REVISION:
192
 
            return "0" * 40
193
163
        try:
194
 
            return self._idmap.lookup_commit(revid)
 
164
            return self._idmap._parent_lookup(revid)
195
165
        except KeyError:
196
 
            self._update_sha_map(revid)
197
 
            return self._idmap.lookup_commit(revid)
 
166
            inv = self.repository.get_inventory(revid)
 
167
            tree_sha = self._get_ie_sha1(inv.root, inv)
 
168
            ret = self._get_commit(revid, tree_sha).id
 
169
            self._idmap.add_entry(ret, "commit", (revid, tree_sha))
 
170
            return ret
198
171
 
199
172
    def get_raw(self, sha):
200
 
        """Get the raw representation of a Git object by SHA1.
201
 
 
202
 
        :param sha: SHA1 of the git object
203
 
        """
204
173
        return self[sha].as_raw_string()
205
174
 
206
175
    def __contains__(self, sha):
226
195
        (type, type_data) = self._lookup_git_sha(sha)
227
196
        # convert object to git object
228
197
        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)
 
198
            return self._get_commit(type_data[0], type_data[1], 
 
199
                                    expected_sha=sha)
235
200
        elif type == "blob":
236
201
            return self._get_blob(type_data[0], type_data[1], expected_sha=sha)
237
202
        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)
 
203
            return self._get_tree(type_data[0], type_data[1], expected_sha=sha)
246
204
        else:
247
205
            raise AssertionError("Unknown object type '%s'" % type)