← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Aaron Bentley
  • Date: 2005-09-14 16:35:46 UTC
  • mto: (1185.1.16)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: abentley@panoramicfeedback.com-20050914163546-ef044baf4ef9c135
Improved merge error handling and testing

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
98
98
            " specified."
99
99
        BzrCommandError.__init__(self, msg)
100
100
 
 
101
class NoCommonAncestor(BzrError):
 
102
    def __init__(self, revision_a, revision_b):
 
103
        msg = "Revisions have no common ancestor: %s %s." \
 
104
            % (revision_a, revision_b) 
 
105
        BzrError.__init__(self, msg)
 
106
 
 
107
class NoCommonRoot(BzrError):
 
108
    def __init__(self, revision_a, revision_b):
 
109
        msg = "Revisions are not derived from the same root: %s %s." \
 
110
            % (revision_a, revision_b) 
 
111
        BzrError.__init__(self, msg)
101
112
 
102
113
class NotAncestor(BzrError):
103
114
    def __init__(self, rev_id, not_ancestor_id):
122
133
        BzrError.__init__(self, msg)
123
134
        self.bases = bases
124
135
 
 
136
class NoCommits(BzrError):
 
137
    def __init__(self, branch):
 
138
        msg = "Branch %s has no commits." % branch
 
139
        BzrError.__init__(self, msg)