Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make excluding ignored files the default in status options (perf impr… #1331

Merged
merged 1 commit into from Jun 24, 2017
Merged

make excluding ignored files the default in status options (perf impr… #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions LibGit2Sharp.Tests/CheckoutFixture.cs
View file
Open in desktop
Expand Up @@ -625,7 +625,7 @@ public void CheckoutRetainsIgnoredChanges()
"bin/some_ignored_file.txt",
"hello from this ignored file.");

Assert.Equal(1, repo.RetrieveStatus().Ignored.Count());
Assert.Equal(1, repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true }).Ignored.Count());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a similar test: Assert.Equal(0, repo.RetrieveStatus().Ignored.Count()) above this?


Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(ignoredFilePath));

Expand All @@ -652,7 +652,7 @@ public void ForceCheckoutRetainsIgnoredChanges()
"bin/some_ignored_file.txt",
"hello from this ignored file.");

Assert.Equal(1, repo.RetrieveStatus().Ignored.Count());
Assert.Equal(1, repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true }).Ignored.Count());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a similar test: Assert.Equal(0, repo.RetrieveStatus().Ignored.Count()) above this?


Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(ignoredFilePath));

Expand Down
2 changes: 1 addition & 1 deletion LibGit2Sharp.Tests/IgnoreFixture.cs
View file
Open in desktop
Expand Up @@ -107,7 +107,7 @@ public void HonorDeeplyNestedGitIgnoreFile()
var file = string.Format("deeply{0}nested{0}file.txt", pd);
Touch(repo.Info.WorkingDirectory, file, "Yeah!");

var repositoryStatus = repo.RetrieveStatus();
var repositoryStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
Assert.True(repositoryStatus.IsDirty);

Assert.Equal(FileStatus.Ignored, repositoryStatus[ignoredFile].State);
Expand Down
8 changes: 4 additions & 4 deletions LibGit2Sharp.Tests/StatusFixture.cs
View file
Open in desktop
Expand Up @@ -310,7 +310,7 @@ public void RetrievingTheStatusOfAnEmptyRepositoryHonorsTheGitIgnoreDirectives()

Touch(repo.Info.WorkingDirectory, ".gitignore", "*.txt" + Environment.NewLine);

RepositoryStatus newStatus = repo.RetrieveStatus();
RepositoryStatus newStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
Assert.Equal(".gitignore", newStatus.Untracked.Select(s => s.FilePath).Single());

Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(relativePath));
Expand Down Expand Up @@ -422,7 +422,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectives()
* # new_untracked_file.txt
*/

RepositoryStatus newStatus = repo.RetrieveStatus();
RepositoryStatus newStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
Assert.Equal(".gitignore", newStatus.Untracked.Select(s => s.FilePath).Single());

Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(relativePath));
Expand Down Expand Up @@ -498,7 +498,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroug
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/look-ma.txt"));
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/what-about-me.txt"));

RepositoryStatus newStatus = repo.RetrieveStatus();
RepositoryStatus newStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });
Assert.Equal(new[] { "bin" + dirSep }, newStatus.Ignored.Select(s => s.FilePath));

var sb = new StringBuilder();
Expand All @@ -509,7 +509,7 @@ public void RetrievingTheStatusOfTheRepositoryHonorsTheGitIgnoreDirectivesThroug
Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/look-ma.txt"));
Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus("bin/what-about-me.txt"));

newStatus = repo.RetrieveStatus();
newStatus = repo.RetrieveStatus(new StatusOptions { IncludeIgnored = true });

Assert.Equal(new[] { "bin" + dirSep + "look-ma.txt" }, newStatus.Ignored.Select(s => s.FilePath));
Assert.True(newStatus.Untracked.Select(s => s.FilePath).Contains("bin" + dirSep + "what-about-me.txt"));
Expand Down
1 change: 0 additions & 1 deletion LibGit2Sharp/StatusOptions.cs
View file
Open in desktop
Expand Up @@ -35,7 +35,6 @@ public sealed class StatusOptions
public StatusOptions()
{
DetectRenamesInIndex = true;
IncludeIgnored = true;
}

/// <summary>
Expand Down