/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-08-11 13:33:45 UTC
  • mfrom: (7379 work)
  • mto: This revision was merged to the branch mainline in revision 7389.
  • Revision ID: jelmer@jelmer.uk-20190811133345-dp9j3c569vxj4l9y
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/repository.py
29
29
    revision as _mod_revision,
30
30
    gpg,
31
31
    )
32
 
from breezy.bundle import serializer
33
32
from breezy.i18n import gettext
34
33
""")
35
34
 
564
563
        :param using: If True, list only branches using this repository.
565
564
        """
566
565
        if using and not self.is_shared():
567
 
            return self.controldir.list_branches()
 
566
            for branch in self.controldir.list_branches():
 
567
                yield branch
 
568
            return
568
569
 
569
570
        class Evaluator(object):
570
571
 
585
586
                value = (controldir.list_branches(), None)
586
587
                return True, value
587
588
 
588
 
        ret = []
589
589
        for branches, repository in controldir.ControlDir.find_controldirs(
590
590
                self.user_transport, evaluate=Evaluator()):
591
591
            if branches is not None:
592
 
                ret.extend(branches)
 
592
                for branch in branches:
 
593
                    yield branch
593
594
            if not using and repository is not None:
594
 
                ret.extend(repository.find_branches())
595
 
        return ret
 
595
                for branch in repository.find_branches():
 
596
                    yield branch
596
597
 
597
598
    def search_missing_revision_ids(self, other,
598
599
                                    find_ghosts=True, revision_ids=None, if_present_ids=None,
718
719
        inter = InterRepository.get(source, self)
719
720
        return inter.fetch(revision_id=revision_id, find_ghosts=find_ghosts)
720
721
 
721
 
    def create_bundle(self, target, base, fileobj, format=None):
722
 
        return serializer.write_bundle(self, target, base, fileobj, format)
723
 
 
724
722
    def get_commit_builder(self, branch, parents, config_stack, timestamp=None,
725
723
                           timezone=None, committer=None, revprops=None,
726
724
                           revision_id=None, lossy=False):
1600
1598
            pb.update(gettext('Creating new repository'))
1601
1599
            converted = self.target_format.initialize(self.repo_dir,
1602
1600
                                                      self.source_repo.is_shared())
1603
 
            converted.lock_write()
1604
 
            try:
 
1601
            with converted.lock_write():
1605
1602
                pb.update(gettext('Copying content'))
1606
1603
                self.source_repo.copy_content_into(converted)
1607
 
            finally:
1608
 
                converted.unlock()
1609
1604
            pb.update(gettext('Deleting old repository content'))
1610
1605
            self.repo_dir.transport.delete_tree('repository.backup')
1611
1606
            ui.ui_factory.note(gettext('repository converted'))