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 System.Linq;
using System.Text;
using LibGit2Sharp.Tests.TestHelpers;
using Xunit;
using Xunit.Extensions;
namespace LibGit2Sharp.Tests
{
public class DiffWorkdirToIndexFixture : BaseFixture
{
/*
* $ git diff
* diff --git a/deleted_unstaged_file.txt b/deleted_unstaged_file.txt
* deleted file mode 100644
* index f2e4113..0000000
* --- a/deleted_unstaged_file.txt
* +++ /dev/null
* @@ -1 +0,0 @@
* -stuff
* diff --git a/modified_unstaged_file.txt b/modified_unstaged_file.txt
* index 9217230..da6fd65 100644
* --- a/modified_unstaged_file.txt
* +++ b/modified_unstaged_file.txt
* @@ -1 +1,2 @@
* +some more text
* more files! more files!
*/
[Fact]
public void CanCompareTheWorkDirAgainstTheIndex()
{
var path = SandboxStandardTestRepoGitDir();
using (var repo = new Repository(path))
{
var changes = repo.Diff.Compare<TreeChanges>();
Assert.Equal(2, changes.Count());
Assert.Equal("deleted_unstaged_file.txt", changes.Deleted.Single().Path);
Assert.Equal("modified_unstaged_file.txt", changes.Modified.Single().Path);
}
}
[Theory]
[InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
[InlineData("really-i-cant-exist.txt", FileStatus.Nonexistent)]
public void CanCompareTheWorkDirAgainstTheIndexWithLaxUnmatchedExplicitPathsValidation(string relativePath, FileStatus currentStatus)
{
var path = SandboxStandardTestRepoGitDir();
using (var repo = new Repository(path))
{
Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
var changes = repo.Diff.Compare<TreeChanges>(new[] { relativePath }, false, new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false });
Assert.Equal(0, changes.Count());
changes = repo.Diff.Compare<TreeChanges>(new[] { relativePath });
Assert.Equal(0, changes.Count());
}
}
[Theory]
[InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
[InlineData("really-i-cant-exist.txt", FileStatus.Nonexistent)]
public void ComparingTheWorkDirAgainstTheIndexWithStrictUnmatchedExplicitPathsValidationAndANonExistentPathspecThrows(string relativePath, FileStatus currentStatus)
{
var path = SandboxStandardTestRepoGitDir();
using (var repo = new Repository(path))
{
Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
Assert.Throws<UnmatchedPathException>(() => repo.Diff.Compare<TreeChanges>(new[] { relativePath }, false, new ExplicitPathsOptions()));
}
}
[Theory]
[InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
[InlineData("where-am-I.txt", FileStatus.Nonexistent)]
public void CallbackForUnmatchedExplicitPathsIsCalledWhenSet(string relativePath, FileStatus currentStatus)
{
var callback = new AssertUnmatchedPathspecsCallbackIsCalled();
var path = SandboxStandardTestRepoGitDir();
using (var repo = new Repository(path))
{
Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
repo.Diff.Compare<TreeChanges>(new[] { relativePath }, false, new ExplicitPathsOptions
{
ShouldFailOnUnmatchedPath = false,
OnUnmatchedPath = callback.OnUnmatchedPath });
Assert.True(callback.WasCalled);
}
}
private class AssertUnmatchedPathspecsCallbackIsCalled
{
public bool WasCalled;
public void OnUnmatchedPath(string unmatchedpath)
{
WasCalled = true;
}
}
[Fact]
public void ComparingReliesOnProvidedConfigEntriesIfAny()
{
const string file = "1/branch_file.txt";
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
TreeEntry entry = repo.Head[file];
Assert.Equal(Mode.ExecutableFile, entry.Mode);
// Recreate the file in the workdir without the executable bit
string fullpath = Path.Combine(repo.Info.WorkingDirectory, file);
File.Delete(fullpath);
using (var stream = ((Blob)(entry.Target)).GetContentStream())
{
Touch(repo.Info.WorkingDirectory, file, stream);
}
// Unset the local core.filemode, if any.
repo.Config.Unset("core.filemode", ConfigurationLevel.Local);
}
SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
var options = BuildFakeSystemConfigFilemodeOption(scd, true);
using (var repo = new Repository(path, options))
{
var changes = repo.Diff.Compare<TreeChanges>(new[] { file });
Assert.Equal(1, changes.Count());
var change = changes.Modified.Single();
Assert.Equal(Mode.ExecutableFile, change.OldMode);
Assert.Equal(Mode.NonExecutableFile, change.Mode);
}
options = BuildFakeSystemConfigFilemodeOption(scd, false);
using (var repo = new Repository(path, options))
{
var changes = repo.Diff.Compare<TreeChanges>(new[] { file });
Assert.Equal(0, changes.Count());
}
}
private RepositoryOptions BuildFakeSystemConfigFilemodeOption(
SelfCleaningDirectory scd,
bool value)
{
Directory.CreateDirectory(scd.DirectoryPath);
var options = new RepositoryOptions
{
SystemConfigurationLocation = Path.Combine(
scd.RootedDirectoryPath, "fake-system.config")
};
StringBuilder sb = new StringBuilder()
.AppendFormat("[core]{0}", Environment.NewLine)
.AppendFormat("filemode = {1}{0}", Environment.NewLine, value);
File.WriteAllText(options.SystemConfigurationLocation, sb.ToString());
return options;
}
[Fact]
public void CanCompareTheWorkDirAgainstTheIndexWithUntrackedFiles()
{
var path = SandboxStandardTestRepoGitDir();
using (var repo = new Repository(path))
{
var changes = repo.Diff.Compare<TreeChanges>(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);
}
}
}
}
|
