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
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
|
using System;
using System.IO;
using System.Linq;
using LibGit2Sharp.Tests.TestHelpers;
using Xunit;
using Xunit.Extensions;
namespace LibGit2Sharp.Tests
{
public class ResetHeadFixture : BaseFixture
{
[Theory]
[InlineData(true)]
[InlineData(false)]
public void ResetANewlyInitializedRepositoryThrows(bool isBare)
{
string repoPath = InitNewRepository(isBare);
using (var repo = new Repository(repoPath))
{
Assert.Throws<UnbornBranchException>(() => repo.Reset(ResetMode.Soft));
}
}
[Fact]
public void SoftResetToTheHeadOfARepositoryDoesNotChangeTheTargetOfTheHead()
{
string path = SandboxBareTestRepo();
using (var repo = new Repository(path))
{
Branch oldHead = repo.Head;
repo.Reset(ResetMode.Soft);
Assert.Equal(oldHead, repo.Head);
}
}
[Fact]
public void SoftResetToAParentCommitChangesTheTargetOfTheHead()
{
string path = SandboxBareTestRepo();
using (var repo = new Repository(path))
{
var headCommit = repo.Head.Tip;
var firstCommitParent = headCommit.Parents.First();
repo.Reset(ResetMode.Soft, firstCommitParent);
Assert.Equal(firstCommitParent, repo.Head.Tip);
}
}
[Fact]
public void SoftResetSetsTheHeadToTheDereferencedCommitOfAChainedTag()
{
string path = SandboxBareTestRepo();
using (var repo = new Repository(path))
{
Tag tag = repo.Tags["test"];
repo.Reset(ResetMode.Soft, tag.CanonicalName);
Assert.Equal("e90810b8df3e80c413d903f631643c716887138d", repo.Head.Tip.Sha);
}
}
[Fact]
public void ResettingWithBadParamsThrows()
{
string path = SandboxBareTestRepo();
using (var repo = new Repository(path))
{
Assert.Throws<ArgumentNullException>(() => repo.Reset(ResetMode.Soft, (string)null));
Assert.Throws<ArgumentNullException>(() => repo.Reset(ResetMode.Soft, (Commit)null));
Assert.Throws<ArgumentException>(() => repo.Reset(ResetMode.Soft, ""));
Assert.Throws<NotFoundException>(() => repo.Reset(ResetMode.Soft, Constants.UnknownSha));
Assert.Throws<InvalidSpecificationException>(() => repo.Reset(ResetMode.Soft, repo.Head.Tip.Tree.Sha));
}
}
[Fact]
public void SoftResetSetsTheHeadToTheSpecifiedCommit()
{
/* Make the Head point to a branch through its name */
AssertSoftReset(b => b.FriendlyName, false, b => b.FriendlyName);
}
[Fact]
public void SoftResetSetsTheDetachedHeadToTheSpecifiedCommit()
{
/* Make the Head point to a commit through its sha (Detaches the Head) */
AssertSoftReset(b => b.Tip.Sha, true, b => "(no branch)");
}
private void AssertSoftReset(Func<Branch, string> branchIdentifierRetriever, bool shouldHeadBeDetached, Func<Branch, string> expectedHeadNameRetriever)
{
string repoPath = InitNewRepository();
using (var repo = new Repository(repoPath, new RepositoryOptions{ Identity = Constants.Identity }))
{
FeedTheRepository(repo);
Tag tag = repo.Tags["mytag"];
Branch branch = repo.Branches["mybranch"];
string branchIdentifier = branchIdentifierRetriever(branch);
repo.Checkout(branchIdentifier);
var oldHeadId = repo.Head.Tip.Id;
Assert.Equal(shouldHeadBeDetached, repo.Info.IsHeadDetached);
string expectedHeadName = expectedHeadNameRetriever(branch);
Assert.Equal(expectedHeadName, repo.Head.FriendlyName);
Assert.Equal(branch.Tip.Sha, repo.Head.Tip.Sha);
/* Reset --soft the Head to a tag through its canonical name */
repo.Reset(ResetMode.Soft, tag.CanonicalName);
Assert.Equal(expectedHeadName, repo.Head.FriendlyName);
Assert.Equal(tag.Target.Id, repo.Head.Tip.Id);
Assert.Equal(FileStatus.ModifiedInIndex, repo.RetrieveStatus("a.txt"));
AssertRefLogEntry(repo, "HEAD",
string.Format("reset: moving to {0}", tag.Target.Sha),
oldHeadId,
tag.Target.Id,
Constants.Identity, DateTimeOffset.Now);
if (!shouldHeadBeDetached)
{
AssertRefLogEntry(repo, branch.CanonicalName,
string.Format("reset: moving to {0}", tag.Target.Sha),
oldHeadId,
tag.Target.Id,
Constants.Identity, DateTimeOffset.Now);
}
/* Reset --soft the Head to a commit through its sha */
repo.Reset(ResetMode.Soft, branch.Tip.Sha);
Assert.Equal(expectedHeadName, repo.Head.FriendlyName);
Assert.Equal(branch.Tip.Sha, repo.Head.Tip.Sha);
Assert.Equal(FileStatus.Unaltered, repo.RetrieveStatus("a.txt"));
AssertRefLogEntry(repo, "HEAD",
string.Format("reset: moving to {0}", branch.Tip.Sha),
tag.Target.Id,
branch.Tip.Id,
Constants.Identity, DateTimeOffset.Now);
if (!shouldHeadBeDetached)
{
AssertRefLogEntry(repo, branch.CanonicalName,
string.Format("reset: moving to {0}", branch.Tip.Sha),
tag.Target.Id,
branch.Tip.Id,
Constants.Identity, DateTimeOffset.Now);
}
}
}
private static void FeedTheRepository(IRepository repo)
{
string fullPath = Touch(repo.Info.WorkingDirectory, "a.txt", "Hello\n");
repo.Stage(fullPath);
repo.Commit("Initial commit", Constants.Signature, Constants.Signature);
repo.ApplyTag("mytag");
File.AppendAllText(fullPath, "World\n");
repo.Stage(fullPath);
Signature shiftedSignature = Constants.Signature.TimeShift(TimeSpan.FromMinutes(1));
repo.Commit("Update file", shiftedSignature, shiftedSignature);
repo.CreateBranch("mybranch");
repo.Checkout("mybranch");
Assert.False(repo.RetrieveStatus().IsDirty);
}
[Fact]
public void MixedResetRefreshesTheIndex()
{
string repoPath = InitNewRepository();
using (var repo = new Repository(repoPath, new RepositoryOptions { Identity = Constants.Identity }))
{
FeedTheRepository(repo);
var oldHeadId = repo.Head.Tip.Id;
Tag tag = repo.Tags["mytag"];
repo.Reset(ResetMode.Mixed, tag.CanonicalName);
Assert.Equal(FileStatus.ModifiedInWorkdir, repo.RetrieveStatus("a.txt"));
AssertRefLogEntry(repo, "HEAD",
string.Format("reset: moving to {0}", tag.Target.Sha),
oldHeadId,
tag.Target.Id,
Constants.Identity, DateTimeOffset.Now);
AssertRefLogEntry(repo, "refs/heads/mybranch",
string.Format("reset: moving to {0}", tag.Target.Sha),
oldHeadId,
tag.Target.Id,
Constants.Identity, DateTimeOffset.Now);
}
}
[Fact]
public void MixedResetInABareRepositoryThrows()
{
string path = SandboxBareTestRepo();
using (var repo = new Repository(path))
{
Assert.Throws<BareRepositoryException>(() => repo.Reset(ResetMode.Mixed));
}
}
[Fact]
public void HardResetInABareRepositoryThrows()
{
string path = SandboxBareTestRepo();
using (var repo = new Repository(path))
{
Assert.Throws<BareRepositoryException>(() => repo.Reset(ResetMode.Hard));
}
}
[Fact]
public void HardResetUpdatesTheContentOfTheWorkingDirectory()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
var names = new DirectoryInfo(repo.Info.WorkingDirectory).GetFileSystemInfos().Select(fsi => fsi.Name).ToList();
File.Delete(Path.Combine(repo.Info.WorkingDirectory, "README"));
Touch(repo.Info.WorkingDirectory, "WillNotBeRemoved.txt", "content\n");
Assert.True(names.Count > 4);
repo.Reset(ResetMode.Hard, "HEAD~3");
names = new DirectoryInfo(repo.Info.WorkingDirectory).GetFileSystemInfos().Select(fsi => fsi.Name).ToList();
names.Sort(StringComparer.Ordinal);
Assert.Equal(new[] { ".git", "README", "WillNotBeRemoved.txt", "branch_file.txt", "new.txt", "new_untracked_file.txt" }, names);
}
}
}
}
|
