dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-21 20:24:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

optimize<*>: App.RaiseException should be called in UIThread; add default progress description for popups;

Browse source
This commit is contained in:
leo 2024-02-26 11:29:57 +08:00
parent dc0b33ba21
commit 9c3294c285
35 changed files with 100 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Commands/MergeTool.cs
View file

@ -1,15 +1,20 @@
using System.IO;
using Avalonia.Threading;
using System.IO;
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)) {
App.RaiseException(repo, "Invalid external merge tool settings!");
Dispatcher.UIThread.Invoke(() => {
App.RaiseException(repo, "Invalid external merge tool settings!");
});
return false;
}
if (!File.Exists(tool)) {
App.RaiseException(repo, $"Can NOT found external merge tool in '{tool}'!");
Dispatcher.UIThread.Invoke(() => {
App.RaiseException(repo, $"Can NOT found external merge tool in '{tool}'!");
});
return false;
}
@ -22,12 +27,16 @@ namespace SourceGit.Commands {
public static bool OpenForDiff(string repo, string tool, string diffCmd, Models.DiffOption option) {
if (string.IsNullOrWhiteSpace(tool) || string.IsNullOrWhiteSpace(diffCmd)) {
App.RaiseException(repo, "Invalid external merge tool settings!");
Dispatcher.UIThread.Invoke(() => {
App.RaiseException(repo, "Invalid external merge tool settings!");
});
return false;
}
if (!File.Exists(tool)) {
App.RaiseException(repo, $"Can NOT found external merge tool in '{tool}'!");
Dispatcher.UIThread.Invoke(() => {
App.RaiseException(repo, $"Can NOT found external merge tool in '{tool}'!");
});
return false;
}