/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/repository.py

  • Committer: Jelmer Vernooij
  • Date: 2019-07-07 20:43:57 UTC
  • mfrom: (7370 work)
  • mto: This revision was merged to the branch mainline in revision 7378.
  • Revision ID: jelmer@jelmer.uk-20190707204357-82bayabtwikhoi0i
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/repository.py
564
564
        :param using: If True, list only branches using this repository.
565
565
        """
566
566
        if using and not self.is_shared():
567
 
            return self.controldir.list_branches()
 
567
            for branch in self.controldir.list_branches():
 
568
                yield branch
 
569
            return
568
570
 
569
571
        class Evaluator(object):
570
572
 
585
587
                value = (controldir.list_branches(), None)
586
588
                return True, value
587
589
 
588
 
        ret = []
589
590
        for branches, repository in controldir.ControlDir.find_controldirs(
590
591
                self.user_transport, evaluate=Evaluator()):
591
592
            if branches is not None:
592
 
                ret.extend(branches)
 
593
                for branch in branches:
 
594
                    yield branch
593
595
            if not using and repository is not None:
594
 
                ret.extend(repository.find_branches())
595
 
        return ret
 
596
                for branch in repository.find_branches():
 
597
                    yield branch
596
598
 
597
599
    def search_missing_revision_ids(self, other,
598
600
                                    find_ghosts=True, revision_ids=None, if_present_ids=None,