← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
1745
1745
    def _resume_write_group(self, tokens):
1746
1746
        raise errors.UnsuspendableWriteGroup(self)
1747
1747
 
1748
 
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
 
1748
    def fetch(self, source, revision_id=None, find_ghosts=False,
1749
1749
            fetch_spec=None):
1750
1750
        """Fetch the content required to construct revision_id from source.
1751
1751
 
1786
1786
                self.get_revision(revision_id)
1787
1787
            return 0, []
1788
1788
        inter = InterRepository.get(source, self)
1789
 
        return inter.fetch(revision_id=revision_id, pb=pb,
 
1789
        return inter.fetch(revision_id=revision_id,
1790
1790
            find_ghosts=find_ghosts, fetch_spec=fetch_spec)
1791
1791
 
1792
1792
    def create_bundle(self, target, base, fileobj, format=None):
3458
3458
        self.target.fetch(self.source, revision_id=revision_id)
3459
3459
 
3460
3460
    @needs_write_lock
3461
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
 
3461
    def fetch(self, revision_id=None, find_ghosts=False,
3462
3462
            fetch_spec=None):
3463
3463
        """Fetch the content required to construct revision_id.
3464
3464
 
3466
3466
 
3467
3467
        :param revision_id: if None all content is copied, if NULL_REVISION no
3468
3468
                            content is copied.
3469
 
        :param pb: ignored.
3470
3469
        :return: None.
3471
3470
        """
3472
3471
        ui.ui_factory.warn_experimental_format_fetch(self)
3931
3930
                  len(revision_ids))
3932
3931
 
3933
3932
    @needs_write_lock
3934
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
 
3933
    def fetch(self, revision_id=None, find_ghosts=False,
3935
3934
            fetch_spec=None):
3936
3935
        """See InterRepository.fetch()."""
3937
3936
        if fetch_spec is not None:
3967
3966
        # Walk though all revisions; get inventory deltas, copy referenced
3968
3967
        # texts that delta references, insert the delta, revision and
3969
3968
        # signature.
3970
 
        if pb is None:
3971
 
            my_pb = ui.ui_factory.nested_progress_bar()
3972
 
            pb = my_pb
3973
 
        else:
3974
 
            symbol_versioning.warn(
3975
 
                symbol_versioning.deprecated_in((1, 14, 0))
3976
 
                % "pb parameter to fetch()")
3977
 
            my_pb = None
 
3969
        pb = ui.ui_factory.nested_progress_bar()
3978
3970
        try:
3979
3971
            self._fetch_all_revisions(revision_ids, pb)
3980
3972
        finally:
3981
 
            if my_pb is not None:
3982
 
                my_pb.finished()
 
3973
            pb.finished()
3983
3974
        return len(revision_ids), 0
3984
3975
 
3985
3976
    def _get_basis(self, first_revision_id):