/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 push.py

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
1
 
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
57
57
        self._pending = []
58
58
        self.pb = pb
59
59
 
60
 
    def import_revisions(self, revids):
 
60
    def import_revisions(self, revids, roundtrip):
 
61
        """Import a set of revisions into this git repository.
 
62
 
 
63
        :param revids: Revision ids of revisions to import
 
64
        :param roundtrip: Whether to roundtrip bzr metadata
 
65
        """
61
66
        for i, revid in enumerate(revids):
62
67
            if self.pb:
63
68
                self.pb.update("pushing revisions", i, len(revids))
64
 
            git_commit = self.import_revision(revid)
 
69
            git_commit = self.import_revision(revid, roundtrip)
65
70
            yield (revid, git_commit)
66
71
 
67
 
    def import_revision(self, revid):
68
 
        """Import the gist of a revision into this Git repository.
 
72
    def import_revision(self, revid, roundtrip):
 
73
        """Import a revision into this Git repository.
69
74
 
 
75
        :param revid: Revision id of the revision
 
76
        :param roundtrip: Whether to roundtrip bzr metadata
70
77
        """
71
 
        inv = self._object_store.parent_invs_cache.get_inventory(revid)
 
78
        tree = self._object_store.tree_cache.revision_tree(revid)
72
79
        rev = self.source.get_revision(revid)
73
80
        commit = None
74
 
        for path, obj in self._object_store._revision_to_objects(rev, inv):
75
 
            if obj._type == "commit":
 
81
        for path, obj, ie in self._object_store._revision_to_objects(rev, tree,
 
82
            roundtrip):
 
83
            if obj.type_name == "commit":
76
84
                commit = obj
77
85
            self._pending.append((obj, path))
78
86
        return commit.id
102
110
        """See InterRepository.copy_content."""
103
111
        self.fetch(revision_id, pb, find_ghosts=False)
104
112
 
105
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
106
 
            fetch_spec=None):
107
 
        raise NoPushSupport()
 
113
    def dfetch_refs(self, update_refs):
 
114
        """Fetch non-roundtripped revisions into the target repository.
 
115
 
 
116
        :param update_refs: Generate refs to fetch. Receives dictionary
 
117
            with old names to old git shas. Should return a dictionary
 
118
            of new names to Bazaar revision ids.
 
119
        :return: revision id map, old refs dictionary and new refs dictionary
 
120
        """
 
121
        raise NotImplementedError(self.dfetch_refs)
 
122
 
 
123
    def fetch_refs(self, update_refs):
 
124
        """Fetch possibly roundtripped revisions into the target repository.
 
125
 
 
126
        :param update_refs: Generate refs to fetch. Receives dictionary
 
127
            with old refs (git shas), returns dictionary of new names to
 
128
            git shas.
 
129
        :return: old refs, new refs
 
130
        """
 
131
        raise NotImplementedError(self.fetch_refs)
108
132
 
109
133
 
110
134
class InterToLocalGitRepository(InterToGitRepository):
111
 
 
112
 
    def missing_revisions(self, stop_revisions, check_revid):
 
135
    """InterBranch implementation between a Bazaar and a Git repository."""
 
136
 
 
137
    def __init__(self, source, target):
 
138
        super(InterToLocalGitRepository, self).__init__(source, target)
 
139
        self.target_store = self.target._git.object_store
 
140
        self.target_refs = self.target._git.refs
 
141
 
 
142
    def _revision_needs_fetching(self, sha_id, revid):
 
143
        if revid == NULL_REVISION:
 
144
            return False
 
145
        if sha_id is None:
 
146
            try:
 
147
                sha_id = self.source_store._lookup_revision_sha1(revid)
 
148
            except KeyError:
 
149
                return False
 
150
        try:
 
151
            return (sha_id not in self.target_store)
 
152
        except errors.NoSuchRevision:
 
153
            # Ghost, can't push
 
154
            return False
 
155
 
 
156
    def missing_revisions(self, stop_revisions):
 
157
        """Find the revisions that are missing from the target repository.
 
158
 
 
159
        :param stop_revisions: Revisions to check for (tuples with
 
160
            Git SHA1, bzr revid)
 
161
        :return: sequence of missing revisions, in topological order
 
162
        :raise: NoSuchRevision if the stop_revisions are not present in
 
163
            the source
 
164
        """
 
165
        revid_sha_map = {}
 
166
        stop_revids = []
 
167
        stop_sha1s = []
 
168
        for (sha1, revid) in stop_revisions:
 
169
            if sha1 is not None and revid is not None:
 
170
                revid_sha_map[revid] = sha1
 
171
            elif sha1 is not None:
 
172
                stop_sha1s.append(sha1)
 
173
            else:
 
174
                assert revid is not None
 
175
                stop_revids.append(revid)
113
176
        missing = []
 
177
        graph = self.source.get_graph()
114
178
        pb = ui.ui_factory.nested_progress_bar()
115
179
        try:
116
 
            graph = self.source.get_graph()
117
 
            for revid, _ in graph.iter_ancestry(stop_revisions):
 
180
            for revid, _ in graph.iter_ancestry(stop_revids):
 
181
                assert type(revid) is str
118
182
                pb.update("determining revisions to fetch", len(missing))
119
 
                if not check_revid(revid):
 
183
                sha1 = revid_sha_map.get(revid)
 
184
                if self._revision_needs_fetching(sha1, revid):
120
185
                    missing.append(revid)
121
 
            return graph.iter_topo_order(missing)
122
186
        finally:
123
187
            pb.finished()
124
 
 
125
 
    def dfetch_refs(self, refs):
126
 
        new_refs = {}
127
 
        revidmap, gitidmap = self.dfetch(refs.values())
128
 
        for name, revid in refs.iteritems():
129
 
            if revid in gitidmap:
130
 
                gitid = gitidmap[revid]
131
 
            else:
132
 
                gitid = self.source_store._lookup_revision_sha1(revid)
133
 
            self.target._git.refs[name] = gitid
134
 
            new_refs[name] = gitid
135
 
        return revidmap, new_refs
 
188
        for sha1 in stop_sha1s:
 
189
            try:
 
190
                (kind, (revid, tree_sha, verifiers)) = self.source_store.lookup_git_sha(sha1)
 
191
            except KeyError:
 
192
                continue
 
193
            else:
 
194
                missing.append(revid)
 
195
                revid_sha_map[revid] = sha1
 
196
        return graph.iter_topo_order(missing)
 
197
 
 
198
    def _get_target_bzr_refs(self):
 
199
        """Return a dictionary with references.
 
200
 
 
201
        :return: Dictionary with reference names as keys and tuples
 
202
            with Git SHA, Bazaar revid as values.
 
203
        """
 
204
        bzr_refs = {}
 
205
        refs = self.target._git.get_refs()
 
206
        for k, v in refs.iteritems():
 
207
            try:
 
208
                (kind, type_data) = self.source_store.lookup_git_sha(v)
 
209
            except KeyError:
 
210
                revid = None
 
211
            else:
 
212
                if kind == "commit":
 
213
                    revid = type_data[0]
 
214
                else:
 
215
                    revid = None
 
216
            bzr_refs[k] = (v, revid)
 
217
        return bzr_refs
 
218
 
 
219
    def fetch_refs(self, update_refs):
 
220
        self.source.lock_read()
 
221
        try:
 
222
            old_refs = self._get_target_bzr_refs()
 
223
            new_refs = update_refs(old_refs)
 
224
            self.fetch(mapped_refs=new_refs.values())
 
225
        finally:
 
226
            self.source.unlock()
 
227
        return old_refs, new_refs
 
228
 
 
229
    def dfetch_refs(self, update_refs):
 
230
        self.source.lock_read()
 
231
        try:
 
232
            old_refs = self._get_target_bzr_refs()
 
233
            new_refs = update_refs(old_refs)
 
234
            revidmap, gitidmap = self.dfetch(new_refs.values())
 
235
            for name, (gitid, revid) in new_refs.iteritems():
 
236
                if gitid is None:
 
237
                    try:
 
238
                        gitid = gitidmap[revid]
 
239
                    except KeyError:
 
240
                        gitid = self.source_store._lookup_revision_sha1(revid)
 
241
                self.target._git.refs[name] = gitid
 
242
                new_refs[name] = (gitid, self.source_store.lookup_git_sha(gitid)[1][0])
 
243
        finally:
 
244
            self.source.unlock()
 
245
        return revidmap, old_refs, new_refs
 
246
 
 
247
    def _get_missing_objects_iterator(self, pb):
 
248
        return MissingObjectsIterator(self.source_store, self.source, pb)
136
249
 
137
250
    def dfetch(self, stop_revisions):
138
251
        """Import the gist of the ancestry of a particular revision."""
140
253
        revidmap = {}
141
254
        self.source.lock_read()
142
255
        try:
143
 
            target_store = self.target._git.object_store
144
 
            def check_revid(revid):
145
 
                if revid == NULL_REVISION:
146
 
                    return True
147
 
                try:
148
 
                    return (self.source_store._lookup_revision_sha1(revid) in target_store)
149
 
                except errors.NoSuchRevision:
150
 
                    # Ghost, can't dpush
151
 
                    return True
152
 
            todo = list(self.missing_revisions(stop_revisions, check_revid))
 
256
            todo = list(self.missing_revisions(stop_revisions))
153
257
            pb = ui.ui_factory.nested_progress_bar()
154
258
            try:
155
 
                object_generator = MissingObjectsIterator(self.source_store, self.source, pb)
 
259
                object_generator = self._get_missing_objects_iterator(pb)
156
260
                for old_bzr_revid, git_commit in object_generator.import_revisions(
157
 
                    todo):
 
261
                    todo, roundtrip=False):
158
262
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
159
263
                    revidmap[old_bzr_revid] = new_bzr_revid
160
264
                    gitidmap[old_bzr_revid] = git_commit
161
 
                target_store.add_objects(object_generator)
 
265
                self.target_store.add_objects(object_generator)
162
266
            finally:
163
267
                pb.finished()
164
268
        finally:
165
269
            self.source.unlock()
166
270
        return revidmap, gitidmap
167
271
 
 
272
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
 
273
            fetch_spec=None, mapped_refs=None):
 
274
        if mapped_refs is not None:
 
275
            stop_revisions = mapped_refs
 
276
        elif revision_id is not None:
 
277
            stop_revisions = [(None, revision_id)]
 
278
        elif fetch_spec is not None:
 
279
            stop_revisions = [(None, revid) for revid in fetch_spec.heads]
 
280
        else:
 
281
            stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
 
282
        self.source.lock_read()
 
283
        try:
 
284
            todo = list(self.missing_revisions(stop_revisions))
 
285
            pb = ui.ui_factory.nested_progress_bar()
 
286
            try:
 
287
                object_generator = self._get_missing_objects_iterator(pb)
 
288
                for (revid, git_sha) in object_generator.import_revisions(
 
289
                    todo, roundtrip=True):
 
290
                    try:
 
291
                        self.mapping.revision_id_bzr_to_foreign(revid)
 
292
                    except errors.InvalidRevisionId:
 
293
                        self.target_refs[self.mapping.revid_as_refname(revid)] = git_sha
 
294
                self.target_store.add_objects(object_generator)
 
295
            finally:
 
296
                pb.finished()
 
297
        finally:
 
298
            self.source.unlock()
 
299
 
168
300
    @staticmethod
169
301
    def is_compatible(source, target):
170
302
        """Be compatible with GitRepository."""
174
306
 
175
307
class InterToRemoteGitRepository(InterToGitRepository):
176
308
 
177
 
    def dfetch_refs(self, new_refs):
 
309
    def dfetch_refs(self, update_refs):
178
310
        """Import the gist of the ancestry of a particular revision."""
179
311
        revidmap = {}
180
 
        def determine_wants(refs):
 
312
        def determine_wants(old_refs):
181
313
            ret = {}
182
 
            for name, revid in new_refs.iteritems():
183
 
                ret[name] = self.source_store._lookup_revision_sha1(revid)
 
314
            self.old_refs = old_refs
 
315
            self.new_refs = update_refs(self.old_refs)
 
316
            for name, (gitid, revid) in self.new_refs.iteritems():
 
317
                if gitid is None:
 
318
                    ret[name] = self.source_store._lookup_revision_sha1(revid)
 
319
                else:
 
320
                    ret[name] = gitid
184
321
            return ret
185
322
        self.source.lock_read()
186
323
        try:
187
324
            new_refs = self.target.send_pack(determine_wants,
188
 
                    self.source_store.generate_pack_contents)
 
325
                    self.source_store.generate_lossy_pack_contents)
189
326
        finally:
190
327
            self.source.unlock()
191
 
        return revidmap, new_refs
 
328
        return revidmap, self.old_refs, self.new_refs
 
329
 
 
330
    def fetch_refs(self, update_refs):
 
331
        raise NoPushSupport()
192
332
 
193
333
    @staticmethod
194
334
    def is_compatible(source, target):