← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Martin Pool
  • Date: 2005-08-25 05:58:05 UTC
  • mfrom: (974.1.36)
  • Revision ID: mbp@sourcefrog.net-20050825055805-8c892bc3c2d75131
- merge aaron's merge improvements:

  * When merging, pull in all missing revisions from the source
    branch. 

  * Detect common ancestors by looking at the whole ancestry graph, 
    rather than just mainline history.

  Some changes to reconcile this with parallel updates to the test and
  trace code.

aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
99
99
        BzrCommandError.__init__(self, msg)
100
100
 
101
101
 
102
 
class NotAncestor(BzrError):
103
 
    def __init__(self, rev_id, not_ancestor_id):
104
 
        self.rev_id = rev_id
105
 
        self.not_ancestor_id = not_ancestor_id
106
 
        msg = "Revision %s is not an ancestor of %s" % (not_ancestor_id, 
107
 
                                                        rev_id)
108
 
        BzrError.__init__(self, msg)
109
 
 
110
 
 
111
102
class InstallFailed(BzrError):
112
103
    def __init__(self, revisions):
113
104
        self.revisions = revisions
114
105
        msg = "Could not install revisions:\n%s" % " ,".join(revisions)
115
106
        BzrError.__init__(self, msg)
116
 
 
117
 
 
118
 
class AmbiguousBase(BzrError):
119
 
    def __init__(self, bases):
120
 
        msg = "The correct base is unclear, becase %s are all equally close" %\
121
 
            ", ".join(bases)
122
 
        BzrError.__init__(self, msg)
123
 
        self.bases = bases
124