← Back to branch summary

~bzr/ubuntu/hardy/bzr-git/bzr-ppa

« back to all changes in this revision

Viewing changes to push.py

  • Committer: Max Bowsher
  • Date: 2011-04-13 00:11:53 UTC
  • mfrom: (75.1.3 jaunty)
  • Revision ID: maxb@f2s.com-20110413001153-arfzlashy1m82w9d
Tags: 0.6.0-1~bazaar1~hardy1
Merge 0.6.0-1

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
190
190
            pb.finished()
191
191
        for sha1 in stop_sha1s:
192
192
            try:
193
 
                (kind, (revid, tree_sha, verifiers)) = self.source_store.lookup_git_sha(sha1)
 
193
                for (kind, (revid, tree_sha, verifiers)) in self.source_store.lookup_git_sha(sha1):
 
194
                    missing.append(revid)
 
195
                    revid_sha_map[revid] = sha1
194
196
            except KeyError:
195
197
                continue
196
 
            else:
197
 
                missing.append(revid)
198
 
                revid_sha_map[revid] = sha1
199
198
        return graph.iter_topo_order(missing)
200
199
 
201
200
    def _get_target_bzr_refs(self):
205
204
            with Git SHA, Bazaar revid as values.
206
205
        """
207
206
        bzr_refs = {}
208
 
        refs = self.target._git.get_refs()
209
 
        for k, v in refs.iteritems():
 
207
        refs = {}
 
208
        for k in self.target._git.refs.allkeys():
 
209
            v = self.target._git.refs.read_ref(k)
210
210
            try:
211
 
                (kind, type_data) = self.source_store.lookup_git_sha(v)
 
211
                for (kind, type_data) in self.source_store.lookup_git_sha(v):
 
212
                    if kind == "commit" and self.source.has_revision(type_data[0]):
 
213
                        revid = type_data[0]
 
214
                        break
 
215
                else:
 
216
                    revid = None
212
217
            except KeyError:
213
218
                revid = None
214
 
            else:
215
 
                if kind == "commit":
216
 
                    revid = type_data[0]
217
 
                else:
218
 
                    revid = None
219
219
            bzr_refs[k] = (v, revid)
220
220
        return bzr_refs
221
221
 
234
234
        try:
235
235
            old_refs = self._get_target_bzr_refs()
236
236
            new_refs = update_refs(old_refs)
237
 
            revidmap, gitidmap = self.dfetch(new_refs.values())
 
237
            gitidmap = {}
 
238
            revidmap = {}
 
239
            todo = list(self.missing_revisions(new_refs.values()))
 
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
                    assert type(old_bzr_revid) is str
 
247
                    assert type(new_bzr_revid) is str
 
248
                    assert type(git_commit) is str
 
249
                    revidmap[old_bzr_revid] = new_bzr_revid
 
250
                    gitidmap[old_bzr_revid] = git_commit
 
251
                self.target_store.add_objects(object_generator)
 
252
            finally:
 
253
                pb.finished()
238
254
            for name, (gitid, revid) in new_refs.iteritems():
239
255
                if gitid is None:
240
256
                    try:
241
257
                        gitid = gitidmap[revid]
242
258
                    except KeyError:
243
259
                        gitid = self.source_store._lookup_revision_sha1(revid)
244
 
                self.target._git.refs[name] = gitid
245
 
                new_refs[name] = (gitid, self.source_store.lookup_git_sha(gitid)[1][0])
 
260
                self.target_refs[name] = gitid
246
261
        finally:
247
262
            self.source.unlock()
248
263
        return revidmap, old_refs, new_refs
252
267
 
253
268
    def dfetch(self, stop_revisions):
254
269
        """Import the gist of the ancestry of a particular revision."""
255
 
        gitidmap = {}
256
 
        revidmap = {}
257
 
        self.source.lock_read()
258
 
        try:
259
 
            todo = list(self.missing_revisions(stop_revisions))
260
 
            pb = ui.ui_factory.nested_progress_bar()
261
 
            try:
262
 
                object_generator = self._get_missing_objects_iterator(pb)
263
 
                for old_bzr_revid, git_commit in object_generator.import_revisions(
264
 
                    todo, roundtrip=False):
265
 
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
266
 
                    revidmap[old_bzr_revid] = new_bzr_revid
267
 
                    gitidmap[old_bzr_revid] = git_commit
268
 
                self.target_store.add_objects(object_generator)
269
 
            finally:
270
 
                pb.finished()
271
 
        finally:
272
 
            self.source.unlock()
273
 
        return revidmap, gitidmap
274
270
 
275
271
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
276
272
            fetch_spec=None, mapped_refs=None):
 
273
        if not self.mapping.roundtripping:
 
274
            raise NoPushSupport()
277
275
        if mapped_refs is not None:
278
276
            stop_revisions = mapped_refs
279
277
        elif revision_id is not None: