Skip to content

Commit 3c42000

Browse files
sboulemasboulema
committed
Merge remote-tracking branch 'remotes/origin/master' into feature/49
# Conflicts: # TGit/TGIT.vsct
2 parents 5412396 + 21adbf8 commit 3c42000

10 files changed

+58
-3
lines changed

‎TGit/Commands/ContextMenuCommands.cs

+7
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public void AddCommands()
2828
CommandHelper.AddCommand(_mcs, ShowLogContextCommand, PkgCmdIDList.ShowLogContext, ActiveDocument_BeforeQueryStatus);
2929
CommandHelper.AddCommand(_mcs, DiskBrowserContextCommand, PkgCmdIDList.DiskBrowserContext, ActiveDocument_BeforeQueryStatus);
3030
CommandHelper.AddCommand(_mcs, RepoBrowserContextCommand, PkgCmdIDList.RepoBrowserContext, ActiveDocument_BeforeQueryStatus);
31+
CommandHelper.AddCommand(_mcs, RevGraphContextCommand, PkgCmdIDList.RevGraphContext, ActiveDocument_BeforeQueryStatus);
3132

3233
CommandHelper.AddCommand(_mcs, BlameContextCommand, PkgCmdIDList.BlameContext, ActiveDocument_BeforeQueryStatus);
3334

@@ -64,6 +65,12 @@ private void RepoBrowserContextCommand(object sender, EventArgs e)
6465
if (string.IsNullOrEmpty(currentFilePath)) return;
6566
ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:repobrowser", currentFilePath);
6667
}
68+
private void RevGraphContextCommand(object sender, EventArgs e)
69+
{
70+
var currentFilePath = _dte.ActiveDocument.FullName;
71+
if (string.IsNullOrEmpty(currentFilePath)) return;
72+
ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:revisiongraph /path:\"{currentFilePath}\"");
73+
}
6774
private void BlameContextCommand(object sender, EventArgs e)
6875
{
6976
var currentFilePath = _dte.ActiveDocument.FullName;

‎TGit/Commands/MainMenuCommands.cs

+6
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public void AddCommands()
3131
CommandHelper.AddCommand(_mcs, ShowLogCommand, PkgCmdIDList.ShowLog);
3232
CommandHelper.AddCommand(_mcs, DiskBrowserCommand, PkgCmdIDList.DiskBrowser);
3333
CommandHelper.AddCommand(_mcs, RepoBrowserCommand, PkgCmdIDList.RepoBrowser);
34+
CommandHelper.AddCommand(_mcs, RevGraphCommand, PkgCmdIDList.RevGraph);
3435

3536
CommandHelper.AddCommand(_mcs, CreateStashCommand, PkgCmdIDList.CreateStash);
3637
CommandHelper.AddCommand(_mcs, ApplyStashCommand, PkgCmdIDList.ApplyStash, CommandHelper.ApplyStash_BeforeQueryStatus);
@@ -102,6 +103,11 @@ private void RepoBrowserCommand(object sender, EventArgs e)
102103
PreCommand();
103104
ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:repobrowser");
104105
}
106+
private void RevGraphCommand(object sender, EventArgs e)
107+
{
108+
PreCommand();
109+
ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:revisiongraph");
110+
}
105111
private void CreateStashCommand(object sender, EventArgs e)
106112
{
107113
PreCommand();

‎TGit/IconMappings.csv

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ fec49b6d-c04a-42bd-b021-b8b2e5cfb291,18,d53d7256-d44d-4245-bdd2-bfd22943659c,18
1919
fec49b6d-c04a-42bd-b021-b8b2e5cfb291,19,d53d7256-d44d-4245-bdd2-bfd22943659c,19
2020
fec49b6d-c04a-42bd-b021-b8b2e5cfb291,20,d53d7256-d44d-4245-bdd2-bfd22943659c,20
2121
fec49b6d-c04a-42bd-b021-b8b2e5cfb291,21,d53d7256-d44d-4245-bdd2-bfd22943659c,21
22-
fec49b6d-c04a-42bd-b021-b8b2e5cfb291,22,d53d7256-d44d-4245-bdd2-bfd22943659c,22
22+
fec49b6d-c04a-42bd-b021-b8b2e5cfb291,22,d53d7256-d44d-4245-bdd2-bfd22943659c,22
23+
fec49b6d-c04a-42bd-b021-b8b2e5cfb291,22,d53d7256-d44d-4245-bdd2-bfd22943659c,23

‎TGit/Images.imagemanifest

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<ID Name="Tag" Value="20" />
3131
<ID Name="AbortMerge" Value="21" />
3232
<ID Name="Rebase" Value="22" />
33+
<ID Name="RevGraph" Value="23" />
3334
</Symbols>
3435
<Images>
3536
<Image Guid="$(CustomMoniker)" ID="$(ShowChanges)">
@@ -98,6 +99,9 @@
9899
<Image Guid="$(CustomMoniker)" ID="$(Rebase)">
99100
<Source Uri="$(Resources)/Rebase.xaml" />
100101
</Image>
102+
<Image Guid="$(CustomMoniker)" ID="$(RevGraph)">
103+
<Source Uri="$(Resources)/RevGraph.xaml" />
104+
</Image>
101105
</Images>
102106
<ImageLists />
103107
</ImageManifest>

‎TGit/Images.vsct

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<IDSymbol name="Tag" value="20" />
3636
<IDSymbol name="AbortMerge" value="21" />
3737
<IDSymbol name="Rebase" value="22" />
38+
<IDSymbol name="RevGraph" value="23" />
3839
</GuidSymbol>
3940
</Symbols>
4041
</CommandTable>

‎TGit/PkgCmdID.cs

+2
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,7 @@ static class PkgCmdIDList
6767
public const uint SvnRebase = 0x145;
6868

6969
public const uint Rebase = 0x146;
70+
public const uint RevGraphContext = 0x147;
71+
public const uint RevGraph = 0x148;
7072
}
7173
}

‎TGit/Resources/Images/RevGraph.xaml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<Rectangle Width="16" Height="16">
3+
<Rectangle.Fill>
4+
<DrawingBrush Stretch="None">
5+
<DrawingBrush.Drawing>
6+
<DrawingGroup>
7+
<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" />
8+
</DrawingGroup>
9+
</DrawingBrush.Drawing>
10+
</DrawingBrush>
11+
</Rectangle.Fill>
12+
</Rectangle>
13+
</Viewbox>

‎TGit/Resources/octicons.png

1.2 KB
Loading

‎TGit/TGIT.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,10 @@
319319
<Generator>MSBuild:Compile</Generator>
320320
<SubType>Designer</SubType>
321321
</Page>
322+
<Page Include="Resources\Images\RevGraph.xaml">
323+
<Generator>MSBuild:Compile</Generator>
324+
<SubType>Designer</SubType>
325+
</Page>
322326
<Page Include="Resources\Images\Stash.xaml">
323327
<Generator>MSBuild:Compile</Generator>
324328
<SubType>Designer</SubType>

‎TGit/TGIT.vsct

+19-2
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
</Strings>
246246
</Button>
247247

248-
<!--Main Buttons-->
248+
<!--Main Menu Buttons-->
249249
<Button guid="guidTGitCmdSet" id="showChanges" priority="0x0103" type="Button">
250250
<Parent guid="guidTGitCmdSet" id="secondMenuGroup" />
251251
<Icon guid="guidImages" id="showChanges" />
@@ -303,6 +303,13 @@
303303
<ButtonText>Repo-Browser</ButtonText>
304304
</Strings>
305305
</Button>
306+
<Button guid="guidTGitCmdSet" id="revGraph" priority="0x0400" type="Button">
307+
<Parent guid="guidTGitCmdSet" id="thirdMenuGroup" />
308+
<Icon guid="guidImages" id="revgraph" />
309+
<Strings>
310+
<ButtonText>Revision Graph</ButtonText>
311+
</Strings>
312+
</Button>
306313

307314
<Button guid="guidTGitCmdSet" id="createStash" priority="0x0100" type="Button">
308315
<Parent guid="guidTGitCmdSet" id="fourthMenuGroup" />
@@ -429,6 +436,13 @@
429436
<ButtonText>Repo-Browser File</ButtonText>
430437
</Strings>
431438
</Button>
439+
<Button guid="guidTGitCmdSet" id="revGraphContext" priority="0x0400" type="Button">
440+
<Parent guid="guidTGitCmdSet" id="firstContextMenuGroup" />
441+
<Icon guid="guidImages" id="revgraph" />
442+
<Strings>
443+
<ButtonText>Revision Graph File</ButtonText>
444+
</Strings>
445+
</Button>
432446

433447
<Button guid="guidTGitCmdSet" id="blameContext" priority="0x0100" type="Button">
434448
<Parent guid="guidTGitCmdSet" id="secondContextMenuGroup" />
@@ -494,7 +508,7 @@
494508
<Bitmaps>
495509
<Bitmap guid="guidImages"
496510
href="Resources\octicons.png"
497-
usedList="showChanges, pull, push, showLog, revert, branch, merge, differences, blame, repo, resolve, sync, commit, disk, switch, cleanup, stash, fetch, browseRef, tag, abortMerge, rebase"/>
511+
usedList="showChanges, pull, push, showLog, revert, branch, merge, differences, blame, repo, resolve, sync, commit, disk, switch, cleanup, stash, fetch, browseRef, tag, abortMerge, rebase, revgraph"/>
498512
</Bitmaps>
499513
</Commands>
500514

@@ -543,6 +557,7 @@
543557
<IDSymbol name="tag" value="20" />
544558
<IDSymbol name="abortMerge" value="21" />
545559
<IDSymbol name="rebase" value="22" />
560+
<IDSymbol name="revgraph" value="23" />
546561
</GuidSymbol>
547562

548563
<!--Special Context Menus-->
@@ -617,6 +632,7 @@
617632
<IDSymbol name="showLog" value="0x0107" />
618633
<IDSymbol name="diskBrowser" value="0x0108" />
619634
<IDSymbol name="repoBrowser" value="0x0109" />
635+
<IDSymbol name="revGraph" value="0x0148" />
620636

621637
<IDSymbol name="createStash" value="0x0110" />
622638
<IDSymbol name="applyStash" value="0x0111" />
@@ -635,6 +651,7 @@
635651
<IDSymbol name="showLogContext" value="0x0117" />
636652
<IDSymbol name="diskBrowserContext" value="0x0118" />
637653
<IDSymbol name="repoBrowserContext" value="0x0119" />
654+
<IDSymbol name="revGraphContext" value="0x0147" />
638655

639656
<IDSymbol name="blameContext" value="0x0120" />
640657

0 commit comments

Comments
 (0)