8000 Rename Filter into CommitFilter · freevoid/libgit2sharp@7d9baab · GitHub
[go: up one dir, main page]
Skip to content

Commit 7d9baab

Browse files
nulltokennulltoken
committed
Rename Filter into CommitFilter
1 parent 8dfa16f commit 7d9baab

12 files changed

+175
-88
lines changed

‎LibGit2Sharp.Tests/CommitFixture.cs

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void CanEnumerateCommitsFromSha()
8787
int count = 0;
8888
using (var repo = new Repository(BareTestRepoPath))
8989
{
90-
foreach (Commit commit in repo.Commits.QueryBy(new Filter { Since = "a4a7dce85cf63874e984719f4fdd239f5145052f" }))
90+
foreach (Commit commit in repo.Commits.QueryBy(new CommitFilter { Since = "a4a7dce85cf63874e984719f4fdd239f5145052f" }))
9191
{
9292
Assert.NotNull(commit);
9393
count++;
@@ -101,9 +101,9 @@ public void QueryingTheCommitHistoryWithUnknownShaOrInvalidEntryPointThrows()
101101
{
102102
using (var repo = new Repository(BareTestRepoPath))
103103
{
104-
Assert.Throws<LibGit2SharpException>(() => repo.Commits.QueryBy(new Filter { Since = Constants.UnknownSha }).Count());
105-
Assert.Throws<LibGit2SharpException>(() => repo.Commits.QueryBy(new Filter { Since = "refs/heads/deadbeef" }).Count());
106-
Assert.Throws<ArgumentNullException>(() => repo.Commits.QueryBy(new Filter { Since = null }).Count());
104+
Assert.Throws<LibGit2SharpException>(() => repo.Commits.QueryBy(new CommitFilter { Since = Constants.UnknownSha }).Count());
105+
Assert.Throws<LibGit2SharpException>(() => repo.Commits.QueryBy(new CommitFilter { Since = "refs/heads/deadbeef" }).Count());
106+
Assert.Throws<ArgumentNullException>(() => repo.Commits.QueryBy(new CommitFilter { Since = null }).Count());
107107
}
108108
}
109109

@@ -115,8 +115,8 @@ public void QueryingTheCommitHistoryFromACorruptedReferenceThrows()
115115
{
116116
CreateCorruptedDeadBeefHead(repo.Info.Path);
117117

118-
Assert.Throws<LibGit2SharpException>(() => repo.Commits.QueryBy(new Filter { Since = repo.Branches["deadbeef"] }).Count());
119-
Assert.Throws<LibGit2SharpException>(() => repo.Commits.QueryBy(new Filter { Since = repo.Refs["refs/heads/deadbeef"] }).Count());
118+
Assert.Throws<LibGit2SharpException>(() => repo.Commits.QueryBy(new CommitFilter { Since = repo.Branches["deadbeef"] }).Count());
119+
Assert.Throws<LibGit2SharpException>(() => repo.Commits.QueryBy(new CommitFilter { Since = repo.Refs["refs/heads/deadbeef"] }).Count());
120120
}
121121
}
122122

@@ -125,9 +125,9 @@ public void QueryingTheCommitHistoryWithBadParamsThrows()
125125
{
126126
using (var repo = new Repository(BareTestRepoPath))
127127
{
128-
Assert.Throws<ArgumentException>(() => repo.Commits.QueryBy(new Filter { Since = string.Empty }));
129-
Assert.Throws<ArgumentNullException>(() => repo.Commits.QueryBy(new Filter { Since = null }));
130-
Assert.Throws<ArgumentNullException>(() => repo.Commits.QueryBy(null));
128+
Assert.Throws<ArgumentException>(() => repo.Commits.QueryBy(new CommitFilter { Since = string.Empty }));
129+
Assert.Throws<ArgumentNullException>(() => repo.Commits.QueryBy(new CommitFilter { Since = null }));
130+
Assert.Throws<ArgumentNullException>(() => repo.Commits.QueryBy(default(CommitFilter)));
131131
}
132132
}
133133

@@ -140,7 +140,7 @@ public void CanEnumerateCommitsWithReverseTimeSorting()
140140
int count = 0;
141141
using (var repo = new Repository(BareTestRepoPath))
142142
{
143-
foreach (Commit commit in repo.Commits.QueryBy(new Filter { Since = "a4a7dce85cf63874e984719f4fdd239f5145052f", SortBy = GitSortOptions.Time | GitSortOptions.Reverse }))
143+
foreach (Commit commit in repo.Commits.QueryBy(new CommitFilter { Since = "a4a7dce85cf63874e984719f4fdd239f5145052f", SortBy = GitSortOptions.Time | GitSortOptions.Reverse }))
144144
{
145145
Assert.NotNull(commit);
146146
Assert.True(commit.Sha.StartsWith(reversedShas[count]));
@@ -155,7 +155,7 @@ public void CanEnumerateCommitsWithReverseTopoSorting()
155155
{
156156
using (var repo = new Repository(BareTestRepoPath))
157157
{
158-
List<Commit> commits = repo.Commits.QueryBy(new Filter { Since = "a4a7dce85cf63874e984719f4fdd239f5145052f", SortBy = GitSortOptions.Time | GitSortOptions.Reverse }).ToList();
158+
List<Commit> commits = repo.Commits.QueryBy(new CommitFilter { Since = "a4a7dce85cf63874e984719f4fdd239f5145052f", SortBy = GitSortOptions.Time | GitSortOptions.Reverse }).ToList();
159159
foreach (Commit commit in commits)
160160
{
161161
Assert.NotNull(commit);
@@ -183,7 +183,7 @@ public void CanEnumerateCommitsWithTimeSorting()
183183
int count = 0;
184184
using (var repo = new Repository(BareTestRepoPath))
185185
{
186-
foreach (Commit commit in repo.Commits.QueryBy(new Filter { Since = "a4a7dce85cf63874e984719f4fdd239f5145052f", SortBy = GitSortOptions.Time }))
186+
foreach (Commit commit in repo.Commits.QueryBy(new CommitFilter { Since = "a4a7dce85cf63874e984719f4fdd239f5145052f", SortBy = GitSortOptions.Time }))
187187
{
188188
Assert.NotNull(commit);
189189
Assert.True(commit.Sha.StartsWith(expectedShas[count]));
@@ -198,7 +198,7 @@ public void CanEnumerateCommitsWithTopoSorting()
198198
{
199199
using (var repo = new Repository(BareTestRepoPath))
200200
{
201-
List<Commit> commits = repo.Commits.QueryBy(new Filter { Since = "a4a7dce85cf63874e984719f4fdd239f5145052f", SortBy = GitSortOptions.Topological }).ToList();
201+
List<Commit> commits = repo.Commits.QueryBy(new CommitFilter { Since = "a4a7dce85cf63874e984719f4fdd239f5145052f", SortBy = GitSortOptions.Topological }).ToList();
202202
foreach (Commit commit in commits)
203203
{
204204
Assert.NotNull(commit);
@@ -215,7 +215,7 @@ public void CanEnumerateCommitsWithTopoSorting()
215215
public void CanEnumerateFromHead()
216216
{
217217
AssertEnumerationOfCommits(
218-
repo => new Filter { Since = repo.Head },
218+
repo => new CommitFilter { Since = repo.Head },
219219
new[]
220220
{
221221
"4c062a6", "be3563a", "c47800c", "9fd738e",
@@ -237,7 +237,7 @@ public void CanEnumerateFromDetachedHead()
237237
repoClone.Checkout(headSha);
238238

239239
AssertEnumerationOfCommitsInRepo(repoClone,
240-
repo => new Filter { Since = repo.Head },
240+
repo => new CommitFilter { Since = repo.Head },
241241
new[]
242242
{
243243
"32eab9c", "592d3c8", "4c062a6",
@@ -251,7 +251,7 @@ public void CanEnumerateFromDetachedHead()
251251
public void CanEnumerateUsingTwoHeadsAsBoundaries()
252252
{
253253
AssertEnumerationOfCommits(
254-
repo => new Filter { Since = "HEAD", Until = "refs/heads/br2" },
254+
repo => new CommitFilter { Since = "HEAD", Until = "refs/heads/br2" },
255255
new[] { "4c062a6", "be3563a" }
256256
);
257257
}
@@ -260,7 +260,7 @@ public void CanEnumerateUsingTwoHeadsAsBoundaries()
260260
public void CanEnumerateUsingImplicitHeadAsSinceBoundary()
261261
{
262262
AssertEnumerationOfCommits(
263-
repo => new Filter { Until = "refs/heads/br2" },
263+
repo => new CommitFilter { Until = "refs/heads/br2" },
264264
new[] { "4c062a6", "be3563a" }
265265
);
266266
}
@@ -269,7 +269,7 @@ public void CanEnumerateUsingImplicitHeadAsSinceBoundary()
269269
public void CanEnumerateUsingTwoAbbreviatedShasAsBoundaries()
270270
{
271271
AssertEnumerationOfCommits(
272-
repo => new Filter { Since = "a4a7dce", Until = "4a202b3" },
272+
repo => new CommitFilter { Since = "a4a7dce", Until = "4a202b3" },
273273
new[] { "a4a7dce", "c47800c", "9fd738e" }
274274
);
275275
}
@@ -278,7 +278,7 @@ public void CanEnumerateUsingTwoAbbreviatedShasAsBoundaries()
278278
public void CanEnumerateCommitsFromTwoHeads()
279279
{
280280
AssertEnumerationOfCommits(
281-
repo => new Filter { Since = new[] { "refs/heads/br2", "refs/heads/master" } },
281+
repo => new CommitFilter { Since = new[] { "refs/heads/br2", "refs/heads/master" } },
282282
new[]
283283
{
284284
"4c062a6", "a4a7dce", "be3563a", "c47800c",
@@ -290,7 +290,7 @@ public void CanEnumerateCommitsFromTwoHeads()
290290
public void CanEnumerateCommitsFromMixedStartingPoints()
291291
{
292292
AssertEnumerationOfCommits(
293-
repo => new Filter { Since = new object[] { repo.Branches["br2"],
293+
repo => new CommitFilter { Since = new object[] { repo.Branches["br2"],
294294
"refs/heads/master",
295295
new ObjectId("e90810b8df3e80c413d903f631643c716887138d") } },
296296
new[]
@@ -305,7 +305,7 @@ public void CanEnumerateCommitsFromMixedStartingPoints()
305305
public void CanEnumerateCommitsUsingGlob()
306306
{
307307
AssertEnumerationOfCommits(
308-
repo => new Filter { Since = repo.Refs.FromGlob("refs/heads/*") },
308+
repo => new CommitFilter { Since = repo.Refs.FromGlob("refs/heads/*") },
309309
new[]
310310
{
311311
"4c062a6", "e90810b", "6dcf9bf", "a4a7dce", "be3563a", "c47800c", "9fd738e", "4a202b3", "41bc8c6", "5001298", "5b5b025", "8496071"
@@ -316,7 +316,7 @@ public void CanEnumerateCommitsUsingGlob()
316316
public void CanHideCommitsUsingGlob()
317317
{
318318
AssertEnumerationOfCommits(
319-
repo => new Filter { Since = "refs/heads/packed-test", Until = repo.Refs.FromGlob("*/packed") },
319+
repo => new CommitFilter { Since = "refs/heads/packed-test", Until = repo.Refs.FromGlob("*/packed") },
320320
new[]
321321
{
322322
"4a202b3", "5b5b025", "8496071"
@@ -338,7 +338,7 @@ public void CanEnumerateCommitsFromATagAnnotation()
338338
private static void CanEnumerateCommitsFromATag(Func<Tag, object> transformer)
339339
{
340340
AssertEnumerationOfCommits(
341-
repo => new Filter { Since = transformer(repo.Tags["test"]) },
341+
repo => new CommitFilter { Since = transformer(repo.Tags["test"]) },
342342
new[] { "e90810b", "6dcf9bf", }
343343
);
344344
}
@@ -347,7 +347,7 @@ private static void CanEnumerateCommitsFromATag(Func<Tag, object> transformer)
347347
public void CanEnumerateAllCommits()
348348
{
349349
AssertEnumerationOfCommits(
350-
repo => new Filter
350+
repo => new CommitFilter
351351
{
352352
Since = repo.Refs.OrderBy(r => r.CanonicalName, StringComparer.Ordinal),
353353
},
@@ -364,7 +364,7 @@ public void CanEnumerateAllCommits()
364364
public void CanEnumerateCommitsFromATagWhichPointsToABlob()
365365
{
366366
AssertEnumerationOfCommits(
367-
repo => new Filter { Since = repo.Tags["point_to_blob"] },
367+
repo => new CommitFilter { Since = repo.Tags["point_to_blob"] },
368368
new string[] { });
369369
}
370370

@@ -379,20 +379,20 @@ public void CanEnumerateCommitsFromATagWhichPointsToATree()
379379
Tag tag = repo.ApplyTag("point_to_tree", headTreeSha);
380380

381381
AssertEnumerationOfCommitsInRepo(repo,
382-
r => new Filter { Since = tag },
382+
r => new CommitFilter { Since = tag },
383383
new string[] { });
384384
}
385385
}
386386

387-
private static void AssertEnumerationOfCommits(Func<Repository, Filter> filterBuilder, IEnumerable<string> abbrevIds)
387+
private static void AssertEnumerationOfCommits(Func<Repository, CommitFilter> filterBuilder, IEnumerable<string> abbrevIds)
388388
{
389389
using (var repo = new Repository(BareTestRepoPath))
390390
{
391391
AssertEnumerationOfCommitsInRepo(repo, filterBuilder, abbrevIds);
392392
}
393393
}
394394

395-
private static void AssertEnumerationOfCommitsInRepo(Repository repo, Func<Repository, Filter> filterBuilder, IEnumerable<string> abbrevIds)
395+
private static void AssertEnumerationOfCommitsInRepo(Repository repo, Func<Repository, CommitFilter> filterBuilder, IEnumerable<string> abbrevIds)
396396
{
397397
ICommitLog commits = repo.Commits.QueryBy(filterBuilder(repo));
398398

@@ -800,7 +800,7 @@ public void CanRetrieveChildrenOfASpecificCommit()
800800
{
801801
const string parentSha = "5b5b025afb0b4c913b4c338a42934a3863bf3644";
802802

803-
var filter = new Filter
803+
var filter = new CommitFilter
804804
{
805805
/* Revwalk from all the refs (git log --all) ... */
806806
Since = repo.Refs,

‎LibGit2Sharp.Tests/FilterBranchFixture.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,38 @@ public override void Dispose()
2525
public void CanRewriteHistoryWithoutChangingCommitMetadata()
2626
{
2727
var originalRefs = repo.Refs.ToList().OrderBy(r => r.CanonicalName);
28-
var commits = repo.Commits.QueryBy(new Filter { Since = repo.Refs }).ToArray();
28+
var commits = repo.Commits.QueryBy(new CommitFilter { Since = repo.Refs }).ToArray();
2929

3030
// Noop header rewriter
3131
repo.Refs.RewriteHistory(commits, commitHeaderRewriter: CommitRewriteInfo.From);
3232

3333
Assert.Equal(originalRefs, repo.Refs.ToList().OrderBy(r => r.CanonicalName));
34-
Assert.Equal(commits, repo.Commits.QueryBy(new Filter { Since = repo.Refs }).ToArray());
34+
Assert.Equal(commits, repo.Commits.QueryBy(new CommitFilter { Since = repo.Refs }).ToArray());
3535
}
3636

3737
[Fact]
3838
public void CanRewriteHistoryWithoutChangingTrees()
3939
{
4040
var originalRefs = repo.Refs.ToList().OrderBy(r => r.CanonicalName);
41-
var commits = repo.Commits.QueryBy(new Filter { Since = repo.Refs }).ToArray();
41+
var commits = repo.Commits.QueryBy(new CommitFilter { Since = repo.Refs }).ToArray();
4242

4343
// Noop tree rewriter
4444
repo.Refs.RewriteHistory(commits, commitTreeRewriter: TreeDefinition.From);
4545

4646
Assert.Equal(originalRefs, repo.Refs.ToList().OrderBy(r => r.CanonicalName));
47-
Assert.Equal(commits, repo.Commits.QueryBy(new Filter { Since = repo.Refs }).ToArray());
47+
Assert.Equal(commits, repo.Commits.QueryBy(new CommitFilter { Since = repo.Refs }).ToArray());
4848
}
4949

5050
[Fact]
5151
public void CanRewriteAuthorOfCommits()
5252
{
53-
var commits = repo.Commits.QueryBy(new Filter { Since = repo.Refs }).ToArray();
53+
var commits = repo.Commits.QueryBy(new CommitFilter { Since = repo.Refs }).ToArray();
5454
repo.Refs.RewriteHistory(
5555
commits,
5656
commitHeaderRewriter: c => CommitRewriteInfo.From(c, author: new Signature("Ben Straub", "me@example.com", c.Author.When)));
5757

5858
var nonBackedUpRefs = repo.Refs.Where(x => !x.CanonicalName.StartsWith("refs/original"));
59-
Assert.Empty(repo.Commits.QueryBy(new Filter { Since = nonBackedUpRefs })
59+
Assert.Empty(repo.Commits.QueryBy(new CommitFilter { Since = nonBackedUpRefs })
6060
.Where(c => c.Author.Name != "Ben Straub"));
6161
}
6262

@@ -221,7 +221,7 @@ public void CanNotOverWriteBackedUpReferences()
221221
[Fact]
222222
public void CanNotOverWriteAnExistingReference()
223223
{
224-
var commits = repo.Commits.QueryBy(new Filter { Since = repo.Refs }).ToArray();
224+
var commits = repo.Commits.QueryBy(new CommitFilter { Since = repo.Refs }).ToArray();
225225

226226
Assert.Throws<NameConflictException>(() => repo.Refs.RewriteHistory(commits, tagNameRewriter: (n, b, t) => "test"));
227227

@@ -283,7 +283,7 @@ public void CanProvideNewNamesForTags()
283283
GitObject e908Target = repo.Tags["e90810b"].Target;
284284
GitObject testTarget = repo.Tags["test"].Target;
285285

286-
repo.Refs.RewriteHistory(repo.Commits.QueryBy(new Filter { Since = repo.Refs["refs/heads/test"] }),
286+
repo.Refs.RewriteHistory(repo.Commits.QueryBy(new CommitFilter { Since = repo.Refs["refs/heads/test"] }),
287287
c => CommitRewriteInfo.From(c, message: ""),
288288
tagNameRewriter: (oldName, isAnnotated, o) => oldName + "_new");
289289

‎LibGit2Sharp.Tests/MetaFixture.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public class MetaFixture
1212
{
1313
private static readonly Type[] excludedTypes = new[]
1414
{
15+
typeof(CommitFilter),
1516
typeof(CommitRewriteInfo),
1617
typeof(CompareOptions),
1718
typeof(Credentials),

‎LibGit2Sharp.Tests/RepositoryFixture.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,11 +237,11 @@ private static void AssertInitializedRepository(Repository repo, string expected
237237
Assert.Null(repo.Head.Tip);
238238

239239
Assert.Equal(0, repo.Commits.Count());
240-
Assert.Equal(0, repo.Commits.QueryBy(new Filter()).Count());
241-
Assert.Equal(0, repo.Commits.QueryBy(new Filter { Since = repo.Refs.Head }).Count());
242-
Assert.Equal(0, repo.Commits.QueryBy(new Filter { Since = repo.Head }).Count());
243-
Assert.Equal(0, repo.Commits.QueryBy(new Filter { Since = "HEAD" }).Count());
244-
Assert.Equal(0, repo.Commits.QueryBy(new Filter { Since = expectedHeadTargetIdentifier }).Count());
240+
Assert.Equal(0, repo.Commits.QueryBy(new CommitFilter()).Count());
241+
Assert.Equal(0, repo.Commits.QueryBy(new CommitFilter { Since = repo.Refs.Head }).Count());
242+
Assert.Equal(0, repo.Commits.QueryBy(new CommitFilter { Since = repo.Head }).Count());
243+
Assert.Equal(0, repo.Commits.QueryBy(new CommitFilter { Since = "HEAD" }).Count());
244+
Assert.Equal(0, repo.Commits.QueryBy(new CommitFilter { Since = expectedHeadTargetIdentifier }).Count());
245245

246246
Assert.Null(repo.Head["subdir/I-do-not-exist"]);
247247

‎LibGit2Sharp/Branch.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public virtual Commit Tip
126126
/// </summary>
127127
public virtual ICommitLog Commits
128128
{
129-
get { return repo.Commits.QueryBy(new Filter { Since = this }); }
129+
get { return repo.Commits.QueryBy(new CommitFilter { Since = this }); }
130130
}
131131

132132
/// <summary>

0 commit comments

Comments
 (0)
0