Merge pull request #287 from pfichtner/tortoise-git

Support for TortoiseGIT added
approvals · Aug 1, 2022 · 718d87f · 718d87f
2 parents 0add6f4 + 673285d
commit 718d87f
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 3 deletions.
diff --git a/approvaltests/src/main/java/org/approvaltests/reporters/DiffPrograms.java b/approvaltests/src/main/java/org/approvaltests/reporters/DiffPrograms.java
@@ -43,6 +43,10 @@ public static class Windows
         "/left:%s /right:%s", IMAGE);
     public static DiffInfo TORTOISE_TEXT_DIFF  = new DiffInfo("{ProgramFiles}TortoiseSVN\\bin\\TortoiseMerge.exe",
         TEXT);
+    public static DiffInfo TORTOISE_GIT_IMAGE_DIFF = new DiffInfo("{ProgramFiles}TortoiseGIT\\bin\\TortoiseGitIDiff.exe",
+    		"/left:%s /right:%s", IMAGE);
+    public static DiffInfo TORTOISE_GIT_TEXT_DIFF  = new DiffInfo("{ProgramFiles}TortoiseGIT\\bin\\TortoiseGitMerge.exe",
+    		TEXT);
     public static DiffInfo WIN_MERGE_REPORTER  = new DiffInfo("{ProgramFiles}WinMerge\\WinMergeU.exe",
         TEXT_AND_IMAGE);
     public static DiffInfo ARAXIS_MERGE        = new DiffInfo("{ProgramFiles}Araxis\\Araxis Merge\\Compare.exe",

diff --git a/approvaltests/src/main/java/org/approvaltests/reporters/ImageReporter.java b/approvaltests/src/main/java/org/approvaltests/reporters/ImageReporter.java
@@ -2,13 +2,14 @@
 
 import org.approvaltests.reporters.macosx.KaleidoscopeDiffReporter;
 import org.approvaltests.reporters.windows.BeyondCompareReporter;
+import org.approvaltests.reporters.windows.TortoiseGitImageDiffReporter;
 import org.approvaltests.reporters.windows.TortoiseImageDiffReporter;
 
 public class ImageReporter extends FirstWorkingReporter
 {
   public ImageReporter()
   {
-    super(TortoiseImageDiffReporter.INSTANCE, BeyondCompareReporter.INSTANCE, KaleidoscopeDiffReporter.INSTANCE,
-        ImageWebReporter.INSTANCE, QuietReporter.INSTANCE);
+    super(TortoiseImageDiffReporter.INSTANCE, TortoiseGitImageDiffReporter.INSTANCE, BeyondCompareReporter.INSTANCE, 
+    	    KaleidoscopeDiffReporter.INSTANCE, ImageWebReporter.INSTANCE, QuietReporter.INSTANCE);
   }
 }
diff --git a/approvaltests/src/main/java/org/approvaltests/reporters/windows/TortoiseDiffReporter.java b/approvaltests/src/main/java/org/approvaltests/reporters/windows/TortoiseDiffReporter.java
@@ -7,6 +7,7 @@ public class TortoiseDiffReporter extends FirstWorkingReporter
   public static final TortoiseDiffReporter INSTANCE = new TortoiseDiffReporter();
   public TortoiseDiffReporter()
   {
-    super(TortoiseTextDiffReporter.INSTANCE, TortoiseImageDiffReporter.INSTANCE);
+    super(TortoiseTextDiffReporter.INSTANCE, TortoiseImageDiffReporter.INSTANCE,
+        TortoiseGitTextDiffReporter.INSTANCE, TortoiseGitImageDiffReporter.INSTANCE);
   }
 }
diff --git a/...tests/src/main/java/org/approvaltests/reporters/windows/TortoiseGitImageDiffReporter.java b/...tests/src/main/java/org/approvaltests/reporters/windows/TortoiseGitImageDiffReporter.java
@@ -0,0 +1,13 @@
+package org.approvaltests.reporters.windows;
+
+import org.approvaltests.reporters.DiffPrograms.Windows;
+import org.approvaltests.reporters.GenericDiffReporter;
+
+public class TortoiseGitImageDiffReporter extends GenericDiffReporter
+{
+  public static final TortoiseGitImageDiffReporter INSTANCE = new TortoiseGitImageDiffReporter();
+  public TortoiseGitImageDiffReporter()
+  {
+    super(Windows.TORTOISE_GIT_IMAGE_DIFF);
+  }
+}
diff --git a/...ltests/src/main/java/org/approvaltests/reporters/windows/TortoiseGitTextDiffReporter.java b/...ltests/src/main/java/org/approvaltests/reporters/windows/TortoiseGitTextDiffReporter.java
@@ -0,0 +1,13 @@
+package org.approvaltests.reporters.windows;
+
+import org.approvaltests.reporters.DiffPrograms.Windows;
+import org.approvaltests.reporters.GenericDiffReporter;
+
+public class TortoiseGitTextDiffReporter extends GenericDiffReporter
+{
+  public static final TortoiseGitTextDiffReporter INSTANCE = new TortoiseGitTextDiffReporter();
+  public TortoiseGitTextDiffReporter()
+  {
+    super(Windows.TORTOISE_GIT_TEXT_DIFF);
+  }
+}