/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: Martin Pool
  • Date: 2009-03-12 02:43:02 UTC
  • mfrom: (4121 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4140.
  • Revision ID: mbp@sourcefrog.net-20090312024302-aynicfx1ywm0k9dl
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1003
1003
 
1004
1004
class LockContention(LockError):
1005
1005
 
1006
 
    _fmt = 'Could not acquire lock "%(lock)s"'
 
1006
    _fmt = 'Could not acquire lock "%(lock)s": %(message)s'
1007
1007
    # TODO: show full url for lock, combining the transport and relative
1008
1008
    # bits?
1009
1009
 
1010
1010
    internal_error = False
1011
1011
 
1012
 
    def __init__(self, lock):
 
1012
    def __init__(self, lock, message=''):
1013
1013
        self.lock = lock
 
1014
        self.message = message
1014
1015
 
1015
1016
 
1016
1017
class LockBroken(LockError):
2503
2504
 
2504
2505
class MalformedBugIdentifier(BzrError):
2505
2506
 
2506
 
    _fmt = "Did not understand bug identifier %(bug_id)s: %(reason)s"
 
2507
    _fmt = ('Did not understand bug identifier %(bug_id)s: %(reason)s. '
 
2508
            'See "bzr help bugs" for more information on this feature.')
2507
2509
 
2508
2510
    def __init__(self, bug_id, reason):
2509
2511
        self.bug_id = bug_id