Add per module versions support to native git provider

Author: mharriger

src/main/java/pl/project13/core/GitCommitIdPlugin.java

@@ -383,9 +383,6 @@ private static void loadGitDataWithNativeGit(
       @Nonnull Callback cb,
       @Nonnull File dotGitDirectory,
       @Nonnull Properties properties) throws GitCommitIdExecutionException {
-    if (cb.getPerModuleVersions()) {
-      throw new GitCommitIdExecutionException("The native git provider does not support per module versions.");
-    }
     GitDataProvider nativeGitProvider = NativeGitProvider
             .on(dotGitDirectory, cb.getNativeGitTimeoutInMs(), cb.getLogInterface())
             .setPrefixDot(cb.getPrefixDot())
@@ -397,6 +394,7 @@ private static void loadGitDataWithNativeGit(
             .setUseBranchNameFromBuildEnvironment(cb.getUseBranchNameFromBuildEnvironment())
             .setExcludeProperties(cb.getExcludeProperties())
             .setIncludeOnlyProperties(cb.getIncludeOnlyProperties())
+            .setPerModuleVersions(cb.getPerModuleVersions()) 
             .setModuleBaseDir(cb.getModuleBaseDir())
             .setOffline(cb.isOffline());
 

src/main/java/pl/project13/core/NativeGitProvider.java

@@ -43,6 +43,8 @@ public class NativeGitProvider extends GitDataProvider {
 
   final File canonical;
 
+  private String moduleRelativePath;
+
   @Nonnull
   public static NativeGitProvider on(@Nonnull File dotGitDirectory, long nativeGitTimeoutInMs, @Nonnull LogInterface log) {
     return new NativeGitProvider(dotGitDirectory, nativeGitTimeoutInMs, log);
@@ -90,6 +92,19 @@ public String getBuildAuthorEmail() throws GitCommitIdExecutionException {
 
   @Override
   public void prepareGitToExtractMoreDetailedRepoInformation() throws GitCommitIdExecutionException {
+    if (perModuleVersions && moduleBaseDir != null) {
+      // For per-module versions, we need to determine the relative path of the module
+      // This will be used in git commands with the -- pathspec limiter
+      try {
+        File gitRoot = canonical.getParentFile();
+        String relativePath = gitRoot.getAbsoluteFile().toPath()
+            .relativize(moduleBaseDir.getAbsoluteFile().toPath()).toString();
+        // Store the relative path for use in git commands
+        this.moduleRelativePath = relativePath.isEmpty() ? null : relativePath;
+      } catch (Exception e) {
+        throw new GitCommitIdExecutionException("Unable to compute module relative path", e);
+      }
+    }
   }
 
   @Override
@@ -196,15 +211,16 @@ private String getArgumentsForGitDescribe(GitDescribeConfig describeConfig) {
   @Override
   public String getCommitId() throws GitCommitIdExecutionException {
     boolean evaluateOnCommitIsSet = evalCommitIsNotHead();
+    String pathspec = moduleRelativePath != null ? " -- " + moduleRelativePath : "";
     if (evaluateOnCommitIsSet) {
       // if evaluateOnCommit represents a tag we need to perform the rev-parse on the actual commit reference
       // in case evaluateOnCommit is not a reference rev-list will just return the argument given
       // and thus it's always safe(r) to unwrap it
       // however when evaluateOnCommit is not set we don't want to waste calls to the native binary
-      String actualCommitId = runQuietGitCommand(canonical, nativeGitTimeoutInMs, "rev-list -n 1 " + evaluateOnCommit);
+      String actualCommitId = runQuietGitCommand(canonical, nativeGitTimeoutInMs, "rev-list -n 1 " + evaluateOnCommit + pathspec);
       return runQuietGitCommand(canonical, nativeGitTimeoutInMs, "rev-parse " + actualCommitId);
     } else {
-      return runQuietGitCommand(canonical, nativeGitTimeoutInMs, "rev-parse HEAD");
+      return runQuietGitCommand(canonical, nativeGitTimeoutInMs, "rev-parse HEAD" + pathspec);
     }
   }
 
@@ -224,7 +240,8 @@ public String getAbbrevCommitId() throws GitCommitIdExecutionException {
 
   @Override
   public boolean isDirty() throws GitCommitIdExecutionException {
-    return !tryCheckEmptyRunGitCommand(canonical, nativeGitTimeoutInMs, "status -s");
+    String pathspec = moduleRelativePath != null ? " -- " + moduleRelativePath : "";
+    return !tryCheckEmptyRunGitCommand(canonical, nativeGitTimeoutInMs, "status -s" + pathspec);
   }
 
   @Override
@@ -311,14 +328,16 @@ public String getClosestTagName() throws GitCommitIdExecutionException {
   public String getClosestTagCommitCount() throws GitCommitIdExecutionException {
     String closestTagName = getClosestTagName();
     if (closestTagName != null && !closestTagName.trim().isEmpty()) {
-      return runQuietGitCommand(canonical, nativeGitTimeoutInMs, "rev-list " + closestTagName + ".." + evaluateOnCommit + " --count");
+      String pathspec = moduleRelativePath != null ? " -- " + moduleRelativePath : "";
+      return runQuietGitCommand(canonical, nativeGitTimeoutInMs, "rev-list " + closestTagName + ".." + evaluateOnCommit + " --count" + pathspec);
     }
     return "";
   }
 
   @Override
   public String getTotalCommitCount() throws GitCommitIdExecutionException {
-    return runQuietGitCommand(canonical, nativeGitTimeoutInMs, "rev-list " + evaluateOnCommit + " --count");
+    String pathspec = moduleRelativePath != null ? " -- " + moduleRelativePath : "";
+    return runQuietGitCommand(canonical, nativeGitTimeoutInMs, "rev-list " + evaluateOnCommit + " --count" + pathspec);
   }
 
   @Override

src/test/java/pl/project13/core/GitCommitIdPluginIntegrationTest.java

@@ -1766,14 +1766,37 @@ public void shouldGiveCommitIdForEachFolderWhenPerModuleVersionsEnabled() throws
                     .build();
     Properties propertiesSrcTestFolder = new Properties();
 
+    GitCommitIdPlugin.Callback cbSrcNative =
+            new GitCommitIdTestCallback()
+                    .setDotGitDirectory(dotGitDirectory)
+                    .setUseNativeGit(true)
+                    .setPerModuleVersions(true)
+                    .setModuleBaseDir(dotGitDirectory.getParentFile().toPath().resolve("src").toFile())
+                    .build();
+    Properties propertiesSrcFolderNative = new Properties();
+
+    GitCommitIdPlugin.Callback cbSrcTestNative =
+            new GitCommitIdTestCallback()
+                    .setDotGitDirectory(dotGitDirectory)
+                    .setUseNativeGit(true)
+                    .setPerModuleVersions(true)
+                    .setModuleBaseDir(dotGitDirectory.getParentFile().toPath().resolve("src/test").toFile())
+                    .build();
+    Properties propertiesSrcTestFolderNative = new Properties();
+
     // when
     GitCommitIdPlugin.runPlugin(cbSrc, propertiesSrcFolder);
     GitCommitIdPlugin.runPlugin(cbSrcTest, propertiesSrcTestFolder);
+    GitCommitIdPlugin.runPlugin(cbSrcNative, propertiesSrcFolderNative);
+    GitCommitIdPlugin.runPlugin(cbSrcTestNative, propertiesSrcTestFolderNative);
 
     // then
     assertThat(propertiesSrcFolder).containsKey("git.commit.id");
     assertThat(propertiesSrcTestFolder).containsKey("git.commit.id");
     assertThat(propertiesSrcFolder.getProperty("git.commit.id")).isNotEqualTo(propertiesSrcTestFolder.getProperty("git.commit.id"));
+    assertThat(propertiesSrcFolderNative).containsKey("git.commit.id");
+    assertThat(propertiesSrcTestFolderNative).containsKey("git.commit.id");
+    assertThat(propertiesSrcFolderNative.getProperty("git.commit.id")).isNotEqualTo(propertiesSrcTestFolderNative.getProperty("git.commit.id"));
   }
 
   private GitDescribeConfig createGitDescribeConfig(boolean forceLongFormat, int abbrev) {