make use of :commits instead of recomputing the changes

Author: itai-spiritt

packages/kmono-git/src/k16/kmono/git/files.clj

@@ -5,7 +5,8 @@
   (:import
    [java.io ByteArrayOutputStream]
    [org.eclipse.jgit.diff DiffEntry DiffFormatter]
-   [org.eclipse.jgit.lib Constants Repository]))
+   [org.eclipse.jgit.lib Constants Repository]
+   [org.eclipse.jgit.revwalk RevCommit RevWalk]))
 
 (set! *warn-on-reflection* true)
 
@@ -41,3 +42,30 @@
                            (or (nil? subdir)
                                (str/starts-with? entry subdir)))))
                 results))))))
+
+(defn find-commit-changed-files
+  "Return file paths changed by a specific commit. If `subdir` is provided, only
+   include files within that subdir."
+  [^String repo-path {:keys [sha subdir]}]
+  (git/with-repo [repo repo-path]
+    (let [commit-id (Repository/.resolve repo sha)
+          subdir-prefix (when subdir (str subdir "/"))]
+      (with-open [walk (RevWalk. repo)]
+        (let [commit (RevWalk/.parseCommit walk commit-id)
+              parent-tree (when (pos? (RevCommit/.getParentCount commit))
+                            (let [parent (RevWalk/.parseCommit walk
+                                                               (aget (RevCommit/.getParents commit) 0))]
+                              (RevCommit/.getTree parent)))
+              commit-tree (RevCommit/.getTree commit)]
+          (with-open [out (ByteArrayOutputStream.)
+                      df (DiffFormatter. out)]
+            (DiffFormatter/.setRepository df repo)
+            (let [diffs (DiffFormatter/.scan df parent-tree commit-tree)]
+              (into []
+                    (comp
+                     (map #(DiffEntry/.getNewPath %))
+                     (remove #(= % DiffEntry/DEV_NULL))
+                     (filter (fn [path]
+                               (or (nil? subdir-prefix)
+                                   (str/starts-with? path subdir-prefix)))))
+                    diffs))))))))

packages/kmono-version/src/k16/kmono/version.clj

@@ -74,13 +74,12 @@
   [patterns file-path]
   (boolean (some #(re-find (re-pattern %) file-path) patterns)))
 
-(defn- has-meaningful-changes?
-  "Returns true if the package has changed files that don't all match ignore
-   patterns. Files are matched against patterns using paths relative to the
-   package root."
-  [project-root pkg ref ignore-changes]
-  (let [files (git.files/find-changed-files-since
-               project-root {:ref ref
+(defn- commit-has-meaningful-changes?
+  "Returns true if the commit has changed files that don't all match ignore
+   patterns. Files are matched relative to the package root."
+  [project-root pkg ignore-changes commit]
+  (let [files (git.files/find-commit-changed-files
+               project-root {:sha (:sha commit)
                              :subdir (:relative-path pkg)})
         pkg-prefix (str (:relative-path pkg) "/")
         relative-files (map #(str/replace-first % pkg-prefix "") files)]
@@ -98,9 +97,9 @@
                                           :subdir (:relative-path pkg)})
                    pkg-ignore-changes (or (:ignore-changes pkg) ignore-changes)
                    commits (if (and (seq pkg-ignore-changes) (seq commits) ref)
-                             (if (has-meaningful-changes? project-root pkg ref pkg-ignore-changes)
-                               commits
-                               [])
+                             (filterv #(commit-has-meaningful-changes?
+                                        project-root pkg pkg-ignore-changes %)
+                                      commits)
                              commits)
                    pkg (assoc pkg :commits (vec commits))]
                [pkg-name pkg]))
@@ -118,8 +117,8 @@
    Any commits found will be appended to the packages `:commits` key.
 
    An optional `opts` map may be provided with `:ignore-changes` - a sequence of
-   regexp patterns. When all changed files in a package match these patterns,
-   the package is treated as unchanged."
+   regexp patterns. Commits where all changed files match these patterns are
+   filtered out."
   {:malli/schema [:-> :string core.schema/?PackageMap core.schema/?PackageMap]}
   ([project-root packages]
    (resolve-package-changes project-root nil packages))
@@ -138,8 +137,8 @@
    Any commits found will be appended to the packages `:commits` key.
 
    An optional `opts` map may be provided with `:ignore-changes` - a sequence of
-   regexp patterns. When all changed files in a package match these patterns,
-   the package is treated as unchanged."
+   regexp patterns. Commits where all changed files match these patterns are
+   filtered out."
   {:malli/schema [:-> :string :string core.schema/?PackageMap core.schema/?PackageMap]}
   ([project-root rev packages]
    (resolve-package-changes-since project-root rev nil packages))

packages/kmono-version/test/k16/kmono/changes_test.clj

@@ -158,3 +158,26 @@
     (is (match? {'com.kepler16/b {:version "1.1.0"
                                   :commits []}}
                 packages))))
+
+(deftest ignore-changes-per-commit-filtering-test
+  (git.tags/create-tags *repo* {:tags ["com.kepler16/a@1.0.0"
+                                       "com.kepler16/b@1.1.0"]})
+
+  ;; Commit 1: only a .md file (should be filtered out)
+  (fs/create-file (fs/file *repo* "packages/a/README.md"))
+  (commit *repo* "docs: add readme")
+
+  ;; Commit 2: a .clj file (should be kept)
+  (fs/create-dirs (fs/file *repo* "packages/a/src"))
+  (fs/create-file (fs/file *repo* "packages/a/src/core.clj"))
+  (commit *repo* "feat: add core module")
+
+  (let [config (core.config/resolve-workspace-config *repo*)
+        packages (->> (core.packages/resolve-packages *repo* config)
+                      (kmono.version/resolve-package-versions *repo*)
+                      (kmono.version/resolve-package-changes *repo* {:ignore-changes [".*\\.md$"]}))]
+    ;; Only the second commit should remain
+    (is (match? {'com.kepler16/a {:version "1.0.0"
+                                  :commits [{:message "feat: add core module"
+                                             :body ""}]}}
+                packages))))