Making sure running processes don't hang Unity when the domain reload…

…s, part deux

Also ensuring that we get data from git commands that output progress
in stderr

.gitignore

@@ -8,4 +8,5 @@ _NCrunch_GitHub.Unity
 build/
 TestResult.xml
 submodules/
-*.stackdump
+*.stackdump
+*.lastcodeanalysissucceeded

src/GitHub.Api/Application/ApplicationConfiguration.cs

@@ -5,6 +5,8 @@ namespace GitHub.Unity
     public static class ApplicationConfiguration
     {
         public const int DefaultWebTimeout = 3000;
+        public const int DefaultGitTimeout = 5000;
         public static int WebTimeout { get; set; } = DefaultWebTimeout;
+        public static int GitTimeout { get; set; } = DefaultGitTimeout;
     }
 }

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -7,7 +7,7 @@
 
 namespace GitHub.Unity
 {
-    abstract class ApplicationManagerBase : IApplicationManager
+    class ApplicationManagerBase : IApplicationManager
     {
         protected static ILogging Logger { get; } = LogHelper.GetLogger<IApplicationManager>();
 
@@ -45,9 +45,10 @@ protected void Initialize()
         {
             LogHelper.TracingEnabled = UserSettings.Get(Constants.TraceLoggingKey, false);
             ApplicationConfiguration.WebTimeout = UserSettings.Get(Constants.WebTimeoutKey, ApplicationConfiguration.WebTimeout);
+            ApplicationConfiguration.GitTimeout = UserSettings.Get(Constants.GitTimeoutKey, ApplicationConfiguration.GitTimeout);
             Platform.Initialize(ProcessManager, TaskManager);
             progress.OnProgress += progressReporter.UpdateProgress;
-            UsageTracker = new UsageTracker(TaskManager, UserSettings, Environment, InstanceId.ToString());
+            UsageTracker = new UsageTracker(TaskManager, GitClient, ProcessManager, UserSettings, Environment, InstanceId.ToString());
 
 #if ENABLE_METRICS
             var metricsService = new MetricsService(ProcessManager,
@@ -191,7 +192,6 @@ public void SetupGit(GitInstaller.GitInstallationState state)
                 if (Environment.RepositoryPath.IsInitialized)
                 {
                     ConfigureMergeSettings();
-                    CaptureRepoSize();
 
                     GitClient.LfsInstall()
                         .Catch(e =>
@@ -300,37 +300,6 @@ private void ConfigureMergeSettings()
             }).RunSynchronously();
         }
 
-        private void CaptureRepoSize()
-        {
-            GitClient.CountObjects()
-                     .Finally((success, gitObjects) =>
-                     {
-                         if (success)
-                         {
-                             UsageTracker.UpdateRepoSize(gitObjects.kilobytes);
-                         }
-                     })
-                     .Start();
-
-            var gitLfsDataPath = Environment.RepositoryPath.Combine(".git", "lfs");
-            if (gitLfsDataPath.Exists())
-            {
-                var diskUsageTask = Environment.IsWindows
-                    ? (IProcessTask<int>)new WindowsDiskUsageTask(gitLfsDataPath, TaskManager.Token)
-                    : new LinuxDiskUsageTask(gitLfsDataPath, TaskManager.Token);
-
-                diskUsageTask
-                    .Configure(ProcessManager)
-                    .Finally((success, kilobytes) =>
-                    {
-                        if (success)
-                        {
-                            UsageTracker.UpdateLfsDiskUsage(kilobytes);
-                        }
-                    }).Start();
-            }
-        }
-
         public void RestartRepository()
         {
             if (!Environment.RepositoryPath.IsInitialized)
@@ -346,8 +315,8 @@ public void RestartRepository()
             Logger.Trace($"Got a repository? {(Environment.Repository != null ? Environment.Repository.LocalPath : "null")}");
         }
 
-        protected abstract void InitializeUI();
-        protected abstract void InitializationComplete();
+        protected virtual void InitializeUI() {}
+        protected virtual void InitializationComplete() {}
 
         private bool disposed = false;
         protected virtual void Dispose(bool disposing)
@@ -356,6 +325,10 @@ protected virtual void Dispose(bool disposing)
             {
                 if (disposed) return;
                 disposed = true;
+                if (ProcessManager != null)
+                {
+                    ProcessManager.Stop();
+                }
                 if (TaskManager != null)
                 {
                     TaskManager.Dispose();

src/GitHub.Api/Git/GitClient.cs

@@ -38,7 +38,7 @@ public interface IGitClient
         ITask<List<GitLogEntry>> Log(BaseOutputListProcessor<GitLogEntry> processor = null);
         ITask<TheVersion> Version(IOutputProcessor<TheVersion> processor = null);
         ITask<TheVersion> LfsVersion(IOutputProcessor<TheVersion> processor = null);
-        ITask<GitCountObjects> CountObjects(IOutputProcessor<GitCountObjects> processor = null);
+        ITask<int> CountObjects(IOutputProcessor<int> processor = null);
         ITask<GitUser> SetConfigNameAndEmail(string username, string email);
         ITask<string> GetHead(IOutputProcessor<string> processor = null);
     }
@@ -100,7 +100,7 @@ public ITask<TheVersion> LfsVersion(IOutputProcessor<TheVersion> processor = nul
                 .Configure(processManager);
         }
 
-        public ITask<GitCountObjects> CountObjects(IOutputProcessor<GitCountObjects> processor = null)
+        public ITask<int> CountObjects(IOutputProcessor<int> processor = null)
         {
             return new GitCountObjectsTask(cancellationToken, processor)
                 .Configure(processManager);
@@ -151,7 +151,7 @@ public ITask<GitUser> SetConfigNameAndEmail(string username, string email)
         public ITask<List<GitLock>> ListLocks(bool local, BaseOutputListProcessor<GitLock> processor = null)
         {
             return new GitListLocksTask(local, cancellationToken, processor)
-                .Configure(processManager);
+                .Configure(processManager, environment.GitLfsExecutablePath);
         }
 
         public ITask<string> Pull(string remote, string branch, IOutputProcessor<string> processor = null)
@@ -301,14 +301,14 @@ public ITask<string> Lock(NPath file,
             IOutputProcessor<string> processor = null)
         {
             return new GitLockTask(file, cancellationToken, processor)
-                .Configure(processManager);
+                .Configure(processManager, environment.GitLfsExecutablePath);
         }
 
         public ITask<string> Unlock(NPath file, bool force,
             IOutputProcessor<string> processor = null)
         {
             return new GitUnlockTask(file, force, cancellationToken, processor)
-                .Configure(processManager);
+                .Configure(processManager, environment.GitLfsExecutablePath);
         }
 
         public ITask<string> GetHead(IOutputProcessor<string> processor = null)

src/GitHub.Api/Git/Repository.cs

@@ -188,9 +188,6 @@ public void Refresh(CacheType cacheType)
         {
             var cache = cacheContainer.GetCache(cacheType);
             cache.InvalidateData();
-
-            // Ensuring that the GitLock cache is kept up to date
-            cacheContainer.GetCache(CacheType.GitLocks).ValidateData();
         }
 
         private void CacheHasBeenInvalidated(CacheType cacheType)
@@ -309,7 +306,6 @@ private static GitBranch GetLocalGitBranch(string currentBranchName, ConfigBranc
         {
             var branchName = x.Name;
             var trackingName = x.IsTracking ? x.Remote.Value.Name + "/" + branchName : "[None]";
-            var isActive = branchName == currentBranchName;
             return new GitBranch(branchName, trackingName);
         }
 
@@ -504,4 +500,4 @@ public string Email
 
         protected static ILogging Logger { get; } = LogHelper.GetLogger<User>();
     }
-}
+}

src/GitHub.Api/Git/RepositoryManager.cs

@@ -195,6 +195,11 @@ public ITask CommitFiles(List<string> files, string message, string body)
         public ITask Fetch(string remote)
         {
             var task = GitClient.Fetch(remote);
+            task.OnEnd += (_, __, success, ___) =>
+            {
+                if (success)
+                    UpdateGitAheadBehindStatus().Start();
+            };
             return HookupHandlers(task, false);
         }
 
@@ -207,6 +212,11 @@ public ITask Pull(string remote, string branch)
         public ITask Push(string remote, string branch)
         {
             var task = GitClient.Push(remote, branch);
+            task.OnEnd += (_, __, success, ___) =>
+            {
+                if (success)
+                    UpdateGitAheadBehindStatus().Start();
+            };
             return HookupHandlers(task, false);
         }
 

src/GitHub.Api/Git/Tasks/GitCountObjectsTask.cs

@@ -2,11 +2,11 @@
 
 namespace GitHub.Unity
 {
-    class GitCountObjectsTask : ProcessTask<GitCountObjects>
+    class GitCountObjectsTask : ProcessTask<int>
     {
         private const string TaskName = "git count-objects";
 
-        public GitCountObjectsTask(CancellationToken token, IOutputProcessor<GitCountObjects> processor = null)
+        public GitCountObjectsTask(CancellationToken token, IOutputProcessor<int> processor = null)
             : base(token, processor ?? new GitCountObjectsProcessor())
         {
             Name = TaskName;
@@ -19,4 +19,4 @@ public override string ProcessArguments
         public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } }
         public override string Message { get; set; } = "Counting git objects...";
     }
-}
+}

src/GitHub.Api/Git/Tasks/GitListLocksTask.cs

@@ -4,18 +4,19 @@ namespace GitHub.Unity
 {
     class GitListLocksTask : ProcessTaskWithListOutput<GitLock>
     {
+        private const string TaskName = "git lfs locks";
         private readonly string args;
 
         public GitListLocksTask(bool local,
             CancellationToken token, BaseOutputListProcessor<GitLock> processor = null)
             : base(token, processor ?? new LocksOutputProcessor())
         {
-            args = "lfs locks --json";
+            Name = TaskName;
+            args = "locks --json";
             if (local)
             {
                 args += " --local";
             }
-            Name = args;
         }
 
         public override string ProcessArguments => args;

src/GitHub.Api/Git/Tasks/GitLockTask.cs

@@ -14,7 +14,7 @@ public GitLockTask(string path,
         {
             Name = TaskName;
             Guard.ArgumentNotNullOrWhiteSpace(path, "path");
-            arguments = String.Format("lfs lock \"{0}\"", path);
+            arguments = String.Format("lock \"{0}\"", path);
         }
 
         public override string ProcessArguments => arguments;

src/GitHub.Api/Git/Tasks/GitUnlockTask.cs

@@ -15,7 +15,7 @@ public GitUnlockTask(NPath path, bool force,
             Guard.ArgumentNotNullOrWhiteSpace(path, "path");
 
             Name = TaskName;
-            var stringBuilder = new StringBuilder("lfs unlock ");
+            var stringBuilder = new StringBuilder("unlock ");
 
             if (force)
             {

src/GitHub.Api/GitHub.Api.csproj

@@ -25,7 +25,7 @@
     <DefineConstants>DEBUG;TRACE;$(BuildDefs)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
   </PropertyGroup>
@@ -91,7 +91,6 @@
     <Compile Include="Cache\CachingClasses.cs" />
     <Compile Include="Extensions\ActionExtensions.cs" />
     <Compile Include="Extensions\ListExtensions.cs" />
-    <Compile Include="Git\GitCountObjects.cs" />
     <Compile Include="Git\Tasks\GitCheckoutTask.cs" />
     <Compile Include="Git\GitAheadBehindStatus.cs" />
     <Compile Include="Git\Tasks\GitAheadBehindStatusTask.cs" />

src/GitHub.Api/Helpers/Constants.cs

@@ -10,6 +10,7 @@ static class Constants
         public const string GitInstallPathKey = "GitInstallPath";
         public const string TraceLoggingKey = "EnableTraceLogging";
         public const string WebTimeoutKey = "WebTimeout";
+        public const string GitTimeoutKey = "GitTimeout";
         public const string Iso8601Format = @"yyyy-MM-dd\THH\:mm\:ss.fffzzz";
         public const string Iso8601FormatZ = @"yyyy-MM-dd\THH\:mm\:ss\Z";
         public static readonly string[] Iso8601Formats = {

src/GitHub.Api/Metrics/UsageTracker.cs

@@ -105,15 +105,21 @@ private void SendUsage()
             }
 
             // if we're here, success!
-            lock(_lock)
+            lock (_lock)
             {
                 usageStore = usageLoader.Load(userId);
                 usageStore.LastSubmissionDate = currentTimeOffset;
                 usageStore.Model.RemoveReports(currentTimeOffset.Date);
                 usageLoader.Save(usageStore);
             }
+
+            // update the repo size for the current report, while we're at it
+            CaptureRepoSize();
         }
 
+        protected virtual void CaptureRepoSize()
+        {}
+
         public virtual void IncrementNumberOfStartups()
         {
             lock (_lock)
@@ -336,13 +342,39 @@ public bool Enabled
 
     class UsageTracker : UsageTrackerSync
     {
-        public UsageTracker(ITaskManager taskManager, ISettings userSettings,
+        public UsageTracker(ITaskManager taskManager, IGitClient gitClient, IProcessManager processManager,
+            ISettings userSettings,
             IEnvironment environment, string instanceId)
             : base(userSettings,
                    new UsageLoader(environment.UserCachePath.Combine(Constants.UsageFile)),
                    environment.UnityVersion, instanceId)
         {
             TaskManager = taskManager;
+            Environment = environment;
+            GitClient = gitClient;
+            ProcessManager = processManager;
+        }
+
+        protected override void CaptureRepoSize()
+        {
+            try
+            {
+                var gitSize = GitClient.CountObjects()
+                    .Catch(_ => true)
+                    .RunSynchronously();
+                base.UpdateRepoSize(gitSize);
+
+                var gitLfsDataPath = Environment.RepositoryPath.Combine(".git", "lfs");
+                if (gitLfsDataPath.Exists())
+                {
+                    var lfsSize = new LinuxDiskUsageTask(gitLfsDataPath, TaskManager.Token)
+                        .Configure(ProcessManager)
+                        .Catch(_ => true)
+                        .RunSynchronously();
+                    base.UpdateLfsDiskUsage(lfsSize);
+                }
+            }
+            catch {}
         }
 
         public override void IncrementApplicationMenuMenuItemCommandLine() => TaskManager.Run(base.IncrementApplicationMenuMenuItemCommandLine);
@@ -365,6 +397,9 @@ public UsageTracker(ITaskManager taskManager, ISettings userSettings,
         public override void UpdateRepoSize(int kilobytes) => TaskManager.Run(() => base.UpdateRepoSize(kilobytes));
 
         protected ITaskManager TaskManager { get; }
+        protected IEnvironment Environment { get; }
+        protected IGitClient GitClient { get; }
+        public IProcessManager ProcessManager { get; }
     }
 
     interface IUsageLoader