← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/clone.py

  • Committer: Robert Collins
  • Date: 2005-11-13 18:57:26 UTC
  • mfrom: (1185.31.9)
  • Revision ID: robertc@robertcollins.net-20051113185726-39ede10d746eee6d
Merge Johns current integration work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/clone.py
100
100
        branch_from.unlock()
101
101
 
102
102
 
103
 
def _get_truncated_history(branch_from, revision):
 
103
def _get_truncated_history(branch_from, revision_id):
104
104
    history = branch_from.revision_history()
105
 
    if revision is None:
 
105
    if revision_id is None:
106
106
        return history
107
107
    try:
108
 
        idx = history.index(revision)
 
108
        idx = history.index(revision_id)
109
109
    except ValueError:
110
110
        raise InvalidRevisionId(revision_id=revision, branch=branch_from)
111
111
    return history[:idx+1]