2024-02-05 23:08:37 -08:00
|
|
|
|
using System.Collections.Generic;
|
|
|
|
|
using System.Threading.Tasks;
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
namespace SourceGit.ViewModels
|
|
|
|
|
{
|
|
|
|
|
public class MergeMode
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
public string Name { get; set; }
|
|
|
|
|
public string Desc { get; set; }
|
|
|
|
|
public string Arg { get; set; }
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public MergeMode(string n, string d, string a)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
Name = n;
|
|
|
|
|
Desc = d;
|
|
|
|
|
Arg = a;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public class Merge : Popup
|
|
|
|
|
{
|
|
|
|
|
public string Source
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get;
|
|
|
|
|
private set;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public string Into
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get;
|
|
|
|
|
private set;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public List<MergeMode> Modes
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get;
|
|
|
|
|
private set;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public MergeMode SelectedMode
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get;
|
|
|
|
|
set;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public Merge(Repository repo, string source, string into)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_repo = repo;
|
|
|
|
|
Source = source;
|
|
|
|
|
Into = into;
|
|
|
|
|
Modes = new List<MergeMode>() {
|
|
|
|
|
new MergeMode("Default", "Fast-forward if possible", ""),
|
|
|
|
|
new MergeMode("No Fast-forward", "Always create a merge commit", "--no-ff"),
|
|
|
|
|
new MergeMode("Squash", "Use '--squash'", "--squash"),
|
|
|
|
|
new MergeMode("Don't commit", "Merge without commit", "--no-commit"),
|
|
|
|
|
};
|
|
|
|
|
SelectedMode = Modes[0];
|
|
|
|
|
View = new Views.Merge() { DataContext = this };
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public override Task<bool> Sure()
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_repo.SetWatcherEnabled(false);
|
2024-02-25 19:29:57 -08:00
|
|
|
|
ProgressDescription = $"Merging '{Source}' into '{Into}' ...";
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
return Task.Run(() =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var succ = new Commands.Merge(_repo.FullPath, Source, SelectedMode.Arg, SetProgressDescription).Exec();
|
|
|
|
|
CallUIThread(() => _repo.SetWatcherEnabled(true));
|
|
|
|
|
return succ;
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
private readonly Repository _repo = null;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
}
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|