92
91
msg = "Branch %s has no revision %s" % (branch, revision)
93
92
BzrError.__init__(self, msg)
96
class DivergedBranches(BzrError):
97
def __init__(self, branch1, branch2):
98
BzrError.__init__(self, "These branches have diverged.")
99
self.branch1 = branch1
100
self.branch2 = branch2
102
class UnrelatedBranches(BzrCommandError):
104
msg = "Branches have no common ancestor, and no base revision"\
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)
120
class NotAncestor(BzrError):
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)
126
self.not_ancestor_id = not_ancestor_id
129
94
class InstallFailed(BzrError):
130
95
def __init__(self, revisions):
96
self.revisions = revisions
131
97
msg = "Could not install revisions:\n%s" % " ,".join(revisions)
132
98
BzrError.__init__(self, msg)
133
self.revisions = revisions
136
class AmbiguousBase(BzrError):
137
def __init__(self, bases):
138
msg = "The correct base is unclear, becase %s are all equally close" %\
140
BzrError.__init__(self, msg)
143
class NoCommits(BzrError):
144
def __init__(self, branch):
145
msg = "Branch %s has no commits." % branch
146
BzrError.__init__(self, msg)
added
removed
bzrlib/errors.py
