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
|
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)
{
SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
using (var repo = Repository.Init(scd.DirectoryPath, isBare))
{
Assert.Throws<LibGit2SharpException>(() => repo.Reset(ResetOptions.Soft));
}
}
[Fact]
public void SoftResetToTheHeadOfARepositoryDoesNotChangeTheTargetOfTheHead()
{
using (var repo = new Repository(BareTestRepoPath))
{
Branch oldHead = repo.Head;
repo.Reset(ResetOptions.Soft);
Assert.Equal(oldHead, repo.Head);
}
}
[Fact]
public void SoftResetToAParentCommitChangesTheTargetOfTheHead()
{
TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
using (var repo = new Repository(path.RepositoryPath))
{
var headCommit = repo.Head.Tip;
var firstCommitParent = headCommit.Parents.First();
repo.Reset(ResetOptions.Soft, firstCommitParent);
Assert.Equal(firstCommitParent, repo.Head.Tip);
}
}
[Fact]
public void SoftResetSetsTheHeadToTheDereferencedCommitOfAChainedTag()
{
TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
using (var repo = new Repository(path.RepositoryPath))
{
Tag tag = repo.Tags["test"];
repo.Reset(ResetOptions.Soft, tag.CanonicalName);
Assert.Equal("e90810b8df3e80c413d903f631643c716887138d", repo.Head.Tip.Sha);
}
}
[Fact]
public void ResettingWithBadParamsThrows()
{
using (var repo = new Repository(BareTestRepoPath))
{
Assert.Throws<ArgumentNullException>(() => repo.Reset(ResetOptions.Soft, (string)null));
Assert.Throws<ArgumentNullException>(() => repo.Reset(ResetOptions.Soft, (Commit)null));
Assert.Throws<ArgumentException>(() => repo.Reset(ResetOptions.Soft, ""));
Assert.Throws<LibGit2SharpException>(() => repo.Reset(ResetOptions.Soft, Constants.UnknownSha));
Assert.Throws<LibGit2SharpException>(() => repo.Reset(ResetOptions.Soft, repo.Head.Tip.Tree.Sha));
}
}
[Fact]
public void SoftResetSetsTheHeadToTheSpecifiedCommit()
{
/* Make the Head point to a branch through its name */
AssertSoftReset(b => b.Name, false, b => b.Name);
}
[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)
{
SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
using (var repo = Repository.Init(scd.DirectoryPath))
{
FeedTheRepository(repo);
Tag tag = repo.Tags["mytag"];
Branch branch = repo.Branches["mybranch"];
string branchIdentifier = branchIdentifierRetriever(branch);
repo.Checkout(branchIdentifier);
Assert.Equal(shouldHeadBeDetached, repo.Info.IsHeadDetached);
string expectedHeadName = expectedHeadNameRetriever(branch);
Assert.Equal(expectedHeadName, repo.Head.Name);
Assert.Equal(branch.Tip.Sha, repo.Head.Tip.Sha);
/* Reset --soft the Head to a tag through its canonical name */
repo.Reset(ResetOptions.Soft, tag.CanonicalName);
Assert.Equal(expectedHeadName, repo.Head.Name);
Assert.Equal(tag.Target.Id, repo.Head.Tip.Id);
Assert.Equal(FileStatus.Staged, repo.Index.RetrieveStatus("a.txt"));
/* Reset --soft the Head to a commit through its sha */
repo.Reset(ResetOptions.Soft, branch.Tip.Sha);
Assert.Equal(expectedHeadName, repo.Head.Name);
Assert.Equal(branch.Tip.Sha, repo.Head.Tip.Sha);
Assert.Equal(FileStatus.Unaltered, repo.Index.RetrieveStatus("a.txt"));
}
}
private static void FeedTheRepository(Repository repo)
{
string fullPath = Path.Combine(repo.Info.WorkingDirectory, "a.txt");
File.WriteAllText(fullPath, "Hello\n");
repo.Index.Stage(fullPath);
repo.Commit("Initial commit", Constants.Signature, Constants.Signature);
repo.ApplyTag("mytag");
File.AppendAllText(fullPath, "World\n");
repo.Index.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.Index.RetrieveStatus().IsDirty);
}
[Fact]
public void MixedResetRefreshesTheIndex()
{
SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
using (var repo = Repository.Init(scd.DirectoryPath))
{
FeedTheRepository(repo);
Tag tag = repo.Tags["mytag"];
repo.Reset(ResetOptions.Mixed, tag.CanonicalName);
Assert.Equal(FileStatus.Modified, repo.Index.RetrieveStatus("a.txt"));
}
}
[Fact]
public void MixedResetInABareRepositoryThrows()
{
using (var repo = new Repository(BareTestRepoPath))
{
Assert.Throws<BareRepositoryException>(() => repo.Reset(ResetOptions.Mixed));
}
}
[Fact]
public void HardResetInABareRepositoryThrows()
{
using (var repo = new Repository(BareTestRepoPath))
{
Assert.Throws<BareRepositoryException>(() => repo.Reset(ResetOptions.Hard));
}
}
[Fact]
public void HardResetUpdatesTheContentOfTheWorkingDirectory()
{
var clone = BuildTemporaryCloneOfTestRepo(StandardTestRepoWorkingDirPath);
using (var repo = new Repository(clone.DirectoryPath))
{
var names = new DirectoryInfo(repo.Info.WorkingDirectory).GetFileSystemInfos().Select(fsi => fsi.Name).ToList();
names.Sort(StringComparer.Ordinal);
File.Delete(Path.Combine(repo.Info.WorkingDirectory, "README"));
File.WriteAllText(Path.Combine(repo.Info.WorkingDirectory, "WillNotBeRemoved.txt"), "content\n");
Assert.True(names.Count > 4);
repo.Reset(ResetOptions.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);
}
}
}
}
|
