/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

Cope with tuples in refs dictionary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
20
20
    errors,
21
21
    ui,
22
22
    )
 
23
from bzrlib.graph import (
 
24
    PendingAncestryResult,
 
25
    )
23
26
from bzrlib.repository import (
24
27
    InterRepository,
25
28
    )
31
34
    NoPushSupport,
32
35
    )
33
36
from bzrlib.plugins.git.object_store import (
34
 
    get_object_store,
 
37
    BazaarObjectStore,
35
38
    )
36
39
from bzrlib.plugins.git.repository import (
37
40
    GitRepository,
41
44
from bzrlib.plugins.git.remote import (
42
45
    RemoteGitRepository,
43
46
    )
44
 
from bzrlib.plugins.git.unpeel_map import (
45
 
    UnpeelMap,
46
 
    )
47
47
 
48
48
 
49
49
class MissingObjectsIterator(object):
103
103
    def __init__(self, source, target):
104
104
        super(InterToGitRepository, self).__init__(source, target)
105
105
        self.mapping = self.target.get_mapping()
106
 
        self.source_store = get_object_store(self.source, self.mapping)
 
106
        self.source_store = BazaarObjectStore(self.source, self.mapping)
107
107
 
108
108
    @staticmethod
109
109
    def _get_repo_format_to_test():
113
113
        """See InterRepository.copy_content."""
114
114
        self.fetch(revision_id, pb, find_ghosts=False)
115
115
 
116
 
    def fetch_refs(self, update_refs, lossy):
117
 
        """Fetch possibly roundtripped revisions into the target repository
118
 
        and update refs.
119
 
 
120
 
        :param update_refs: Generate refs to fetch. Receives dictionary
121
 
            with old refs (git shas), returns dictionary of new names to
 
116
    def dfetch_refs(self, update_refs):
 
117
        """Fetch non-roundtripped revisions into the target repository.
 
118
 
 
119
        :param update_refs: Generate refs to fetch. Receives dictionary 
 
120
            with old names to old git shas. Should return a dictionary
 
121
            of new names to Bazaar revision ids.
 
122
        :return: revision id map, old refs dictionary and new refs dictionary
 
123
        """
 
124
        raise NotImplementedError(self.dfetch_refs)
 
125
 
 
126
    def fetch_refs(self, update_refs):
 
127
        """Fetch possibly roundtripped revisions into the target repository.
 
128
 
 
129
        :param update_refs: Generate refs to fetch. Receives dictionary 
 
130
            with old refs (git shas), returns dictionary of new names to 
122
131
            git shas.
123
 
        :param lossy: Whether to roundtrip
124
132
        :return: old refs, new refs
125
133
        """
126
134
        raise NotImplementedError(self.fetch_refs)
134
142
        self.target_store = self.target._git.object_store
135
143
        self.target_refs = self.target._git.refs
136
144
 
137
 
    def _revision_needs_fetching(self, sha_id, revid):
 
145
    def _revision_needs_fetching(self, revid):
138
146
        if revid == NULL_REVISION:
139
147
            return False
140
 
        if sha_id is None:
141
 
            try:
142
 
                sha_id = self.source_store._lookup_revision_sha1(revid)
143
 
            except KeyError:
144
 
                return False
 
148
        try:
 
149
            sha_id = self.source_store._lookup_revision_sha1(revid)
 
150
        except KeyError:
 
151
            return False
145
152
        try:
146
153
            return (sha_id not in self.target_store)
147
154
        except errors.NoSuchRevision:
151
158
    def missing_revisions(self, stop_revisions):
152
159
        """Find the revisions that are missing from the target repository.
153
160
 
154
 
        :param stop_revisions: Revisions to check for (tuples with
 
161
        :param stop_revisions: Revisions to check for (tuples with 
155
162
            Git SHA1, bzr revid)
156
163
        :return: sequence of missing revisions, in topological order
157
164
        :raise: NoSuchRevision if the stop_revisions are not present in
158
165
            the source
159
166
        """
160
 
        revid_sha_map = {}
161
 
        stop_revids = []
162
 
        stop_sha1s = []
163
 
        for (sha1, revid) in stop_revisions:
164
 
            if sha1 is not None and revid is not None:
165
 
                revid_sha_map[revid] = sha1
166
 
            elif sha1 is not None:
167
 
                stop_sha1s.append(sha1)
168
 
            else:
169
 
                assert revid is not None
170
 
                stop_revids.append(revid)
 
167
        stop_revids = [revid for (sha1, revid) in stop_revisions]
171
168
        missing = []
172
169
        graph = self.source.get_graph()
173
170
        pb = ui.ui_factory.nested_progress_bar()
175
172
            for revid, _ in graph.iter_ancestry(stop_revids):
176
173
                assert type(revid) is str
177
174
                pb.update("determining revisions to fetch", len(missing))
178
 
                sha1 = revid_sha_map.get(revid)
179
 
                if self._revision_needs_fetching(sha1, revid):
 
175
                if self._revision_needs_fetching(revid):
180
176
                    missing.append(revid)
181
177
        finally:
182
178
            pb.finished()
183
 
        for sha1 in stop_sha1s:
184
 
            try:
185
 
                for (kind, (revid, tree_sha, verifiers)) in self.source_store.lookup_git_sha(sha1):
186
 
                    missing.append(revid)
187
 
                    revid_sha_map[revid] = sha1
188
 
            except KeyError:
189
 
                continue
190
179
        return graph.iter_topo_order(missing)
191
180
 
192
181
    def _get_target_bzr_refs(self):
196
185
            with Git SHA, Bazaar revid as values.
197
186
        """
198
187
        bzr_refs = {}
199
 
        refs = {}
200
 
        for k in self.target._git.refs.allkeys():
201
 
            v = self.target._git.refs.read_ref(k)
 
188
        refs = self.target._git.get_refs()
 
189
        for k, v in refs.iteritems():
202
190
            try:
203
 
                for (kind, type_data) in self.source_store.lookup_git_sha(v):
204
 
                    if kind == "commit" and self.source.has_revision(type_data[0]):
205
 
                        revid = type_data[0]
206
 
                        break
 
191
                (kind, type_data) = self.source_store.lookup_git_sha(v)
 
192
            except KeyError:
 
193
                revid = None
 
194
            else:
 
195
                if kind == "commit":
 
196
                    revid = type_data[0]
207
197
                else:
208
198
                    revid = None
209
 
            except KeyError:
210
 
                revid = None
211
199
            bzr_refs[k] = (v, revid)
212
200
        return bzr_refs
213
201
 
214
 
    def fetch_refs(self, update_refs, lossy):
215
 
        self.source_store.lock_read()
216
 
        try:
217
 
            old_refs = self._get_target_bzr_refs()
218
 
            new_refs = update_refs(old_refs)
219
 
            revidmap = self.fetch_objects(new_refs.values(), roundtrip=not lossy)
 
202
    def fetch_refs(self, update_refs):
 
203
        self.source.lock_read()
 
204
        try:
 
205
            old_refs = self._get_target_bzr_refs()
 
206
            new_refs = update_refs(old_refs)
 
207
            self.fetch(mapped_refs=new_refs.values())
 
208
        finally:
 
209
            self.source.unlock()
 
210
        return old_refs, new_refs
 
211
 
 
212
    def dfetch_refs(self, update_refs):
 
213
        self.source.lock_read()
 
214
        try:
 
215
            old_refs = self._get_target_bzr_refs()
 
216
            new_refs = update_refs(old_refs)
 
217
            revidmap, gitidmap = self.dfetch(new_refs.values())
220
218
            for name, (gitid, revid) in new_refs.iteritems():
221
219
                if gitid is None:
222
220
                    try:
223
 
                        gitid = revidmap[revid][0]
 
221
                        gitid = gitidmap[revid]
224
222
                    except KeyError:
225
223
                        gitid = self.source_store._lookup_revision_sha1(revid)
226
 
                assert len(gitid) == 40
227
 
                self.target_refs[name] = gitid
 
224
                self.target._git.refs[name] = gitid
 
225
                new_refs[name] = (gitid, self.source_store.lookup_git_sha(gitid)[1][0])
228
226
        finally:
229
 
            self.source_store.unlock()
 
227
            self.source.unlock()
230
228
        return revidmap, old_refs, new_refs
231
229
 
232
 
    def fetch_objects(self, revs, roundtrip):
233
 
        todo = list(self.missing_revisions(revs))
234
 
        revidmap = {}
235
 
        pb = ui.ui_factory.nested_progress_bar()
236
 
        try:
237
 
            object_generator = self._get_missing_objects_iterator(pb)
238
 
            for (old_revid, git_sha) in object_generator.import_revisions(
239
 
                todo, roundtrip=roundtrip):
240
 
                try:
241
 
                    self.mapping.revision_id_bzr_to_foreign(old_revid)
242
 
                except errors.InvalidRevisionId:
243
 
                    self.target_refs[self.mapping.revid_as_refname(old_revid)] = git_sha
244
 
                if not roundtrip:
245
 
                    new_revid = self.mapping.revision_id_foreign_to_bzr(git_sha)
246
 
                else:
247
 
                    new_revid = old_revid
248
 
                revidmap[old_revid] = (git_sha, new_revid)
249
 
            self.target_store.add_objects(object_generator)
250
 
            return revidmap
251
 
        finally:
252
 
            pb.finished()
253
 
 
254
230
    def _get_missing_objects_iterator(self, pb):
255
231
        return MissingObjectsIterator(self.source_store, self.source, pb)
256
232
 
257
233
    def dfetch(self, stop_revisions):
258
234
        """Import the gist of the ancestry of a particular revision."""
 
235
        gitidmap = {}
 
236
        revidmap = {}
 
237
        self.source.lock_read()
 
238
        try:
 
239
            todo = list(self.missing_revisions(stop_revisions))
 
240
            pb = ui.ui_factory.nested_progress_bar()
 
241
            try:
 
242
                object_generator = self._get_missing_objects_iterator(pb)
 
243
                for old_bzr_revid, git_commit in object_generator.import_revisions(
 
244
                    todo, roundtrip=False):
 
245
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
 
246
                    revidmap[old_bzr_revid] = new_bzr_revid
 
247
                    gitidmap[old_bzr_revid] = git_commit
 
248
                self.target_store.add_objects(object_generator)
 
249
            finally:
 
250
                pb.finished()
 
251
        finally:
 
252
            self.source.unlock()
 
253
        return revidmap, gitidmap
259
254
 
260
255
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
261
256
            fetch_spec=None, mapped_refs=None):
262
 
        if not self.mapping.roundtripping:
263
 
            raise NoPushSupport()
264
 
        self.source_store.lock_read()
 
257
        if mapped_refs is not None:
 
258
            stop_revisions = mapped_refs
 
259
        elif revision_id is not None:
 
260
            stop_revisions = [(None, revision_id)]
 
261
        elif fetch_spec is not None:
 
262
            stop_revisions = [(None, revid) for revid in fetch_spec.heads]
 
263
        else:
 
264
            stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
 
265
        self.source.lock_read()
265
266
        try:
266
 
            if mapped_refs is not None:
267
 
                stop_revisions = mapped_refs
268
 
            elif revision_id is not None:
269
 
                stop_revisions = [(None, revision_id)]
270
 
            elif fetch_spec is not None:
271
 
                stop_revisions = [(None, revid) for revid in fetch_spec.heads]
272
 
            else:
273
 
                stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
274
 
            self.fetch_objects(stop_revisions, roundtrip=True)
 
267
            todo = list(self.missing_revisions(stop_revisions))
 
268
            pb = ui.ui_factory.nested_progress_bar()
 
269
            try:
 
270
                object_generator = self._get_missing_objects_iterator(pb)
 
271
                for (revid, git_sha) in object_generator.import_revisions(
 
272
                    todo, roundtrip=True):
 
273
                    try:
 
274
                        self.mapping.revision_id_bzr_to_foreign(revid)
 
275
                    except errors.InvalidRevisionId:
 
276
                        self.target_refs[self.mapping.revid_as_refname(revid)] = git_sha
 
277
                self.target_store.add_objects(object_generator)
 
278
            finally:
 
279
                pb.finished()
275
280
        finally:
276
 
            self.source_store.unlock()
 
281
            self.source.unlock()
277
282
 
278
283
    @staticmethod
279
284
    def is_compatible(source, target):
284
289
 
285
290
class InterToRemoteGitRepository(InterToGitRepository):
286
291
 
287
 
    def fetch_refs(self, update_refs, lossy):
 
292
    def dfetch_refs(self, update_refs):
288
293
        """Import the gist of the ancestry of a particular revision."""
289
 
        if not lossy:
290
 
            raise NoPushSupport()
291
 
        unpeel_map = UnpeelMap.from_repository(self.source)
292
294
        revidmap = {}
293
295
        def determine_wants(old_refs):
294
296
            ret = {}
295
 
            self.old_refs = dict([(k, (v, None)) for (k, v) in old_refs.iteritems()])
 
297
            self.old_refs = old_refs
296
298
            self.new_refs = update_refs(self.old_refs)
297
299
            for name, (gitid, revid) in self.new_refs.iteritems():
298
300
                if gitid is None:
299
 
                    git_sha = self.source_store._lookup_revision_sha1(revid)
300
 
                    ret[name] = unpeel_map.re_unpeel_tag(git_sha, old_refs.get(name))
 
301
                    ret[name] = self.source_store._lookup_revision_sha1(revid)
301
302
                else:
302
303
                    ret[name] = gitid
303
304
            return ret
304
 
        self.source_store.lock_read()
 
305
        self.source.lock_read()
305
306
        try:
306
307
            new_refs = self.target.send_pack(determine_wants,
307
308
                    self.source_store.generate_lossy_pack_contents)
308
309
        finally:
309
 
            self.source_store.unlock()
310
 
        # FIXME: revidmap?
 
310
            self.source.unlock()
311
311
        return revidmap, self.old_refs, self.new_refs
312
312
 
 
313
    def fetch_refs(self, update_refs):
 
314
        raise NoPushSupport()
 
315
 
313
316
    @staticmethod
314
317
    def is_compatible(source, target):
315
318
        """Be compatible with GitRepository."""