/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
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
91
95
        interrepo = repository.InterRepository.get(source, self)
92
96
        return interrepo.dfetch_refs(stop_revision)
93
97
 
 
98
    def fetch_refs(self, source, stop_revision):
 
99
        interrepo = repository.InterRepository.get(source, self)
 
100
        return interrepo.fetch_refs(stop_revision)
 
101
 
94
102
 
95
103
class LocalGitRepository(GitRepository):
96
104
    """Git repository on the file system."""
97
105
 
98
106
    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
107
        GitRepository.__init__(self, gitdir, lockfiles)
103
108
        self.base = gitdir.root_transport.base
104
109
        self._git = gitdir._git
107
112
        self.inventories = None
108
113
        self.texts = GitTexts(self)
109
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
 
110
124
    def all_revision_ids(self):
111
125
        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)
 
126
        for git_sha, revid in self._iter_revision_ids():
 
127
            ret.add(revid)
120
128
        return ret
121
129
 
122
 
    def _make_parents_provider(self):
123
 
        """See Repository._make_parents_provider()."""
124
 
        return self._parents_provider
125
 
 
126
130
    def get_parent_map(self, revids):
127
131
        parent_map = {}
128
132
        for revision_id in revids:
132
136
                continue
133
137
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
134
138
            try:
135
 
                commit = self._git.commit(hexsha)
 
139
                commit = self._git[hexsha]
136
140
            except KeyError:
137
141
                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]
 
142
            parent_map[revision_id] = [self.lookup_foreign_revision_id(p, mapping) for p in commit.parents]
144
143
        return parent_map
145
144
 
146
145
    def get_ancestry(self, revision_id, topo_sorted=True):
165
164
        """
166
165
        if mapping is None:
167
166
            mapping = self.get_mapping()
168
 
        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
169
175
 
170
176
    def has_signature_for_revision_id(self, revision_id):
171
177
        return False
172
178
 
173
 
    def lookup_bzr_revision_id(self, bzr_revid):
 
179
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
174
180
        try:
175
181
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
176
182
        except errors.InvalidRevisionId:
177
 
            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)
178
195
 
179
196
    def get_revision(self, revision_id):
180
197
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
181
198
        try:
182
 
            commit = self._git.commit(git_commit_id)
 
199
            commit = self._git[git_commit_id]
183
200
        except KeyError:
184
201
            raise errors.NoSuchRevision(self, revision_id)
185
202
        # print "fetched revision:", git_commit_id
186
 
        revision = mapping.import_commit(commit)
 
203
        revision = mapping.import_commit(commit,
 
204
            self.lookup_foreign_revision_id)
187
205
        assert revision is not None
188
206
        return revision
189
207
 
190
208
    def has_revision(self, revision_id):
191
209
        try:
192
 
            self.get_revision(revision_id)
 
210
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
193
211
        except errors.NoSuchRevision:
194
212
            return False
195
 
        else:
196
 
            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))
197
217
 
198
218
    def get_revisions(self, revids):
199
219
        return [self.get_revision(r) for r in revids]