92
92
BzrError.__init__(self, msg)
95
class DivergedBranches(BzrError):
96
def __init__(self, branch1, branch2):
97
BzrError.__init__(self, "These branches have diverged.")
98
self.branch1 = branch1
99
self.branch2 = branch2
101
class UnrelatedBranches(BzrCommandError):
103
msg = "Branches have no common ancestor, and no base revision"\
105
BzrCommandError.__init__(self, msg)
107
class NoCommonAncestor(BzrError):
108
def __init__(self, revision_a, revision_b):
109
msg = "Revisions have no common ancestor: %s %s." \
110
% (revision_a, revision_b)
111
BzrError.__init__(self, msg)
113
class NoCommonRoot(BzrError):
114
def __init__(self, revision_a, revision_b):
115
msg = "Revisions are not derived from the same root: %s %s." \
116
% (revision_a, revision_b)
117
BzrError.__init__(self, msg)
119
class NotAncestor(BzrError):
120
def __init__(self, rev_id, not_ancestor_id):
121
msg = "Revision %s is not an ancestor of %s" % (not_ancestor_id,
123
BzrError.__init__(self, msg)
125
self.not_ancestor_id = not_ancestor_id
128
class InstallFailed(BzrError):
129
def __init__(self, revisions):
130
msg = "Could not install revisions:\n%s" % " ,".join(revisions)
131
BzrError.__init__(self, msg)
132
self.revisions = revisions
135
class AmbiguousBase(BzrError):
136
def __init__(self, bases):
137
msg = "The correct base is unclear, becase %s are all equally close" %\
139
BzrError.__init__(self, msg)
142
class NoCommits(BzrError):
143
def __init__(self, branch):
144
msg = "Branch %s has no commits." % branch
145
BzrError.__init__(self, msg)
added
removed
bzrlib/errors.py
