/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

  • Committer: Jelmer Vernooij
  • Date: 2010-05-01 23:16:11 UTC
  • mfrom: (0.200.904 trunk)
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100501231611-t8hh69jq6krevlwi
merge trunk

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,
22
23
    inventory,
23
24
    repository,
24
25
    revision,
45
46
    )
46
47
 
47
48
 
48
 
from dulwich.objects import (
49
 
    Commit,
50
 
    )
51
 
 
52
 
 
53
49
class GitRepository(ForeignRepository):
54
50
    """An adapter to git repositories for bzr."""
55
51
 
82
78
        return default_mapping
83
79
 
84
80
    def make_working_trees(self):
85
 
        return not self._git.bare
 
81
        return True
86
82
 
87
83
    def revision_graph_can_have_wrong_parents(self):
88
84
        return False
91
87
        interrepo = repository.InterRepository.get(source, self)
92
88
        return interrepo.dfetch(stop_revision)
93
89
 
 
90
    def dfetch_refs(self, source, stop_revision):
 
91
        interrepo = repository.InterRepository.get(source, self)
 
92
        return interrepo.dfetch_refs(stop_revision)
 
93
 
 
94
    def fetch_refs(self, source, stop_revision):
 
95
        interrepo = repository.InterRepository.get(source, self)
 
96
        return interrepo.fetch_refs(stop_revision)
 
97
 
94
98
 
95
99
class LocalGitRepository(GitRepository):
96
100
    """Git repository on the file system."""
97
101
 
98
102
    def __init__(self, gitdir, lockfiles):
 
103
        # FIXME: This also caches negatives. Need to be more careful
 
104
        # about this once we start writing to git
 
105
        self._parents_provider = graph.CachingParentsProvider(self)
99
106
        GitRepository.__init__(self, gitdir, lockfiles)
100
107
        self.base = gitdir.root_transport.base
101
108
        self._git = gitdir._git
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
115
        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)
 
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:
134
139
                commit = self._git[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
            parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
140
143
        return parent_map
141
144
 
142
145
    def get_ancestry(self, revision_id, topo_sorted=True):
155
158
    def get_signature_text(self, revision_id):
156
159
        raise errors.NoSuchRevision(self, revision_id)
157
160
 
158
 
    def pack(self, hint=None, clean_obsolete_packs=False):
159
 
        self._git.object_store.pack_loose_objects()
160
 
 
161
161
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
162
162
        """Lookup a revision id.
163
163
 
164
164
        """
165
 
        assert type(foreign_revid) is str
166
165
        if mapping is None:
167
166
            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
 
167
        return mapping.revision_id_foreign_to_bzr(foreign_revid)
181
168
 
182
169
    def has_signature_for_revision_id(self, revision_id):
183
170
        return False
184
171
 
185
 
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
 
172
    def lookup_bzr_revision_id(self, bzr_revid):
186
173
        try:
187
174
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
188
175
        except errors.InvalidRevisionId:
189
 
            if mapping is None:
190
 
                mapping = self.get_mapping()
191
176
            try:
192
 
                return (self._git.refs[mapping.revid_as_refname(bzr_revid)],
193
 
                        mapping)
 
177
                return self._git.refs["refs/bzr/%s" % bzr_revid], self.get_mapping()
194
178
            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
179
                raise errors.NoSuchRevision(self, bzr_revid)
205
180
 
206
181
    def get_revision(self, revision_id):
209
184
            commit = self._git[git_commit_id]
210
185
        except KeyError:
211
186
            raise errors.NoSuchRevision(self, revision_id)
212
 
        revision, roundtrip_revid, verifiers = mapping.import_commit(
213
 
            commit, self.lookup_foreign_revision_id)
 
187
        # print "fetched revision:", git_commit_id
 
188
        revision, file_ids = mapping.import_commit(commit)
214
189
        assert revision is not None
215
 
        # FIXME: check verifiers ?
216
 
        if roundtrip_revid:
217
 
            revision.revision_id = roundtrip_revid
218
190
        return revision
219
191
 
220
192
    def has_revision(self, revision_id):
225
197
        return (git_commit_id in self._git)
226
198
 
227
199
    def has_revisions(self, revision_ids):
228
 
        return set(filter(self.has_revision, revision_ids))
 
200
        ret = set()
 
201
        for revid in revision_ids:
 
202
            if self.has_revision(revid):
 
203
                ret.add(revid)
 
204
        return ret
229
205
 
230
206
    def get_revisions(self, revids):
231
207
        return [self.get_revision(r) for r in revids]
257
233
                        ancestors=None):
258
234
        return GitVersionedFileChecker(self,
259
235
            text_key_references=text_key_references, ancestors=ancestors)
260
 
 
 
236
    
261
237
 
262
238
class GitVersionedFileChecker(repository._VersionedFileChecker):
263
239