def patched_file(file_patch, original):
"""Produce a file-like object with the patched version of a text"""
from bzrlib.patches import iter_patched
from bzrlib.iterablefile import IterableFile
if file_patch == "":
return IterableFile(())
# string.splitlines(True) also splits on '\r', but the iter_patched code
# only expects to iterate over '\n' style lines
return IterableFile(iter_patched(original,
StringIO(file_patch).readlines()))
def patched_file(file_patch, original):
"""Produce a file-like object with the patched version of a text"""
from bzrlib.patches import iter_patched
from bzrlib.iterablefile import IterableFile
if file_patch == "":
return IterableFile(())
# string.splitlines(True) also splits on '\r', but the iter_patched code
# only expects to iterate over '\n' style lines
return IterableFile(
iter_patched(original,
StringIO(file_patch).readlines()))
def testPatching(self):
"""Test a few patch files, and make sure they work."""
files = [
('diff-2', 'orig-2', 'mod-2'),
('diff-3', 'orig-3', 'mod-3'),
('diff-4', 'orig-4', 'mod-4'),
('diff-5', 'orig-5', 'mod-5'),
('diff-6', 'orig-6', 'mod-6'),
]
for diff, orig, mod in files:
patch = self.datafile(diff)
orig_lines = list(self.datafile(orig))
mod_lines = list(self.datafile(mod))
patched_file = IterableFile(iter_patched(orig_lines, patch))
lines = []
count = 0
for patch_line in patched_file:
self.assertEqual(patch_line, mod_lines[count])
count += 1
self.assertEqual(count, len(mod_lines))
def testPatching(self):
"""Test a few patch files, and make sure they work."""
files = [
('diff-2', 'orig-2', 'mod-2'),
('diff-3', 'orig-3', 'mod-3'),
('diff-4', 'orig-4', 'mod-4'),
('diff-5', 'orig-5', 'mod-5'),
('diff-6', 'orig-6', 'mod-6'),
('diff-7', 'orig-7', 'mod-7'),
]
for diff, orig, mod in files:
patch = self.datafile(diff)
orig_lines = list(self.datafile(orig))
mod_lines = list(self.datafile(mod))
patched_file = IterableFile(iter_patched(orig_lines, patch))
count = 0
for patch_line in patched_file:
self.assertEqual(patch_line, mod_lines[count])
count += 1
self.assertEqual(count, len(mod_lines))
