Introduce OO-patch class

Author: ben-edna

dfetch/commands/format_patch.py

@@ -29,8 +29,6 @@
 import pathlib
 import re
 
-import patch_ng
-
 import dfetch.commands.command
 import dfetch.manifest.project
 import dfetch.project
@@ -40,14 +38,7 @@
 from dfetch.project.subproject import SubProject
 from dfetch.project.svnsubproject import SvnSubProject
 from dfetch.util.util import catch_runtime_exceptions, in_directory
-from dfetch.vcs.patch import (
-    PatchAuthor,
-    PatchInfo,
-    add_prefix_to_patch,
-    convert_patch_to,
-    dump_patch,
-    parse_patch,
-)
+from dfetch.vcs.patch import Patch, PatchAuthor, PatchInfo, PatchType
 
 logger = get_logger(__name__)
 
@@ -112,7 +103,7 @@ def __call__(self, args: argparse.Namespace) -> None:
                         continue
 
                     version = subproject.on_disk_version()
-                    for idx, patch in enumerate(subproject.patch, start=1):
+                    for idx, patch_file in enumerate(subproject.patch, start=1):
 
                         patch_info = PatchInfo(
                             author=PatchAuthor(
@@ -125,20 +116,20 @@ def __call__(self, args: argparse.Namespace) -> None:
                             revision="" if not version else version.revision,
                         )
 
-                        corrected_patch = convert_patch_to(
-                            parse_patch(patch), _determine_target_patch_type(subproject)
+                        patch = Patch.from_file(patch_file)
+                        patch = patch.convert_type(
+                            _determine_target_patch_type(subproject)
                         )
-                        prefixed_patch = add_prefix_to_patch(
-                            corrected_patch,
-                            path_prefix=re.split(r"\*", subproject.source, 1)[0].rstrip(
-                                "/"
-                            ),
+                        patch = patch.add_prefix(
+                            re.split(r"\*", subproject.source, 1)[0].rstrip("/")
                         )
 
-                        output_patch_file = output_dir_path / pathlib.Path(patch).name
+                        output_patch_file = (
+                            output_dir_path / pathlib.Path(patch_file).name
+                        )
                         output_patch_file.write_text(
                             subproject.create_formatted_patch_header(patch_info)
-                            + dump_patch(prefixed_patch)
+                            + patch.dump()
                         )
 
                         logger.print_info_line(
@@ -150,13 +141,13 @@ def __call__(self, args: argparse.Namespace) -> None:
             raise RuntimeError("\n".join(exceptions))
 
 
-def _determine_target_patch_type(subproject: SubProject) -> str:
+def _determine_target_patch_type(subproject: SubProject) -> PatchType:
     """Determine the subproject type for the patch."""
     if isinstance(subproject, GitSubProject):
-        required_type = patch_ng.GIT
+        required_type = PatchType.GIT
     elif isinstance(subproject, SvnSubProject):
-        required_type = patch_ng.SVN
+        required_type = PatchType.SVN
     else:
-        required_type = patch_ng.PLAIN
+        required_type = PatchType.PLAIN
 
-    return str(required_type)
+    return required_type

dfetch/project/subproject.py

@@ -13,7 +13,7 @@
 from dfetch.project.metadata import Metadata
 from dfetch.util.util import hash_directory, safe_rm
 from dfetch.util.versions import latest_tag_from_list
-from dfetch.vcs.patch import PatchInfo, apply_patch
+from dfetch.vcs.patch import Patch, PatchInfo
 
 logger = get_logger(__name__)
 
@@ -161,7 +161,7 @@ def _apply_patches(self, count: int = -1) -> list[str]:
             normalized_patch_path = str(relative_patch_path.as_posix())
 
             self._log_project(f'Applying patch "{normalized_patch_path}"')
-            result = apply_patch(normalized_patch_path, root=self.local_path)
+            result = Patch.from_file(normalized_patch_path).apply(root=self.local_path)
 
             if result.encoding_warning:
                 self._log_project(

dfetch/project/svnsuperproject.py

@@ -20,11 +20,7 @@
     in_directory,
     resolve_absolute_path,
 )
-from dfetch.vcs.patch import (
-    combine_patches,
-    create_svn_patch_for_new_file,
-    reverse_patch,
-)
+from dfetch.vcs.patch import Patch, PatchType
 from dfetch.vcs.svn import SvnRepo
 
 logger = get_logger(__name__)
@@ -119,19 +115,21 @@ def diff(
         filtered = repo.create_diff(old, new, ignore)
 
         if new:
-            return filtered
+            return filtered.dump()
 
-        patches: list[bytes] = [filtered.encode("utf-8")] if filtered else []
+        patches: list[Patch] = [] if filtered.is_empty() else [filtered]
         with in_directory(path):
             for file_path in repo.untracked_files(".", ignore):
-                patch = create_svn_patch_for_new_file(file_path)
-                if patch:
-                    patches.append(patch.encode("utf-8"))
+                patch_text = Patch.for_new_file(file_path, PatchType.SVN)
+                if patch_text:
+                    patches.append(Patch.from_string(patch_text))
 
-        patch_str = combine_patches(patches)
+        if not patches:
+            return ""
 
-        # SVN has no way of producing a reverse working copy patch, reverse ourselves
-        if reverse and not new:
-            patch_str = reverse_patch(patch_str.encode("UTF-8"))
+        combined = patches[0]
+        if len(patches) > 1:
+            combined = combined.combine(patches[1:])
 
-        return patch_str
+        # SVN has no way of producing a reverse working copy patch, reverse ourselves
+        return combined.dump() if not reverse else combined.reverse().dump()

dfetch/vcs/git.py

@@ -12,7 +12,7 @@
 from dfetch.log import get_logger
 from dfetch.util.cmdline import SubprocessCommandError, run_on_cmdline
 from dfetch.util.util import in_directory, safe_rmtree
-from dfetch.vcs.patch import create_git_patch_for_new_file
+from dfetch.vcs.patch import Patch, PatchType
 
 logger = get_logger(__name__)
 
@@ -477,7 +477,10 @@ def untracked_files_patch(self, ignore: Sequence[str] | None = None) -> str:
 
             if untracked_files:
                 return "\n".join(
-                    [create_git_patch_for_new_file(file) for file in untracked_files]
+                    [
+                        Patch.for_new_file(file, PatchType.GIT)
+                        for file in untracked_files
+                    ]
                 )
             return ""