← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

Merge with extras

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
690
690
        self._write_group = None
691
691
        # Additional places to query for data.
692
692
        self._fallback_repositories = []
 
693
        # What order should fetch operations request streams in?
 
694
        # The default is unsorted as that is the cheapest for an origin to
 
695
        # provide.
 
696
        self._fetch_order = 'unsorted'
 
697
        # Does this repository use deltas that can be fetched as-deltas ?
 
698
        # (E.g. knits, where the knit deltas can be transplanted intact.
 
699
        # We default to False, which will ensure that enough data to get
 
700
        # a full text out of any fetch stream will be grabbed.
 
701
        self._fetch_uses_deltas = False
 
702
        # Should fetch trigger a reconcile after the fetch? Only needed for
 
703
        # some repository formats that can suffer internal inconsistencies.
 
704
        self._fetch_reconcile = False
693
705
 
694
706
    def __repr__(self):
695
707
        return '%s(%r)' % (self.__class__.__name__,
2487
2499
    @needs_write_lock
2488
2500
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2489
2501
        """See InterRepository.fetch()."""
2490
 
        from bzrlib.fetch import GenericRepoFetcher
 
2502
        from bzrlib.fetch import RepoFetcher
2491
2503
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2492
2504
               self.source, self.source._format, self.target,
2493
2505
               self.target._format)
2494
 
        f = GenericRepoFetcher(to_repository=self.target,
 
2506
        f = RepoFetcher(to_repository=self.target,
2495
2507
                               from_repository=self.source,
2496
2508
                               last_revision=revision_id,
2497
2509
                               pb=pb, find_ghosts=find_ghosts)
2568
2580
    @needs_write_lock
2569
2581
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2570
2582
        """See InterRepository.fetch()."""
2571
 
        from bzrlib.fetch import GenericRepoFetcher
 
2583
        from bzrlib.fetch import RepoFetcher
2572
2584
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2573
2585
               self.source, self.source._format, self.target, self.target._format)
2574
 
        f = GenericRepoFetcher(to_repository=self.target,
 
2586
        f = RepoFetcher(to_repository=self.target,
2575
2587
                               from_repository=self.source,
2576
2588
                               last_revision=revision_id,
2577
2589
                               pb=pb, find_ghosts=find_ghosts)
2649
2661
    @needs_write_lock
2650
2662
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2651
2663
        """See InterRepository.fetch()."""
2652
 
        from bzrlib.fetch import KnitRepoFetcher
 
2664
        from bzrlib.fetch import RepoFetcher
2653
2665
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2654
2666
               self.source, self.source._format, self.target, self.target._format)
2655
 
        f = KnitRepoFetcher(to_repository=self.target,
 
2667
        f = RepoFetcher(to_repository=self.target,
2656
2668
                            from_repository=self.source,
2657
2669
                            last_revision=revision_id,
2658
2670
                            pb=pb, find_ghosts=find_ghosts)
2720
2732
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2721
2733
        """See InterRepository.fetch()."""
2722
2734
        if len(self.source._fallback_repositories) > 0:
2723
 
            from bzrlib.fetch import KnitRepoFetcher
2724
 
            fetcher = KnitRepoFetcher(self.target, self.source, revision_id,
 
2735
            from bzrlib.fetch import RepoFetcher
 
2736
            fetcher = RepoFetcher(self.target, self.source, revision_id,
2725
2737
                                      pb, find_ghosts)
2726
2738
            return fetcher.count_copied, fetcher.failed_revisions
2727
2739
        from bzrlib.repofmt.pack_repo import Packer