/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

get remote dpush to a point where we now what to send.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
199
199
 
200
200
class InterToRemoteGitRepository(InterToGitRepository):
201
201
 
202
 
    def dfetch(self, stop_revision=None):
 
202
    def dfetch_refs(self, new_refs):
203
203
        """Import the gist of the ancestry of a particular revision."""
204
204
        revidmap = {}
 
205
        def get_changed_refs(refs):
 
206
            ret = {}
 
207
            for name, revid in new_refs.iteritems():
 
208
                ret[name] = (refs.get(name), object_generator._object_store._lookup_revision_sha1(revid))
 
209
            return ret
 
210
        def generate_blob_contents(have, want):
 
211
            import pdb; pdb.set_trace()
205
212
        mapping = self.target.get_mapping()
206
213
        self.source.lock_read()
207
214
        try:
208
 
            todo = [revid for revid in self.missing_revisions(stop_revision) if revid != NULL_REVISION]
209
 
            pb = ui.ui_factory.nested_progress_bar()
210
 
            try:
211
 
                object_generator = MissingObjectsIterator(self.source, mapping, pb)
212
 
                for old_bzr_revid, git_commit in object_generator.import_revisions(
213
 
                    todo):
214
 
                    new_bzr_revid = mapping.revision_id_foreign_to_bzr(git_commit)
215
 
                    revidmap[old_bzr_revid] = new_bzr_revid
216
 
                self.target._git.object_store.add_objects(object_generator) 
217
 
            finally:
218
 
                pb.finished()
 
215
            object_generator = MissingObjectsIterator(self.source, mapping)
 
216
            self.target.send_pack(get_changed_refs, generate_blob_contents)
219
217
        finally:
220
218
            self.source.unlock()
221
219
        return revidmap