/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

Default to HEAD rather than refs/heads/master again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
19
19
 
20
20
from bzrlib import (
21
21
    errors,
 
22
    graph,
22
23
    inventory,
23
24
    repository,
24
25
    revision,
45
46
    )
46
47
 
47
48
 
48
 
from dulwich.objects import (
49
 
    Commit,
50
 
    )
51
 
 
52
 
 
53
49
class GitRepository(ForeignRepository):
54
50
    """An adapter to git repositories for bzr."""
55
51
 
82
78
        return default_mapping
83
79
 
84
80
    def make_working_trees(self):
85
 
        return not self._git.bare
 
81
        return True
86
82
 
87
83
    def revision_graph_can_have_wrong_parents(self):
88
84
        return False
91
87
        interrepo = repository.InterRepository.get(source, self)
92
88
        return interrepo.dfetch(stop_revision)
93
89
 
 
90
    def dfetch_refs(self, source, stop_revision):
 
91
        interrepo = repository.InterRepository.get(source, self)
 
92
        return interrepo.dfetch_refs(stop_revision)
 
93
 
94
94
 
95
95
class LocalGitRepository(GitRepository):
96
96
    """Git repository on the file system."""
104
104
        self.inventories = None
105
105
        self.texts = GitTexts(self)
106
106
 
107
 
    def _iter_revision_ids(self):
108
 
        mapping = self.get_mapping()
109
 
        for sha in self._git.object_store:
110
 
            o = self._git.object_store[sha]
111
 
            if not isinstance(o, Commit):
112
 
                continue
113
 
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
114
 
                self.lookup_foreign_revision_id)
115
 
            yield o.id, rev.revision_id, roundtrip_revid
116
 
 
117
107
    def all_revision_ids(self):
118
108
        ret = set([])
119
 
        for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
120
 
            ret.add(revid)
121
 
            if roundtrip_revid:
122
 
                ret.add(roundtrip_revid)
 
109
        heads = self._git.refs.as_dict('refs/heads')
 
110
        if heads == {}:
 
111
            return ret
 
112
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
 
113
        ret = set(bzr_heads)
 
114
        graph = self.get_graph()
 
115
        for rev, parents in graph.iter_ancestry(bzr_heads):
 
116
            ret.add(rev)
123
117
        return ret
124
118
 
125
119
    def get_parent_map(self, revids):
134
128
                commit = self._git[hexsha]
135
129
            except KeyError:
136
130
                continue
137
 
            parent_map[revision_id] = [
138
 
                self.lookup_foreign_revision_id(p, mapping)
139
 
                for p in commit.parents]
 
131
            parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
140
132
        return parent_map
141
133
 
142
134
    def get_ancestry(self, revision_id, topo_sorted=True):
155
147
    def get_signature_text(self, revision_id):
156
148
        raise errors.NoSuchRevision(self, revision_id)
157
149
 
158
 
    def pack(self, hint=None, clean_obsolete_packs=False):
159
 
        self._git.object_store.pack_loose_objects()
160
 
 
161
150
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
162
151
        """Lookup a revision id.
163
152
 
164
153
        """
165
 
        assert type(foreign_revid) is str
166
154
        if mapping is None:
167
155
            mapping = self.get_mapping()
168
 
        from dulwich.protocol import (
169
 
            ZERO_SHA,
170
 
            )
171
 
        if foreign_revid == ZERO_SHA:
172
 
            return revision.NULL_REVISION
173
 
        commit = self._git[foreign_revid]
174
 
        rev, roundtrip_revid, verifiers = mapping.import_commit(commit,
175
 
            lambda x: None)
176
 
        # FIXME: check testament before doing this?
177
 
        if roundtrip_revid:
178
 
            return roundtrip_revid
179
 
        else:
180
 
            return rev.revision_id
 
156
        return mapping.revision_id_foreign_to_bzr(foreign_revid)
181
157
 
182
158
    def has_signature_for_revision_id(self, revision_id):
183
159
        return False
184
160
 
185
 
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
 
161
    def lookup_bzr_revision_id(self, bzr_revid):
186
162
        try:
187
163
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
188
164
        except errors.InvalidRevisionId:
189
 
            if mapping is None:
190
 
                mapping = self.get_mapping()
191
 
            try:
192
 
                return (self._git.refs[mapping.revid_as_refname(bzr_revid)],
193
 
                        mapping)
194
 
            except KeyError:
195
 
                # Update refs from Git commit objects
196
 
                # FIXME: Hitting this a lot will be very inefficient...
197
 
                for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
198
 
                    if not roundtrip_revid:
199
 
                        continue
200
 
                    refname = mapping.revid_as_refname(roundtrip_revid)
201
 
                    self._git.refs[refname] = git_sha
202
 
                    if roundtrip_revid == bzr_revid:
203
 
                        return git_sha, mapping
204
 
                raise errors.NoSuchRevision(self, bzr_revid)
 
165
            raise errors.NoSuchRevision(self, bzr_revid)
205
166
 
206
167
    def get_revision(self, revision_id):
207
168
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
209
170
            commit = self._git[git_commit_id]
210
171
        except KeyError:
211
172
            raise errors.NoSuchRevision(self, revision_id)
212
 
        revision, roundtrip_revid, verifiers = mapping.import_commit(
213
 
            commit, self.lookup_foreign_revision_id)
 
173
        # print "fetched revision:", git_commit_id
 
174
        revision = mapping.import_commit(commit)
214
175
        assert revision is not None
215
 
        # FIXME: check verifiers ?
216
 
        if roundtrip_revid:
217
 
            revision.revision_id = roundtrip_revid
218
176
        return revision
219
177
 
220
178
    def has_revision(self, revision_id):
225
183
        return (git_commit_id in self._git)
226
184
 
227
185
    def has_revisions(self, revision_ids):
228
 
        return set(filter(self.has_revision, revision_ids))
 
186
        ret = set()
 
187
        for revid in revision_ids:
 
188
            if self.has_revision(revid):
 
189
                ret.add(revid)
 
190
        return ret
229
191
 
230
192
    def get_revisions(self, revids):
231
193
        return [self.get_revision(r) for r in revids]
257
219
                        ancestors=None):
258
220
        return GitVersionedFileChecker(self,
259
221
            text_key_references=text_key_references, ancestors=ancestors)
260
 
 
 
222
    
261
223
 
262
224
class GitVersionedFileChecker(repository._VersionedFileChecker):
263
225