Allow --diff-filter usage

sebastianfeldmann · Jan 23, 2024 · 5cb1ea9 · 5cb1ea9
1 parent 4b77bd2
commit 5cb1ea9
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 4 deletions.
diff --git a/src/Command/Log/ChangedFiles.php b/src/Command/Log/ChangedFiles.php
@@ -31,6 +31,7 @@ protected function getGitCommand(): string
     {
         return 'log --format=' . escapeshellarg('')
                . ' --name-only'
+               . $this->diffFilter
                . $this->author
                . $this->merges
                . $this->date

diff --git a/src/Command/Log/Log.php b/src/Command/Log/Log.php
@@ -31,6 +31,14 @@ abstract class Log extends Base
      */
     protected string $format = '%h -%d %s (%ci) <%an>';
 
+    /**
+     * Diff filter types
+     * --diff-filter
+     *
+     * @var string
+     */
+    protected string $diffFilter = '';
+
     /**
      * Include or hide merge commits.
      * --no-merges
@@ -87,6 +95,18 @@ public function prettyFormat(string $format): Log
         return $this;
     }
 
+    /**
+     * Set the diff filter
+     *
+     * @param array<string> $filter
+     * @return $this
+     */
+    public function withDiffFilter(array $filter): Log
+    {
+        $this->diffFilter = empty($filter) ? '' : ' --diff-filter=' . implode('', $filter);
+        return $this;
+    }
+
     /**
      * Define merge commit behaviour.
      *

diff --git a/src/Operator/Log.php b/src/Operator/Log.php
@@ -30,12 +30,13 @@ class Log extends Base
     /**
      * Get the list of files that changed since a given revision.
      *
-     * @param  string $revision
+     * @param string        $revision
+     * @param array<string> $filter
      * @return array<string>
      */
-    public function getChangedFilesSince(string $revision): array
+    public function getChangedFilesSince(string $revision, array $filter = []): array
     {
-        $cmd    = (new ChangedFiles($this->repo->getRoot()))->byRange($revision);
+        $cmd    = (new ChangedFiles($this->repo->getRoot()))->byRange($revision)->withDiffFilter($filter);
         $result = $this->runner->run($cmd);
 
         return $result->getBufferedOutput();

diff --git a/tests/git/Command/Log/ChangedFilesTest.php b/tests/git/Command/Log/ChangedFilesTest.php
@@ -24,7 +24,7 @@
 class ChangedFilesTest extends TestCase
 {
     /**
-     * Tests Commits::getCommand
+     * Tests ChangedFiles::getCommand
      */
     public function testDefault()
     {
@@ -36,4 +36,19 @@ public function testDefault()
             $exe
         );
     }
+
+    /**
+     * Tests ChangedFiles::getCommand
+     */
+    public function testWithFilter()
+    {
+        $cmd = new ChangedFiles();
+        $cmd->withDiffFilter(['A']);
+        $exe = $cmd->getCommand();
+
+        $this->assertEquals(
+            'git log --format=\'\' --name-only --diff-filter=A --no-merges',
+            $exe
+        );
+    }
 }