Updated to GitReader 0.12.0.

kekyo · Jun 11, 2023 · 636f6e5 · 636f6e5
1 parent 4614b87
commit 636f6e5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/CenterCLR.RelaxVersioner.Core/Analyzer.cs b/CenterCLR.RelaxVersioner.Core/Analyzer.cs
@@ -11,6 +11,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 using GitReader.Structures;
@@ -35,9 +36,9 @@ public override string ToString() =>
     }
 
     public static async Task<Version> LookupVersionLabelAsync(
-        Branch targetBranch)
+        Branch targetBranch, CancellationToken ct)
     {
-        var topCommit = targetBranch.Head;
+        var topCommit = await targetBranch.GetHeadCommitAsync(ct);
 
         var reached = new HashSet<Commit>();
         var scheduled = new Stack<TargetCommit>();
@@ -62,7 +63,7 @@ public static async Task<Version> LookupVersionLabelAsync(
                 }
 
                 // If found be applied tags at this commit:
-                if (currentCommit.Tags.Length >= 1)
+                if (currentCommit.Tags.Count >= 1)
                 {
                     var filteredTags = currentCommit.Tags.
                         Select(tag => Version.TryParse(tag.Name, out var version) ? (Version?)version : null).
@@ -78,7 +79,7 @@ public static async Task<Version> LookupVersionLabelAsync(
                 }
 
                 // Found parents.
-                if (await currentCommit.GetParentCommitsAsync() is { Length: >= 1 } parents)
+                if (await currentCommit.GetParentCommitsAsync(ct) is { Length: >= 1 } parents)
                 {
                     // Dive parent commit.
                     currentDepth++;

diff --git a/CenterCLR.RelaxVersioner.Core/CenterCLR.RelaxVersioner.Core.csproj b/CenterCLR.RelaxVersioner.Core/CenterCLR.RelaxVersioner.Core.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitReader" Version="0.7.0" />
+    <PackageReference Include="GitReader" Version="0.12.0" />
     <PackageReference Include="NamingFormatter" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
     <PackageReference Include="RelaxVersioner" Version="2.14.0" PrivateAssets="all" />

diff --git a/CenterCLR.RelaxVersioner.Core/Processor.cs b/CenterCLR.RelaxVersioner.Core/Processor.cs
@@ -19,6 +19,7 @@
 using GitReader.Structures;
 
 using RelaxVersioner.Writers;
+using System.Threading;
 
 namespace RelaxVersioner;
 
@@ -78,12 +79,15 @@ private static async Task<Result> WriteVersionSourceFileAsync(
         Branch targetBranch,
         DateTimeOffset generated,
         IEnumerable<Rule> ruleSet,
-        IEnumerable<string> importSet)
+        IEnumerable<string> importSet,
+        CancellationToken ct)
     {
         Debug.Assert(ruleSet != null);
         Debug.Assert(importSet != null);
 
-        var commit = targetBranch?.Head;
+        var commit = targetBranch != null ?
+            await targetBranch.GetHeadCommitAsync(ct) :
+            null;
 
         var commitId = commit?.Hash.ToString() ?? string.Empty;
 
@@ -110,7 +114,7 @@ static string FormatSignature(Signature? sig) => sig is { } s ?
         var epochIntDateVersion = Utilities.GetEpochIntDateVersionFromDate(commitDate);
 
         var versionLabelTask = targetBranch is { } ?
-            Analyzer.LookupVersionLabelAsync(targetBranch) :
+            Analyzer.LookupVersionLabelAsync(targetBranch, ct) :
             Task.FromResult(Version.Default);
         var keyValues =
             (!string.IsNullOrWhiteSpace(context.PropertiesPath) &&
@@ -173,7 +177,8 @@ static string FormatSignature(Signature? sig) => sig is { } s ?
             commit.Body);
     }
 
-    public async Task<Result> RunAsync(ProcessorContext context)
+    public async Task<Result> RunAsync(
+        ProcessorContext context, CancellationToken ct)
     {
         var writer = writers[context.Language];
 
@@ -195,10 +200,11 @@ public async Task<Result> RunAsync(ProcessorContext context)
                 logger,
                 writer,
                 context,
-                repository.GetHead(),
+                repository.Head,
                 DateTimeOffset.Now,
                 ruleSet,
-                importSet);
+                importSet,
+                ct);
         }
         finally
         {

diff --git a/CenterCLR.RelaxVersioner/Program.cs b/CenterCLR.RelaxVersioner/Program.cs
@@ -70,7 +70,7 @@ public static async Task<int> Main(string[] args)
 
             context.ProjectDirectory = trails[0];
 
-            var result = await processor.RunAsync(context);
+            var result = await processor.RunAsync(context, default);
 
             var dryrunDisplay = string.IsNullOrWhiteSpace(context.OutputPath) ?
                 " (dryrun)" : string.Empty;