← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-06-21 13:45:53 UTC
  • mfrom: (1793.2.6 bundles)
  • Revision ID: pqm@pqm.ubuntu.com-20060621134553-260d7058a7c44a27
Refactor bundle code

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
26
26
from bzrlib.branch import Branch, BranchReferenceFormat
27
27
from bzrlib import (bundle, branch, bzrdir, errors, osutils, ui, config,
28
28
    repository, log)
29
 
from bzrlib.bundle.read_bundle import BundleReader
 
29
from bzrlib.bundle import read_bundle_from_url
30
30
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
31
31
from bzrlib.commands import Command, display_command
32
32
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError, 
456
456
        rev_id = None
457
457
        if revision is None:
458
458
            if reader is not None:
459
 
                rev_id = reader.info.target
 
459
                rev_id = reader.target
460
460
        elif len(revision) == 1:
461
461
            rev_id = revision[0].in_history(branch_from).rev_id
462
462
        else: