Skip to content

Commit fa6d7ec

Browse files
committed
cleanup
1 parent 9d114ab commit fa6d7ec

File tree

13 files changed

+34
-34
lines changed

13 files changed

+34
-34
lines changed

src/GitVersion.LibGit2Sharp/Git/Commit.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,40 @@ internal class Commit : ICommit
99
private static readonly LambdaEqualityHelper<ICommit> equalityHelper = new(x => x.Id);
1010
private static readonly LambdaKeyComparer<ICommit, string> comparerHelper = new(x => x.Sha);
1111

12-
private readonly LibGit2Sharp.Commit innerObjectId;
12+
private readonly LibGit2Sharp.Commit innerCommit;
1313

14-
internal Commit(LibGit2Sharp.Commit objectId) => innerObjectId = objectId;
14+
internal Commit(LibGit2Sharp.Commit objectId) => innerCommit = objectId;
1515

1616
public int CompareTo(ICommit other) => comparerHelper.Compare(this, other);
1717
public override bool Equals(object obj) => Equals((obj as ICommit)!);
1818
public bool Equals(ICommit other) => equalityHelper.Equals(this, other);
1919
public override int GetHashCode() => equalityHelper.GetHashCode(this);
2020

21-
public static implicit operator LibGit2Sharp.Commit(Commit d) => d.innerObjectId;
21+
public static implicit operator LibGit2Sharp.Commit(Commit d) => d.innerCommit;
2222

2323
public virtual IEnumerable<ICommit?> Parents
2424
{
2525
get
2626
{
27-
if (innerObjectId == null) yield return null;
27+
if (innerCommit == null) yield return null;
2828
else
29-
foreach (var parent in innerObjectId.Parents)
29+
foreach (var parent in innerCommit.Parents)
3030
yield return new Commit(parent);
3131
}
3232
}
3333

34-
public virtual string Sha => innerObjectId.Sha;
34+
public virtual string Sha => innerCommit.Sha;
3535

3636
public virtual IObjectId? Id
3737
{
3838
get
3939
{
40-
var objectId = innerObjectId.Id;
40+
var objectId = innerCommit.Id;
4141
return objectId is null ? null : new ObjectId(objectId);
4242
}
4343
}
4444

45-
public virtual DateTimeOffset CommitterWhen => innerObjectId.Committer.When;
46-
public virtual string Message => innerObjectId.Message;
45+
public virtual DateTimeOffset When => innerCommit.Committer.When;
46+
public virtual string Message => innerCommit.Message;
4747
}
4848
}

src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public virtual IEnumerator<ICommit> GetEnumerator()
1818

1919
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
2020

21-
public IEnumerable<ICommit> GetCommitsPriorTo(DateTimeOffset olderThan) => this.SkipWhile(c => c.CommitterWhen > olderThan);
21+
public IEnumerable<ICommit> GetCommitsPriorTo(DateTimeOffset olderThan) => this.SkipWhile(c => c.When > olderThan);
2222
public virtual ICommitCollection QueryBy(CommitFilter commitFilter)
2323
{
2424
static object? GetReacheableFrom(object item)

src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static ICommit CreateMockCommit()
3434
commit.Sha.Returns(objectId.Sha);
3535
commit.Message.Returns("Commit " + commitCount++);
3636
commit.Parents.Returns(Enumerable.Empty<ICommit>());
37-
commit.CommitterWhen.Returns(when.AddSeconds(1));
37+
commit.When.Returns(when.AddSeconds(1));
3838
return commit;
3939
}
4040
public static IBranch CreateMockBranch(string name, params ICommit[] commits)

src/GitVersionCore.Tests/IntegrationTests/IgnoreBeforeScenarios.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ public void ShouldFallbackToBaseVersionWhenAllCommitsAreIgnored()
1919
var objectId = fixture.Repository.MakeACommit();
2020
var commit = Substitute.For<ICommit>();
2121
commit.Sha.Returns(objectId.Sha);
22-
commit.CommitterWhen.Returns(DateTimeOffset.Now);
22+
commit.When.Returns(DateTimeOffset.Now);
2323

2424
var config = new ConfigurationBuilder()
2525
.Add(new Config
2626
{
2727
Ignore = new IgnoreConfig
2828
{
29-
Before = commit.CommitterWhen.AddMinutes(1)
29+
Before = commit.When.AddMinutes(1)
3030
}
3131
}).Build();
3232

src/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void ChoosesHighestVersionReturnedFromStrategies()
3333

3434
baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
3535
baseVersion.ShouldIncrement.ShouldBe(true);
36-
baseVersion.BaseVersionSource.CommitterWhen.ShouldBe(dateTimeOffset);
36+
baseVersion.BaseVersionSource.When.ShouldBe(dateTimeOffset);
3737
}
3838

3939
[Test]
@@ -55,7 +55,7 @@ public void UsesWhenFromNextBestMatchIfHighestDoesntHaveWhen()
5555

5656
baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
5757
baseVersion.ShouldIncrement.ShouldBe(true);
58-
baseVersion.BaseVersionSource.CommitterWhen.ShouldBe(when);
58+
baseVersion.BaseVersionSource.When.ShouldBe(when);
5959
}
6060

6161
[Test]
@@ -77,7 +77,7 @@ public void UsesWhenFromNextBestMatchIfHighestDoesntHaveWhenReversedOrder()
7777

7878
baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
7979
baseVersion.ShouldIncrement.ShouldBe(true);
80-
baseVersion.BaseVersionSource.CommitterWhen.ShouldBe(when);
80+
baseVersion.BaseVersionSource.When.ShouldBe(when);
8181
}
8282

8383
[Test]
@@ -220,7 +220,7 @@ public V1Strategy(DateTimeOffset? when)
220220
if (when != null)
221221
{
222222
this.when = GitToolsTestingExtensions.CreateMockCommit();
223-
this.when.CommitterWhen.Returns(when.Value);
223+
this.when.When.Returns(when.Value);
224224
}
225225
else
226226
{
@@ -243,7 +243,7 @@ public V2Strategy(DateTimeOffset? when)
243243
if (when != null)
244244
{
245245
this.when = GitToolsTestingExtensions.CreateMockCommit();
246-
this.when.CommitterWhen.Returns(when.Value);
246+
this.when.When.Returns(when.Value);
247247
}
248248
else
249249
{

src/GitVersionCore/Core/Abstractions/Git/ICommit.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public interface ICommit : IEquatable<ICommit>, IComparable<ICommit>
88
IEnumerable<ICommit> Parents { get; }
99
string Sha { get; }
1010
IObjectId Id { get; }
11-
DateTimeOffset CommitterWhen { get; }
11+
DateTimeOffset When { get; }
1212
string Message { get; }
1313
}
1414
}

src/GitVersionCore/Core/RepositoryMetadataProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ public IEnumerable<Tuple<ITag, SemanticVersion>> GetValidVersionTags(string tagP
371371
if (commit == null)
372372
continue;
373373

374-
if (olderThan.HasValue && commit.CommitterWhen > olderThan.Value)
374+
if (olderThan.HasValue && commit.When > olderThan.Value)
375375
continue;
376376

377377
if (SemanticVersion.TryParse(tag.FriendlyName, tagPrefixRegex, out var semver))
@@ -435,7 +435,7 @@ private IEnumerable<BranchCommit> GetMergeCommitsForBranch(IBranch branch, Confi
435435
return new BranchCommit(findMergeBase, otherBranch);
436436
})
437437
.Where(b => b.Commit != null)
438-
.OrderByDescending(b => b.Commit.CommitterWhen)
438+
.OrderByDescending(b => b.Commit.When)
439439
.ToList();
440440
mergeBaseCommitsCache.Add(branch, branchMergeBases);
441441

src/GitVersionCore/Helpers/KeyComparer.cs renamed to src/GitVersionCore/Helpers/LambdaKeyComparer.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ namespace GitVersion.Helpers
55
{
66
public class LambdaKeyComparer<TSource, TKey> : Comparer<TSource> where TSource : class
77
{
8-
private readonly Func<TSource, TKey> _keySelector;
9-
private readonly IComparer<TKey> _innerComparer;
8+
private readonly Func<TSource, TKey> keySelector;
9+
private readonly IComparer<TKey> innerComparer;
1010

1111
public LambdaKeyComparer(
1212
Func<TSource, TKey> keySelector,
1313
IComparer<TKey> innerComparer = null)
1414
{
15-
_keySelector = keySelector;
16-
_innerComparer = innerComparer ?? Comparer<TKey>.Default;
15+
this.keySelector = keySelector;
16+
this.innerComparer = innerComparer ?? Comparer<TKey>.Default;
1717
}
1818

1919
public override int Compare(TSource x, TSource y)
@@ -25,9 +25,9 @@ public override int Compare(TSource x, TSource y)
2525
if (y == null)
2626
return 1;
2727

28-
var xKey = _keySelector(x);
29-
var yKey = _keySelector(y);
30-
return _innerComparer.Compare(xKey, yKey);
28+
var xKey = keySelector(x);
29+
var yKey = keySelector(y);
30+
return innerComparer.Compare(xKey, yKey);
3131
}
3232
}
3333
}

src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public BaseVersion GetBaseVersion()
5858
BaseVersion baseVersionWithOldestSource;
5959
if (matchingVersionsOnceIncremented.Any())
6060
{
61-
var oldest = matchingVersionsOnceIncremented.Aggregate((v1, v2) => v1.Version.BaseVersionSource.CommitterWhen < v2.Version.BaseVersionSource.CommitterWhen ? v1 : v2);
61+
var oldest = matchingVersionsOnceIncremented.Aggregate((v1, v2) => v1.Version.BaseVersionSource.When < v2.Version.BaseVersionSource.When ? v1 : v2);
6262
baseVersionWithOldestSource = oldest.Version;
6363
maxVersion = oldest;
6464
log.Info($"Found multiple base versions which will produce the same SemVer ({maxVersion.IncrementedVersion}), taking oldest source for commit counting ({baseVersionWithOldestSource.Source})");
@@ -68,7 +68,7 @@ public BaseVersion GetBaseVersion()
6868
baseVersionWithOldestSource = versions
6969
.Where(v => v.Version.BaseVersionSource != null)
7070
.OrderByDescending(v => v.IncrementedVersion)
71-
.ThenByDescending(v => v.Version.BaseVersionSource.CommitterWhen)
71+
.ThenByDescending(v => v.Version.BaseVersionSource.When)
7272
.First()
7373
.Version;
7474
}

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public MergeMessageVersionStrategy(ILog log, Lazy<GitVersionContext> versionCont
2424

2525
public override IEnumerable<BaseVersion> GetVersions()
2626
{
27-
var commitsPriorToThan = Context.CurrentBranch.Commits.GetCommitsPriorTo(Context.CurrentCommit.CommitterWhen);
27+
var commitsPriorToThan = Context.CurrentBranch.Commits.GetCommitsPriorTo(Context.CurrentCommit.When);
2828
var baseVersions = commitsPriorToThan
2929
.SelectMany(c =>
3030
{

0 commit comments

Comments
 (0)