← 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: 2005-08-25 06:08:36 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825060836-40b430abb9d341d9
unbreak cmd_branch now that something tests the core of it..

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
92
92
        BzrError.__init__(self, msg)
93
93
 
94
94
 
95
 
class DivergedBranches(BzrError):
96
 
    def __init__(self, branch1, branch2):
97
 
        self.branch1 = branch1
98
 
        self.branch2 = branch2
99
 
        BzrError.__init__(self, "These branches have diverged.")
100
 
 
101
95
class UnrelatedBranches(BzrCommandError):
102
96
    def __init__(self):
103
97
        msg = "Branches have no common ancestor, and no base revision"\
105
99
        BzrCommandError.__init__(self, msg)
106
100
 
107
101
 
108
 
class NotAncestor(BzrError):
109
 
    def __init__(self, rev_id, not_ancestor_id):
110
 
        self.rev_id = rev_id
111
 
        self.not_ancestor_id = not_ancestor_id
112
 
        msg = "Revision %s is not an ancestor of %s" % (not_ancestor_id, 
113
 
                                                        rev_id)
114
 
        BzrError.__init__(self, msg)
115
 
 
116
 
 
117
 
class InstallFailed(BzrError):
118
 
    def __init__(self, revisions):
119
 
        self.revisions = revisions
120
 
        msg = "Could not install revisions:\n%s" % " ,".join(revisions)
121
 
        BzrError.__init__(self, msg)
122
 
 
123
 
 
124
 
class AmbiguousBase(BzrError):
125
 
    def __init__(self, bases):
126
 
        msg = "The correct base is unclear, becase %s are all equally close" %\
127
 
            ", ".join(bases)
128
 
        BzrError.__init__(self, msg)
129
 
        self.bases = bases
130