Use Community Toolkit for options retrieval, Use correct KnownCommands

sboulema · Jul 30, 2021 · ce74efb · ce74efb
1 parent 49177c7
commit ce74efb
Show file tree

Hide file tree

Showing 60 changed files with 187 additions and 172 deletions.
diff --git a/TGit/Commands/Context/AddFileCommand.cs b/TGit/Commands/Context/AddFileCommand.cs
@@ -11,9 +11,9 @@ internal sealed class AddFileCommand : BaseCommand<AddFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "add");
+            await ProcessHelper.RunTortoiseGitFileCommand("add");
         }
     }
 }
diff --git a/TGit/Commands/Context/BlameFileCommand.cs b/TGit/Commands/Context/BlameFileCommand.cs
@@ -11,9 +11,9 @@ internal sealed class BlameFileCommand : BaseCommand<BlameFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "blame", $"/line:{await FileHelper.GetActiveDocumentCurrentLine()}");
+            await ProcessHelper.RunTortoiseGitFileCommand("blame", $"/line:{await FileHelper.GetActiveDocumentCurrentLine()}");
         }
     }
 }
diff --git a/TGit/Commands/Context/CommitFileCommand.cs b/TGit/Commands/Context/CommitFileCommand.cs
@@ -11,17 +11,17 @@ internal sealed class CommitFileCommand : BaseCommand<CommitFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            var options = (OptionPageGrid)Package.GetDialogPage(typeof(OptionPageGrid));
+            var options = await General.GetLiveInstanceAsync();
             var commitMessage = await GitHelper.GetCommitMessage(options.CommitMessage);
             var bugId = await GitHelper.GetCommitMessage(options.BugId);
             var gitConfig = await GitHelper.GetGitConfig();
 
             var args = $"{(string.IsNullOrEmpty(commitMessage) ? string.Empty : $"/logmsg:\"{commitMessage}\"")} " +
                 $"{(!string.IsNullOrEmpty(bugId) && !string.IsNullOrEmpty(gitConfig.BugTraqMessage) ? $"/bugid:\"{bugId}\"" : string.Empty)}";
 
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "commit", args);
+            await ProcessHelper.RunTortoiseGitFileCommand("commit", args);
         }
     }
 }
diff --git a/TGit/Commands/Context/DeleteFileCommand.cs b/TGit/Commands/Context/DeleteFileCommand.cs
@@ -10,7 +10,7 @@ internal sealed class DeleteFileCommand : BaseCommand<DeleteFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "remove");
+            await ProcessHelper.RunTortoiseGitFileCommand("remove");
         }
     }
 }
diff --git a/TGit/Commands/Context/DeleteKeepFileCommand.cs b/TGit/Commands/Context/DeleteKeepFileCommand.cs
@@ -10,7 +10,7 @@ internal sealed class DeleteKeepFileCommand : BaseCommand<DeleteKeepFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "remove", "/keep");
+            await ProcessHelper.RunTortoiseGitFileCommand("remove", "/keep");
         }
     }
 }
diff --git a/TGit/Commands/Context/DiffFileCommand.cs b/TGit/Commands/Context/DiffFileCommand.cs
@@ -11,9 +11,9 @@ internal sealed class DiffFileCommand : BaseCommand<DiffFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "diff");
+            await ProcessHelper.RunTortoiseGitFileCommand("diff");
         }
     }
 }
diff --git a/TGit/Commands/Context/FetchFileCommand.cs b/TGit/Commands/Context/FetchFileCommand.cs
@@ -11,9 +11,9 @@ internal sealed class FetchFileCommand : BaseCommand<FetchFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "fetch");
+            await ProcessHelper.RunTortoiseGitFileCommand("fetch");
         }
     }
 }
diff --git a/TGit/Commands/Context/MergeFileCommand.cs b/TGit/Commands/Context/MergeFileCommand.cs
@@ -11,9 +11,9 @@ internal sealed class MergeFileCommand : BaseCommand<MergeFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "merge");
+            await ProcessHelper.RunTortoiseGitFileCommand("merge");
         }
     }
 }
diff --git a/TGit/Commands/Context/PrefDiffFileCommand.cs b/TGit/Commands/Context/PrefDiffFileCommand.cs
@@ -12,7 +12,7 @@ internal sealed class PrefDiffFileCommand : BaseCommand<PrefDiffFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
             var filePath = await FileHelper.GetActiveDocumentFilePath();
             var exactFilePath = FileHelper.GetExactFileName(filePath);
@@ -25,7 +25,7 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
                 return;
             }
 
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "diff", $"/startrev:{revisions.Split(',')[0]} /endrev:{revisions.Split(',')[1]}", exactFilePath);
+            await ProcessHelper.RunTortoiseGitFileCommand("diff", $"/startrev:{revisions.Split(',')[0]} /endrev:{revisions.Split(',')[1]}", exactFilePath);
         }
     }
 }
diff --git a/TGit/Commands/Context/PullFileCommand.cs b/TGit/Commands/Context/PullFileCommand.cs
@@ -11,9 +11,9 @@ internal sealed class PullFileCommand : BaseCommand<PullFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "pull");
+            await ProcessHelper.RunTortoiseGitFileCommand("pull");
         }
     }
 }
diff --git a/TGit/Commands/Context/RepoBrowserFileCommand.cs b/TGit/Commands/Context/RepoBrowserFileCommand.cs
@@ -10,7 +10,7 @@ internal sealed class RepoBrowserFileCommand : BaseCommand<RepoBrowserFileComman
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "repobrowser");
+            await ProcessHelper.RunTortoiseGitFileCommand("repobrowser");
         }
     }
 }
diff --git a/TGit/Commands/Context/RevGraphFileCommand.cs b/TGit/Commands/Context/RevGraphFileCommand.cs
@@ -10,7 +10,7 @@ internal sealed class RevGraphFileCommand : BaseCommand<RevGraphFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "revisiongraph");
+            await ProcessHelper.RunTortoiseGitFileCommand("revisiongraph");
         }
     }
 }
diff --git a/TGit/Commands/Context/RevertFileCommand.cs b/TGit/Commands/Context/RevertFileCommand.cs
@@ -11,9 +11,9 @@ internal sealed class RevertFileCommand : BaseCommand<RevertFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "revert");
+            await ProcessHelper.RunTortoiseGitFileCommand("revert");
         }
     }
 }
diff --git a/TGit/Commands/Context/ShowLogFileCommand.cs b/TGit/Commands/Context/ShowLogFileCommand.cs
@@ -10,7 +10,7 @@ internal sealed class ShowLogFileCommand : BaseCommand<ShowLogFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await ProcessHelper.RunTortoiseGitFileCommand(Package, "log");
+            await ProcessHelper.RunTortoiseGitFileCommand("log");
         }
     }
 }
diff --git a/TGit/Commands/GitFlow/GitFlowFinishFeatureCommand.cs b/TGit/Commands/GitFlow/GitFlowFinishFeatureCommand.cs
@@ -13,7 +13,7 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
             var featureBranch = await GitHelper.GetCurrentBranchName(false);
             var featureName = await GitHelper.GetCurrentBranchName(true);
             var gitConfig = await GitHelper.GetGitConfig();
-            var options = ProcessHelper.GetOptions(Package);
+            var options = await General.GetLiveInstanceAsync();
 
             /* 1. Switch to the develop branch
              * 2. Pull latest changes on develop
@@ -30,7 +30,7 @@ await GitHelper.GetSshSetup() +
                     (options.PullChanges ? GitHelper.FormatCliCommand("pull") : string.Empty) +
                     GitHelper.FormatCliCommand($"merge --no-ff {featureBranch}", false),
                 $"Finishing feature {featureName}",
-                featureBranch, null, options, GitHelper.FormatCliCommand($"push origin {gitConfig.DevelopBranch}")
+                featureBranch, null, GitHelper.FormatCliCommand($"push origin {gitConfig.DevelopBranch}")
             );
         }
 

diff --git a/TGit/Commands/GitFlow/GitFlowFinishFeatureGitHubCommand.cs b/TGit/Commands/GitFlow/GitFlowFinishFeatureGitHubCommand.cs
@@ -12,7 +12,7 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
             var featureBranch = await GitHelper.GetCurrentBranchName(false);
             var featureName = await GitHelper.GetCurrentBranchName(true);
-            var options = ProcessHelper.GetOptions(Package);
+            var options = await General.GetLiveInstanceAsync();
 
             /* 1. Switch to the master branch
              * 2. Pull latest changes on master
@@ -29,7 +29,7 @@ await GitHelper.GetSshSetup() +
                     (options.PullChanges ? GitHelper.FormatCliCommand("pull") : string.Empty) +
                     GitHelper.FormatCliCommand($"merge --no-ff {featureBranch}", false),
                 $"Finishing feature {featureName}",
-                featureBranch, null, options, GitHelper.FormatCliCommand("push origin master"));
+                featureBranch, null, GitHelper.FormatCliCommand("push origin master"));
         }
 
         protected override async void BeforeQueryStatus(System.EventArgs e)

diff --git a/TGit/Commands/GitFlow/GitFlowFinishHotfixCommand.cs b/TGit/Commands/GitFlow/GitFlowFinishHotfixCommand.cs
@@ -14,7 +14,7 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
             var hotfixBranch = await GitHelper.GetCurrentBranchName(false);
             var hotfixName = await GitHelper.GetCurrentBranchName(true);
             var gitConfig = await GitHelper.GetGitConfig();
-            var options = ProcessHelper.GetOptions(Package);
+            var options = await General.GetLiveInstanceAsync();
 
             var tagMessage = string.Empty;
 
@@ -48,11 +48,10 @@ await GitHelper.GetSshSetup() +
                     (options.PullChanges ? GitHelper.FormatCliCommand("pull") : string.Empty) +
                     GitHelper.FormatCliCommand($"merge --no-ff {hotfixBranch}", false),
                 $"Finishing hotfix {hotfixName}",
-                hotfixBranch, null, options,
+                hotfixBranch, null,
                     GitHelper.FormatCliCommand($"push origin {gitConfig.DevelopBranch}") +
                     GitHelper.FormatCliCommand($"push origin {gitConfig.MasterBranch}") +
-                    GitHelper.FormatCliCommand($"push origin {gitConfig.TagPrefix}{hotfixName}"),
-                    Package
+                    GitHelper.FormatCliCommand($"push origin {gitConfig.TagPrefix}{hotfixName}")
             );
         }
 

diff --git a/TGit/Commands/GitFlow/GitFlowFinishReleaseCommand.cs b/TGit/Commands/GitFlow/GitFlowFinishReleaseCommand.cs
@@ -14,7 +14,7 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
             var releaseBranch = await GitHelper.GetCurrentBranchName(false);
             var releaseName = await GitHelper.GetCurrentBranchName(true);
             var gitConfig = await GitHelper.GetGitConfig();
-            var options = ProcessHelper.GetOptions(Package);
+            var options = await General.GetLiveInstanceAsync();
 
             var tagMessage = string.Empty;
 
@@ -48,11 +48,10 @@ await GitHelper.GetSshSetup() +
                     (options.PullChanges ? GitHelper.FormatCliCommand("pull") : string.Empty) +
                     GitHelper.FormatCliCommand($"merge --no-ff {releaseBranch}", false),
                 $"Finishing release {releaseName}",
-                releaseBranch, null, options,
+                releaseBranch, null,
                     GitHelper.FormatCliCommand($"push origin {gitConfig.DevelopBranch}") +
                     GitHelper.FormatCliCommand($"push origin {gitConfig.MasterBranch}") +
-                    GitHelper.FormatCliCommand($"push origin {gitConfig.TagPrefix}{releaseName}"),
-                    Package
+                    GitHelper.FormatCliCommand($"push origin {gitConfig.TagPrefix}{releaseName}")
             );
         }
 

diff --git a/TGit/Commands/GitFlow/GitFlowStartFeatureCommand.cs b/TGit/Commands/GitFlow/GitFlowStartFeatureCommand.cs
@@ -19,7 +19,7 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
             }
 
             var flowOptions = await GitHelper.GetGitConfig();
-            var options = ProcessHelper.GetOptions(Package);
+            var options = await General.GetLiveInstanceAsync();
 
             /* 1. Switch to the develop branch
              * 2. Pull latest changes on develop

diff --git a/TGit/Commands/GitFlow/GitFlowStartFeatureGitHubCommand.cs b/TGit/Commands/GitFlow/GitFlowStartFeatureGitHubCommand.cs
@@ -18,7 +18,7 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
                 return;
             }
 
-            var options = ProcessHelper.GetOptions(Package);
+            var options = await General.GetLiveInstanceAsync();
 
             /* 1. Switch to the master branch
              * 2. Pull latest changes on master

diff --git a/TGit/Commands/GitFlow/GitFlowStartHotfixCommand.cs b/TGit/Commands/GitFlow/GitFlowStartHotfixCommand.cs
@@ -19,7 +19,7 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
             }
 
             var flowOptions = await GitHelper.GetGitConfig();
-            var options = ProcessHelper.GetOptions(Package);
+            var options = await General.GetLiveInstanceAsync();
 
             /* 1. Switch to the master branch
              * 2. Pull latest changes on master

diff --git a/TGit/Commands/GitFlow/GitFlowStartReleaseCommand.cs b/TGit/Commands/GitFlow/GitFlowStartReleaseCommand.cs
@@ -19,7 +19,7 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
             }
 
             var flowOptions = await GitHelper.GetGitConfig();
-            var options = ProcessHelper.GetOptions(Package);
+            var options = await General.GetLiveInstanceAsync();
 
             /* 1. Switch to the develop branch
              * 2. Pull latest changes on develop

diff --git a/TGit/Commands/MainMenu/AbortMergeCommand.cs b/TGit/Commands/MainMenu/AbortMergeCommand.cs
@@ -11,9 +11,9 @@ internal sealed class AbortMergeCommand : BaseCommand<AbortMergeCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitCommand(Package, "merge", "/abort");
+            await ProcessHelper.RunTortoiseGitCommand("merge", "/abort");
         }
     }
 }
diff --git a/TGit/Commands/MainMenu/ApplyStashCommand.cs b/TGit/Commands/MainMenu/ApplyStashCommand.cs
@@ -12,9 +12,9 @@ internal sealed class ApplyStashCommand : BaseCommand<ApplyStashCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitCommand(Package, "reflog", "/ref:refs/stash");
+            await ProcessHelper.RunTortoiseGitCommand("reflog", "/ref:refs/stash");
         }
 
         protected override async void BeforeQueryStatus(EventArgs e)

diff --git a/TGit/Commands/MainMenu/BranchCommand.cs b/TGit/Commands/MainMenu/BranchCommand.cs
@@ -11,9 +11,9 @@ internal sealed class BranchCommand : BaseCommand<BranchCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitCommand(Package, "branch");
+            await ProcessHelper.RunTortoiseGitCommand("branch");
         }
     }
 }
diff --git a/TGit/Commands/MainMenu/BrowseRefCommand.cs b/TGit/Commands/MainMenu/BrowseRefCommand.cs
@@ -11,9 +11,9 @@ internal sealed class BrowseRefCommand : BaseCommand<BrowseRefCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitCommand(Package, "refbrowse");
+            await ProcessHelper.RunTortoiseGitCommand("refbrowse");
         }
     }
 }
diff --git a/TGit/Commands/MainMenu/CleanupCommand.cs b/TGit/Commands/MainMenu/CleanupCommand.cs
@@ -11,9 +11,9 @@ internal sealed class CleanupCommand : BaseCommand<CleanupCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitCommand(Package, "cleanup");
+            await ProcessHelper.RunTortoiseGitCommand("cleanup");
         }
     }
 }
diff --git a/TGit/Commands/MainMenu/CommitCommand.cs b/TGit/Commands/MainMenu/CommitCommand.cs
@@ -11,17 +11,17 @@ internal sealed class CommitCommand : BaseCommand<CommitCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            var options = (OptionPageGrid)Package.GetDialogPage(typeof(OptionPageGrid));
+            var options = await General.GetLiveInstanceAsync();
             var commitMessage = await GitHelper.GetCommitMessage(options.CommitMessage);
             var bugId = await GitHelper.GetCommitMessage(options.BugId);
             var gitConfig = await GitHelper.GetGitConfig();
 
             var args = $"{(string.IsNullOrEmpty(commitMessage) ? string.Empty : $"/logmsg:\"{commitMessage}\"")} " +
                 $"{(!string.IsNullOrEmpty(bugId) && !string.IsNullOrEmpty(gitConfig.BugTraqMessage) ? $"/bugid:\"{bugId}\"" : string.Empty)}";
 
-            await ProcessHelper.RunTortoiseGitCommand(Package, "commit", args);
+            await ProcessHelper.RunTortoiseGitCommand("commit", args);
         }
     }
 }
diff --git a/TGit/Commands/MainMenu/CreateStashCommand.cs b/TGit/Commands/MainMenu/CreateStashCommand.cs
@@ -11,9 +11,9 @@ internal sealed class CreateStashCommand : BaseCommand<CreateStashCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitCommand(Package, "stashsave");
+            await ProcessHelper.RunTortoiseGitCommand("stashsave");
         }
     }
 }
diff --git a/TGit/Commands/MainMenu/DiskBrowserCommand.cs b/TGit/Commands/MainMenu/DiskBrowserCommand.cs
@@ -11,7 +11,7 @@ internal sealed class DiskBrowserCommand : BaseCommand<DiskBrowserCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
             ProcessHelper.Start(await FileHelper.GetSolutionDir());
         }

diff --git a/TGit/Commands/MainMenu/FetchCommand.cs b/TGit/Commands/MainMenu/FetchCommand.cs
@@ -11,9 +11,9 @@ internal sealed class FetchCommand : BaseCommand<FetchCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await KnownCommands.File_SaveSelectedItems.ExecuteAsync();
+            await KnownCommands.File_SaveAll.ExecuteAsync();
 
-            await ProcessHelper.RunTortoiseGitCommand(Package, "fetch");
+            await ProcessHelper.RunTortoiseGitCommand("fetch");
         }
     }
 }