/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

Simply refer to bzr's docs in HACKING.

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