← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-13 00:05:14 UTC
  • mfrom: (1861 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1871.
  • Revision ID: john@arbash-meinel.com-20060713000514-aa62627aa0d4deb6
[merge] bzr.dev 1861

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)
723
723
    from bzrlib.iterablefile import IterableFile
724
724
    if file_patch == "":
725
725
        return IterableFile(())
726
 
    return IterableFile(iter_patched(original, file_patch.splitlines(True)))
 
726
    # string.splitlines(True) also splits on '\r', but the iter_patched code
 
727
    # only expects to iterate over '\n' style lines
 
728
    return IterableFile(iter_patched(original,
 
729
                StringIO(file_patch).readlines()))