1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
|
using System;
using System.IO;
using LibGit2Sharp.Tests.TestHelpers;
using Xunit;
using Xunit.Extensions;
namespace LibGit2Sharp.Tests
{
public class RemoveFixture : BaseFixture
{
[Theory]
/***
* Test case: file exists in workdir and index, and has not been modified.
* 'git rm --cached <file>' works (file removed only from index).
* 'git rm <file>' works (file removed from both index and workdir).
*/
[InlineData(false, "1/branch_file.txt", false, FileStatus.Unaltered, true, true, FileStatus.Untracked | FileStatus.Removed)]
[InlineData(true, "1/branch_file.txt", false, FileStatus.Unaltered, true, false, FileStatus.Removed)]
/***
* Test case: file exists in the index, and has been removed from the wd.
* 'git rm <file> and 'git rm --cached <file>' both work (file removed from the index)
*/
[InlineData(true, "deleted_unstaged_file.txt", false, FileStatus.Missing, false, false, FileStatus.Removed)]
[InlineData(false, "deleted_unstaged_file.txt", false, FileStatus.Missing, false, false, FileStatus.Removed)]
/***
* Test case: modified file in wd, the modifications have not been promoted to the index yet.
* 'git rm --cached <file>' works (removes the file from the index)
* 'git rm <file>' fails ("error: '<file>' has local modifications").
*/
[InlineData(false, "modified_unstaged_file.txt", false, FileStatus.Modified, true, true, FileStatus.Untracked | FileStatus.Removed)]
[InlineData(true, "modified_unstaged_file.txt", true, FileStatus.Modified, true, true, 0)]
/***
* Test case: modified file in wd, the modifications have already been promoted to the index.
* 'git rm --cached <file>' works (removes the file from the index)
* 'git rm <file>' fails ("error: '<file>' has changes staged in the index")
*/
[InlineData(false, "modified_staged_file.txt", false, FileStatus.Staged, true, true, FileStatus.Untracked | FileStatus.Removed)]
[InlineData(true, "modified_staged_file.txt", true, FileStatus.Staged, true, true, 0)]
/***
* Test case: modified file in wd, the modifications have already been promoted to the index, and
* the file does not exist in the HEAD.
* 'git rm --cached <file>' works (removes the file from the index)
* 'git rm <file>' throws ("error: '<file>' has changes staged in the index")
*/
[InlineData(false, "new_tracked_file.txt", false, FileStatus.Added, true, true, FileStatus.Untracked)]
[InlineData(true, "new_tracked_file.txt", true, FileStatus.Added, true, true, 0)]
public void CanRemoveAnUnalteredFileFromTheIndexWithoutRemovingItFromTheWorkingDirectory(
bool removeFromWorkdir, string filename, bool throws, FileStatus initialStatus, bool existsBeforeRemove, bool existsAfterRemove, FileStatus lastStatus)
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
int count = repo.Index.Count;
string fullpath = Path.Combine(repo.Info.WorkingDirectory, filename);
Assert.Equal(initialStatus, repo.RetrieveStatus(filename));
Assert.Equal(existsBeforeRemove, File.Exists(fullpath));
if (throws)
{
Assert.Throws<RemoveFromIndexException>(() => repo.Remove(filename, removeFromWorkdir));
Assert.Equal(count, repo.Index.Count);
}
else
{
repo.Remove(filename, removeFromWorkdir);
Assert.Equal(count - 1, repo.Index.Count);
Assert.Equal(existsAfterRemove, File.Exists(fullpath));
Assert.Equal(lastStatus, repo.RetrieveStatus(filename));
}
}
}
/***
* Test case: modified file in wd, the modifications have already been promoted to the index, and
* new modifications have been made in the wd.
* 'git rm <file>' and 'git rm --cached <file>' both fail ("error: '<file>' has staged content different from both the file and the HEAD")
*/
[Fact]
public void RemovingAModifiedFileWhoseChangesHaveBeenPromotedToTheIndexAndWithAdditionalModificationsMadeToItThrows()
{
const string filename = "modified_staged_file.txt";
var path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
string fullpath = Path.Combine(repo.Info.WorkingDirectory, filename);
Assert.Equal(true, File.Exists(fullpath));
File.AppendAllText(fullpath, "additional content");
Assert.Equal(FileStatus.Staged | FileStatus.Modified, repo.RetrieveStatus(filename));
Assert.Throws<RemoveFromIndexException>(() => repo.Remove(filename));
Assert.Throws<RemoveFromIndexException>(() => repo.Remove(filename, false));
}
}
[Fact]
public void CanRemoveAFolderThroughUsageOfPathspecsForNewlyAddedFiles()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
repo.Stage(Touch(repo.Info.WorkingDirectory, "2/subdir1/2.txt", "whone"));
repo.Stage(Touch(repo.Info.WorkingDirectory, "2/subdir1/3.txt", "too"));
repo.Stage(Touch(repo.Info.WorkingDirectory, "2/subdir2/4.txt", "tree"));
repo.Stage(Touch(repo.Info.WorkingDirectory, "2/5.txt", "for"));
repo.Stage(Touch(repo.Info.WorkingDirectory, "2/6.txt", "fyve"));
int count = repo.Index.Count;
Assert.True(Directory.Exists(Path.Combine(repo.Info.WorkingDirectory, "2")));
repo.Remove("2", false);
Assert.Equal(count - 5, repo.Index.Count);
}
}
[Fact]
public void CanRemoveAFolderThroughUsageOfPathspecsForFilesAlreadyInTheIndexAndInTheHEAD()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
int count = repo.Index.Count;
Assert.True(Directory.Exists(Path.Combine(repo.Info.WorkingDirectory, "1")));
repo.Remove("1");
Assert.False(Directory.Exists(Path.Combine(repo.Info.WorkingDirectory, "1")));
Assert.Equal(count - 1, repo.Index.Count);
}
}
[Theory]
[InlineData("deleted_staged_file.txt", FileStatus.Removed)]
[InlineData("1/I-do-not-exist.txt", FileStatus.Nonexistent)]
public void RemovingAnUnknownFileWithLaxExplicitPathsValidationDoesntThrow(string relativePath, FileStatus status)
{
for (int i = 0; i < 2; i++)
{
var path = SandboxStandardTestRepoGitDir();
using (var repo = new Repository(path))
{
Assert.Null(repo.Index[relativePath]);
Assert.Equal(status, repo.RetrieveStatus(relativePath));
repo.Remove(relativePath, i % 2 == 0);
repo.Remove(relativePath, i % 2 == 0,
new ExplicitPathsOptions {ShouldFailOnUnmatchedPath = false});
}
}
}
[Theory]
[InlineData("deleted_staged_file.txt", FileStatus.Removed)]
[InlineData("1/I-do-not-exist.txt", FileStatus.Nonexistent)]
public void RemovingAnUnknownFileThrowsIfExplicitPath(string relativePath, FileStatus status)
{
for (int i = 0; i < 2; i++)
{
var path = SandboxStandardTestRepoGitDir();
using (var repo = new Repository(path))
{
Assert.Null(repo.Index[relativePath]);
Assert.Equal(status, repo.RetrieveStatus(relativePath));
Assert.Throws<UnmatchedPathException>(
() => repo.Remove(relativePath, i%2 == 0, new ExplicitPathsOptions()));
}
}
}
[Fact]
public void RemovingFileWithBadParamsThrows()
{
var path = SandboxStandardTestRepoGitDir();
using (var repo = new Repository(path))
{
Assert.Throws<ArgumentException>(() => repo.Remove(string.Empty));
Assert.Throws<ArgumentNullException>(() => repo.Remove((string)null));
Assert.Throws<ArgumentException>(() => repo.Remove(new string[] { }));
Assert.Throws<ArgumentNullException>(() => repo.Remove(new string[] { null }));
}
}
}
}
|
