Merge lp:~jelmer/brz/patch-api into lp:brz

[Jelmer Vernooij]

Add iter_patched_from_hunks implementation that calls out to the patch command.

Add iter_patched_from_hunks implementation that calls out to the patch command.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/bzr/bundle/bundle_data.py'
--- breezy/bzr/bundle/bundle_data.py	2019-09-27 02:16:49 +0000
+++ breezy/bzr/bundle/bundle_data.py	2019-11-22 05:22:05 +0000
@@ -624,8 +624,6 @@
         except NoSuchId:
             patch_original = None
         else:
-            if old_path is None:
-                import pdb; pdb.set_trace()
             patch_original = self.base_tree.get_file(old_path)
         file_patch = self.patches.get(path)
         if file_patch is None:

=== modified file 'breezy/patch.py'
--- breezy/patch.py	2019-11-19 18:10:28 +0000
+++ breezy/patch.py	2019-11-22 05:22:05 +0000
@@ -23,6 +23,7 @@
 import os
 from subprocess import Popen, PIPE
 import sys
+import tempfile
 
 from .errors import NoDiff3, BzrError
 from .textfile import check_text_path
@@ -175,3 +176,27 @@
         raise PatchFailed()
 
     return result
+
+
+def iter_patched_from_hunks(orig_lines, hunks):
+    """Iterate through a series of lines with a patch applied.
+    This handles a single file, and does exact, not fuzzy patching.
+
+    :param orig_lines: The unpatched lines.
+    :param hunks: An iterable of Hunk instances.
+
+    This is different from breezy.patches in that it invokes the patch
+    command.
+    """
+    with tempfile.NamedTemporaryFile() as f:
+        f.writelines(orig_lines)
+        f.flush()
+        # TODO(jelmer): Stream patch contents to command, rather than
+        # serializing the entire patch upfront.
+        serialized = b''.join([hunk.as_bytes() for hunk in hunks])
+        args = ["patch", "-f", "-s", "--posix", "--binary",
+                "-o", "-", f.name, "-r", "-"]
+        stdout, stderr, status = write_to_cmd(args, serialized)
+    if status == 0:
+        return [stdout]
+    raise PatchFailed(stderr)

=== modified file 'breezy/tests/test_patch.py'
--- breezy/tests/test_patch.py	2019-04-06 12:28:50 +0000
+++ breezy/tests/test_patch.py	2019-11-22 05:22:05 +0000
@@ -15,9 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+import os
+
+from breezy.iterablefile import IterableFile
 from breezy.errors import BinaryFile
-from breezy.patch import diff3, PatchInvokeError, run_patch
-from breezy.tests import TestCaseInTempDir
+from breezy.patch import diff3, PatchInvokeError, run_patch, iter_patched_from_hunks
+from breezy.patches import parse_patch
+from breezy.tests import TestCaseInTempDir, TestCase
 
 
 class TestPatch(TestCaseInTempDir):
@@ -37,3 +41,37 @@
     def test_missing_patch(self):
         self.assertRaises(PatchInvokeError, run_patch, '.', [],
                           _patch_cmd='/unlikely/to/exist')
+
+
+class PatchesTester(TestCase):
+
+    def datafile(self, filename):
+        data_path = os.path.join(os.path.dirname(__file__),
+                                 "test_patches_data", filename)
+        return open(data_path, "rb")
+
+    def data_lines(self, filename):
+        with self.datafile(filename) as datafile:
+            return datafile.readlines()
+
+    def test_iter_patched_from_hunks(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:
+            parsed = parse_patch(self.datafile(diff))
+            orig_lines = list(self.datafile(orig))
+            mod_lines = list(self.datafile(mod))
+            iter_patched = iter_patched_from_hunks(orig_lines, parsed.hunks)
+            patched_file = IterableFile(iter_patched)
+            count = 0
+            for patch_line in patched_file:
+                self.assertEqual(patch_line, mod_lines[count], 'for file %s' % diff)
+                count += 1
+            self.assertEqual(count, len(mod_lines))