← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-03-02 18:59:02 UTC
  • mfrom: (5689.2.2 tag-ghosts)
  • Revision ID: pqm@pqm.ubuntu.com-20110302185902-f0qc7uyy82j785q3
(jelmer) Support branches with ghosts in their mainline and tags on
 revisions not in the branch ancestry in "bzr tags". (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
3097
3097
        try:
3098
3098
            index = self._partial_revision_history_cache.index(revision_id)
3099
3099
        except ValueError:
3100
 
            self._extend_partial_history(stop_revision=revision_id)
 
3100
            try:
 
3101
                self._extend_partial_history(stop_revision=revision_id)
 
3102
            except errors.RevisionNotPresent, e:
 
3103
                raise errors.GhostRevisionsHaveNoRevno(revision_id, e.revision_id)
3101
3104
            index = len(self._partial_revision_history_cache) - 1
3102
3105
            if self._partial_revision_history_cache[index] != revision_id:
3103
3106
                raise errors.NoSuchRevision(self, revision_id)