~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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, bzrdir=a_bzrdir)
 
1444
            raise errors.NotBranchError(path=transport.base)
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, bzrdir=a_bzrdir)
 
1799
            raise errors.NotBranchError(path=transport.base)
1800
1800
 
1801
1801
    def __init__(self):
1802
1802
        super(BranchFormatMetadir, self).__init__()