/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: Robert Collins
  • Date: 2008-04-04 00:43:07 UTC
  • mfrom: (3331 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3333.
  • Revision ID: robertc@robertcollins.net-20080404004307-0whomfhm3yal2rvw
Resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
541
541
 
542
542
class InvalidURLJoin(PathError):
543
543
 
544
 
    _fmt = 'Invalid URL join request: "%(args)s"%(extra)s'
 
544
    _fmt = "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
545
545
 
546
 
    def __init__(self, msg, base, args):
547
 
        PathError.__init__(self, base, msg)
548
 
        self.args = [base] + list(args)
 
546
    def __init__(self, reason, base, join_args):
 
547
        self.reason = reason
 
548
        self.base = base
 
549
        self.join_args = join_args
 
550
        PathError.__init__(self, base, reason)
549
551
 
550
552
 
551
553
class UnknownHook(BzrError):
684
686
 
685
687
class UnknownFormatError(BzrError):
686
688
    
687
 
    _fmt = "Unknown branch format: %(format)r"
 
689
    _fmt = "Unknown %(kind)s format: %(format)r"
 
690
 
 
691
    def __init__(self, format, kind='branch'):
 
692
        self.kind = kind
 
693
        self.format = format
688
694
 
689
695
 
690
696
class IncompatibleFormat(BzrError):
2178
2184
 
2179
2185
    _fmt = "No smart server available at %(url)s"
2180
2186
 
 
2187
    @symbol_versioning.deprecated_method(symbol_versioning.one_four)
2181
2188
    def __init__(self, url):
2182
2189
        self.url = url
2183
2190
 
2576
2583
 
2577
2584
    def __init__(self, timezone):
2578
2585
        self.timezone = timezone
 
2586
 
 
2587
 
 
2588
class NotATerminal(BzrError):
 
2589
 
 
2590
    _fmt = 'Unable to ask for a password without real terminal.'
 
2591
 
 
2592
 
 
2593
class UnableEncodePath(BzrError):
 
2594
 
 
2595
    _fmt = ('Unable to encode %(kind)s path %(path)r in '
 
2596
            'user encoding %(user_encoding)s')
 
2597
 
 
2598
    def __init__(self, path, kind):
 
2599
        self.path = path
 
2600
        self.kind = kind
 
2601
        self.user_encoding = osutils.get_user_encoding()