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

refactor: rewrite integration for git difftool and git mergetool command

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-07-07 17:14:59 +08:00
parent 122de2ea92
commit b2aac68600
9 changed files with 107 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Commands/Command.cs
View File

@@ -37,11 +37,24 @@ namespace SourceGit.Commands
public bool RaiseError { get; set; } = true;
public Models.ICommandLog Log { get; set; } = null;
public void Exec()
{
try
{
var start = CreateGitStartInfo(false);
Process.Start(start);
}
catch (Exception ex)
{
App.RaiseException(Context, ex.Message);
}
}
public async Task<bool> ExecAsync()
{
Log?.AppendLine($"$ git {Args}\n");
var start = CreateGitStartInfo();
var start = CreateGitStartInfo(true);
var errs = new List<string>();
var proc = new Process() { StartInfo = start };
@@ -118,7 +131,7 @@ namespace SourceGit.Commands
protected async Task<Result> ReadToEndAsync()
{
var start = CreateGitStartInfo();
var start = CreateGitStartInfo(true);
var proc = new Process() { StartInfo = start };
try
@@ -140,17 +153,21 @@ namespace SourceGit.Commands
return rs;
}
private ProcessStartInfo CreateGitStartInfo()
private ProcessStartInfo CreateGitStartInfo(bool redirect)
{
var start = new ProcessStartInfo();
start.FileName = Native.OS.GitExecutable;
start.Arguments = "--no-pager -c core.quotepath=off -c credential.helper=manager ";
start.UseShellExecute = false;
start.CreateNoWindow = true;
start.RedirectStandardOutput = true;
start.RedirectStandardError = true;
start.StandardOutputEncoding = Encoding.UTF8;
start.StandardErrorEncoding = Encoding.UTF8;
if (redirect)
{
start.RedirectStandardOutput = true;
start.RedirectStandardError = true;
start.StandardOutputEncoding = Encoding.UTF8;
start.StandardErrorEncoding = Encoding.UTF8;
}
// Force using this app as SSH askpass program
var selfExecFile = Process.GetCurrentProcess().MainModule!.FileName;

46
src/Commands/DiffTool.cs Normal file
View File

@@ -0,0 +1,46 @@
using System.IO;
namespace SourceGit.Commands
{
public class DiffTool : Command
{
public DiffTool(string repo, int type, string exec, Models.DiffOption option)
{
WorkingDirectory = repo;
Context = repo;
_merger = Models.ExternalMerger.Supported.Find(x => x.Type == type);
_exec = exec;
_option = option;
}
public void Open()
{
if (_merger == null)
{
App.RaiseException(Context, "Invalid merge tool in preference setting!");
return;
}
if (_merger.Type == 0)
{
Args = $"difftool -g --no-prompt {_option}";
}
else if (File.Exists(_exec))
{
Args = $"-c difftool.sourcegit.cmd=\"\\\"{_exec}\\\" {_merger.DiffCmd}\" difftool --tool=sourcegit --no-prompt {_option}";
}
else
{
App.RaiseException(Context, $"Can NOT find external diff tool in '{_exec}'!");
return;
}
Exec();
}
private Models.ExternalMerger _merger;
private string _exec;
private Models.DiffOption _option;
}
}

74
src/Commands/MergeTool.cs
View File

@@ -3,69 +3,45 @@ using System.Threading.Tasks;
namespace SourceGit.Commands
{
public static class MergeTool
public class MergeTool : Command
{
public static async Task<bool> OpenForMergeAsync(string repo, int toolType, string toolPath, string file)
public MergeTool(string repo, int type, string exec, string file)
{
var cmd = new Command();
cmd.WorkingDirectory = repo;
cmd.Context = repo;
cmd.RaiseError = true;
WorkingDirectory = repo;
Context = exec;
// NOTE: If no <file> names are specified, 'git mergetool' will run the merge tool program on every file with merge conflicts.
var fileArg = string.IsNullOrEmpty(file) ? "" : $"\"{file}\"";
if (toolType == 0)
{
cmd.Args = $"mergetool {fileArg}";
return await cmd.ExecAsync().ConfigureAwait(false);
}
if (!File.Exists(toolPath))
{
App.RaiseException(repo, $"Can NOT find external merge tool in '{toolPath}'!");
return false;
}
var supported = Models.ExternalMerger.Supported.Find(x => x.Type == toolType);
if (supported == null)
{
App.RaiseException(repo, "Invalid merge tool in preference setting!");
return false;
}
cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.Cmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit {fileArg}";
return await cmd.ExecAsync().ConfigureAwait(false);
_merger = Models.ExternalMerger.Supported.Find(x => x.Type == type);
_exec = exec;
_file = string.IsNullOrEmpty(file) ? "" : $"\"{file}\"";
}
public static async Task<bool> OpenForDiffAsync(string repo, int toolType, string toolPath, Models.DiffOption option)
public async Task<bool> OpenAsync()
{
var cmd = new Command();
cmd.WorkingDirectory = repo;
cmd.Context = repo;
cmd.RaiseError = true;
if (toolType == 0)
if (_merger == null)
{
cmd.Args = $"difftool -g --no-prompt {option}";
return await cmd.ExecAsync();
}
if (!File.Exists(toolPath))
{
App.RaiseException(repo, $"Can NOT find external diff tool in '{toolPath}'!");
App.RaiseException(Context, "Invalid merge tool in preference setting!");
return false;
}
var supported = Models.ExternalMerger.Supported.Find(x => x.Type == toolType);
if (supported == null)
if (_merger.Type == 0)
{
App.RaiseException(repo, "Invalid merge tool in preference setting!");
Args = $"mergetool {_file}";
}
else if (File.Exists(_exec))
{
Args = $"-c mergetool.sourcegit.cmd=\"\\\"{_exec}\\\" {_merger.Cmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit {_file}";
}
else
{
App.RaiseException(Context, $"Can NOT find external merge tool in '{_exec}'!");
return false;
}
cmd.Args = $"-c difftool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.DiffCmd}\" difftool --tool=sourcegit --no-prompt {option}";
return await cmd.ExecAsync().ConfigureAwait(false);
return await ExecAsync().ConfigureAwait(false);
}
private Models.ExternalMerger _merger;
private string _exec;
private string _file;
}
}

4
src/ViewModels/BranchCompare.cs
View File

@@ -125,13 +125,13 @@ namespace SourceGit.ViewModels
var openWithMerger = new MenuItem();
openWithMerger.Header = App.Text("OpenInExternalMergeTool");
openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
openWithMerger.Click += (sender, ev) =>
openWithMerger.Click += (_, ev) =>
{
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
var opt = new Models.DiffOption(_based.Head, _to.Head, change);
_ = Commands.MergeTool.OpenForDiffAsync(_repo, toolType, toolPath, opt);
new Commands.DiffTool(_repo, toolType, toolPath, opt).Open();
ev.Handled = true;
};
menu.Items.Add(openWithMerger);

5
src/ViewModels/CommitDetail.cs
View File

@@ -325,13 +325,12 @@ namespace SourceGit.ViewModels
var openWithMerger = new MenuItem();
openWithMerger.Header = App.Text("OpenInExternalMergeTool");
openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
openWithMerger.Click += (sender, ev) =>
openWithMerger.Click += (_, ev) =>
{
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
var opt = new Models.DiffOption(_commit, change);
_ = Commands.MergeTool.OpenForDiffAsync(_repo.FullPath, toolType, toolPath, opt);
new Commands.DiffTool(_repo.FullPath, toolType, toolPath, opt).Open();
ev.Handled = true;
};

2
src/ViewModels/DiffContext.cs
View File

@@ -97,7 +97,7 @@ namespace SourceGit.ViewModels
{
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
Task.Run(() => Commands.MergeTool.OpenForDiffAsync(_repo, toolType, toolPath, _option));
new Commands.DiffTool(_repo, toolType, toolPath, _option).Open();
}
private void LoadDiffContent()

3
src/ViewModels/RevisionCompare.cs
View File

@@ -144,8 +144,7 @@ namespace SourceGit.ViewModels
var opt = new Models.DiffOption(GetSHA(_startPoint), GetSHA(_endPoint), change);
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
Task.Run(() => Commands.MergeTool.OpenForDiffAsync(_repo, toolType, toolPath, opt));
new Commands.DiffTool(_repo, toolType, toolPath, opt).Open();
ev.Handled = true;
};
menu.Items.Add(openWithMerger);

3
src/ViewModels/StashesPage.cs
View File

@@ -231,8 +231,7 @@ namespace SourceGit.ViewModels
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
var opt = new Models.DiffOption($"{_selectedStash.SHA}^", _selectedStash.SHA, change);
Task.Run(() => Commands.MergeTool.OpenForDiffAsync(_repo.FullPath, toolType, toolPath, opt));
new Commands.DiffTool(_repo.FullPath, toolType, toolPath, opt).Open();
ev.Handled = true;
};

11
src/ViewModels/WorkingCopy.cs
View File

@@ -464,12 +464,12 @@ namespace SourceGit.ViewModels
_repo.SetWatcherEnabled(true);
}
public async Task UseExternalMergeTool(Models.Change change)
public async Task<bool> UseExternalMergeTool(Models.Change change)
{
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
var file = change?.Path;
await Commands.MergeTool.OpenForMergeAsync(_repo.FullPath, toolType, toolPath, file);
return await new Commands.MergeTool(_repo.FullPath, toolType, toolPath, file).OpenAsync();
}
public void ContinueMerge()
@@ -598,7 +598,7 @@ namespace SourceGit.ViewModels
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);
new Commands.DiffTool(_repo.FullPath, toolType, toolPath, opt).Open();
}
e.Handled = true;
@@ -1250,13 +1250,12 @@ namespace SourceGit.ViewModels
var openWithMerger = new MenuItem();
openWithMerger.Header = App.Text("OpenInExternalMergeTool");
openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
openWithMerger.Click += (sender, ev) =>
openWithMerger.Click += (_, 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);
new Commands.DiffTool(_repo.FullPath, toolType, toolPath, opt).Open();
ev.Handled = true;
};