forked from libgit2/libgit2sharp
-
Notifications
You must be signed in to change notification settings - Fork 0
/
StashFixture.cs
435 lines (348 loc) · 16.8 KB
/
StashFixture.cs
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
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
using System;
using System.IO;
using System.Linq;
using LibGit2Sharp.Tests.TestHelpers;
using Xunit;
using Xunit.Extensions;
namespace LibGit2Sharp.Tests
{
public class StashFixture : BaseFixture
{
[Fact]
public void CannotAddStashAgainstBareRepository()
{
string path = SandboxBareTestRepo();
using (var repo = new Repository(path))
{
var stasher = Constants.Signature;
Assert.Throws<BareRepositoryException>(() => repo.Stashes.Add(stasher, "My very first stash", StashModifiers.Default));
}
}
[Fact]
public void CanAddAndRemoveStash()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
var stasher = Constants.Signature;
Assert.True(repo.RetrieveStatus().IsDirty);
Stash stash = repo.Stashes.Add(stasher, "My very first stash", StashModifiers.IncludeUntracked);
// Check that untracked files are deleted from working directory
string untrackedFilename = "new_untracked_file.txt";
Assert.False(File.Exists(Path.Combine(repo.Info.WorkingDirectory, untrackedFilename)));
Assert.NotNull(stash.Untracked[untrackedFilename]);
Assert.NotNull(stash);
Assert.Equal("stash@{0}", stash.CanonicalName);
Assert.Contains("My very first stash", stash.Message);
var stashRef = repo.Refs["refs/stash"];
Assert.Equal(stash.WorkTree.Sha, stashRef.TargetIdentifier);
Assert.False(repo.RetrieveStatus().IsDirty);
// Create extra file
untrackedFilename = "stash_candidate.txt";
Touch(repo.Info.WorkingDirectory, untrackedFilename, "Oh, I'm going to be stashed!\n");
Stash secondStash = repo.Stashes.Add(stasher, "My second stash", StashModifiers.IncludeUntracked);
Assert.NotNull(stash);
Assert.Equal("stash@{0}", stash.CanonicalName);
Assert.Contains("My second stash", secondStash.Message);
Assert.Equal(2, repo.Stashes.Count());
Assert.Equal("stash@{0}", repo.Stashes.First().CanonicalName);
Assert.Equal("stash@{1}", repo.Stashes.Last().CanonicalName);
Assert.NotNull(secondStash.Untracked[untrackedFilename]);
// Stash history has been shifted
Assert.Equal(repo.Lookup<Commit>("stash@{0}").Sha, secondStash.WorkTree.Sha);
Assert.Equal(repo.Lookup<Commit>("stash@{1}").Sha, stash.WorkTree.Sha);
//Remove one stash
repo.Stashes.Remove(0);
Assert.Equal(1, repo.Stashes.Count());
Stash newTopStash = repo.Stashes.First();
Assert.Equal("stash@{0}", newTopStash.CanonicalName);
Assert.Equal(stash.WorkTree.Sha, newTopStash.WorkTree.Sha);
// Stash history has been shifted
Assert.Equal(stash.WorkTree.Sha, repo.Lookup<Commit>("stash").Sha);
Assert.Equal(stash.WorkTree.Sha, repo.Lookup<Commit>("stash@{0}").Sha);
}
}
[Fact]
public void AddingAStashWithNoMessageGeneratesADefaultOne()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
var stasher = Constants.Signature;
Stash stash = repo.Stashes.Add(stasher, options: StashModifiers.Default);
Assert.NotNull(stash);
Assert.Equal("stash@{0}", stash.CanonicalName);
Assert.NotEmpty(stash.WorkTree.Message);
var stashRef = repo.Refs["refs/stash"];
Assert.Equal(stash.WorkTree.Sha, stashRef.TargetIdentifier);
}
}
[Fact]
public void AddStashWithBadParamsShouldThrows()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
Assert.Throws<ArgumentNullException>(() => repo.Stashes.Add(default(Signature), options: StashModifiers.Default));
}
}
[Fact]
public void StashingAgainstCleanWorkDirShouldReturnANullStash()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
var stasher = Constants.Signature;
Stash stash = repo.Stashes.Add(stasher, "My very first stash", StashModifiers.IncludeUntracked);
Assert.NotNull(stash);
//Stash against clean working directory
Assert.Null(repo.Stashes.Add(stasher, options: StashModifiers.Default));
}
}
[Fact]
public void CanStashWithoutOptions()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
var stasher = Constants.Signature;
const string untracked = "new_untracked_file.txt";
Touch(repo.Info.WorkingDirectory, untracked, "I'm untracked\n");
const string staged = "staged_file_path.txt";
Touch(repo.Info.WorkingDirectory, staged, "I'm staged\n");
Commands.Stage(repo, staged);
Stash stash = repo.Stashes.Add(stasher, "Stash with default options", StashModifiers.Default);
Assert.NotNull(stash);
//It should not keep staged files
Assert.Equal(FileStatus.Nonexistent, repo.RetrieveStatus(staged));
Assert.NotNull(stash.Index[staged]);
//It should leave untracked files untracked
Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(untracked));
Assert.Null(stash.Untracked);
}
}
[Fact]
public void CanStashAndKeepIndex()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
var stasher = Constants.Signature;
const string filename = "staged_file_path.txt";
Touch(repo.Info.WorkingDirectory, filename, "I'm staged\n");
Commands.Stage(repo, filename);
Stash stash = repo.Stashes.Add(stasher, "This stash will keep index", StashModifiers.KeepIndex);
Assert.NotNull(stash);
Assert.NotNull(stash.Index[filename]);
Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(filename));
Assert.Null(stash.Untracked);
}
}
[Fact]
public void CanStashIgnoredFiles()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
const string gitIgnore = ".gitignore";
const string ignoredFilename = "ignored_file.txt";
Touch(repo.Info.WorkingDirectory, gitIgnore, ignoredFilename);
Commands.Stage(repo, gitIgnore);
repo.Commit("Modify gitignore", Constants.Signature, Constants.Signature);
Touch(repo.Info.WorkingDirectory, ignoredFilename, "I'm ignored\n");
Assert.True(repo.Ignore.IsPathIgnored(ignoredFilename));
var stasher = Constants.Signature;
var stash = repo.Stashes.Add(stasher, "This stash includes ignore files", StashModifiers.IncludeIgnored);
Assert.False(File.Exists(Path.Combine(repo.Info.WorkingDirectory, ignoredFilename)));
var blob = repo.Lookup<Blob>("stash^3:ignored_file.txt");
Assert.NotNull(blob);
Assert.NotNull(stash.Untracked[ignoredFilename]);
}
}
[Fact]
public void CanStashAndApplyWithOptions()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
var stasher = Constants.Signature;
const string filename = "staged_file_path.txt";
Touch(repo.Info.WorkingDirectory, filename, "I'm staged\n");
Commands.Stage(repo, filename);
repo.Stashes.Add(stasher, "This stash with default options");
Assert.Equal(StashApplyStatus.Applied, repo.Stashes.Apply(0));
Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(filename));
Assert.Equal(1, repo.Stashes.Count());
Commands.Stage(repo, filename);
repo.Stashes.Add(stasher, "This stash with default options");
Assert.Equal(StashApplyStatus.Applied, repo.Stashes.Apply(
0,
new StashApplyOptions
{
ApplyModifiers = StashApplyModifiers.ReinstateIndex,
}));
Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(filename));
Assert.Equal(2, repo.Stashes.Count());
}
}
[Fact]
public void CanStashAndPop()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
var stasher = Constants.Signature;
Assert.Equal(0, repo.Stashes.Count());
const string filename = "staged_file_path.txt";
const string contents = "I'm staged";
Touch(repo.Info.WorkingDirectory, filename, contents);
Commands.Stage(repo, filename);
repo.Stashes.Add(stasher, "This stash with default options");
Assert.Equal(1, repo.Stashes.Count());
Assert.Equal(StashApplyStatus.Applied, repo.Stashes.Pop(0));
Assert.Equal(0, repo.Stashes.Count());
Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(filename));
Assert.Equal(contents, File.ReadAllText(Path.Combine(repo.Info.WorkingDirectory, filename)));
}
}
[Fact]
public void StashFailsWithUncommittedChangesIntheIndex()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
var stasher = Constants.Signature;
const string filename = "staged_file_path.txt";
const string originalContents = "I'm pre-stash.";
const string filename2 = "unstaged_file_path.txt";
const string newContents = "I'm post-stash.";
Touch(repo.Info.WorkingDirectory, filename, originalContents);
Commands.Stage(repo, filename);
Touch(repo.Info.WorkingDirectory, filename2, originalContents);
repo.Stashes.Add(stasher, "This stash with default options");
Touch(repo.Info.WorkingDirectory, filename, newContents);
Commands.Stage(repo, filename);
Touch(repo.Info.WorkingDirectory, filename2, newContents);
Assert.Equal(StashApplyStatus.UncommittedChanges, repo.Stashes.Pop(0, new StashApplyOptions
{
ApplyModifiers = StashApplyModifiers.ReinstateIndex,
}));
Assert.Equal(1, repo.Stashes.Count());
Assert.Equal(newContents, File.ReadAllText(Path.Combine(repo.Info.WorkingDirectory, filename)));
Assert.Equal(newContents, File.ReadAllText(Path.Combine(repo.Info.WorkingDirectory, filename2)));
}
}
[Fact]
public void StashCallsTheCallback()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
var stasher = Constants.Signature;
bool called;
const string filename = "staged_file_path.txt";
const string filename2 = "unstaged_file_path.txt";
const string originalContents = "I'm pre-stash.";
Touch(repo.Info.WorkingDirectory, filename, originalContents);
Commands.Stage(repo, filename);
Touch(repo.Info.WorkingDirectory, filename2, originalContents);
repo.Stashes.Add(stasher, "This stash with default options");
called = false;
repo.Stashes.Apply(0, new StashApplyOptions
{
ProgressHandler = (progress) => { called = true; return true; }
});
Assert.Equal(true, called);
repo.Reset(ResetMode.Hard);
called = false;
repo.Stashes.Pop(0, new StashApplyOptions
{
ProgressHandler = (progress) => { called = true; return true; }
});
Assert.Equal(true, called);
}
}
[Fact]
public void StashApplyReportsNotFound()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
var stasher = Constants.Signature;
const string filename = "unstaged_file_path.txt";
Touch(repo.Info.WorkingDirectory, filename, "I'm unstaged\n");
repo.Stashes.Add(stasher, "This stash with default options", StashModifiers.IncludeUntracked);
Touch(repo.Info.WorkingDirectory, filename, "I'm another unstaged\n");
Assert.Equal(StashApplyStatus.NotFound, repo.Stashes.Pop(1));
Assert.Throws<ArgumentException>(() => repo.Stashes.Pop(-1));
}
}
[Theory]
[InlineData(-1)]
[InlineData(-42)]
public void RemovingStashWithBadParamShouldThrow(int badIndex)
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
Assert.Throws<ArgumentException>(() => repo.Stashes.Remove(badIndex));
}
}
[Fact]
public void CanGetStashByIndexer()
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
var stasher = Constants.Signature;
const string firstStashMessage = "My very first stash";
const string secondStashMessage = "My second stash";
const string thirdStashMessage = "My third stash";
// Create first stash
Stash firstStash = repo.Stashes.Add(stasher, firstStashMessage, StashModifiers.IncludeUntracked);
Assert.NotNull(firstStash);
// Create second stash
Touch(repo.Info.WorkingDirectory, "stash_candidate.txt", "Oh, I'm going to be stashed!\n");
Stash secondStash = repo.Stashes.Add(stasher, secondStashMessage, StashModifiers.IncludeUntracked);
Assert.NotNull(secondStash);
// Create third stash
Touch(repo.Info.WorkingDirectory, "stash_candidate_again.txt", "Oh, I'm going to be stashed!\n");
Stash thirdStash = repo.Stashes.Add(stasher, thirdStashMessage, StashModifiers.IncludeUntracked);
Assert.NotNull(thirdStash);
// Get by indexer
Assert.Equal(3, repo.Stashes.Count());
Assert.Equal("stash@{0}", repo.Stashes[0].CanonicalName);
Assert.Contains(thirdStashMessage, repo.Stashes[0].Message);
Assert.Equal(thirdStash.WorkTree, repo.Stashes[0].WorkTree);
Assert.Equal("stash@{1}", repo.Stashes[1].CanonicalName);
Assert.Contains(secondStashMessage, repo.Stashes[1].Message);
Assert.Equal(secondStash.WorkTree, repo.Stashes[1].WorkTree);
Assert.Equal("stash@{2}", repo.Stashes[2].CanonicalName);
Assert.Contains(firstStashMessage, repo.Stashes[2].Message);
Assert.Equal(firstStash.WorkTree, repo.Stashes[2].WorkTree);
}
}
[Theory]
[InlineData(-1)]
[InlineData(-42)]
public void GettingStashWithBadIndexThrows(int badIndex)
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
Assert.Throws<ArgumentOutOfRangeException>(() => repo.Stashes[badIndex]);
}
}
[Theory]
[InlineData(28)]
[InlineData(42)]
public void GettingAStashThatDoesNotExistReturnsNull(int bigIndex)
{
string path = SandboxStandardTestRepo();
using (var repo = new Repository(path))
{
Assert.Null(repo.Stashes[bigIndex]);
}
}
}
}