/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

  • Committer: Martin Pool
  • Date: 2010-02-09 19:04:02 UTC
  • mfrom: (5010 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5019.
  • Revision ID: mbp@canonical.com-20100209190402-2xbzrchmb4dfi2j7
Resolve conflicts with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1441
1441
            format_string = transport.get_bytes("format")
1442
1442
            return klass._formats[format_string]
1443
1443
        except errors.NoSuchFile:
1444
 
            raise errors.NotBranchError(path=transport.base)
 
1444
            raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1445
1445
        except KeyError:
1446
1446
            raise errors.UnknownFormatError(format=format_string, kind='branch')
1447
1447
 
1796
1796
                              _repository=a_bzrdir.find_repository(),
1797
1797
                              ignore_fallbacks=ignore_fallbacks)
1798
1798
        except errors.NoSuchFile:
1799
 
            raise errors.NotBranchError(path=transport.base)
 
1799
            raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1800
1800
 
1801
1801
    def __init__(self):
1802
1802
        super(BranchFormatMetadir, self).__init__()