/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/tests/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/__init__.py
2643
2643
    def make_branch(self, relpath, format=None, name=None):
2644
2644
        """Create a branch on the transport at relpath."""
2645
2645
        repo = self.make_repository(relpath, format=format)
2646
 
        return repo.bzrdir.create_branch(append_revisions_only=False,
2647
 
                                         name=name)
 
2646
        return repo.controldir.create_branch(append_revisions_only=False, name=name)
2648
2647
 
2649
2648
    def get_default_format(self):
2650
2649
        return 'default'
2662
2661
        if format is None:
2663
2662
            format = self.get_default_format()
2664
2663
        if isinstance(format, str):
2665
 
            format = controldir.format_registry.make_bzrdir(format)
 
2664
            format = controldir.format_registry.make_controldir(format)
2666
2665
        return format
2667
2666
 
2668
 
    def make_bzrdir(self, relpath, format=None):
 
2667
    def make_controldir(self, relpath, format=None):
2669
2668
        try:
2670
2669
            # might be a relative or absolute path
2671
2670
            maybe_a_url = self.get_url(relpath)
2687
2686
        # real format, which is incorrect.  Actually we should make sure that
2688
2687
        # RemoteBzrDir returns a RemoteRepository.
2689
2688
        # maybe  mbp 20070410
2690
 
        made_control = self.make_bzrdir(relpath, format=format)
 
2689
        made_control = self.make_controldir(relpath, format=format)
2691
2690
        return made_control.create_repository(shared=shared)
2692
2691
 
2693
2692
    def make_smart_server(self, path, backing_server=None):
2948
2947
            return b.create_checkout(relpath, lightweight=True)
2949
2948
        b = self.make_branch(relpath, format=format)
2950
2949
        try:
2951
 
            return b.bzrdir.create_workingtree()
 
2950
            return b.controldir.create_workingtree()
2952
2951
        except errors.NotLocalUrl:
2953
2952
            # We can only make working trees locally at the moment.  If the
2954
2953
            # transport can't support them, then we keep the non-disk-backed