Revert to using Action<string> instead of IProgress

Author: jcansdale

src/GitHub.App/Services/PullRequestService.cs

@@ -186,20 +186,20 @@ public IObservable<Unit> Push(ILocalRepositoryModel repository)
             });
         }
 
-        public async Task<bool> SyncSubmodules(ILocalRepositoryModel repository, IProgress<string> progress)
+        public async Task<bool> SyncSubmodules(ILocalRepositoryModel repository, Action<string> progress)
         {
             var exitCode = await Where("git");
             if (exitCode != 0)
             {
-                progress.Report(App.Resources.CouldntFindGitOnPath);
+                progress(App.Resources.CouldntFindGitOnPath);
                 return false;
             }
 
             return await SyncSubmodules(repository.LocalPath, progress) == 0;
         }
 
         // LibGit2Sharp has limited submodule support so shelling out Git.exe for submodule commands.
-        async Task<int> SyncSubmodules(string workingDir, IProgress<string> progress)
+        async Task<int> SyncSubmodules(string workingDir, Action<string> progress)
         {
             var cmdArguments = "/C git submodule init & git submodule sync --recursive & git submodule update --recursive";
             var startInfo = new ProcessStartInfo("cmd", cmdArguments)
@@ -240,12 +240,12 @@ static Task<int> Where(string fileName)
             });
         }
 
-        static async Task ReadLinesAsync(TextReader reader, IProgress<string> progress)
+        static async Task ReadLinesAsync(TextReader reader, Action<string> progress)
         {
             string line;
             while ((line = await reader.ReadLineAsync()) != null)
             {
-                progress.Report(line);
+                progress(line);
             }
         }
 

src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs

@@ -683,11 +683,11 @@ async Task DoSyncSubmodules(object unused)
                 IsBusy = true;
                 usageTracker.IncrementCounter(x => x.NumberOfSyncSubmodules).Forget();
 
-                var progress = new CaptureProgress();
-                var complete = await pullRequestsService.SyncSubmodules(LocalRepository, progress);
+                var writer = new StringWriter(CultureInfo.CurrentCulture);
+                var complete = await pullRequestsService.SyncSubmodules(LocalRepository, writer.WriteLine);
                 if (!complete)
                 {
-                    throw new ApplicationException(progress.ToString());
+                    throw new ApplicationException(writer.ToString());
                 }
             }
             finally
@@ -696,18 +696,6 @@ async Task DoSyncSubmodules(object unused)
             }
         }
 
-        sealed class CaptureProgress : IProgress<string>, IDisposable
-        {
-            StringWriter writer = new StringWriter(CultureInfo.CurrentCulture);
-            public void Report(string value)
-            {
-                VisualStudio.Services.Dte.StatusBar.Text = value;
-                writer.WriteLine(value);
-            }
-            public override string ToString() => writer.ToString();
-            public void Dispose() => writer.Dispose();
-        }
-
         class CheckoutCommandState : IPullRequestCheckoutState
         {
             public CheckoutCommandState(string caption, string disabledMessage)

src/GitHub.Exports.Reactive/Services/IPullRequestService.cs

@@ -56,7 +56,7 @@ IObservable<IPullRequestModel> CreatePullRequest(IModelService modelService,
         /// Sync submodules on the current branch.
         /// </summary>
         /// <param name="repository">The repository.</param>
-        Task<bool> SyncSubmodules(ILocalRepositoryModel repository, IProgress<string> progress);
+        Task<bool> SyncSubmodules(ILocalRepositoryModel repository, Action<string> progress);
 
         /// <summary>
         /// Calculates the name of a local branch for a pull request avoiding clashes with existing branches.