← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-09-05 07:10:59 UTC
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050905071059-63693b49338a914c
Added merge test

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
23
23
######################################################################
24
24
# exceptions 
25
25
class BzrError(StandardError):
26
 
    def __str__(self):
27
 
        if len(self.args) == 1:
28
 
            return self.args[0]
29
 
        elif len(self.args) == 2:
30
 
            # further explanation or suggestions
31
 
            return '\n  '.join([self.args[0]] + self.args[1])
32
 
        else:
33
 
            return `self.args`
34
 
 
 
26
    pass
35
27
 
36
28
class BzrCheckError(BzrError):
37
29
    pass
100
92
        BzrError.__init__(self, msg)
101
93
 
102
94
 
103
 
class HistoryMissing(BzrError):
104
 
    def __init__(self, branch, object_type, object_id):
105
 
        self.branch = branch
106
 
        BzrError.__init__(self,
107
 
                          '%s is missing %s {%s}'
108
 
                          % (branch, object_type, object_id))
109
 
 
110
 
 
111
95
class UnrelatedBranches(BzrCommandError):
112
96
    def __init__(self):
113
97
        msg = "Branches have no common ancestor, and no base revision"\