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

Avoid invoking git directly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
91
91
        interrepo = repository.InterRepository.get(source, self)
92
92
        return interrepo.dfetch(stop_revision)
93
93
 
94
 
    def dfetch_refs(self, source, stop_revision):
95
 
        interrepo = repository.InterRepository.get(source, self)
96
 
        return interrepo.dfetch_refs(stop_revision)
97
 
 
98
 
    def fetch_refs(self, source, stop_revision):
99
 
        interrepo = repository.InterRepository.get(source, self)
100
 
        return interrepo.fetch_refs(stop_revision)
101
 
 
102
94
 
103
95
class LocalGitRepository(GitRepository):
104
96
    """Git repository on the file system."""
112
104
        self.inventories = None
113
105
        self.texts = GitTexts(self)
114
106
 
115
 
    def all_revision_ids(self):
116
 
        ret = set([])
 
107
    def _iter_revision_ids(self):
117
108
        for sha in self._git.object_store:
118
109
            o = self._git.object_store[sha]
119
110
            if not isinstance(o, Commit):
120
111
                continue
121
 
            rev = self.get_mapping().import_commit(o)
122
 
            ret.append(rev.revision_id)
 
112
            rev = self.get_mapping().import_commit(o,
 
113
                self.lookup_foreign_revision_id)
 
114
            yield o.id, rev.revision_id
 
115
 
 
116
    def all_revision_ids(self):
 
117
        ret = set([])
 
118
        for git_sha, revid in self._iter_revision_ids():
 
119
            ret.add(revid)
123
120
        return ret
124
121
 
125
122
    def get_parent_map(self, revids):
134
131
                commit = self._git[hexsha]
135
132
            except KeyError:
136
133
                continue
137
 
            parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
134
            parent_map[revision_id] = [self.lookup_foreign_revision_id(p, mapping) for p in commit.parents]
138
135
        return parent_map
139
136
 
140
137
    def get_ancestry(self, revision_id, topo_sorted=True):
153
150
    def get_signature_text(self, revision_id):
154
151
        raise errors.NoSuchRevision(self, revision_id)
155
152
 
 
153
    def pack(self, hint=None, clean_obsolete_packs=False):
 
154
        self._git.object_store.pack_loose_objects()
 
155
 
156
156
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
157
157
        """Lookup a revision id.
158
158
 
159
159
        """
160
160
        if mapping is None:
161
161
            mapping = self.get_mapping()
162
 
        return mapping.revision_id_foreign_to_bzr(foreign_revid)
 
162
        from dulwich.protocol import (
 
163
            ZERO_SHA,
 
164
            )
 
165
        if foreign_revid == ZERO_SHA:
 
166
            return revision.NULL_REVISION
 
167
        commit = self._git[foreign_revid]
 
168
        rev = mapping.import_commit(commit, lambda x: None)
 
169
        return rev.revision_id
163
170
 
164
171
    def has_signature_for_revision_id(self, revision_id):
165
172
        return False
166
173
 
167
 
    def lookup_bzr_revision_id(self, bzr_revid):
 
174
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
168
175
        try:
169
176
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
170
177
        except errors.InvalidRevisionId:
171
 
            mapping = self.get_mapping()
 
178
            if mapping is None:
 
179
                mapping = self.get_mapping()
172
180
            try:
173
181
                return self._git.refs[mapping.revid_as_refname(bzr_revid)], mapping
174
182
            except KeyError:
 
183
                # Update refs from Git commit objects
 
184
                # FIXME: Hitting this a lot will be very inefficient...
 
185
                for git_sha, revid in self._iter_revision_ids():
 
186
                    self._git.refs[mapping.revid_as_refname(revid)] = git_sha
 
187
                    if revid == bzr_revid:
 
188
                        return git_sha, mapping
175
189
                raise errors.NoSuchRevision(self, bzr_revid)
176
190
 
177
191
    def get_revision(self, revision_id):
181
195
        except KeyError:
182
196
            raise errors.NoSuchRevision(self, revision_id)
183
197
        # print "fetched revision:", git_commit_id
184
 
        revision = mapping.import_commit(commit)
 
198
        revision = mapping.import_commit(commit,
 
199
            self.lookup_foreign_revision_id)
185
200
        assert revision is not None
186
201
        return revision
187
202
 
193
208
        return (git_commit_id in self._git)
194
209
 
195
210
    def has_revisions(self, revision_ids):
196
 
        ret = set()
197
 
        for revid in revision_ids:
198
 
            if self.has_revision(revid):
199
 
                ret.add(revid)
200
 
        return ret
 
211
        return set(filter(self.has_revision, revision_ids))
201
212
 
202
213
    def get_revisions(self, revids):
203
214
        return [self.get_revision(r) for r in revids]