Merge pull request #10 from openrails/feature/git-stdout

feat: More detailed git logging

Author: twpol

Git/Project.cs

@@ -10,12 +10,10 @@ namespace Open_Rails_Code_Bot.Git
     public class Project
     {
         string GitPath;
-        bool Verbose;
 
-        public Project(string gitPath, bool verbose)
+        public Project(string gitPath)
         {
             GitPath = gitPath;
-            Verbose = verbose;
         }
 
         public void Init(string repository)
@@ -56,7 +54,7 @@ public void Clean()
 
         public void Merge(string reference)
         {
-            RunCommand($"merge --no-edit --no-ff {reference}");
+            RunCommand($"merge --quiet --no-edit --no-ff {reference}");
         }
 
         public void Push(string reference)
@@ -132,40 +130,44 @@ public void SetBranchRef(string branch, string reference)
 
         void RunCommand(string command)
         {
-            foreach (var line in GetCommandOutput(command))
+            foreach (var line in GetCommandOutput(command, true))
             {
             }
         }
 
-        IEnumerable<string> GetCommandOutput(string command)
+        IEnumerable<string> GetCommandOutput(string command, bool printOutput = false)
         {
             var args = $"--no-pager {command}";
-            if (Verbose)
+            if (printOutput)
+                Console.WriteLine($"  > git {args}");
+            var git = new Process();
+            git.StartInfo.WorkingDirectory = GitPath;
+            git.StartInfo.FileName = "git";
+            git.StartInfo.Arguments = args;
+            git.StartInfo.UseShellExecute = false;
+            git.StartInfo.RedirectStandardOutput = true;
+            git.StartInfo.RedirectStandardError = true;
+            git.StartInfo.StandardOutputEncoding = Encoding.UTF8;
+            git.StartInfo.StandardErrorEncoding = Encoding.UTF8;
+            git.ErrorDataReceived += (sender, e) =>
             {
-                Console.WriteLine("```shell");
-                Console.WriteLine($"{GitPath}> git {args}");
-            }
-            var git = Process.Start(new ProcessStartInfo()
-            {
-                WorkingDirectory = GitPath,
-                FileName = "git",
-                Arguments = args,
-                StandardOutputEncoding = Encoding.UTF8,
-                RedirectStandardOutput = true,
-            });
+                if (e.Data?.Length > 0)
+                    Console.Error.WriteLine($"  ! {e.Data}");
+            };
+            git.Start();
+            git.BeginErrorReadLine();
             while (!git.StandardOutput.EndOfStream)
             {
-                yield return git.StandardOutput.ReadLine();
+                if (printOutput)
+                    Console.WriteLine($"  < {git.StandardOutput.ReadLine()}");
+                else
+                    yield return git.StandardOutput.ReadLine();
             }
             git.WaitForExit();
             if (git.ExitCode != 0)
             {
                 throw new ApplicationException($"git {command} failed: {git.ExitCode}");
             }
-            if (Verbose)
-            {
-                Console.WriteLine("```");
-            }
         }
     }
 }

Program.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -82,7 +82,8 @@ static async Task AsyncMain(IConfigurationRoot config)
                 Console.WriteLine($"  #{pullRequest.Number} {pullRequest.Title}");
             }
 
-            var git = new Git.Project(GetGitPath(), false);
+            Console.WriteLine("Preparing repository...");
+            var git = new Git.Project(GetGitPath());
             git.Init($"https://github.com/{gitHubConfig["organization"]}/{gitHubConfig["repository"]}.git");
             git.Fetch();
             git.ResetHard();
@@ -99,7 +100,7 @@ static async Task AsyncMain(IConfigurationRoot config)
             var autoMergePullRequestsFailure = new List<GraphPullRequest>();
             foreach (var pullRequest in autoMergePullRequests)
             {
-                Console.WriteLine($"Merging #{pullRequest.Number} {pullRequest.Title}");
+                Console.WriteLine($"Merging #{pullRequest.Number} {pullRequest.Title}...");
                 var mergeCommit = git.ParseRef($"pull/{pullRequest.Number}/head");
                 try
                 {
@@ -112,7 +113,7 @@ static async Task AsyncMain(IConfigurationRoot config)
                     autoMergePullRequestsFailure.Add(pullRequest);
                     git.ResetHard();
                     git.Clean();
-                    Console.WriteLine($"Error: {error.Message}");
+                    Console.WriteLine($"  Error: {error.Message}");
                 }
             }
             var autoMergeCommit = git.ParseRef("HEAD");
@@ -137,6 +138,7 @@ static async Task AsyncMain(IConfigurationRoot config)
             }
             else
             {
+                Console.WriteLine("Creating merge commit...");
                 var newMergeBranchMessage = String.Format(gitHubConfig["mergeMessageFormat"],
                     baseBranchVersion,
                     autoMergePullRequestsSuccess.Count,