/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,
34
31
from bzrlib.plugins.git.commit import (
35
32
    GitCommitBuilder,
36
33
    )
37
 
from bzrlib.plugins.git.inventory import (
38
 
    GitInventory,
39
 
    )
40
34
from bzrlib.plugins.git.mapping import (
41
35
    default_mapping,
42
36
    foreign_git,
43
37
    mapping_registry,
44
38
    )
 
39
from bzrlib.plugins.git.tree import (
 
40
    GitRevisionTree,
 
41
    )
45
42
from bzrlib.plugins.git.versionedfiles import (
46
43
    GitRevisions,
47
44
    GitTexts,
48
45
    )
49
46
 
50
47
 
 
48
from dulwich.objects import (
 
49
    Commit,
 
50
    )
 
51
 
 
52
 
51
53
class GitRepository(ForeignRepository):
52
54
    """An adapter to git repositories for bzr."""
53
55
 
56
58
    vcs = foreign_git
57
59
 
58
60
    def __init__(self, gitdir, lockfiles):
59
 
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
 
61
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir,
60
62
            lockfiles)
61
63
        from bzrlib.plugins.git import fetch, push
62
 
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
 
64
        for optimiser in [fetch.InterRemoteGitNonGitRepository,
63
65
                          fetch.InterLocalGitNonGitRepository,
64
66
                          fetch.InterGitGitRepository,
65
67
                          push.InterToLocalGitRepository,
67
69
            repository.InterRepository.register_optimiser(optimiser)
68
70
 
69
71
    def is_shared(self):
70
 
        return True
 
72
        return False
71
73
 
72
74
    def supports_rich_root(self):
73
75
        return True
74
76
 
75
 
    def _warn_if_deprecated(self):
 
77
    def _warn_if_deprecated(self, branch=None):
76
78
        # This class isn't deprecated
77
79
        pass
78
80
 
80
82
        return default_mapping
81
83
 
82
84
    def make_working_trees(self):
83
 
        return True
 
85
        return not self._git.bare
84
86
 
85
87
    def revision_graph_can_have_wrong_parents(self):
86
88
        return False
89
91
        interrepo = repository.InterRepository.get(source, self)
90
92
        return interrepo.dfetch(stop_revision)
91
93
 
92
 
    def dfetch_refs(self, source, stop_revision):
93
 
        interrepo = repository.InterRepository.get(source, self)
94
 
        return interrepo.dfetch_refs(stop_revision)
95
 
 
96
94
 
97
95
class LocalGitRepository(GitRepository):
98
96
    """Git repository on the file system."""
99
97
 
100
98
    def __init__(self, gitdir, lockfiles):
101
 
        # FIXME: This also caches negatives. Need to be more careful 
102
 
        # about this once we start writing to git
103
 
        self._parents_provider = graph.CachingParentsProvider(self)
104
99
        GitRepository.__init__(self, gitdir, lockfiles)
105
100
        self.base = gitdir.root_transport.base
106
101
        self._git = gitdir._git
107
 
        self.texts = None
108
102
        self.signatures = None
109
 
        self.revisions = GitRevisions(self._git.object_store)
 
103
        self.revisions = GitRevisions(self, self._git.object_store)
110
104
        self.inventories = None
111
105
        self.texts = GitTexts(self)
112
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
 
113
117
    def all_revision_ids(self):
114
 
        ret = set([revision.NULL_REVISION])
115
 
        heads = self._git.refs.as_dict('refs/heads')
116
 
        if heads == {}:
117
 
            return ret
118
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
119
 
        ret = set(bzr_heads)
120
 
        graph = self.get_graph()
121
 
        for rev, parents in graph.iter_ancestry(bzr_heads):
122
 
            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)
123
123
        return ret
124
124
 
125
 
    def _make_parents_provider(self):
126
 
        """See Repository._make_parents_provider()."""
127
 
        return self._parents_provider
128
 
 
129
125
    def get_parent_map(self, revids):
130
126
        parent_map = {}
131
127
        for revision_id in revids:
133
129
            if revision_id == revision.NULL_REVISION:
134
130
                parent_map[revision_id] = ()
135
131
                continue
136
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
137
 
            commit  = self._git.commit(hexsha)
138
 
            if commit is None:
 
132
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
 
133
            try:
 
134
                commit = self._git[hexsha]
 
135
            except KeyError:
139
136
                continue
140
 
            else:
141
 
                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]
142
140
        return parent_map
143
141
 
144
142
    def get_ancestry(self, revision_id, topo_sorted=True):
157
155
    def get_signature_text(self, revision_id):
158
156
        raise errors.NoSuchRevision(self, revision_id)
159
157
 
160
 
    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):
161
162
        """Lookup a revision id.
162
 
        
163
 
        :param revid: Bazaar revision id.
164
 
        :return: Tuple with git revisionid and mapping.
 
163
 
165
164
        """
166
 
        # Yes, this doesn't really work, but good enough as a stub
167
 
        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
168
181
 
169
182
    def has_signature_for_revision_id(self, revision_id):
170
183
        return False
171
184
 
172
 
    def lookup_git_revid(self, bzr_revid):
 
185
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
173
186
        try:
174
187
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
175
188
        except errors.InvalidRevisionId:
176
 
            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)
177
205
 
178
206
    def get_revision(self, revision_id):
179
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
 
207
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
180
208
        try:
181
 
            commit = self._git.commit(git_commit_id)
 
209
            commit = self._git[git_commit_id]
182
210
        except KeyError:
183
211
            raise errors.NoSuchRevision(self, revision_id)
184
 
        # print "fetched revision:", git_commit_id
185
 
        revision = mapping.import_commit(commit)
 
212
        revision, roundtrip_revid, verifiers = mapping.import_commit(
 
213
            commit, self.lookup_foreign_revision_id)
186
214
        assert revision is not None
 
215
        # FIXME: check verifiers ?
 
216
        if roundtrip_revid:
 
217
            revision.revision_id = roundtrip_revid
187
218
        return revision
188
219
 
189
220
    def has_revision(self, revision_id):
190
221
        try:
191
 
            self.get_revision(revision_id)
 
222
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
192
223
        except errors.NoSuchRevision:
193
224
            return False
194
 
        else:
195
 
            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))
196
229
 
197
230
    def get_revisions(self, revids):
198
231
        return [self.get_revision(r) for r in revids]
220
253
        progress=None):
221
254
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
222
255
 
223
 
 
224
 
class GitRevisionTree(revisiontree.RevisionTree):
225
 
 
226
 
    def __init__(self, repository, revision_id):
227
 
        self._revision_id = revision_id
228
 
        self._repository = repository
229
 
        store = repository._git.object_store
230
 
        assert isinstance(revision_id, str)
231
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
232
 
        try:
233
 
            commit = store[git_id]
234
 
        except KeyError, r:
235
 
            raise errors.NoSuchRevision(repository, revision_id)
236
 
        self.tree = commit.tree
237
 
        self._inventory = GitInventory(self.tree, self.mapping, store, 
238
 
                                       revision_id)
239
 
 
240
 
    def get_revision_id(self):
241
 
        return self._revision_id
242
 
 
243
 
    def get_file_text(self, file_id, path=None):
244
 
        if path is not None:
245
 
            entry = self._inventory._get_ie(path)
246
 
        else:
247
 
            entry = self._inventory[file_id]
248
 
        if entry.kind == 'directory': return ""
249
 
        return entry.object.data
 
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 {}, []
250
268
 
251
269
 
252
270
class GitRepositoryFormat(repository.RepositoryFormat):
264
282
    def check_conversion_target(self, target_repo_format):
265
283
        return target_repo_format.rich_root_data
266
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
 
267
291
    def network_name(self):
268
292
        return "git"