mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-20 19:55:00 +00:00
66 lines
No EOL
3.7 KiB
C#
66 lines
No EOL
3.7 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
|
|
namespace SourceGit.Models
|
|
{
|
|
public class ExternalMergeTools
|
|
{
|
|
public int Type { get; set; }
|
|
public string Name { get; set; }
|
|
public string Exec { get; set; }
|
|
public string Cmd { get; set; }
|
|
public string DiffCmd { get; set; }
|
|
|
|
public static List<ExternalMergeTools> Supported;
|
|
|
|
static ExternalMergeTools()
|
|
{
|
|
if (OperatingSystem.IsWindows())
|
|
{
|
|
Supported = new List<ExternalMergeTools>() {
|
|
new ExternalMergeTools(0, "Custom", "", "", ""),
|
|
new ExternalMergeTools(1, "Visual Studio Code", "Code.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
|
|
new ExternalMergeTools(2, "Visual Studio 2017/2019", "vsDiffMerge.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" /m", "\"$LOCAL\" \"$REMOTE\""),
|
|
new ExternalMergeTools(3, "Tortoise Merge", "TortoiseMerge.exe;TortoiseGitMerge.exe", "-base:\"$BASE\" -theirs:\"$REMOTE\" -mine:\"$LOCAL\" -merged:\"$MERGED\"", "-base:\"$LOCAL\" -theirs:\"$REMOTE\""),
|
|
new ExternalMergeTools(4, "KDiff3", "kdiff3.exe", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
|
|
new ExternalMergeTools(5, "Beyond Compare 4", "BComp.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
|
|
new ExternalMergeTools(6, "WinMerge", "WinMergeU.exe", "-u -e \"$REMOTE\" \"$LOCAL\" \"$MERGED\"", "-u -e \"$LOCAL\" \"$REMOTE\""),
|
|
};
|
|
}
|
|
else if (OperatingSystem.IsMacOS())
|
|
{
|
|
Supported = new List<ExternalMergeTools>() {
|
|
new ExternalMergeTools(0, "Custom", "", "", ""),
|
|
new ExternalMergeTools(1, "FileMerge", "/usr/bin/opendiff", "\"$BASE\" \"$LOCAL\" \"$REMOTE\" -ancestor \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
|
|
new ExternalMergeTools(2, "Visual Studio Code", "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
|
|
new ExternalMergeTools(3, "KDiff3", "/Applications/kdiff3.app/Contents/MacOS/kdiff3", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
|
|
new ExternalMergeTools(4, "Beyond Compare 4", "/Applications/Beyond Compare.app/Contents/MacOS/bcomp", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
|
|
};
|
|
}
|
|
else if (OperatingSystem.IsLinux())
|
|
{
|
|
Supported = new List<ExternalMergeTools>() {
|
|
new ExternalMergeTools(0, "Custom", "", "", ""),
|
|
new ExternalMergeTools(1, "Visual Studio Code", "/usr/share/code/code", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
|
|
new ExternalMergeTools(2, "KDiff3", "/usr/bin/kdiff3", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
|
|
new ExternalMergeTools(3, "Beyond Compare 4", "/usr/bin/bcomp", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
|
|
};
|
|
}
|
|
else
|
|
{
|
|
Supported = new List<ExternalMergeTools>() {
|
|
new ExternalMergeTools(0, "Custom", "", "", ""),
|
|
};
|
|
}
|
|
}
|
|
|
|
public ExternalMergeTools(int type, string name, string exec, string cmd, string diffCmd)
|
|
{
|
|
Type = type;
|
|
Name = name;
|
|
Exec = exec;
|
|
Cmd = cmd;
|
|
DiffCmd = diffCmd;
|
|
}
|
|
}
|
|
} |