/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: Jan Balster
  • Date: 2006-08-15 12:39:42 UTC
  • mfrom: (1923 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1928.
  • Revision ID: jan@merlinux.de-20060815123942-22c388c6e9a8ac91
merge bzr.dev 1923

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
109
109
        split up, based on the assumptions that can be made
110
110
        when information is missing.
111
111
        """
112
 
        from bzrlib.bundle.common import unpack_highres_date
 
112
        from bzrlib.bundle.serializer import unpack_highres_date
113
113
        # Put in all of the guessable information.
114
114
        if not self.timestamp and self.date:
115
115
            self.timestamp, self.timezone = unpack_highres_date(self.date)
652
652
            inv = Inventory(root_id, self.revision_id)
653
653
        except TypeError:
654
654
            inv = Inventory(revision_id=self.revision_id)
 
655
        inv.root.revision = self.get_last_changed(root_id)
655
656
 
656
657
        def add_entry(file_id):
657
658
            path = self.id2path(file_id)
723
724
    from bzrlib.iterablefile import IterableFile
724
725
    if file_patch == "":
725
726
        return IterableFile(())
726
 
    return IterableFile(iter_patched(original, file_patch.splitlines(True)))
 
727
    # string.splitlines(True) also splits on '\r', but the iter_patched code
 
728
    # only expects to iterate over '\n' style lines
 
729
    return IterableFile(iter_patched(original,
 
730
                StringIO(file_patch).readlines()))