/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: Robert Collins
  • Date: 2007-04-23 02:29:35 UTC
  • mfrom: (2441 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070423022935-9hhongamvk6bfdso
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
25
25
    osutils,
26
26
    )
27
27
import bzrlib.errors
 
28
from bzrlib.bundle import apply_bundle
28
29
from bzrlib.errors import (TestamentMismatch, BzrError, 
29
30
                           MalformedHeader, MalformedPatches, NotABundle)
30
31
from bzrlib.inventory import (Inventory, InventoryEntry,
112
113
        split up, based on the assumptions that can be made
113
114
        when information is missing.
114
115
        """
115
 
        from bzrlib.bundle.serializer import unpack_highres_date
 
116
        from bzrlib.timestamp import unpack_highres_date
116
117
        # Put in all of the guessable information.
117
118
        if not self.timestamp and self.date:
118
119
            self.timestamp, self.timezone = unpack_highres_date(self.date)
432
433
                        ' (unrecognized action): %r' % action_line)
433
434
            valid_actions[action](kind, extra, lines)
434
435
 
 
436
    def install_revisions(self, target_repo):
 
437
        """Install revisions and return the target revision"""
 
438
        apply_bundle.install_bundle(target_repo, self)
 
439
        return self.target
 
440
 
435
441
 
436
442
class BundleTree(Tree):
437
443
    def __init__(self, base_tree, revision_id):