← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Andrew Bennetts
  • Date: 2007-03-06 07:11:37 UTC
  • mto: (2018.5.91 hpss)
  • mto: This revision was merged to the branch mainline in revision 2435.
  • Revision ID: andrew.bennetts@canonical.com-20070306071137-7aoryabu1ychy6ge
Tidy up BzrDir.cloning_metadir: bogus try/except, and basis argument isn't actually used.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
625
625
        except errors.NoWorkingTree:
626
626
            return False
627
627
 
628
 
    def cloning_metadir(self, basis=None):
 
628
    def cloning_metadir(self):
629
629
        """Produce a metadir suitable for cloning with"""
630
630
        def related_repository(bzrdir):
631
631
            try:
636
636
                return bzrdir.open_repository()
637
637
        result_format = self._format.__class__()
638
638
        try:
639
 
            try:
640
 
                source_repository = related_repository(self)
641
 
            except errors.NoRepositoryPresent:
642
 
                if basis is None:
643
 
                    raise
644
 
                source_repository = related_repository(self)
 
639
            source_repository = related_repository(self)
 
640
        except errors.NoRepositoryPresent:
 
641
            pass
 
642
        else:
645
643
            result_format.repository_format = source_repository._format
646
 
        except errors.NoRepositoryPresent:
647
 
            pass
648
644
        return result_format
649
645
 
650
646
    def sprout(self, url, revision_id=None, basis=None, force_new_repo=False):
662
658
            itself to download less data.
663
659
        """
664
660
        self._make_tail(url)
665
 
        cloning_format = self.cloning_metadir(basis)
 
661
        cloning_format = self.cloning_metadir()
666
662
        result = cloning_format.initialize(url)
667
663
        basis_repo, basis_branch, basis_tree = self._get_basis_components(basis)
668
664
        try: