Merge remote-tracking branch 'remotes/origin/master' into feature/49

# Conflicts: # TGit/TGIT.vsct
sboulema · Dec 17, 2018 · 3c42000 · 3c42000
2 parents 5412396 + 21adbf8
commit 3c42000
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 3 deletions.
diff --git a/TGit/Commands/ContextMenuCommands.cs b/TGit/Commands/ContextMenuCommands.cs
@@ -28,6 +28,7 @@ public void AddCommands()
             CommandHelper.AddCommand(_mcs, ShowLogContextCommand, PkgCmdIDList.ShowLogContext, ActiveDocument_BeforeQueryStatus);
             CommandHelper.AddCommand(_mcs, DiskBrowserContextCommand, PkgCmdIDList.DiskBrowserContext, ActiveDocument_BeforeQueryStatus);
             CommandHelper.AddCommand(_mcs, RepoBrowserContextCommand, PkgCmdIDList.RepoBrowserContext, ActiveDocument_BeforeQueryStatus);
+            CommandHelper.AddCommand(_mcs, RevGraphContextCommand, PkgCmdIDList.RevGraphContext, ActiveDocument_BeforeQueryStatus);
 
             CommandHelper.AddCommand(_mcs, BlameContextCommand, PkgCmdIDList.BlameContext, ActiveDocument_BeforeQueryStatus);
 
@@ -64,6 +65,12 @@ private void RepoBrowserContextCommand(object sender, EventArgs e)
             if (string.IsNullOrEmpty(currentFilePath)) return;
             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}\"");
+        }
         private void BlameContextCommand(object sender, EventArgs e)
         {
             var currentFilePath = _dte.ActiveDocument.FullName;

diff --git a/TGit/Commands/MainMenuCommands.cs b/TGit/Commands/MainMenuCommands.cs
@@ -31,6 +31,7 @@ public void AddCommands()
             CommandHelper.AddCommand(_mcs, ShowLogCommand, PkgCmdIDList.ShowLog);
             CommandHelper.AddCommand(_mcs, DiskBrowserCommand, PkgCmdIDList.DiskBrowser);
             CommandHelper.AddCommand(_mcs, RepoBrowserCommand, PkgCmdIDList.RepoBrowser);
+            CommandHelper.AddCommand(_mcs, RevGraphCommand, PkgCmdIDList.RevGraph);
 
             CommandHelper.AddCommand(_mcs, CreateStashCommand, PkgCmdIDList.CreateStash);
             CommandHelper.AddCommand(_mcs, ApplyStashCommand, PkgCmdIDList.ApplyStash, CommandHelper.ApplyStash_BeforeQueryStatus);
@@ -102,6 +103,11 @@ private void RepoBrowserCommand(object sender, EventArgs e)
             PreCommand();
             ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:repobrowser");
         }
+        private void RevGraphCommand(object sender, EventArgs e)
+        {
+            PreCommand();
+            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:revisiongraph");
+        }
         private void CreateStashCommand(object sender, EventArgs e)
         {
             PreCommand();

diff --git a/TGit/IconMappings.csv b/TGit/IconMappings.csv
@@ -19,4 +19,5 @@ fec49b6d-c04a-42bd-b021-b8b2e5cfb291,18,d53d7256-d44d-4245-bdd2-bfd22943659c,18
 fec49b6d-c04a-42bd-b021-b8b2e5cfb291,19,d53d7256-d44d-4245-bdd2-bfd22943659c,19
 fec49b6d-c04a-42bd-b021-b8b2e5cfb291,20,d53d7256-d44d-4245-bdd2-bfd22943659c,20
 fec49b6d-c04a-42bd-b021-b8b2e5cfb291,21,d53d7256-d44d-4245-bdd2-bfd22943659c,21
-fec49b6d-c04a-42bd-b021-b8b2e5cfb291,22,d53d7256-d44d-4245-bdd2-bfd22943659c,22
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,22,d53d7256-d44d-4245-bdd2-bfd22943659c,22
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,22,d53d7256-d44d-4245-bdd2-bfd22943659c,23
diff --git a/TGit/Images.imagemanifest b/TGit/Images.imagemanifest
@@ -30,6 +30,7 @@
     <ID Name="Tag" Value="20" />
     <ID Name="AbortMerge" Value="21" />
     <ID Name="Rebase" Value="22" />
+    <ID Name="RevGraph" Value="23" />
   </Symbols>
   <Images>
     <Image Guid="$(CustomMoniker)" ID="$(ShowChanges)">
@@ -98,6 +99,9 @@
     <Image Guid="$(CustomMoniker)" ID="$(Rebase)">
       <Source Uri="$(Resources)/Rebase.xaml" />
     </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(RevGraph)">
+      <Source Uri="$(Resources)/RevGraph.xaml" />
+    </Image>
   </Images>
   <ImageLists />
 </ImageManifest>
diff --git a/TGit/Images.vsct b/TGit/Images.vsct
@@ -35,6 +35,7 @@
       <IDSymbol name="Tag" value="20" />
       <IDSymbol name="AbortMerge" value="21" />
       <IDSymbol name="Rebase" value="22" />
+      <IDSymbol name="RevGraph" value="23" />
     </GuidSymbol>
   </Symbols>
 </CommandTable>
diff --git a/TGit/PkgCmdID.cs b/TGit/PkgCmdID.cs
@@ -67,5 +67,7 @@ static class PkgCmdIDList
         public const uint SvnRebase = 0x145;
 
         public const uint Rebase = 0x146;
+        public const uint RevGraphContext = 0x147;
+        public const uint RevGraph = 0x148;
     }
 }
diff --git a/TGit/Resources/Images/RevGraph.xaml b/TGit/Resources/Images/RevGraph.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF000000" Geometry="F0 M16,16z M0,0z M15.7,13.3L11.89,9.47A5.93,5.93,0,0,0,13,6C13,2.69 10.31,0 7,0 3.69,0 1,2.69 1,6 1,9.31 3.69,12 7,12 8.3,12 9.48,11.59 10.47,10.89L14.3,14.7C14.49,14.9 14.75,15 15,15 15.25,15 15.52,14.91 15.7,14.7A0.996,0.996,0,0,0,15.7,13.29L15.7,13.3z M7,10.7C4.41,10.7 2.3,8.59 2.3,6 2.3,3.41 4.41,1.3 7,1.3 9.59,1.3 11.7,3.41 11.7,6 11.7,8.59 9.59,10.7 7,10.7z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
diff --git a/TGit/Resources/octicons.png b/TGit/Resources/octicons.png
diff --git a/TGit/TGIT.csproj b/TGit/TGIT.csproj
@@ -319,6 +319,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Resources\Images\RevGraph.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Resources\Images\Stash.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

diff --git a/TGit/TGIT.vsct b/TGit/TGIT.vsct
@@ -245,7 +245,7 @@
         </Strings>
       </Button>
 
-      <!--Main Buttons-->
+      <!--Main Menu Buttons-->
       <Button guid="guidTGitCmdSet" id="showChanges" priority="0x0103" type="Button">
         <Parent guid="guidTGitCmdSet" id="secondMenuGroup" />
         <Icon guid="guidImages" id="showChanges" />
@@ -303,6 +303,13 @@
           <ButtonText>Repo-Browser</ButtonText>
         </Strings>
       </Button>
+      <Button guid="guidTGitCmdSet" id="revGraph" priority="0x0400" type="Button">
+        <Parent guid="guidTGitCmdSet" id="thirdMenuGroup" />
+        <Icon guid="guidImages" id="revgraph" />
+        <Strings>
+          <ButtonText>Revision Graph</ButtonText>
+        </Strings>
+      </Button>
 
       <Button guid="guidTGitCmdSet" id="createStash" priority="0x0100" type="Button">
         <Parent guid="guidTGitCmdSet" id="fourthMenuGroup" />
@@ -429,6 +436,13 @@
           <ButtonText>Repo-Browser File</ButtonText>
         </Strings>
       </Button>
+      <Button guid="guidTGitCmdSet" id="revGraphContext" priority="0x0400" type="Button">
+        <Parent guid="guidTGitCmdSet" id="firstContextMenuGroup" />
+        <Icon guid="guidImages" id="revgraph" />
+        <Strings>
+          <ButtonText>Revision Graph File</ButtonText>
+        </Strings>
+      </Button>
 
       <Button guid="guidTGitCmdSet" id="blameContext" priority="0x0100" type="Button">
         <Parent guid="guidTGitCmdSet" id="secondContextMenuGroup" />
@@ -494,7 +508,7 @@
     <Bitmaps>
       <Bitmap guid="guidImages" 
               href="Resources\octicons.png" 
-              usedList="showChanges, pull, push, showLog, revert, branch, merge, differences, blame, repo, resolve, sync, commit, disk, switch, cleanup, stash, fetch, browseRef, tag, abortMerge, rebase"/>     
+              usedList="showChanges, pull, push, showLog, revert, branch, merge, differences, blame, repo, resolve, sync, commit, disk, switch, cleanup, stash, fetch, browseRef, tag, abortMerge, rebase, revgraph"/>     
     </Bitmaps>
   </Commands>
 
@@ -543,6 +557,7 @@
       <IDSymbol name="tag" value="20" />
       <IDSymbol name="abortMerge" value="21" />
       <IDSymbol name="rebase" value="22" />
+      <IDSymbol name="revgraph" value="23" />
     </GuidSymbol>
 
     <!--Special Context Menus-->
@@ -617,6 +632,7 @@
       <IDSymbol name="showLog" value="0x0107" />
       <IDSymbol name="diskBrowser" value="0x0108" />
       <IDSymbol name="repoBrowser" value="0x0109" />
+      <IDSymbol name="revGraph" value="0x0148" />
 
       <IDSymbol name="createStash" value="0x0110" />
       <IDSymbol name="applyStash" value="0x0111" />
@@ -635,6 +651,7 @@
       <IDSymbol name="showLogContext" value="0x0117" />
       <IDSymbol name="diskBrowserContext" value="0x0118" />
       <IDSymbol name="repoBrowserContext" value="0x0119" />
+      <IDSymbol name="revGraphContext" value="0x0147" />
 
       <IDSymbol name="blameContext" value="0x0120" />