mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-22 12:45:00 +00:00

* fix: Improve in-progress rebase handling * fix: Close merge popup even if there are conflicts (#941)
88 lines
2.6 KiB
C#
88 lines
2.6 KiB
C#
using System;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace SourceGit.ViewModels
|
|
{
|
|
public class Merge : Popup
|
|
{
|
|
public object Source
|
|
{
|
|
get;
|
|
}
|
|
|
|
public string Into
|
|
{
|
|
get;
|
|
}
|
|
|
|
public Models.MergeMode SelectedMode
|
|
{
|
|
get;
|
|
set;
|
|
}
|
|
|
|
public Merge(Repository repo, Models.Branch source, string into)
|
|
{
|
|
_repo = repo;
|
|
_sourceName = source.FriendlyName;
|
|
|
|
Source = source;
|
|
Into = into;
|
|
SelectedMode = AutoSelectMergeMode();
|
|
View = new Views.Merge() { DataContext = this };
|
|
}
|
|
|
|
public Merge(Repository repo, Models.Commit source, string into)
|
|
{
|
|
_repo = repo;
|
|
_sourceName = source.SHA;
|
|
|
|
Source = source;
|
|
Into = into;
|
|
SelectedMode = AutoSelectMergeMode();
|
|
View = new Views.Merge() { DataContext = this };
|
|
}
|
|
|
|
public Merge(Repository repo, Models.Tag source, string into)
|
|
{
|
|
_repo = repo;
|
|
_sourceName = source.Name;
|
|
|
|
Source = source;
|
|
Into = into;
|
|
SelectedMode = AutoSelectMergeMode();
|
|
View = new Views.Merge() { DataContext = this };
|
|
}
|
|
|
|
public override Task<bool> Sure()
|
|
{
|
|
_repo.SetWatcherEnabled(false);
|
|
ProgressDescription = $"Merging '{_sourceName}' into '{Into}' ...";
|
|
|
|
return Task.Run(() =>
|
|
{
|
|
new Commands.Merge(_repo.FullPath, _sourceName, SelectedMode.Arg, SetProgressDescription).Exec();
|
|
CallUIThread(() => _repo.SetWatcherEnabled(true));
|
|
return true;
|
|
});
|
|
}
|
|
|
|
private Models.MergeMode AutoSelectMergeMode()
|
|
{
|
|
var config = new Commands.Config(_repo.FullPath).Get($"branch.{Into}.mergeoptions");
|
|
if (string.IsNullOrEmpty(config))
|
|
return Models.MergeMode.Supported[0];
|
|
if (config.Equals("--no-ff", StringComparison.Ordinal))
|
|
return Models.MergeMode.Supported[1];
|
|
if (config.Equals("--squash", StringComparison.Ordinal))
|
|
return Models.MergeMode.Supported[2];
|
|
if (config.Equals("--no-commit", StringComparison.Ordinal) || config.Equals("--no-ff --no-commit", StringComparison.Ordinal))
|
|
return Models.MergeMode.Supported[3];
|
|
|
|
return Models.MergeMode.Supported[0];
|
|
}
|
|
|
|
private readonly Repository _repo = null;
|
|
private readonly string _sourceName = string.Empty;
|
|
}
|
|
}
|