mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-06-17 00:14:59 +00:00

* remove dotnet-tool.json because the project does not rely on any dotnet tools. * remove Directory.Build.props because the solution has only one project. * move src/SourceGit to src. It's not needed to put all sources into a subfolder of src since there's only one project.
63 lines
2.2 KiB
C#
63 lines
2.2 KiB
C#
using System.IO;
|
|
|
|
using Avalonia.Threading;
|
|
|
|
namespace SourceGit.Commands
|
|
{
|
|
public static class MergeTool
|
|
{
|
|
public static bool OpenForMerge(string repo, string tool, string mergeCmd, string file)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(tool) || string.IsNullOrWhiteSpace(mergeCmd))
|
|
{
|
|
Dispatcher.UIThread.Invoke(() =>
|
|
{
|
|
App.RaiseException(repo, "Invalid external merge tool settings!");
|
|
});
|
|
return false;
|
|
}
|
|
|
|
if (!File.Exists(tool))
|
|
{
|
|
Dispatcher.UIThread.Invoke(() =>
|
|
{
|
|
App.RaiseException(repo, $"Can NOT found external merge tool in '{tool}'!");
|
|
});
|
|
return false;
|
|
}
|
|
|
|
var cmd = new Command();
|
|
cmd.WorkingDirectory = repo;
|
|
cmd.RaiseError = false;
|
|
cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{tool}\\\" {mergeCmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit \"{file}\"";
|
|
return cmd.Exec();
|
|
}
|
|
|
|
public static bool OpenForDiff(string repo, string tool, string diffCmd, Models.DiffOption option)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(tool) || string.IsNullOrWhiteSpace(diffCmd))
|
|
{
|
|
Dispatcher.UIThread.Invoke(() =>
|
|
{
|
|
App.RaiseException(repo, "Invalid external merge tool settings!");
|
|
});
|
|
return false;
|
|
}
|
|
|
|
if (!File.Exists(tool))
|
|
{
|
|
Dispatcher.UIThread.Invoke(() =>
|
|
{
|
|
App.RaiseException(repo, $"Can NOT found external merge tool in '{tool}'!");
|
|
});
|
|
return false;
|
|
}
|
|
|
|
var cmd = new Command();
|
|
cmd.WorkingDirectory = repo;
|
|
cmd.RaiseError = false;
|
|
cmd.Args = $"-c difftool.sourcegit.cmd=\"\\\"{tool}\\\" {diffCmd}\" difftool --tool=sourcegit --no-prompt {option}";
|
|
return cmd.Exec();
|
|
}
|
|
}
|
|
}
|