/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
17
17
 
18
18
"""An adapter between a Git Repository and a Bazaar Branch"""
19
19
 
20
 
import bzrlib
21
20
from bzrlib import (
22
21
    errors,
23
 
    graph,
24
22
    inventory,
25
 
    osutils,
26
23
    repository,
27
24
    revision,
28
25
    revisiontree,
41
38
    )
42
39
from bzrlib.plugins.git.tree import (
43
40
    GitRevisionTree,
44
 
    InterGitRevisionTrees,
45
41
    )
46
42
from bzrlib.plugins.git.versionedfiles import (
47
43
    GitRevisions,
49
45
    )
50
46
 
51
47
 
 
48
from dulwich.objects import (
 
49
    Commit,
 
50
    )
 
51
 
 
52
 
52
53
class GitRepository(ForeignRepository):
53
54
    """An adapter to git repositories for bzr."""
54
55
 
57
58
    vcs = foreign_git
58
59
 
59
60
    def __init__(self, gitdir, lockfiles):
60
 
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
 
61
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir,
61
62
            lockfiles)
62
63
        from bzrlib.plugins.git import fetch, push
63
 
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
 
64
        for optimiser in [fetch.InterRemoteGitNonGitRepository,
64
65
                          fetch.InterLocalGitNonGitRepository,
65
66
                          fetch.InterGitGitRepository,
66
67
                          push.InterToLocalGitRepository,
68
69
            repository.InterRepository.register_optimiser(optimiser)
69
70
 
70
71
    def is_shared(self):
71
 
        return True
 
72
        return False
72
73
 
73
74
    def supports_rich_root(self):
74
75
        return True
75
76
 
76
 
    def _warn_if_deprecated(self):
 
77
    def _warn_if_deprecated(self, branch=None):
77
78
        # This class isn't deprecated
78
79
        pass
79
80
 
81
82
        return default_mapping
82
83
 
83
84
    def make_working_trees(self):
84
 
        return True
 
85
        return not self._git.bare
85
86
 
86
87
    def revision_graph_can_have_wrong_parents(self):
87
88
        return False
90
91
        interrepo = repository.InterRepository.get(source, self)
91
92
        return interrepo.dfetch(stop_revision)
92
93
 
93
 
    def dfetch_refs(self, source, stop_revision):
94
 
        interrepo = repository.InterRepository.get(source, self)
95
 
        return interrepo.dfetch_refs(stop_revision)
96
 
 
97
94
 
98
95
class LocalGitRepository(GitRepository):
99
96
    """Git repository on the file system."""
100
97
 
101
98
    def __init__(self, gitdir, lockfiles):
102
 
        # FIXME: This also caches negatives. Need to be more careful 
103
 
        # about this once we start writing to git
104
 
        self._parents_provider = graph.CachingParentsProvider(self)
105
99
        GitRepository.__init__(self, gitdir, lockfiles)
106
100
        self.base = gitdir.root_transport.base
107
101
        self._git = gitdir._git
108
 
        self.texts = None
109
102
        self.signatures = None
110
 
        self.revisions = GitRevisions(self._git.object_store)
 
103
        self.revisions = GitRevisions(self, self._git.object_store)
111
104
        self.inventories = None
112
105
        self.texts = GitTexts(self)
113
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
 
114
117
    def all_revision_ids(self):
115
 
        ret = set([revision.NULL_REVISION])
116
 
        heads = self._git.refs.as_dict('refs/heads')
117
 
        if heads == {}:
118
 
            return ret
119
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
120
 
        ret = set(bzr_heads)
121
 
        graph = self.get_graph()
122
 
        for rev, parents in graph.iter_ancestry(bzr_heads):
123
 
            ret.add(rev)
 
118
        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)
124
123
        return ret
125
124
 
126
 
    def _make_parents_provider(self):
127
 
        """See Repository._make_parents_provider()."""
128
 
        return self._parents_provider
129
 
 
130
125
    def get_parent_map(self, revids):
131
126
        parent_map = {}
132
127
        for revision_id in revids:
134
129
            if revision_id == revision.NULL_REVISION:
135
130
                parent_map[revision_id] = ()
136
131
                continue
137
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
132
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
138
133
            try:
139
 
                commit = self._git.commit(hexsha)
 
134
                commit = self._git[hexsha]
140
135
            except KeyError:
141
136
                continue
142
 
            if commit is None:
143
 
                # Older versions of Dulwich used to return None rather than 
144
 
                # raise KeyError.
145
 
                continue
146
 
            else:
147
 
                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]
148
140
        return parent_map
149
141
 
150
142
    def get_ancestry(self, revision_id, topo_sorted=True):
163
155
    def get_signature_text(self, revision_id):
164
156
        raise errors.NoSuchRevision(self, revision_id)
165
157
 
166
 
    def lookup_revision_id(self, revid):
 
158
    def pack(self, hint=None, clean_obsolete_packs=False):
 
159
        self._git.object_store.pack_loose_objects()
 
160
 
 
161
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
167
162
        """Lookup a revision id.
168
 
        
169
 
        :param revid: Bazaar revision id.
170
 
        :return: Tuple with git revisionid and mapping.
 
163
 
171
164
        """
172
 
        # Yes, this doesn't really work, but good enough as a stub
173
 
        return osutils.sha(revid).hexdigest(), self.get_mapping()
 
165
        assert type(foreign_revid) is str
 
166
        if mapping is None:
 
167
            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
174
181
 
175
182
    def has_signature_for_revision_id(self, revision_id):
176
183
        return False
177
184
 
178
 
    def lookup_git_revid(self, bzr_revid):
 
185
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
179
186
        try:
180
187
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
181
188
        except errors.InvalidRevisionId:
182
 
            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)
183
205
 
184
206
    def get_revision(self, revision_id):
185
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
 
207
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
186
208
        try:
187
 
            commit = self._git.commit(git_commit_id)
 
209
            commit = self._git[git_commit_id]
188
210
        except KeyError:
189
211
            raise errors.NoSuchRevision(self, revision_id)
190
 
        # print "fetched revision:", git_commit_id
191
 
        revision = mapping.import_commit(commit)
 
212
        revision, roundtrip_revid, verifiers = mapping.import_commit(
 
213
            commit, self.lookup_foreign_revision_id)
192
214
        assert revision is not None
 
215
        # FIXME: check verifiers ?
 
216
        if roundtrip_revid:
 
217
            revision.revision_id = roundtrip_revid
193
218
        return revision
194
219
 
195
220
    def has_revision(self, revision_id):
196
221
        try:
197
 
            self.get_revision(revision_id)
 
222
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
198
223
        except errors.NoSuchRevision:
199
224
            return False
200
 
        else:
201
 
            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))
202
229
 
203
230
    def get_revisions(self, revids):
204
231
        return [self.get_revision(r) for r in revids]
226
253
        progress=None):
227
254
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
228
255
 
 
256
    def _get_versioned_file_checker(self, text_key_references=None,
 
257
                        ancestors=None):
 
258
        return GitVersionedFileChecker(self,
 
259
            text_key_references=text_key_references, ancestors=ancestors)
 
260
 
 
261
 
 
262
class GitVersionedFileChecker(repository._VersionedFileChecker):
 
263
 
 
264
    file_ids = []
 
265
 
 
266
    def _check_file_version_parents(self, texts, progress_bar):
 
267
        return {}, []
 
268
 
229
269
 
230
270
class GitRepositoryFormat(repository.RepositoryFormat):
231
271
    """Git repository format."""
242
282
    def check_conversion_target(self, target_repo_format):
243
283
        return target_repo_format.rich_root_data
244
284
 
 
285
    def get_foreign_tests_repository_factory(self):
 
286
        from bzrlib.plugins.git.tests.test_repository import (
 
287
            ForeignTestsRepositoryFactory,
 
288
            )
 
289
        return ForeignTestsRepositoryFactory()
 
290
 
245
291
    def network_name(self):
246
292
        return "git"