/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

Fix some more tests.

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
 
94
95
        interrepo = repository.InterRepository.get(source, self)
95
96
        return interrepo.dfetch_refs(stop_revision)
96
97
 
 
98
    def fetch_refs(self, source, stop_revision):
 
99
        interrepo = repository.InterRepository.get(source, self)
 
100
        return interrepo.fetch_refs(stop_revision)
 
101
 
97
102
 
98
103
class LocalGitRepository(GitRepository):
99
104
    """Git repository on the file system."""
100
105
 
101
106
    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
107
        GitRepository.__init__(self, gitdir, lockfiles)
106
108
        self.base = gitdir.root_transport.base
107
109
        self._git = gitdir._git
110
112
        self.inventories = None
111
113
        self.texts = GitTexts(self)
112
114
 
 
115
    def _iter_revision_ids(self):
 
116
        for sha in self._git.object_store:
 
117
            o = self._git.object_store[sha]
 
118
            if not isinstance(o, Commit):
 
119
                continue
 
120
            rev = self.get_mapping().import_commit(o,
 
121
                self.lookup_foreign_revision_id)
 
122
            yield o.id, rev.revision_id
 
123
 
113
124
    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)
 
125
        ret = set([])
 
126
        for git_sha, revid in self._iter_revision_ids():
 
127
            ret.add(revid)
123
128
        return ret
124
129
 
125
 
    def _make_parents_provider(self):
126
 
        """See Repository._make_parents_provider()."""
127
 
        return self._parents_provider
128
 
 
129
130
    def get_parent_map(self, revids):
130
131
        parent_map = {}
131
132
        for revision_id in revids:
135
136
                continue
136
137
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
137
138
            try:
138
 
                commit = self._git.commit(hexsha)
 
139
                commit = self._git[hexsha]
139
140
            except KeyError:
140
141
                continue
141
 
            if commit is None:
142
 
                # Older versions of Dulwich used to return None rather than 
143
 
                # raise KeyError.
144
 
                continue
145
 
            else:
146
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
142
            parent_map[revision_id] = [self.lookup_foreign_revision_id(p, mapping) for p in commit.parents]
147
143
        return parent_map
148
144
 
149
145
    def get_ancestry(self, revision_id, topo_sorted=True):
164
160
 
165
161
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
166
162
        """Lookup a revision id.
167
 
        
168
 
        :param revid: Bazaar revision id.
169
 
        :return: Tuple with git revisionid and mapping.
 
163
 
170
164
        """
171
165
        if mapping is None:
172
166
            mapping = self.get_mapping()
173
 
        return mapping.revision_id_foreign_to_bzr(foreign_revid)
 
167
        from dulwich.protocol import (
 
168
            ZERO_SHA,
 
169
            )
 
170
        if foreign_revid == ZERO_SHA:
 
171
            return revision.NULL_REVISION
 
172
        commit = self._git[foreign_revid]
 
173
        rev = mapping.import_commit(commit, lambda x: None)
 
174
        return rev.revision_id
174
175
 
175
176
    def has_signature_for_revision_id(self, revision_id):
176
177
        return False
177
178
 
178
 
    def lookup_bzr_revision_id(self, bzr_revid):
 
179
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
179
180
        try:
180
181
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
181
182
        except errors.InvalidRevisionId:
182
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
183
            if mapping is None:
 
184
                mapping = self.get_mapping()
 
185
            try:
 
186
                return self._git.refs[mapping.revid_as_refname(bzr_revid)], mapping
 
187
            except KeyError:
 
188
                # Update refs from Git commit objects
 
189
                # FIXME: Hitting this a lot will be very inefficient...
 
190
                for git_sha, revid in self._iter_revision_ids():
 
191
                    self._git.refs[mapping.revid_as_refname(revid)] = git_sha
 
192
                    if revid == bzr_revid:
 
193
                        return git_sha, mapping
 
194
                raise errors.NoSuchRevision(self, bzr_revid)
183
195
 
184
196
    def get_revision(self, revision_id):
185
197
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
186
198
        try:
187
 
            commit = self._git.commit(git_commit_id)
 
199
            commit = self._git[git_commit_id]
188
200
        except KeyError:
189
201
            raise errors.NoSuchRevision(self, revision_id)
190
202
        # print "fetched revision:", git_commit_id
191
 
        revision = mapping.import_commit(commit)
 
203
        revision = mapping.import_commit(commit,
 
204
            self.lookup_foreign_revision_id)
192
205
        assert revision is not None
193
206
        return revision
194
207
 
195
208
    def has_revision(self, revision_id):
196
209
        try:
197
 
            self.get_revision(revision_id)
 
210
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
198
211
        except errors.NoSuchRevision:
199
212
            return False
200
 
        else:
201
 
            return True
 
213
        return (git_commit_id in self._git)
 
214
 
 
215
    def has_revisions(self, revision_ids):
 
216
        return set(filter(self.has_revision, revision_ids))
202
217
 
203
218
    def get_revisions(self, revids):
204
219
        return [self.get_revision(r) for r in revids]
226
241
        progress=None):
227
242
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
228
243
 
 
244
    def _get_versioned_file_checker(self, text_key_references=None,
 
245
                        ancestors=None):
 
246
        return GitVersionedFileChecker(self,
 
247
            text_key_references=text_key_references, ancestors=ancestors)
 
248
    
 
249
 
 
250
class GitVersionedFileChecker(repository._VersionedFileChecker):
 
251
 
 
252
    file_ids = []
 
253
 
 
254
    def _check_file_version_parents(self, texts, progress_bar):
 
255
        return {}, []
 
256
 
229
257
 
230
258
class GitRepositoryFormat(repository.RepositoryFormat):
231
259
    """Git repository format."""
243
271
        return target_repo_format.rich_root_data
244
272
 
245
273
    def get_foreign_tests_repository_factory(self):
246
 
        from bzrlib.plugins.git.tests.test_repository import ForeignTestsRepositoryFactory
 
274
        from bzrlib.plugins.git.tests.test_repository import (
 
275
            ForeignTestsRepositoryFactory,
 
276
            )
247
277
        return ForeignTestsRepositoryFactory()
248
278
 
249
279
    def network_name(self):