95
96
class DivergedBranches(BzrError):
96
97
def __init__(self, branch1, branch2):
98
BzrError.__init__(self, "These branches have diverged.")
97
99
self.branch1 = branch1
98
100
self.branch2 = branch2
99
BzrError.__init__(self, "These branches have diverged.")
101
102
class UnrelatedBranches(BzrCommandError):
102
103
def __init__(self):
105
106
BzrCommandError.__init__(self, msg)
108
class NoCommonAncestor(BzrError):
109
def __init__(self, revision_a, revision_b):
110
msg = "Revisions have no common ancestor: %s %s." \
111
% (revision_a, revision_b)
112
BzrError.__init__(self, msg)
114
class NoCommonRoot(BzrError):
115
def __init__(self, revision_a, revision_b):
116
msg = "Revisions are not derived from the same root: %s %s." \
117
% (revision_a, revision_b)
118
BzrError.__init__(self, msg)
108
120
class NotAncestor(BzrError):
109
121
def __init__(self, rev_id, not_ancestor_id):
122
msg = "Revision %s is not an ancestor of %s" % (not_ancestor_id,
124
BzrError.__init__(self, msg)
110
125
self.rev_id = rev_id
111
126
self.not_ancestor_id = not_ancestor_id
112
msg = "Revision %s is not an ancestor of %s" % (not_ancestor_id,
114
BzrError.__init__(self, msg)
117
129
class InstallFailed(BzrError):
118
130
def __init__(self, revisions):
131
msg = "Could not install revisions:\n%s" % " ,".join(revisions)
132
BzrError.__init__(self, msg)
119
133
self.revisions = revisions
120
msg = "Could not install revisions:\n%s" % " ,".join(revisions)
121
BzrError.__init__(self, msg)
124
136
class AmbiguousBase(BzrError):
128
140
BzrError.__init__(self, msg)
129
141
self.bases = bases
143
class NoCommits(BzrError):
144
def __init__(self, branch):
145
msg = "Branch %s has no commits." % branch
146
BzrError.__init__(self, msg)