← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1179
1179
 
1180
1180
class InvalidRevisionSpec(BzrError):
1181
1181
 
1182
 
    _fmt = ("Requested revision: %(spec)r does not exist in branch:"
 
1182
    _fmt = ("Requested revision: '%(spec)s' does not exist in branch:"
1183
1183
            " %(branch)s%(extra)s")
1184
1184
 
1185
1185
    def __init__(self, spec, branch, extra=None):
1297
1297
class BoundBranchOutOfDate(BzrError):
1298
1298
 
1299
1299
    _fmt = ("Bound branch %(branch)s is out of date with master branch"
1300
 
            " %(master)s.")
 
1300
            " %(master)s.%(extra_help)s")
1301
1301
 
1302
1302
    def __init__(self, branch, master):
1303
1303
        BzrError.__init__(self)
1304
1304
        self.branch = branch
1305
1305
        self.master = master
 
1306
        self.extra_help = ''
1306
1307
 
1307
1308
 
1308
1309
class CommitToDoubleBoundBranch(BzrError):
3124
3125
 
3125
3126
    def __init__(self, path):
3126
3127
        self.path = path
 
3128
 
 
3129
 
 
3130
class NoColocatedBranchSupport(BzrError):
 
3131
 
 
3132
    _fmt = ("%(bzrdir)r does not support co-located branches.")
 
3133
 
 
3134
    def __init__(self, bzrdir):
 
3135
        self.bzrdir = bzrdir
 
3136