github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-24 02:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: diff with merger option on local changes (#1534)

Browse Source
This commit is contained in:
Nathan Baulch
2025-07-07 16:53:09 +10:00
committed by GitHub
parent 2b3e94e1d1
commit 6d068157b4
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ViewModels/WorkingCopy.cs
View File

@@ -590,6 +590,20 @@ namespace SourceGit.ViewModels
var change = _selectedUnstaged[0];
var path = Native.OS.GetAbsPath(_repo.FullPath, change.Path);
var diffWithMerger = new MenuItem();
diffWithMerger.Header = App.Text("DiffWithMerger");
diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
diffWithMerger.Click += (sender, ev) =>
{
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
var opt = new Models.DiffOption(change, true);
_ = Commands.MergeTool.OpenForDiffAsync(_repo.FullPath, toolType, toolPath, opt);
ev.Handled = true;
};
menu.Items.Add(diffWithMerger);
var explore = new MenuItem();
explore.Header = App.Text("RevealFile");
explore.Icon = App.CreateMenuIcon("Icons.Explore");
@@ -1243,6 +1257,19 @@ namespace SourceGit.ViewModels
var change = _selectedStaged[0];
var path = Native.OS.GetAbsPath(_repo.FullPath, change.Path);
var diffWithMerger = new MenuItem();
diffWithMerger.Header = App.Text("DiffWithMerger");
diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
diffWithMerger.Click += (sender, ev) =>
{
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
var opt = new Models.DiffOption(change, false);
_ = Commands.MergeTool.OpenForDiffAsync(_repo.FullPath, toolType, toolPath, opt);
ev.Handled = true;
};
var explore = new MenuItem();
explore.IsEnabled = File.Exists(path) || Directory.Exists(path);
explore.Header = App.Text("RevealFile");
@@ -1310,6 +1337,7 @@ namespace SourceGit.ViewModels
e.Handled = true;
};
menu.Items.Add(diffWithMerger);
menu.Items.Add(explore);
menu.Items.Add(openWith);
menu.Items.Add(new MenuItem() { Header = "-" });