~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-01 19:18:09 UTC
  • mfrom: (6459 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6460.
  • Revision ID: jelmer@samba.org-20120201191809-xn340a5i5v4fqsfu
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
710
710
    _fmt = 'Already a branch: "%(path)s".'
711
711
 
712
712
 
 
713
class ParentBranchExists(AlreadyBranchError):
 
714
 
 
715
    _fmt = 'Parent branch already exists: "%(path)s".'
 
716
 
 
717
 
713
718
class BranchExistsWithoutWorkingTree(PathError):
714
719
 
715
720
    _fmt = 'Directory contains a branch, but no working tree \
1756
1761
 
1757
1762
class ConfigOptionValueError(BzrError):
1758
1763
 
1759
 
    _fmt = """Bad value "%(value)s" for option "%(name)s"."""
 
1764
    _fmt = ('Bad value "%(value)s" for option "%(name)s".\n'
 
1765
            'See ``bzr help %(name)s``')
1760
1766
 
1761
1767
    def __init__(self, name, value):
1762
1768
        BzrError.__init__(self, name=name, value=value)