Make Diff.Compare consider untracked changes

mm201 · nulltoken · commit e1205a20a284 · 2013-03-11T23:19:44.000+01:00
diff --git a/LibGit2Sharp.Tests/DiffWorkdirToIndexFixture.cs b/LibGit2Sharp.Tests/DiffWorkdirToIndexFixture.cs
@@ -35,5 +35,19 @@ public void CanCompareTheWorkDirAgainstTheIndex()
                 Assert.Equal("modified_unstaged_file.txt", changes.Modified.Single().Path);
             }
         }
+
+        [Fact]
+        public void CanCompareTheWorkDirAgainstTheIndexWithUntrackedFiles()
+        {
+            using (var repo = new Repository(StandardTestRepoPath))
+            {
+                TreeChanges changes = repo.Diff.Compare(null, true);
+
+                Assert.Equal(3, changes.Count());
+                Assert.Equal("deleted_unstaged_file.txt", changes.Deleted.Single().Path);
+                Assert.Equal("modified_unstaged_file.txt", changes.Modified.Single().Path);
+                Assert.Equal("new_untracked_file.txt", changes.Added.Single().Path);
+            }
+        }
     }
 }
diff --git a/LibGit2Sharp/Diff.cs b/LibGit2Sharp/Diff.cs
@@ -201,12 +201,13 @@ public virtual TreeChanges Compare(Tree oldTree, DiffTargets diffTargets, IEnume
         ///   Show changes between the working directory and the index.
         /// </summary>
         /// <param name = "paths">The list of paths (either files or directories) that should be compared.</param>
+        /// <param name = "includeUntracked">If true, include untracked files from the working dir as additions. Otherwise ignore them.</param>
         /// <returns>A <see cref = "TreeChanges"/> containing the changes between the working directory and the index.</returns>
-        public virtual TreeChanges Compare(IEnumerable<string> paths = null)
+        public virtual TreeChanges Compare(IEnumerable<string> paths = null, bool includeUntracked = false)
         {
             var comparer = WorkdirToIndex(repo);
 
-            using (GitDiffOptions options = BuildOptions(DiffOptions.None, paths))
+            using (GitDiffOptions options = BuildOptions(includeUntracked ? DiffOptions.IncludeUntracked : DiffOptions.None, paths))
             using (DiffListSafeHandle dl = BuildDiffListFromComparer(null, comparer, options))
             {
                 return new TreeChanges(dl);

Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,19 @@ public void CanCompareTheWorkDirAgainstTheIndex()`
`35`	`35`	`Assert.Equal("modified_unstaged_file.txt", changes.Modified.Single().Path);`
`36`	`36`	`}`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+ [Fact]`
	`40`	`+ public void CanCompareTheWorkDirAgainstTheIndexWithUntrackedFiles()`
	`41`	`+ {`
	`42`	`+ using (var repo = new Repository(StandardTestRepoPath))`
	`43`	`+ {`
	`44`	`+ TreeChanges changes = repo.Diff.Compare(null, true);`
	`45`	`+`
	`46`	`+ Assert.Equal(3, changes.Count());`
	`47`	`+ Assert.Equal("deleted_unstaged_file.txt", changes.Deleted.Single().Path);`
	`48`	`+ Assert.Equal("modified_unstaged_file.txt", changes.Modified.Single().Path);`
	`49`	`+ Assert.Equal("new_untracked_file.txt", changes.Added.Single().Path);`
	`50`	`+ }`
	`51`	`+ }`
`38`	`52`	`}`
`39`	`53`	`}`