/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

More work on roundtrip push support.

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,
23
22
    inventory,
24
23
    repository,
25
24
    revision,
46
45
    )
47
46
 
48
47
 
 
48
from dulwich.objects import (
 
49
    Commit,
 
50
    )
 
51
 
 
52
 
49
53
class GitRepository(ForeignRepository):
50
54
    """An adapter to git repositories for bzr."""
51
55
 
65
69
            repository.InterRepository.register_optimiser(optimiser)
66
70
 
67
71
    def is_shared(self):
68
 
        return True
 
72
        return False
69
73
 
70
74
    def supports_rich_root(self):
71
75
        return True
78
82
        return default_mapping
79
83
 
80
84
    def make_working_trees(self):
81
 
        return True
 
85
        return not self._git.bare
82
86
 
83
87
    def revision_graph_can_have_wrong_parents(self):
84
88
        return False
87
91
        interrepo = repository.InterRepository.get(source, self)
88
92
        return interrepo.dfetch(stop_revision)
89
93
 
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."""
97
97
 
98
98
    def __init__(self, gitdir, lockfiles):
99
 
        # FIXME: This also caches negatives. Need to be more careful
100
 
        # about this once we start writing to git
101
 
        self._parents_provider = graph.CachingParentsProvider(self)
102
99
        GitRepository.__init__(self, gitdir, lockfiles)
103
100
        self.base = gitdir.root_transport.base
104
101
        self._git = gitdir._git
107
104
        self.inventories = None
108
105
        self.texts = GitTexts(self)
109
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
 
110
117
    def all_revision_ids(self):
111
118
        ret = set([])
112
 
        heads = self._git.refs.as_dict('refs/heads')
113
 
        if heads == {}:
114
 
            return ret
115
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
116
 
        ret = set(bzr_heads)
117
 
        graph = self.get_graph()
118
 
        for rev, parents in graph.iter_ancestry(bzr_heads):
119
 
            ret.add(rev)
 
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)
120
123
        return ret
121
124
 
122
 
    def _make_parents_provider(self):
123
 
        """See Repository._make_parents_provider()."""
124
 
        return self._parents_provider
125
 
 
126
125
    def get_parent_map(self, revids):
127
126
        parent_map = {}
128
127
        for revision_id in revids:
132
131
                continue
133
132
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
134
133
            try:
135
 
                commit = self._git.commit(hexsha)
 
134
                commit = self._git[hexsha]
136
135
            except KeyError:
137
136
                continue
138
 
            if commit is None:
139
 
                # Older versions of Dulwich used to return None rather than
140
 
                # raise KeyError.
141
 
                continue
142
 
            else:
143
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
137
            parent_map[revision_id] = [
 
138
                self.lookup_foreign_revision_id(p, mapping)
 
139
                for p in commit.parents]
144
140
        return parent_map
145
141
 
146
142
    def get_ancestry(self, revision_id, topo_sorted=True):
159
155
    def get_signature_text(self, revision_id):
160
156
        raise errors.NoSuchRevision(self, revision_id)
161
157
 
 
158
    def pack(self, hint=None, clean_obsolete_packs=False):
 
159
        self._git.object_store.pack_loose_objects()
 
160
 
162
161
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
163
162
        """Lookup a revision id.
164
163
 
165
164
        """
 
165
        assert type(foreign_revid) is str
166
166
        if mapping is None:
167
167
            mapping = self.get_mapping()
168
 
        return mapping.revision_id_foreign_to_bzr(foreign_revid)
 
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
169
181
 
170
182
    def has_signature_for_revision_id(self, revision_id):
171
183
        return False
172
184
 
173
 
    def lookup_bzr_revision_id(self, bzr_revid):
 
185
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
174
186
        try:
175
187
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
176
188
        except errors.InvalidRevisionId:
177
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
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)
178
205
 
179
206
    def get_revision(self, revision_id):
180
207
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
181
208
        try:
182
 
            commit = self._git.commit(git_commit_id)
 
209
            commit = self._git[git_commit_id]
183
210
        except KeyError:
184
211
            raise errors.NoSuchRevision(self, revision_id)
185
 
        # print "fetched revision:", git_commit_id
186
 
        revision = mapping.import_commit(commit)
 
212
        revision, roundtrip_revid, verifiers = mapping.import_commit(
 
213
            commit, self.lookup_foreign_revision_id)
187
214
        assert revision is not None
 
215
        # FIXME: check verifiers ?
 
216
        if roundtrip_revid:
 
217
            revision.revision_id = roundtrip_revid
188
218
        return revision
189
219
 
190
220
    def has_revision(self, revision_id):
191
221
        try:
192
 
            self.get_revision(revision_id)
 
222
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
193
223
        except errors.NoSuchRevision:
194
224
            return False
195
 
        else:
196
 
            return True
 
225
        return (git_commit_id in self._git)
 
226
 
 
227
    def has_revisions(self, revision_ids):
 
228
        return set(filter(self.has_revision, revision_ids))
197
229
 
198
230
    def get_revisions(self, revids):
199
231
        return [self.get_revision(r) for r in revids]
225
257
                        ancestors=None):
226
258
        return GitVersionedFileChecker(self,
227
259
            text_key_references=text_key_references, ancestors=ancestors)
228
 
    
 
260
 
229
261
 
230
262
class GitVersionedFileChecker(repository._VersionedFileChecker):
231
263