Merge pull request #455 from cweagans/451-dry-run

Add --dry-run to patchers
cweagans · Feb 8, 2023 · 511b413 · 511b413
2 parents cd06d60 + 8541d7c
commit 511b413
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/Patcher/BsdPatchPatcher.php b/src/Patcher/BsdPatchPatcher.php
@@ -12,7 +12,16 @@ class BsdPatchPatcher extends PatcherBase
 
     public function apply(Patch $patch, string $path): bool
     {
-        // TODO: Dry run first?
+        $status = $this->executeCommand(
+            '%s -p%s --posix --batch --dry-run -d %s -i %s',
+            $this->patchTool(),
+            $patch->depth,
+            $path,
+            $patch->localPath
+        );
+        if (!$status) {
+            return false;
+        }
 
         return $this->executeCommand(
             '%s -p%s --verbose --posix --batch -d %s -i %s',

diff --git a/src/Patcher/GnuPatchPatcher.php b/src/Patcher/GnuPatchPatcher.php
@@ -11,7 +11,16 @@ class GnuPatchPatcher extends PatcherBase
 
     public function apply(Patch $patch, string $path): bool
     {
-        // TODO: Dry run first?
+        $status = $this->executeCommand(
+            '%s -p%s --dry-run --no-backup-if-mismatch -d %s -i %s',
+            $this->patchTool(),
+            $patch->depth,
+            $path,
+            $patch->localPath
+        );
+        if (!$status) {
+            return false;
+        }
 
         return $this->executeCommand(
             '%s -p%s --no-backup-if-mismatch --verbose -d %s -i %s',