Git branch validation (#30)

* Added branch validator

* close #28

Author: Aaronontheweb

src/Incrementalist.Cmd/Commands/EmitAffectedFoldersTask.cs

@@ -36,6 +36,19 @@ public async Task<IEnumerable<string>> Run()
             // load the git repository
             var repoResult = GitRunner.FindRepository(Settings.WorkingDirectory);
 
+            if (!repoResult.foundRepo)
+            {
+                Logger.LogError("Unable to find Git repository located in {0}. Shutting down.", Settings.WorkingDirectory);
+                return new List<string>();
+            }
+
+            // validate the target branch
+            if (!DiffHelper.HasBranch(repoResult.repo, Settings.TargetBranch))
+            {
+                Logger.LogError("Current git repository doesn't have any branch named [{0}]. Shutting down.", Settings.TargetBranch);
+                return new List<string>();
+            }
+
             // start the cancellation timer.
             _cts.CancelAfter(Settings.TimeoutDuration);
             var listAllFilesCmd = new ListAffectedFilesCmd(Logger, _cts.Token, Settings.TargetBranch);

src/Incrementalist.Cmd/Commands/EmitDependencyGraphTask.cs

@@ -7,6 +7,8 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Incrementalist.Git;
+using Incrementalist.ProjectSystem;
 using Incrementalist.ProjectSystem.Cmds;
 using Microsoft.CodeAnalysis.MSBuild;
 using Microsoft.Extensions.Logging;
@@ -39,6 +41,7 @@ public async Task<IEnumerable<string>> Run()
         {
             // start the cancellation timer.
             _cts.CancelAfter(Settings.TimeoutDuration);
+
             var loadSln = new LoadSolutionCmd(Logger, _workspace, _cts.Token);
             var slnFile = await loadSln.Process(Task.FromResult(Settings.SolutionFile));
 

src/Incrementalist.Cmd/Program.cs

@@ -5,11 +5,13 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using CommandLine;
 using Incrementalist.Cmd.Commands;
+using Incrementalist.Git;
 using Incrementalist.ProjectSystem;
 using LibGit2Sharp;
 using Microsoft.Build.Locator;
@@ -78,9 +80,25 @@ private static async Task<int> RunIncrementalist(SlnOptions options)
                     return -2;
                 }
 
+
                 var repoFolder = Repository.Discover(pwd);
                 var workingFolder = Directory.GetParent(repoFolder).Parent;
 
+                var repoResult = GitRunner.FindRepository(workingFolder.FullName);
+
+                if (!repoResult.foundRepo)
+                {
+                    Console.WriteLine("Unable to find Git repository located in {0}. Shutting down.", workingFolder.FullName);
+                    return -3;
+                }
+
+                // validate the target branch
+                if (!DiffHelper.HasBranch(repoResult.repo, options.GitBranch))
+                {
+                    Console.WriteLine("Current git repository doesn't have any branch named [{0}]. Shutting down.", options.GitBranch);
+                    return -4;
+                }
+
 
                 if (!string.IsNullOrEmpty(repoFolder))
                 {
@@ -137,7 +155,7 @@ private static async Task ProcessSln(SlnOptions options, string sln, DirectoryIn
 
         private static void HandleAffectedFiles(SlnOptions options, string affectedFilesStr)
         {
-// Check to see if we're planning on writing out to the file system or not.
+            // Check to see if we're planning on writing out to the file system or not.
             if (!string.IsNullOrEmpty(options.OutputFile))
                 File.WriteAllText(options.OutputFile, affectedFilesStr);
             else

src/Incrementalist.Tests/Git/GitBranchDetectionSpecs.cs

@@ -0,0 +1,36 @@
+// -----------------------------------------------------------------------
+// <copyright file="GitBranchDetectionSpecs.cs" company="Petabridge, LLC">
+//      Copyright (C) 2015 - 2019 Petabridge, LLC <https://petabridge.com>
+// </copyright>
+// -----------------------------------------------------------------------
+
+using System;
+using FluentAssertions;
+using Incrementalist.Git;
+using Incrementalist.Tests.Helpers;
+using Xunit;
+
+namespace Incrementalist.Tests.Git
+{
+    public class GitBranchDetectionSpecs : IDisposable
+    {
+        public GitBranchDetectionSpecs()
+        {
+            Repository = new DisposableRepository();
+        }
+
+        public void Dispose()
+        {
+            Repository?.Dispose();
+        }
+
+        public DisposableRepository Repository { get; }
+
+        [Fact(DisplayName = "Should detect existing Git branch")]
+        public void ShouldDetectExistingBranch()
+        {
+            Repository.CreateBranch("foo");
+            DiffHelper.HasBranch(Repository.Repository, "foo").Should().BeTrue();
+        }
+    }
+}

src/Incrementalist/Git/DiffHelper.cs

@@ -21,5 +21,10 @@ public static IEnumerable<string> ChangedFiles(Repository repo, string targetBra
             return repo.Diff.Compare<TreeChanges>(repo.Branches[targetBranch].Tip.Tree, DiffTargets.Index)
                 .Select(x => Path.GetFullPath(Path.Combine(repo.Info.WorkingDirectory, x.Path)));
         }
+
+        public static bool HasBranch(Repository repo, string targetBranch)
+        {
+            return repo.Branches.Any(x => x.FriendlyName.Equals(targetBranch));
+        }
     }
 }

src/Incrementalist/ProjectSystem/Cmds/FilterAffectedProjectFilesCmd.cs

@@ -41,9 +41,15 @@ protected override async Task<Dictionary<string, SlnFile>> ProcessImpl(
             var repoResult = GitRunner.FindRepository(_workingDirectory);
             if (!repoResult.foundRepo)
             {
-                var errMsg = $"Unable to find suitable git repository starting in directory {_workingDirectory}";
-                Logger.LogError(errMsg);
-                throw new InvalidOperationException(errMsg);
+                Logger.LogError("Unable to find Git repository located in {0}. Shutting down.", _workingDirectory);
+                return new Dictionary<string, SlnFile>();
+            }
+
+            // validate the target branch
+            if (!DiffHelper.HasBranch(repoResult.repo, _targetGitBranch))
+            {
+                Logger.LogError("Current git repository doesn't have any branch named [{0}]. Shutting down.", _targetGitBranch);
+                return new Dictionary<string, SlnFile>();
             }
 
             var repo = repoResult.repo;