Merge pull request #1039 from dmalikov/feature/1037-patience-diff

PatienceAlgorithm flag in CompareOptions

Author: nulltoken

LibGit2Sharp.Tests/DiffTreeToTreeFixture.cs

@@ -1133,5 +1133,75 @@ public void CallingCompareWithAnUnsupportedGenericParamThrows()
                 Assert.Throws<LibGit2SharpException>(() => repo.Diff.Compare<string>());
             }
         }
+
+        [Fact]
+        public void UsingPatienceAlgorithmCompareOptionProducesPatienceDiff()
+        {
+            string repoPath = InitNewRepository();
+            using (var repo = new Repository(repoPath))
+            {
+                Func<string, Tree> fromString =
+                    s =>
+                        repo.ObjectDatabase.CreateTree(new TreeDefinition().Add("file.txt",
+                            OdbHelper.CreateBlob(repo, s), Mode.NonExecutableFile));
+
+                Tree treeOld = fromString(new StringBuilder()
+                    .Append("aaaaaa\n")
+                    .Append("aaaaaa\n")
+                    .Append("bbbbbb\n")
+                    .Append("bbbbbb\n")
+                    .Append("cccccc\n")
+                    .Append("cccccc\n")
+                    .Append("abc\n").ToString());
+
+                Tree treeNew = fromString(new StringBuilder()
+                    .Append("abc\n")
+                    .Append("aaaaaa\n")
+                    .Append("aaaaaa\n")
+                    .Append("bbbbbb\n")
+                    .Append("bbbbbb\n")
+                    .Append("cccccc\n")
+                    .Append("cccccc\n").ToString());
+
+                string diffDefault = new StringBuilder()
+                    .Append("diff --git a/file.txt b/file.txt\n")
+                    .Append("index 3299d68..accc3bd 100644\n")
+                    .Append("--- a/file.txt\n")
+                    .Append("+++ b/file.txt\n")
+                    .Append("@@ -1,7 +1,7 @@\n")
+                    .Append("+abc\n")
+                    .Append(" aaaaaa\n")
+                    .Append(" aaaaaa\n")
+                    .Append(" bbbbbb\n")
+                    .Append(" bbbbbb\n")
+                    .Append(" cccccc\n")
+                    .Append(" cccccc\n")
+                    .Append("-abc\n").ToString();
+
+                string diffPatience = new StringBuilder()
+                    .Append("diff --git a/file.txt b/file.txt\n")
+                    .Append("index 3299d68..accc3bd 100644\n")
+                    .Append("--- a/file.txt\n")
+                    .Append("+++ b/file.txt\n")
+                    .Append("@@ -1,7 +1,7 @@\n")
+                    .Append("-aaaaaa\n")
+                    .Append("-aaaaaa\n")
+                    .Append("-bbbbbb\n")
+                    .Append("-bbbbbb\n")
+                    .Append("-cccccc\n")
+                    .Append("-cccccc\n")
+                    .Append(" abc\n")
+                    .Append("+aaaaaa\n")
+                    .Append("+aaaaaa\n")
+                    .Append("+bbbbbb\n")
+                    .Append("+bbbbbb\n")
+                    .Append("+cccccc\n")
+                    .Append("+cccccc\n").ToString();
+
+                Assert.Equal(diffDefault, repo.Diff.Compare<Patch>(treeOld, treeNew));
+                Assert.Equal(diffPatience, repo.Diff.Compare<Patch>(treeOld, treeNew,
+                    compareOptions: new CompareOptions { UsePatienceAlgorithm = true }));
+            }
+        }
     }
 }

LibGit2Sharp/CompareOptions.cs

@@ -35,5 +35,10 @@ public CompareOptions()
         /// Include "unmodified" entries in the results.
         /// </summary>
         public bool IncludeUnmodified { get; set; }
+
+        /// <summary>
+        /// Use the "patience diff" algorithm.
+        /// </summary>
+        public bool UsePatienceAlgorithm { get; set; }
     }
 }

LibGit2Sharp/Diff.cs

@@ -49,6 +49,11 @@ private static GitDiffOptions BuildOptions(DiffModifiers diffOptions, FilePath[]
                 options.Flags |= GitDiffOptionFlags.GIT_DIFF_INCLUDE_UNMODIFIED;
             }
 
+            if (compareOptions.UsePatienceAlgorithm)
+            {
+                options.Flags |= GitDiffOptionFlags.GIT_DIFF_PATIENCE;
+            }
+
             if (diffOptions.HasFlag(DiffModifiers.DisablePathspecMatch))
             {
                 options.Flags |= GitDiffOptionFlags.GIT_DIFF_DISABLE_PATHSPEC_MATCH;