/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/errors.py

  • Committer: Parth Malwankar
  • Date: 2010-03-06 01:26:10 UTC
  • mfrom: (5076 +trunk)
  • mto: (5094.3.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5107.
  • Revision ID: parth.malwankar@gmail.com-20100306012610-a32cmtc938t6vw8p
merged trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
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