~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/clone.py

[merge] win32 fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
52
52
from bzrlib.branch import Branch
53
53
from bzrlib.trace import mutter, note
54
54
from bzrlib.store import copy_all
 
55
from bzrlib.errors import InvalidRevisionId
55
56
 
56
57
def copy_branch(branch_from, to_location, revision=None, basis_branch=None):
57
58
    """Copy branch_from into the existing directory to_location.
106
107
    try:
107
108
        idx = history.index(revision)
108
109
    except ValueError:
109
 
        raise InvalidRevisionId('revision {%s} is not on the mainline of %s' 
110
 
                                % (revision, branch_from))
 
110
        raise InvalidRevisionId(revision_id=revision, branch=branch_from)
111
111
    return history[:idx+1]
112
112
 
113
113
def _copy_text_weaves(branch_from, branch_to):