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

Fix pull from remote branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
247
247
            pb.update("finding revisions to fetch", len(graph), None)
248
248
        head = heads.pop()
249
249
        assert isinstance(head, str)
250
 
        o = object_iter[head]
 
250
        try:
 
251
            o = object_iter[head]
 
252
        except KeyError:
 
253
            continue
251
254
        if isinstance(o, Commit):
252
255
            rev = mapping.import_commit(o)
253
256
            if repo.has_revision(rev.revision_id):
372
375
                    objects_iter = self.source.fetch_objects(
373
376
                                record_determine_wants, 
374
377
                                graph_walker, 
375
 
                                target_git_object_retriever.__getitem__, 
 
378
                                target_git_object_retriever.get_raw, 
376
379
                                progress)
377
380
                    import_git_objects(self.target, mapping, objects_iter, 
378
381
                            target_git_object_retriever, recorded_wants, pb)