Skip to content

Commit cc04c43

Browse files
nulltokennulltoken
committed
Merge pull request #527 from libgit2/ntk/filestatus
FileStatus names
2 parents ef63b09 + 79d30b1 commit cc04c43

20 files changed

+214
-166
lines changed

‎LibGit2Sharp.Tests/CheckoutFixture.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -527,13 +527,13 @@ public void CheckoutRetainsUntrackedChanges()
527527

528528
// Verify that there is an untracked entry.
529529
Assert.Equal(1, repo.RetrieveStatus().Untracked.Count());
530-
Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(fullPathFileB));
530+
Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(fullPathFileB));
531531

532532
repo.Checkout(otherBranchName);
533533

534534
// Verify untracked entry still exists.
535535
Assert.Equal(1, repo.RetrieveStatus().Untracked.Count());
536-
Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(fullPathFileB));
536+
Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(fullPathFileB));
537537
}
538538
}
539539

@@ -551,13 +551,13 @@ public void ForceCheckoutRetainsUntrackedChanges()
551551

552552
// Verify that there is an untracked entry.
553553
Assert.Equal(1, repo.RetrieveStatus().Untracked.Count());
554-
Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(fullPathFileB));
554+
Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(fullPathFileB));
555555

556556
repo.Checkout(otherBranchName, new CheckoutOptions() { CheckoutModifiers = CheckoutModifiers.Force });
557557

558558
// Verify untracked entry still exists.
559559
Assert.Equal(1, repo.RetrieveStatus().Untracked.Count());
560-
Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(fullPathFileB));
560+
Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(fullPathFileB));
561561
}
562562
}
563563

@@ -575,13 +575,13 @@ public void CheckoutRetainsUnstagedChanges()
575575

576576
// Verify that there is a modified entry.
577577
Assert.Equal(1, repo.RetrieveStatus().Modified.Count());
578-
Assert.Equal(FileStatus.Modified, repo.RetrieveStatus(fullPathFileA));
578+
Assert.Equal(FileStatus.ModifiedInWorkdir, repo.RetrieveStatus(fullPathFileA));
579579

580580
repo.Checkout(otherBranchName);
581581

582582
// Verify modified entry still exists.
583583
Assert.Equal(1, repo.RetrieveStatus().Modified.Count());
584-
Assert.Equal(FileStatus.Modified, repo.RetrieveStatus(fullPathFileA));
584+
Assert.Equal(FileStatus.ModifiedInWorkdir, repo.RetrieveStatus(fullPathFileA));
585585
}
586586
}
587587

@@ -600,13 +600,13 @@ public void CheckoutRetainsStagedChanges()
600600

601601
// Verify that there is a staged entry.
602602
Assert.Equal(1, repo.RetrieveStatus().Staged.Count());
603-
Assert.Equal(FileStatus.Staged, repo.RetrieveStatus(fullPathFileA));
603+
Assert.Equal(FileStatus.ModifiedInIndex, repo.RetrieveStatus(fullPathFileA));
604604

605605
repo.Checkout(otherBranchName);
606606

607607
// Verify staged entry still exists.
608608
Assert.Equal(1, repo.RetrieveStatus().Staged.Count());
609-
Assert.Equal(FileStatus.Staged, repo.RetrieveStatus(fullPathFileA));
609+
Assert.Equal(FileStatus.ModifiedInIndex, repo.RetrieveStatus(fullPathFileA));
610610
}
611611
}
612612

@@ -935,10 +935,10 @@ public void CanCheckoutDetachedHead()
935935
}
936936

937937
[Theory]
938-
[InlineData("master", "6dcf9bf", "readme.txt", FileStatus.Added)]
939-
[InlineData("master", "refs/tags/lw", "readme.txt", FileStatus.Added)]
940-
[InlineData("master", "i-do-numbers", "super-file.txt", FileStatus.Added)]
941-
[InlineData("i-do-numbers", "diff-test-cases", "numbers.txt", FileStatus.Staged)]
938+
[InlineData("master", "6dcf9bf", "readme.txt", FileStatus.NewInIndex)]
939+
[InlineData("master", "refs/tags/lw", "readme.txt", FileStatus.NewInIndex)]
940+
[InlineData("master", "i-do-numbers", "super-file.txt", FileStatus.NewInIndex)]
941+
[InlineData("i-do-numbers", "diff-test-cases", "numbers.txt", FileStatus.ModifiedInIndex)]
942942
public void CanCheckoutPath(string originalBranch, string checkoutFrom, string path, FileStatus expectedStatus)
943943
{
944944
string repoPath = SandboxStandardTestRepo();
@@ -973,7 +973,7 @@ public void CanCheckoutPaths()
973973

974974
foreach (string checkoutPath in checkoutPaths)
975975
{
976-
Assert.Equal(FileStatus.Added, repo.RetrieveStatus(checkoutPath));
976+
Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(checkoutPath));
977977
}
978978
}
979979
}

‎LibGit2Sharp.Tests/ConflictFixture.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ private static List<object[]> RenameConflictData
4747
}
4848

4949
[Theory]
50-
[InlineData(true, "ancestor-and-ours.txt", true, false, FileStatus.Removed, 2)]
51-
[InlineData(false, "ancestor-and-ours.txt", true, true, FileStatus.Removed |FileStatus.Untracked, 2)]
50+
[InlineData(true, "ancestor-and-ours.txt", true, false, FileStatus.DeletedFromIndex, 2)]
51+
[InlineData(false, "ancestor-and-ours.txt", true, true, FileStatus.DeletedFromIndex |FileStatus.NewInWorkdir, 2)]
5252
[InlineData(true, "ancestor-and-theirs.txt", true, false, FileStatus.Nonexistent, 2)]
53-
[InlineData(false, "ancestor-and-theirs.txt", true, true, FileStatus.Untracked, 2)]
53+
[InlineData(false, "ancestor-and-theirs.txt", true, true, FileStatus.NewInWorkdir, 2)]
5454
[InlineData(true, "ancestor-only.txt", false, false, FileStatus.Nonexistent, 1)]
5555
[InlineData(false, "ancestor-only.txt", false, false, FileStatus.Nonexistent, 1)]
56-
[InlineData(true, "conflicts-one.txt", true, false, FileStatus.Removed, 3)]
57-
[InlineData(false, "conflicts-one.txt", true, true, FileStatus.Removed | FileStatus.Untracked, 3)]
58-
[InlineData(true, "conflicts-two.txt", true, false, FileStatus.Removed, 3)]
59-
[InlineData(false, "conflicts-two.txt", true, true, FileStatus.Removed | FileStatus.Untracked, 3)]
60-
[InlineData(true, "ours-and-theirs.txt", true, false, FileStatus.Removed, 2)]
61-
[InlineData(false, "ours-and-theirs.txt", true, true, FileStatus.Removed | FileStatus.Untracked, 2)]
62-
[InlineData(true, "ours-only.txt", true, false, FileStatus.Removed, 1)]
63-
[InlineData(false, "ours-only.txt", true, true, FileStatus.Removed | FileStatus.Untracked, 1)]
56+
[InlineData(true, "conflicts-one.txt", true, false, FileStatus.DeletedFromIndex, 3)]
57+
[InlineData(false, "conflicts-one.txt", true, true, FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir, 3)]
58+
[InlineData(true, "conflicts-two.txt", true, false, FileStatus.DeletedFromIndex, 3)]
59+
[InlineData(false, "conflicts-two.txt", true, true, FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir, 3)]
60+
[InlineData(true, "ours-and-theirs.txt", true, false, FileStatus.DeletedFromIndex, 2)]
61+
[InlineData(false, "ours-and-theirs.txt", true, true, FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir, 2)]
62+
[InlineData(true, "ours-only.txt", true, false, FileStatus.DeletedFromIndex, 1)]
63+
[InlineData(false, "ours-only.txt", true, true, FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir, 1)]
6464
[InlineData(true, "theirs-only.txt", true, false, FileStatus.Nonexistent, 1)]
65-
[InlineData(false, "theirs-only.txt", true, true, FileStatus.Untracked, 1)]
65+
[InlineData(false, "theirs-only.txt", true, true, FileStatus.NewInWorkdir, 1)]
6666
public void CanResolveConflictsByRemovingFromTheIndex(
6767
bool removeFromWorkdir, string filename, bool existsBeforeRemove, bool existsAfterRemove, FileStatus lastStatus, int removedIndexEntries)
6868
{

‎LibGit2Sharp.Tests/DiffTreeToTargetFixture.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public void ShowcaseTheDifferenceBetweenTheTwoKindOfComparison()
163163
File.Move(fullpath + ".bak", fullpath);
164164

165165
FileStatus state = repo.RetrieveStatus("file.txt");
166-
Assert.Equal(FileStatus.Removed | FileStatus.Untracked, state);
166+
Assert.Equal(FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir, state);
167167

168168
var wrkDirToIdxToTree = repo.Diff.Compare<TreeChanges>(repo.Head.Tip.Tree,
169169
DiffTargets.Index | DiffTargets.WorkingDirectory);

‎LibGit2Sharp.Tests/DiffWorkdirToIndexFixture.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void CanCompareTheWorkDirAgainstTheIndex()
4242
}
4343

4444
[Theory]
45-
[InlineData("new_untracked_file.txt", FileStatus.Untracked)]
45+
[InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
4646
[InlineData("really-i-cant-exist.txt", FileStatus.Nonexistent)]
4747
public void CanCompareTheWorkDirAgainstTheIndexWithLaxUnmatchedExplicitPathsValidation(string relativePath, FileStatus currentStatus)
4848
{
@@ -60,7 +60,7 @@ public void CanCompareTheWorkDirAgainstTheIndexWithLaxUnmatchedExplicitPathsVali
6060
}
6161

6262
[Theory]
63-
[InlineData("new_untracked_file.txt", FileStatus.Untracked)]
63+
[InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
6464
[InlineData("really-i-cant-exist.txt", FileStatus.Nonexistent)]
6565
public void ComparingTheWorkDirAgainstTheIndexWithStrictUnmatchedExplicitPathsValidationAndANonExistentPathspecThrows(string relativePath, FileStatus currentStatus)
6666
{
@@ -74,7 +74,7 @@ public void ComparingTheWorkDirAgainstTheIndexWithStrictUnmatchedExplicitPathsVa
7474
}
7575

7676
[Theory]
77-
[InlineData("new_untracked_file.txt", FileStatus.Untracked)]
77+
[InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
7878
[InlineData("where-am-I.txt", FileStatus.Nonexistent)]
7979
public void CallbackForUnmatchedExplicitPathsIsCalledWhenSet(string relativePath, FileStatus currentStatus)
8080
{

0 commit comments

Comments
 (0)