← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Robert Collins
  • Date: 2009-03-02 04:45:02 UTC
  • mto: This revision was merged to the branch mainline in revision 4069.
  • Revision ID: robertc@robertcollins.net-20090302044502-ev676ddgmzsvny8u
Change the return value of fetch() to None.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
2571
2571
                            content is copied.
2572
2572
        :param pb: optional progress bar to use for progress reports. If not
2573
2573
                   provided a default one will be created.
2574
 
 
2575
 
        :returns: (copied_revision_count, failures).
 
2574
        :return: None.
2576
2575
        """
2577
2576
        # Normally we should find a specific InterRepository subclass to do
2578
2577
        # the fetch; if nothing else then at least InterSameDataRepository.
2761
2760
                               from_repository=self.source,
2762
2761
                               last_revision=revision_id,
2763
2762
                               pb=pb, find_ghosts=find_ghosts)
2764
 
        return f.count_copied, f.failed_revisions
2765
2763
 
2766
2764
 
2767
2765
class InterWeaveRepo(InterSameDataRepository):
2841
2839
                               from_repository=self.source,
2842
2840
                               last_revision=revision_id,
2843
2841
                               pb=pb, find_ghosts=find_ghosts)
2844
 
        return f.count_copied, f.failed_revisions
2845
2842
 
2846
2843
    @needs_read_lock
2847
2844
    def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
2922
2919
                            from_repository=self.source,
2923
2920
                            last_revision=revision_id,
2924
2921
                            pb=pb, find_ghosts=find_ghosts)
2925
 
        return f.count_copied, f.failed_revisions
2926
2922
 
2927
2923
    @needs_read_lock
2928
2924
    def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
2994
2990
            from bzrlib.fetch import RepoFetcher
2995
2991
            fetcher = RepoFetcher(self.target, self.source, revision_id,
2996
2992
                                  pb, find_ghosts)
2997
 
            return fetcher.count_copied, fetcher.failed_revisions
2998
2993
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2999
2994
               self.source, self.source._format, self.target, self.target._format)
3000
2995
        self.count_copied = 0
3117
3112
                                 from_repository=self.source,
3118
3113
                                 last_revision=revision_id,
3119
3114
                                 pb=pb, find_ghosts=find_ghosts)
3120
 
        return f.count_copied, f.failed_revisions
3121
3115
 
3122
3116
    @needs_write_lock
3123
3117
    def copy_content(self, revision_id=None):
3210
3204
                            from_repository=self.source,
3211
3205
                            last_revision=revision_id,
3212
3206
                            pb=pb, find_ghosts=find_ghosts)
3213
 
        return f.count_copied, f.failed_revisions
3214
3207
 
3215
3208
 
3216
3209
class InterDifferingSerializer(InterKnitRepo):
3494
3487
        from bzrlib.fetch import RepoFetcher
3495
3488
        fetcher = RepoFetcher(self.target, self.source, revision_id,
3496
3489
                              pb, find_ghosts)
3497
 
        return fetcher.count_copied, fetcher.failed_revisions
3498
3490
 
3499
3491
    def _get_target_pack_collection(self):
3500
3492
        return self.target._real_repository._pack_collection