← 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-09-15 08:57:46 UTC
  • Revision ID: mbp@sourcefrog.net-20050915085746-89170eabc66f8b89
- clean up imports

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
26
26
     sha_file, appendpath, file_kind
27
27
 
28
28
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
29
 
                           NoSuchRevision)
 
29
                           NoSuchRevision, HistoryMissing)
30
30
from bzrlib.textui import show_status
31
 
from bzrlib.revision import Revision
 
31
from bzrlib.revision import Revision, validate_revision_id
32
32
from bzrlib.delta import compare_trees
33
33
from bzrlib.tree import EmptyTree, RevisionTree
34
34
from bzrlib.inventory import Inventory
1256
1256
 
1257
1257
 
1258
1258
    def add_pending_merge(self, revision_id):
1259
 
        from bzrlib.revision import validate_revision_id
1260
 
 
1261
1259
        validate_revision_id(revision_id)
1262
 
 
 
1260
        # TODO: Perhaps should check at this point that the
 
1261
        # history of the revision is actually present?
1263
1262
        p = self.pending_merges()
1264
1263
        if revision_id in p:
1265
1264
            return