#49 Commands cleanup

sboulema · Feb 1, 2019 · 7ab8b0d · 7ab8b0d
1 parent 8ab783b
commit 7ab8b0d
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 149 deletions.
diff --git a/TGit/Commands/ContextMenuCommands.cs b/TGit/Commands/ContextMenuCommands.cs
@@ -29,11 +29,8 @@ public void AddCommands()
             CommandHelper.AddCommand(_mcs, PkgCmdIDList.DiskBrowserContext, DiskBrowserContextCommand, ActiveDocument_BeforeQueryStatus);
             CommandHelper.AddCommand(_mcs, PkgCmdIDList.RepoBrowserContext, RepoBrowserContextCommand, ActiveDocument_BeforeQueryStatus);
             CommandHelper.AddCommand(_mcs, PkgCmdIDList.RevGraphContext, RevGraphContextCommand, ActiveDocument_BeforeQueryStatus);
-
             CommandHelper.AddCommand(_mcs, PkgCmdIDList.BlameContext, BlameContextCommand, ActiveDocument_BeforeQueryStatus);
-
             CommandHelper.AddCommand(_mcs, PkgCmdIDList.MergeContext, MergeContextCommand, ActiveDocument_BeforeQueryStatus);
-
             CommandHelper.AddCommand(_mcs, PkgCmdIDList.PullContext, PullContextCommand, ActiveDocument_BeforeQueryStatus);
             CommandHelper.AddCommand(_mcs, PkgCmdIDList.FetchContext, FetchContextCommand, ActiveDocument_BeforeQueryStatus);
             CommandHelper.AddCommand(_mcs, PkgCmdIDList.CommitContext, CommitContextCommand, ActiveDocument_BeforeQueryStatus);
@@ -51,7 +48,7 @@ private void ShowLogContextCommand(object sender, EventArgs e)
             if (string.IsNullOrEmpty(currentFilePath)) return;
             if (!_dte.ActiveDocument.Saved)
                 _dte.ActiveDocument.Save();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:log /path:\"{currentFilePath}\" /closeonend:{_generalOptions.CloseOnEnd}");
+            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:log /closeonend:{_generalOptions.CloseOnEnd}", currentFilePath);
         }
         private void DiskBrowserContextCommand(object sender, EventArgs e)
         {
@@ -63,13 +60,13 @@ private void RepoBrowserContextCommand(object sender, EventArgs e)
         {
             var currentFilePath = _dte.ActiveDocument.FullName;
             if (string.IsNullOrEmpty(currentFilePath)) return;
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:repobrowser /path:\"{currentFilePath}\"");
+            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:repobrowser", currentFilePath);
         }
         private void RevGraphContextCommand(object sender, EventArgs e)
         {
             var currentFilePath = _dte.ActiveDocument.FullName;
             if (string.IsNullOrEmpty(currentFilePath)) return;
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:revisiongraph /path:\"{currentFilePath}\"");
+            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:revisiongraph", currentFilePath);
         }
         private void BlameContextCommand(object sender, EventArgs e)
         {
@@ -78,31 +75,31 @@ private void BlameContextCommand(object sender, EventArgs e)
             if (string.IsNullOrEmpty(currentFilePath)) return;
             if (!_dte.ActiveDocument.Saved)
                 _dte.ActiveDocument.Save();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:blame /path:\"{currentFilePath}\" /line:{currentLineIndex}");
+            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:blame /line:{currentLineIndex}", currentFilePath);
         }
         private void MergeContextCommand(object sender, EventArgs e)
         {
             var currentFilePath = _dte.ActiveDocument.FullName;
             if (string.IsNullOrEmpty(currentFilePath)) return;
             if (!_dte.ActiveDocument.Saved)
                 _dte.ActiveDocument.Save();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:merge /path:\"{currentFilePath}\"");
+            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:merge", currentFilePath);
         }
         private void PullContextCommand(object sender, EventArgs e)
         {
             var currentFilePath = _dte.ActiveDocument.FullName;
             if (string.IsNullOrEmpty(currentFilePath)) return;
             if (!_dte.ActiveDocument.Saved)
                 _dte.ActiveDocument.Save();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:pull /path:\"{currentFilePath}\"");
+            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:pull", currentFilePath);
         }
         private void FetchContextCommand(object sender, EventArgs e)
         {
             var currentFilePath = _dte.ActiveDocument.FullName;
             if (string.IsNullOrEmpty(currentFilePath)) return;
             if (!_dte.ActiveDocument.Saved)
                 _dte.ActiveDocument.Save();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:fetch /path:\"{currentFilePath}\"");
+            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:fetch", currentFilePath);
         }
         private void CommitContextCommand(object sender, EventArgs e)
         {
@@ -114,26 +111,26 @@ private void CommitContextCommand(object sender, EventArgs e)
             var bugId = GitHelper.GetCommitMessage(_generalOptions.BugId, _dte, _envHelper);
             var gitConfig = GitHelper.GetGitConfig(_envHelper);
 
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:commit /path:\"{currentFilePath}\" " +
+            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:commit " +
                 $"{(string.IsNullOrEmpty(commitMessage) ? string.Empty : $"/logmsg:\"{commitMessage}\"")} " +
                 $"{(!string.IsNullOrEmpty(bugId) && !string.IsNullOrEmpty(gitConfig.BugTraqMessage) ? $"/bugid:\"{bugId}\"" : string.Empty)} " +
-                $"/closeonend:{_generalOptions.CloseOnEnd}");
+                $"/closeonend:{_generalOptions.CloseOnEnd}", currentFilePath);
         }
         private void RevertContextCommand(object sender, EventArgs e)
         {
             var currentFilePath = _dte.ActiveDocument.FullName;
             if (string.IsNullOrEmpty(currentFilePath)) return;
             if (!_dte.ActiveDocument.Saved)
                 _dte.ActiveDocument.Save();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:revert /path:\"{currentFilePath}\"");
+            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:revert", currentFilePath);
         }
         private void DiffContextCommand(object sender, EventArgs e)
         {
             var currentFilePath = _dte.ActiveDocument.FullName;
             if (string.IsNullOrEmpty(currentFilePath)) return;
             if (!_dte.ActiveDocument.Saved)
                 _dte.ActiveDocument.Save();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:diff /path:\"{currentFilePath}\"");
+            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:diff", currentFilePath);
         }
 
         private void PrefDiffContextCommand(object sender, EventArgs e)
@@ -152,7 +149,7 @@ private void PrefDiffContextCommand(object sender, EventArgs e)
             else
             {
                 ProcessHelper.StartTortoiseGitProc(_envHelper, 
-                    $"/command:diff /path:\"{FileHelper.GetExactPathName(currentFilePath)}\" /startrev:{revisions.Split(',')[0]} /endrev:{revisions.Split(',')[1]}");
+                    $"/command:diff /startrev:{revisions.Split(',')[0]} /endrev:{revisions.Split(',')[1]}", FileHelper.GetExactPathName(currentFilePath));
             }
         }
     }

diff --git a/TGit/Commands/GitSVNMenuCommands.cs b/TGit/Commands/GitSVNMenuCommands.cs
@@ -1,23 +1,19 @@
 using SamirBoulema.TGit.Helpers;
 using System;
 using Microsoft.VisualStudio.Shell;
-using EnvDTE;
 
 namespace SamirBoulema.TGit.Commands
 {
     public class GitSVNMenuCommands
     {
         private readonly OptionPageGrid _options;
         private readonly OleMenuCommandService _mcs;
-        private readonly DTE _dte;
         private readonly EnvHelper _envHelper;
 
-        public GitSVNMenuCommands(OleMenuCommandService mcs, DTE dte, 
-            OptionPageGrid options, EnvHelper envHelper)
+        public GitSVNMenuCommands(OleMenuCommandService mcs, OptionPageGrid options, EnvHelper envHelper)
         {
             _mcs = mcs;
             _options = options;
-            _dte = dte;
             _envHelper = envHelper;
         }
 
@@ -28,22 +24,13 @@ public void AddCommands()
             CommandHelper.AddCommand(_mcs, PkgCmdIDList.SvnRebase, SvnRebaseCommand);
         }
 
-        private void SvnDCommitCommand(object sender, EventArgs e)
-        {
-            FileHelper.SaveAllFiles(_dte);
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:svndcommit /path:\"{_envHelper.GetSolutionDir()}\" /closeonend:{_options.CloseOnEnd}");
-        }
+        private void SvnDCommitCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:svndcommit /closeonend:{_options.CloseOnEnd}");
 
-        private void SvnFetchCommand(object sender, EventArgs e)
-        {
-            FileHelper.SaveAllFiles(_dte);
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:svnrebase /path:\"{_envHelper.GetSolutionDir()}\" /closeonend:{_options.CloseOnEnd}");
-        }
+        private void SvnFetchCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:svnrebase /closeonend:{_options.CloseOnEnd}");
 
-        private void SvnRebaseCommand(object sender, EventArgs e)
-        {
-            FileHelper.SaveAllFiles(_dte);
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:svnfetch /path:\"{_envHelper.GetSolutionDir()}\" /closeonend:{_options.CloseOnEnd}");
-        }
+        private void SvnRebaseCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:svnfetch /closeonend:{_options.CloseOnEnd}");
     }
 }
diff --git a/TGit/Commands/MainMenuCommands.cs b/TGit/Commands/MainMenuCommands.cs
@@ -51,137 +51,79 @@ public void AddCommands()
 
         }
 
-        private void PreCommand()
-        {
-            FileHelper.SaveAllFiles(_dte);
-        }
+        private void ShowChangesCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:repostatus /closeonend:{_generalOptions.CloseOnEnd}");
+
+        private void PullCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:pull /closeonend:{_generalOptions.CloseOnEnd}");
+
+        private void FetchCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:fetch /closeonend:{_generalOptions.CloseOnEnd}");
 
-        private void ShowChangesCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:repostatus /path:\"{_envHelper.GetSolutionDir()}\" /closeonend:{_generalOptions.CloseOnEnd}");
-        }
-        private void PullCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:pull /path:\"{_envHelper.GetSolutionDir()}\" /closeonend:{_generalOptions.CloseOnEnd}");
-        }
-        private void FetchCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:fetch /path:\"{_envHelper.GetSolutionDir()}\" /closeonend:{_generalOptions.CloseOnEnd}");
-        }
         private void CommitCommand(object sender, EventArgs e)
         {
-            PreCommand();
             var commitMessage = GitHelper.GetCommitMessage(_generalOptions.CommitMessage, _dte, _envHelper);
             var bugId = GitHelper.GetCommitMessage(_generalOptions.BugId, _dte, _envHelper);
             var gitConfig = GitHelper.GetGitConfig(_envHelper);
             ProcessHelper.StartTortoiseGitProc(_envHelper,
-                $"/command:commit /path:\"{_envHelper.GetSolutionDir()}\" " +
+                $"/command:commit " +
                 $"{(string.IsNullOrEmpty(commitMessage) ? string.Empty : $"/logmsg:\"{commitMessage}\"")} " +
                 $"{(!string.IsNullOrEmpty(bugId) && !string.IsNullOrEmpty(gitConfig.BugTraqMessage) ? $"/bugid:\"{bugId}\"" : string.Empty)} " +
                 $"/closeonend:{_generalOptions.CloseOnEnd}");
         }
-        private void PushCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:push /path:\"{_envHelper.GetSolutionDir()}\" /closeonend:{_generalOptions.CloseOnEnd}");
-        }
-        private void ShowLogCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:log /path:\"{_envHelper.GetSolutionDir()}\" /closeonend:{_generalOptions.CloseOnEnd}");
-        }
-        private void DiskBrowserCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.Start(_envHelper.GetSolutionDir());
-        }
-        private void RepoBrowserCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:repobrowser /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
-        private void RevGraphCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:revisiongraph /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
-        private void CreateStashCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:stashsave /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
-        private void ApplyStashCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:reflog /ref:refs/stash /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
-        private void BranchCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:branch /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
 
-        private void SwitchCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:switch /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
+        private void PushCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:push /closeonend:{_generalOptions.CloseOnEnd}");
 
-        private void MergeCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:merge /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
+        private void ShowLogCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:log /closeonend:{_generalOptions.CloseOnEnd}");
 
-        private void RebaseCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:rebase /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
+        private void DiskBrowserCommand(object sender, EventArgs e) 
+            => ProcessHelper.Start(_envHelper.GetSolutionDir());
 
-        private void AbortMergeCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:merge /abort /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
+        private void RepoBrowserCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:repobrowser");
 
-        private void RevertCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:revert /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
+        private void RevGraphCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:revisiongraph");
 
-        private void CleanupCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:cleanup /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
+        private void CreateStashCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:stashsave");
 
-        private void ResolveCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:resolve /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
+        private void ApplyStashCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:reflog /ref:refs/stash");
 
-        private void SyncCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:sync /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
+        private void BranchCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:branch");
 
-        private void BrowseRefCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:refbrowse /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
+        private void SwitchCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:switch");
 
-        private void TagCommand(object sender, EventArgs e)
-        {
-            PreCommand();
-            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:tag /path:\"{_envHelper.GetSolutionDir()}\"");
-        }
+        private void MergeCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:merge");
+
+        private void RebaseCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:rebase");
+
+        private void AbortMergeCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:merge /abort");
+
+        private void RevertCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:revert");
+
+        private void CleanupCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:cleanup");
+
+        private void ResolveCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:resolve");
+
+        private void SyncCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:sync");
+
+        private void BrowseRefCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:refbrowse");
+
+        private void TagCommand(object sender, EventArgs e) 
+            => ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:tag");
     }
 }