/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 bzrlib/branch.py

Merge from remote-transport

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
820
820
        if not _found:
821
821
            format = BranchFormat.find_format(a_bzrdir)
822
822
            assert format.__class__ == self.__class__
823
 
        transport = a_bzrdir.get_branch_transport(None)
824
 
        control_files = lockable_files.LockableFiles(transport, 'lock',
825
 
                                                     lockdir.LockDir)
826
 
        return BzrBranch5(_format=self,
827
 
                          _control_files=control_files,
828
 
                          a_bzrdir=a_bzrdir,
829
 
                          _repository=a_bzrdir.find_repository())
 
823
        try:
 
824
            transport = a_bzrdir.get_branch_transport(None)
 
825
            control_files = lockable_files.LockableFiles(transport, 'lock',
 
826
                                                         lockdir.LockDir)
 
827
            return BzrBranch5(_format=self,
 
828
                              _control_files=control_files,
 
829
                              a_bzrdir=a_bzrdir,
 
830
                              _repository=a_bzrdir.find_repository())
 
831
        except NoSuchFile:
 
832
            raise NotBranchError(path=transport.base)
830
833
 
831
834
    def __str__(self):
832
835
        return "Bazaar-NG Metadir branch format 5"