11using System ;
22using System . Collections . Generic ;
33using System . Diagnostics ;
4+ using System . Diagnostics . CodeAnalysis ;
5+ using System . Linq ;
46using System . Text . RegularExpressions ;
57using System . Threading . Tasks ;
68
@@ -20,23 +22,43 @@ public class GitMissingOrNotGitRepoException : RepoInspectionException
2022 /// <seealso cref="IRepoInspector"/>
2123 public sealed class GitRepoInspector : IRepoInspector
2224 {
25+ #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
26+ // TODO: Remove all of these enumerated permutations of the old optional args in 2.0.0
27+ [ ExcludeFromCodeCoverage ]
28+ [ Obsolete ( "Use FromPath(path, remote, log, commandRunner)" , error : false ) ]
29+ public static Task < GitRepoInspector > FromPath ( string path , ILogger ? log , ICommandRunner ? commandRunner )
30+ => FromPath ( path , "origin" , log , commandRunner ?? new SystemCommandRunner ( ) ) ;
31+ [ ExcludeFromCodeCoverage ]
32+ [ Obsolete ( "Use FromPath(path, remote, log, commandRunner)" , error : false ) ]
33+ public static Task < GitRepoInspector > FromPath ( string path , ILogger ? log )
34+ => FromPath ( path , "origin" , log , new SystemCommandRunner ( ) ) ;
35+ [ ExcludeFromCodeCoverage ]
36+ [ Obsolete ( "Use FromPath(path, remote, log, commandRunner)" , error : false ) ]
37+ public static Task < GitRepoInspector > FromPath ( string path , ICommandRunner ? commandRunner )
38+ => FromPath ( path , "origin" , null , commandRunner ?? new SystemCommandRunner ( ) ) ;
39+ [ ExcludeFromCodeCoverage ]
40+ [ Obsolete ( "Use FromPath(path, remote, log, commandRunner)" , error : false ) ]
41+ public static Task < GitRepoInspector > FromPath ( string path )
42+ => FromPath ( path , "origin" , null , new SystemCommandRunner ( ) ) ;
43+ #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
44+
2345 /// <summary>
2446 /// Creates an inspector from the specified path.
2547 /// </summary>
2648 /// <param name="path">The path of the Git repository.</param>
49+ /// <param name="remote">The remote endpoint.</param>
2750 /// <param name="log">A logger for diagnostics.</param>
28- /// <param name="commandRunner">A command runner to use. Defaults to <see cref="SystemCommandRunner"/> if null is given. </param>
51+ /// <param name="commandRunner">A command runner to use.</param>
2952 /// <exception cref="GitMissingOrNotGitRepoException">Thrown if the path is not a Git repository.</exception>
3053 /// <returns>A task containing the Git repo inspector.</returns>
31- public static async Task < GitRepoInspector > FromPath ( string path , ILogger ? log = null , ICommandRunner ? commandRunner = null )
54+ public static async Task < GitRepoInspector > FromPath ( string path , string remote , ILogger ? log , ICommandRunner commandRunner )
3255 {
33- commandRunner ??= new SystemCommandRunner ( ) ;
34-
3556 try
3657 {
3758 var ( root , _) = await commandRunner . Run ( path , "git" , new string [ ] { "rev-parse" , "--show-toplevel" } ) ;
3859 var ret = new GitRepoInspector (
3960 root ,
61+ remote ,
4062 log ,
4163 commandRunner ) ;
4264 await ret . CacheParents ( ) ;
@@ -60,10 +82,12 @@ public static async Task<GitRepoInspector> FromPath(string path, ILogger? log =
6082 public string Root { get ; }
6183 private Dictionary < Commit , Commit > CachedParents { get ; } = new ( ) ;
6284 private ( int depth , bool shallow , Commit deepest ) ? FetchDepth { get ; set ; }
85+ public string Remote { get ; }
6386
64- private GitRepoInspector ( string root , ILogger ? log , ICommandRunner commandRunner )
87+ private GitRepoInspector ( string root , string remote , ILogger ? log , ICommandRunner commandRunner )
6588 {
6689 Root = root ;
90+ Remote = remote ;
6791 Log = log ;
6892 CommandRunner = commandRunner ;
6993 }
@@ -169,11 +193,9 @@ private async Task Deepen()
169193 try
170194 {
171195 if ( DeepenFromCommitSupported )
172- _ = await Git ( "fetch" , "origin" , FetchDepth . Value . deepest . Id , $ "--depth={ deltaDepth } ") ;
196+ _ = await Git ( "fetch" , Remote , FetchDepth . Value . deepest . Id , $ "--depth={ deltaDepth } ") ;
173197 else
174- _ = await Git ( "fetch" , $ "--depth={ newDepth } ") ;
175-
176- await CacheParents ( ) ;
198+ _ = await Git ( "fetch" , Remote , $ "--depth={ newDepth } ") ;
177199 }
178200 catch ( CommandException ex )
179201 when (
@@ -226,9 +248,18 @@ private async Task CacheParents()
226248
227249 /// <inheritdoc/>
228250 public async Task < Commit ? > GetParent ( Commit commit )
251+ {
252+ var parents = await GetParents ( commit ) ;
253+ return parents
254+ . Select ( p => ( Commit ? ) p )
255+ . FirstOrDefault ( ) ;
256+ }
257+
258+ /// <inheritdoc/>
259+ public async Task < IReadOnlyList < Commit > > GetParents ( Commit commit )
229260 {
230261 if ( CachedParents . TryGetValue ( commit , out Commit ret ) )
231- return ret ;
262+ return new [ ] { ret } ;
232263
233264 var contents = await GetCommitObject ( commit ) ;
234265 var parent = ParseCommitObjectParent ( contents ) ;
@@ -237,7 +268,7 @@ private async Task CacheParents()
237268 CachedParents [ commit ] = parent . Value ;
238269
239270 Log ? . Verbatim ( $ "GetParent() -> { parent } ") ;
240- return parent ;
271+ return parent is not null ? new Commit [ ] { parent . Value } : Array . Empty < Commit > ( ) ;
241272 }
242273
243274 private static readonly Regex RefsTagRegex = new Regex (
@@ -265,7 +296,7 @@ public async Task<TagContainer> GetTags(QueryTarget queryTarget)
265296 try
266297 {
267298 Log ? . Verbatim ( $ "GetTags(): Reading remote tags.") ;
268- var ( response , _) = await Git ( "ls-remote" , "--tags" ) ;
299+ var ( response , _) = await Git ( "ls-remote" , "--tags" , Remote , "*" ) ;
269300
270301 foreach ( Tag tag in MatchTags ( response ) )
271302 {
@@ -308,5 +339,11 @@ public async Task FetchTag(Tag tag, string remote)
308339 else
309340 await Git ( "fetch" , remote , $ "refs/tags/{ tag . Name } :refs/tags/{ tag . Name } ") ;
310341 }
342+
343+ /// <inheritdoc/>
344+ public Task FetchTag ( Tag tag )
345+ {
346+ return FetchTag ( tag , Remote ) ;
347+ }
311348 }
312349}
0 commit comments