Include process ID in command log

Motivated by issue reported in gitextensions#4256. Relates to gitextensions#4753.
drewnoakes · Jul 25, 2018 · ceca298 · ceca298
1 parent 6e2fd0c
commit ceca298
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/GitCommands/Git/GitCommandHelpers.cs b/GitCommands/Git/GitCommandHelpers.cs
@@ -89,6 +89,7 @@ internal static Process StartProcess(string fileName, string arguments, string w
             var startInfo = CreateProcessStartInfo(fileName, arguments, workingDirectory, outputEncoding);
             var process = Process.Start(startInfo);
             process.EnableRaisingEvents = true;
+            operation.SetProcessId(process.Id);
 
             void ProcessExited(object sender, EventArgs args)
             {

diff --git a/GitCommands/Git/GitModule.cs b/GitCommands/Git/GitModule.cs
@@ -515,9 +515,10 @@ private static Process StartProcess([NotNull] string fileName, [NotNull] string
             }
 
             var operation = CommandLog.LogProcessStart(fileName, arguments);
-            var startProcess = Process.Start(startInfo);
-            startProcess.Exited += (s, e) => operation.LogProcessEnd();
-            return startProcess;
+            var process = Process.Start(startInfo);
+            operation.SetProcessId(process.Id);
+            process.Exited += (s, e) => operation.LogProcessEnd();
+            return process;
         }
 
         [NotNull]

diff --git a/GitCommands/Logging/CommandLog.cs b/GitCommands/Logging/CommandLog.cs
@@ -30,6 +30,12 @@ public void LogProcessEnd()
             _entry.Duration = _stopwatch.Elapsed;
             _raiseCommandsChanged();
         }
+
+        public void SetProcessId(int processId)
+        {
+            _entry.ProcessId = processId;
+            _raiseCommandsChanged();
+        }
     }
 
     public sealed class CommandLogEntry
@@ -39,6 +45,7 @@ public sealed class CommandLogEntry
         private DateTime StartedAt { get; }
         public bool IsOnMainThread { get; }
         public TimeSpan? Duration { get; internal set; }
+        public int? ProcessId { get; set; }
 
         internal CommandLogEntry(string fileName, string arguments, DateTime startedAt, bool isOnMainThread)
         {
@@ -61,7 +68,7 @@ public override string ToString()
                 fileName = "git";
             }
 
-            return $"{StartedAt:HH:mm:ss.fff} {duration,7} {(IsOnMainThread ? "UI" : "  ")} {fileName} {Arguments}";
+            return $"{StartedAt:HH:mm:ss.fff} {duration,7} {ProcessId?.ToString("#D,-5") ?? "     "} {(IsOnMainThread ? "UI" : "  ")} {fileName} {Arguments}";
         }
     }
 

diff --git a/GitUI/Script/PowerShellHelper.cs b/GitUI/Script/PowerShellHelper.cs
@@ -9,21 +9,21 @@ public static class PowerShellHelper
         internal static void RunPowerShell(string command, string argument, string workingDir, bool runInBackground)
         {
             const string filename = "powershell.exe";
-            var psarguments = (runInBackground ? "" : "-NoExit") + " -ExecutionPolicy Unrestricted -Command \"" + command + " " + argument + "\"";
+            var arguments = (runInBackground ? "" : "-NoExit") + " -ExecutionPolicy Unrestricted -Command \"" + command + " " + argument + "\"";
             EnvironmentConfiguration.SetEnvironmentVariables();
 
             var startInfo = new ProcessStartInfo
             {
                 FileName = filename,
-                Arguments = psarguments,
+                Arguments = arguments,
                 WorkingDirectory = workingDir,
                 UseShellExecute = false
             };
 
-            var operation = CommandLog.LogProcessStart(filename, psarguments);
-            var startProcess = Process.Start(startInfo);
-
-            startProcess.Exited += (s, e) => operation.LogProcessEnd();
+            var operation = CommandLog.LogProcessStart(filename, arguments);
+            var process = Process.Start(startInfo);
+            operation.SetProcessId(process.Id);
+            process.Exited += (s, e) => operation.LogProcessEnd();
         }
     }
 }
diff --git a/GitUI/UserControls/EditboxBasedConsoleOutputControl.cs b/GitUI/UserControls/EditboxBasedConsoleOutputControl.cs
@@ -127,7 +127,7 @@ public override void StartProcess(string command, string arguments, string workd
 
                 var operation = CommandLog.LogProcessStart(command, arguments);
                 process.Exited += (s, e) => operation.LogProcessEnd();
-
+                operation.SetProcessId(process.Id);
                 process.Start();
                 _process = process;
                 process.BeginOutputReadLine();