fix: Save before executing git command doesn't work anymore in VS2022 #75

Samir Boulema · Samir Boulema · commit d3bcbecaf0b8 · 2022-06-01T20:21:17.000+02:00
diff --git a/TGit/Commands/Context/AddFileCommand.cs b/TGit/Commands/Context/AddFileCommand.cs
@@ -10,6 +10,8 @@ internal sealed class AddFileCommand : BaseCommand<AddFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitFileCommand("add");
         }
     }
diff --git a/TGit/Commands/Context/BlameFileCommand.cs b/TGit/Commands/Context/BlameFileCommand.cs
@@ -10,6 +10,8 @@ internal sealed class BlameFileCommand : BaseCommand<BlameFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitFileCommand("blame", $"/line:{await FileHelper.GetActiveDocumentCurrentLine()}");
         }
     }
diff --git a/TGit/Commands/Context/CommitFileCommand.cs b/TGit/Commands/Context/CommitFileCommand.cs
@@ -10,6 +10,8 @@ internal sealed class CommitFileCommand : BaseCommand<CommitFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             var options = await General.GetLiveInstanceAsync();
             var commitMessage = await GitHelper.GetCommitMessage(options.CommitMessage);
             var bugId = await GitHelper.GetCommitMessage(options.BugId);
diff --git a/TGit/Commands/Context/DiffFileCommand.cs b/TGit/Commands/Context/DiffFileCommand.cs
@@ -10,6 +10,8 @@ internal sealed class DiffFileCommand : BaseCommand<DiffFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitFileCommand("diff");
         }
     }
diff --git a/TGit/Commands/Context/FetchFileCommand.cs b/TGit/Commands/Context/FetchFileCommand.cs
@@ -10,6 +10,8 @@ internal sealed class FetchFileCommand : BaseCommand<FetchFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitFileCommand("fetch");
         }
     }
diff --git a/TGit/Commands/Context/MergeFileCommand.cs b/TGit/Commands/Context/MergeFileCommand.cs
@@ -10,6 +10,8 @@ internal sealed class MergeFileCommand : BaseCommand<MergeFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitFileCommand("merge");
         }
     }
diff --git a/TGit/Commands/Context/PrefDiffFileCommand.cs b/TGit/Commands/Context/PrefDiffFileCommand.cs
@@ -11,6 +11,8 @@ internal sealed class PrefDiffFileCommand : BaseCommand<PrefDiffFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             var filePath = await FileHelper.GetActiveDocumentFilePath();
             var exactFilePath = FileHelper.GetExactFileName(filePath);
 
diff --git a/TGit/Commands/Context/PullFileCommand.cs b/TGit/Commands/Context/PullFileCommand.cs
@@ -10,6 +10,8 @@ internal sealed class PullFileCommand : BaseCommand<PullFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitFileCommand("pull");
         }
     }
diff --git a/TGit/Commands/Context/RevGraphFileCommand.cs b/TGit/Commands/Context/RevGraphFileCommand.cs
@@ -10,6 +10,8 @@ internal sealed class RevGraphFileCommand : BaseCommand<RevGraphFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitFileCommand("revisiongraph");
         }
     }
diff --git a/TGit/Commands/Context/RevertFileCommand.cs b/TGit/Commands/Context/RevertFileCommand.cs
@@ -10,6 +10,8 @@ internal sealed class RevertFileCommand : BaseCommand<RevertFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitFileCommand("revert");
         }
     }
diff --git a/TGit/Commands/Context/ShowLogFileCommand.cs b/TGit/Commands/Context/ShowLogFileCommand.cs
@@ -10,6 +10,8 @@ internal sealed class ShowLogFileCommand : BaseCommand<ShowLogFileCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitFileCommand("log");
         }
     }
diff --git a/TGit/Commands/MainMenu/AbortMergeCommand.cs b/TGit/Commands/MainMenu/AbortMergeCommand.cs
@@ -10,6 +10,8 @@ internal sealed class AbortMergeCommand : BaseCommand<AbortMergeCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("merge", "/abort");
         }
     }
diff --git a/TGit/Commands/MainMenu/ApplyStashCommand.cs b/TGit/Commands/MainMenu/ApplyStashCommand.cs
@@ -11,6 +11,8 @@ internal sealed class ApplyStashCommand : BaseCommand<ApplyStashCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("reflog", "/ref:refs/stash");
         }
 
diff --git a/TGit/Commands/MainMenu/BranchCommand.cs b/TGit/Commands/MainMenu/BranchCommand.cs
@@ -10,6 +10,8 @@ internal sealed class BranchCommand : BaseCommand<BranchCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("branch");
         }
     }
diff --git a/TGit/Commands/MainMenu/BrowseRefCommand.cs b/TGit/Commands/MainMenu/BrowseRefCommand.cs
@@ -10,6 +10,8 @@ internal sealed class BrowseRefCommand : BaseCommand<BrowseRefCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("refbrowse");
         }
     }
diff --git a/TGit/Commands/MainMenu/CleanupCommand.cs b/TGit/Commands/MainMenu/CleanupCommand.cs
@@ -10,6 +10,8 @@ internal sealed class CleanupCommand : BaseCommand<CleanupCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("cleanup");
         }
     }
diff --git a/TGit/Commands/MainMenu/CommitCommand.cs b/TGit/Commands/MainMenu/CommitCommand.cs
@@ -10,6 +10,8 @@ internal sealed class CommitCommand : BaseCommand<CommitCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             var options = await General.GetLiveInstanceAsync();
             var commitMessage = await GitHelper.GetCommitMessage(options.CommitMessage);
             var bugId = await GitHelper.GetCommitMessage(options.BugId);
diff --git a/TGit/Commands/MainMenu/CreateStashCommand.cs b/TGit/Commands/MainMenu/CreateStashCommand.cs
@@ -10,6 +10,8 @@ internal sealed class CreateStashCommand : BaseCommand<CreateStashCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("stashsave");
         }
     }
diff --git a/TGit/Commands/MainMenu/DiskBrowserCommand.cs b/TGit/Commands/MainMenu/DiskBrowserCommand.cs
@@ -10,6 +10,8 @@ internal sealed class DiskBrowserCommand : BaseCommand<DiskBrowserCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             ProcessHelper.Start(await FileHelper.GetSolutionDir());
         }
     }
diff --git a/TGit/Commands/MainMenu/FetchCommand.cs b/TGit/Commands/MainMenu/FetchCommand.cs
@@ -10,6 +10,8 @@ internal sealed class FetchCommand : BaseCommand<FetchCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("fetch");
         }
     }
diff --git a/TGit/Commands/MainMenu/MergeCommand.cs b/TGit/Commands/MainMenu/MergeCommand.cs
@@ -10,6 +10,8 @@ internal sealed class MergeCommand : BaseCommand<MergeCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("merge");
         }
     }
diff --git a/TGit/Commands/MainMenu/PullCommand.cs b/TGit/Commands/MainMenu/PullCommand.cs
@@ -10,6 +10,8 @@ internal sealed class PullCommand : BaseCommand<PullCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("pull");
         }
     }
diff --git a/TGit/Commands/MainMenu/PushCommand.cs b/TGit/Commands/MainMenu/PushCommand.cs
@@ -10,6 +10,8 @@ internal sealed class PushCommand : BaseCommand<PushCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("push");
         }
     }
diff --git a/TGit/Commands/MainMenu/RebaseCommand.cs b/TGit/Commands/MainMenu/RebaseCommand.cs
@@ -10,6 +10,8 @@ internal sealed class RebaseCommand : BaseCommand<RebaseCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("rebase");
         }
     }
diff --git a/TGit/Commands/MainMenu/RepoBrowserCommand.cs b/TGit/Commands/MainMenu/RepoBrowserCommand.cs
@@ -10,6 +10,8 @@ internal sealed class RepoBrowserCommand : BaseCommand<RepoBrowserCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("repobrowser");
         }
     }
diff --git a/TGit/Commands/MainMenu/ResolveCommand.cs b/TGit/Commands/MainMenu/ResolveCommand.cs
@@ -10,6 +10,8 @@ internal sealed class ResolveCommand : BaseCommand<ResolveCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("resolve");
         }
     }
diff --git a/TGit/Commands/MainMenu/RevGraphCommand.cs b/TGit/Commands/MainMenu/RevGraphCommand.cs
@@ -10,6 +10,8 @@ internal sealed class RevGraphCommand : BaseCommand<RevGraphCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("revisiongraph");
         }
     }
diff --git a/TGit/Commands/MainMenu/RevertCommand.cs b/TGit/Commands/MainMenu/RevertCommand.cs
@@ -10,6 +10,8 @@ internal sealed class RevertCommand : BaseCommand<RevertCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("revert");
         }
     }
diff --git a/TGit/Commands/MainMenu/ShowChangesCommand.cs b/TGit/Commands/MainMenu/ShowChangesCommand.cs
@@ -10,6 +10,8 @@ internal sealed class ShowChangesCommand : BaseCommand<ShowChangesCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("repostatus");
         }
     }
diff --git a/TGit/Commands/MainMenu/ShowLogCommand.cs b/TGit/Commands/MainMenu/ShowLogCommand.cs
@@ -10,6 +10,8 @@ internal sealed class ShowLogCommand : BaseCommand<ShowLogCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("log");
         }
     }
diff --git a/TGit/Commands/MainMenu/StashPopCommand.cs b/TGit/Commands/MainMenu/StashPopCommand.cs
@@ -11,6 +11,8 @@ internal sealed class StashPopCommand : BaseCommand<StashPopCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("stashpop");
         }
 
diff --git a/TGit/Commands/MainMenu/SwitchCommand.cs b/TGit/Commands/MainMenu/SwitchCommand.cs
@@ -10,6 +10,8 @@ internal sealed class SwitchCommand : BaseCommand<SwitchCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("switch");
         }
     }
diff --git a/TGit/Commands/MainMenu/SyncCommand.cs b/TGit/Commands/MainMenu/SyncCommand.cs
@@ -10,6 +10,8 @@ internal sealed class SyncCommand : BaseCommand<SyncCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("sync");
         }
     }
diff --git a/TGit/Commands/MainMenu/TagCommand.cs b/TGit/Commands/MainMenu/TagCommand.cs
@@ -10,6 +10,8 @@ internal sealed class TagCommand : BaseCommand<TagCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("tag");
         }
     }
diff --git a/TGit/Commands/SVN/SVNDCommitCommand.cs b/TGit/Commands/SVN/SVNDCommitCommand.cs
@@ -10,6 +10,8 @@ internal sealed class SVNDCommitCommand : BaseCommand<SVNDCommitCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("svndcommit");
         }
     }
diff --git a/TGit/Commands/SVN/SVNFetchCommand.cs b/TGit/Commands/SVN/SVNFetchCommand.cs
@@ -10,6 +10,8 @@ internal sealed class SVNFetchCommand : BaseCommand<SVNFetchCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("svnfetch");
         }
     }
diff --git a/TGit/Commands/SVN/SVNRebaseCommand.cs b/TGit/Commands/SVN/SVNRebaseCommand.cs
@@ -10,6 +10,8 @@ internal sealed class SVNRebaseCommand : BaseCommand<SVNRebaseCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
+            await CommandHelper.SaveFiles();
+
             await ProcessHelper.RunTortoiseGitCommand("svnrebase");
         }
     }
diff --git a/TGit/Helpers/CommandHelper.cs b/TGit/Helpers/CommandHelper.cs
@@ -1,6 +1,8 @@
-﻿using Microsoft.VisualStudio.Shell;
+﻿using Community.VisualStudio.Toolkit;
+using Microsoft.VisualStudio.Shell;
 using System;
 using System.ComponentModel.Design;
+using System.Threading.Tasks;
 
 namespace SamirBoulema.TGit.Helpers
 {
@@ -25,5 +27,17 @@ public static async void GitHubFlow_BeforeQueryStatus(object sender, EventArgs e
 
         public static async void GitSvn_BeforeQueryStatus(object sender, EventArgs e) 
             => ((OleMenuCommand)sender).Visible = await FileHelper.HasSolutionDir() && await GitHelper.IsGitSvn();
+
+        public static async Task<bool> SaveFiles()
+        {
+            var options = await General.GetLiveInstanceAsync();
+
+            if (!options.SaveFiles)
+            {
+                return false;
+            }
+
+            return await KnownCommands.File_SaveAll.ExecuteAsync();
+        }
     }
 }
diff --git a/TGit/Options/General.cs b/TGit/Options/General.cs
@@ -51,5 +51,10 @@ public class General : BaseOptionModel<General>
         [DisplayName("Default bug id")]
         [Description("$(BranchName), $(FeatureName), https://msdn.microsoft.com/en-us/library/c02as0cs.aspx")]
         public string BugId { get; set; }
+
+        [Category("TGit")]
+        [DisplayName("Save files before operations")]
+        [Description("Save files before doing any Git operation")]
+        public bool SaveFiles { get; set; }
     }
 }
diff --git a/TGit/TGit.csproj b/TGit/TGit.csproj
@@ -351,15 +351,15 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Community.VisualStudio.Toolkit.15">
-      <Version>15.0.445</Version>
+      <Version>15.0.455</Version>
     </PackageReference>
     <PackageReference Include="Community.VisualStudio.VSCT">
       <Version>16.0.29.6</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
-      <Version>17.1.4057</Version>
+      <Version>17.2.2186</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ internal sealed class AddFileCommand : BaseCommand<AddFileCommand>`
`10`	`10`	`{`
`11`	`11`	`protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)`
`12`	`12`	`{`
	`13`	`+ await CommandHelper.SaveFiles();`
	`14`	`+`
`13`	`15`	`await ProcessHelper.RunTortoiseGitFileCommand("add");`
`14`	`16`	`}`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ internal sealed class PrefDiffFileCommand : BaseCommand<PrefDiffFileCommand>`
`11`	`11`	`{`
`12`	`12`	`protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)`
`13`	`13`	`{`
	`14`	`+ await CommandHelper.SaveFiles();`
	`15`	`+`
`14`	`16`	`var filePath = await FileHelper.GetActiveDocumentFilePath();`
`15`	`17`	`var exactFilePath = FileHelper.GetExactFileName(filePath);`
`16`	`18`