← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

Merge in bzr.dev 3801, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
799
799
        return repository.InterRepository.get(
800
800
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
801
801
 
802
 
    def fetch(self, source, revision_id=None, pb=None):
 
802
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False):
803
803
        if self.has_same_location(source):
804
804
            # check that last_revision is in 'from' and then return a
805
805
            # no-operation.
807
807
                not revision.is_null(revision_id)):
808
808
                self.get_revision(revision_id)
809
809
            return 0, []
810
 
        self._ensure_real()
811
 
        return self._real_repository.fetch(
812
 
            source, revision_id=revision_id, pb=pb)
 
810
        inter = repository.InterRepository.get(source, self)
 
811
        try:
 
812
            return inter.fetch(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts)
 
813
 
 
814
        except NotImplementedError:
 
815
            raise errors.IncompatibleRepositories(source, self)
813
816
 
814
817
    def create_bundle(self, target, base, fileobj, format=None):
815
818
        self._ensure_real()