michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-23 20:47:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feature<Merge>: show progress for merge

Browse source
This commit is contained in:
leo 2021-05-26 18:58:34 +08:00
parent 67f5eed9a0
commit 763779b529
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Commands/Merge.cs
View file

@ -1,12 +1,21 @@
using System;
namespace SourceGit.Commands {
/// <summary>
/// 合并分支
/// </summary>
public class Merge : Command {
private Action<string> handler = null;
public Merge(string repo, string source, string mode) {
public Merge(string repo, string source, string mode, Action<string> onProgress) {
Cwd = repo;
Args = $"merge {source} {mode}";
Args = $"merge --progress {source} {mode}";
TraitErrorAsOutput = true;
handler = onProgress;
}
public override void OnReadline(string line) {
handler?.Invoke(line);
}
}
}

2
src/Views/Popups/Merge.xaml.cs
View file

@ -26,7 +26,7 @@ namespace SourceGit.Views.Popups {
var mode = (cmbMode.SelectedItem as Models.MergeOption).Arg;
return Task.Run(() => {
Models.Watcher.SetEnabled(repo, false);
new Commands.Merge(repo, source, mode).Exec();
new Commands.Merge(repo, source, mode, UpdateProgress).Exec();
Models.Watcher.SetEnabled(repo, true);
return true;
});