← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2005-08-04 21:39:23 UTC
  • Revision ID: mbp@sourcefrog.net-20050804213923-aaf986c9c9a29506
- merge bzrlib.revision.is_ancestor from aaron

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
130
130
        Exception.__init__(self, "These branches have diverged.")
131
131
 
132
132
 
133
 
class NoSuchRevision(BzrError):
134
 
    def __init__(self, branch, revision):
135
 
        self.branch = branch
136
 
        self.revision = revision
137
 
        msg = "Branch %s has no revision %d" % (branch, revision)
138
 
        BzrError.__init__(self, msg)
139
 
 
140
 
 
141
133
######################################################################
142
134
# branch objects
143
135
 
602
594
            try:
603
595
                return self.revision_store[revision_id]
604
596
            except IndexError:
605
 
                raise bzrlib.errors.RevisionNotPresent(revision_id)
 
597
                raise bzrlib.errors.NoSuchRevision(revision_id)
606
598
        finally:
607
599
            self.unlock()
608
600