/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

Merge roundtrip support.

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
 
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."""
104
112
        self.inventories = None
105
113
        self.texts = GitTexts(self)
106
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
 
107
124
    def all_revision_ids(self):
108
125
        ret = set([])
109
 
        heads = self._git.refs.as_dict('refs/heads')
110
 
        if heads == {}:
111
 
            return ret
112
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
113
 
        ret = set(bzr_heads)
114
 
        graph = self.get_graph()
115
 
        for rev, parents in graph.iter_ancestry(bzr_heads):
116
 
            ret.add(rev)
 
126
        for git_sha, revid in self._iter_revision_ids():
 
127
            ret.add(revid)
117
128
        return ret
118
129
 
119
130
    def get_parent_map(self, revids):
128
139
                commit = self._git[hexsha]
129
140
            except KeyError:
130
141
                continue
131
 
            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]
132
143
        return parent_map
133
144
 
134
145
    def get_ancestry(self, revision_id, topo_sorted=True):
153
164
        """
154
165
        if mapping is None:
155
166
            mapping = self.get_mapping()
156
 
        return mapping.revision_id_foreign_to_bzr(foreign_revid)
 
167
        commit = self._git[foreign_revid]
 
168
        rev = mapping.import_commit(commit, lambda x: None)
 
169
        return rev.revision_id
157
170
 
158
171
    def has_signature_for_revision_id(self, revision_id):
159
172
        return False
162
175
        try:
163
176
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
164
177
        except errors.InvalidRevisionId:
165
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
178
            mapping = self.get_mapping()
 
179
            try:
 
180
                return self._git.refs[mapping.revid_as_refname(bzr_revid)], mapping
 
181
            except KeyError:
 
182
                # Update refs from Git commit objects
 
183
                # FIXME: Hitting this a lot will be very inefficient...
 
184
                for git_sha, bzr_revid in self._iter_revision_ids():
 
185
                    self._git.refs[mapping.revid_as_refname(bzr_revid)] = git_sha
 
186
                try:
 
187
                    return self._git.refs[mapping.revid_as_refname(bzr_revid)], mapping
 
188
                except KeyError:
 
189
                    raise errors.NoSuchRevision(self, bzr_revid)
166
190
 
167
191
    def get_revision(self, revision_id):
168
192
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
171
195
        except KeyError:
172
196
            raise errors.NoSuchRevision(self, revision_id)
173
197
        # print "fetched revision:", git_commit_id
174
 
        revision = mapping.import_commit(commit)
 
198
        revision = mapping.import_commit(commit,
 
199
            self.lookup_foreign_revision_id)
175
200
        assert revision is not None
176
201
        return revision
177
202
 
183
208
        return (git_commit_id in self._git)
184
209
 
185
210
    def has_revisions(self, revision_ids):
186
 
        ret = set()
187
 
        for revid in revision_ids:
188
 
            if self.has_revision(revid):
189
 
                ret.add(revid)
190
 
        return ret
 
211
        return set((self.has_revision(revid) for revid in revision_ids))
191
212
 
192
213
    def get_revisions(self, revids):
193
214
        return [self.get_revision(r) for r in revids]