← 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-09-28 05:25:54 UTC
  • mfrom: (1185.1.42)
  • mto: (1092.2.18)
  • mto: This revision was merged to the branch mainline in revision 1397.
  • Revision ID: robertc@robertcollins.net-20050928052554-beb985505f77ea6a
update symlink branch to integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1
 
#! /usr/bin/env python
2
1
# -*- coding: UTF-8 -*-
3
2
 
4
3
# This program is free software; you can redistribute it and/or modify
25
24
class BzrError(StandardError):
26
25
    pass
27
26
 
 
27
 
28
28
class BzrCheckError(BzrError):
29
29
    pass
30
30
 
92
92
        BzrError.__init__(self, msg)
93
93
 
94
94
 
 
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
 
100
 
95
101
class UnrelatedBranches(BzrCommandError):
96
102
    def __init__(self):
97
103
        msg = "Branches have no common ancestor, and no base revision"\
98
104
            " specified."
99
105
        BzrCommandError.__init__(self, msg)
100
106
 
 
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)
 
112
 
 
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)
 
118
 
 
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, 
 
122
                                                        rev_id)
 
123
        BzrError.__init__(self, msg)
 
124
        self.rev_id = rev_id
 
125
        self.not_ancestor_id = not_ancestor_id
 
126
 
101
127
 
102
128
class NotAncestor(BzrError):
103
129
    def __init__(self, rev_id, not_ancestor_id):
110
136
 
111
137
class InstallFailed(BzrError):
112
138
    def __init__(self, revisions):
 
139
        msg = "Could not install revisions:\n%s" % " ,".join(revisions)
 
140
        BzrError.__init__(self, msg)
113
141
        self.revisions = revisions
114
 
        msg = "Could not install revisions:\n%s" % " ,".join(revisions)
115
 
        BzrError.__init__(self, msg)
116
142
 
117
143
 
118
144
class AmbiguousBase(BzrError):
122
148
        BzrError.__init__(self, msg)
123
149
        self.bases = bases
124
150
 
 
151
class NoCommits(BzrError):
 
152
    def __init__(self, branch):
 
153
        msg = "Branch %s has no commits." % branch
 
154
        BzrError.__init__(self, msg)