-
Notifications
You must be signed in to change notification settings - Fork 385
Expand file tree
/
Copy pathMerge.cs
More file actions
135 lines (111 loc) · 3.98 KB
/
Merge.cs
File metadata and controls
135 lines (111 loc) · 3.98 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
using System.IO;
using System.Threading.Tasks;
namespace SourceGit.ViewModels
{
public class Merge : Popup
{
public object Source
{
get;
}
public string Into
{
get;
}
public Models.MergeMode Mode
{
get => _mode;
set
{
if (SetProperty(ref _mode, value))
CanEditMessage = _mode == Models.MergeMode.Default ||
_mode == Models.MergeMode.FastForward ||
_mode == Models.MergeMode.NoFastForward;
}
}
public bool CanEditMessage
{
get => _canEditMessage;
set => SetProperty(ref _canEditMessage, value);
}
public bool Edit
{
get;
set;
} = false;
public Merge(Repository repo, Models.Branch source, string into, bool forceFastForward)
{
_repo = repo;
_sourceName = source.FriendlyName;
Source = source;
Into = into;
Mode = forceFastForward ? Models.MergeMode.FastForward : AutoSelectMergeMode();
}
public Merge(Repository repo, Models.Commit source, string into)
{
_repo = repo;
_sourceName = source.SHA;
Source = source;
Into = into;
Mode = AutoSelectMergeMode();
}
public Merge(Repository repo, Models.Tag source, string into)
{
_repo = repo;
_sourceName = source.Name;
Source = source;
Into = into;
Mode = AutoSelectMergeMode();
}
public override async Task<bool> Sure()
{
using var lockWatcher = _repo.LockWatcher();
_repo.ClearCommitMessage();
ProgressDescription = $"Merging '{_sourceName}' into '{Into}' ...";
var log = _repo.CreateLog($"Merging '{_sourceName}' into '{Into}'");
Use(log);
var succ = await new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, _canEditMessage && Edit)
.Use(log)
.ExecAsync();
if (succ)
{
var squashMsgFile = Path.Combine(_repo.GitDir, "SQUASH_MSG");
if (Mode == Models.MergeMode.Squash && File.Exists(squashMsgFile))
{
var msg = await File.ReadAllTextAsync(squashMsgFile);
_repo.SetCommitMessage(msg);
}
await _repo.AutoUpdateSubmodulesAsync(log);
}
log.Complete();
if (succ && _repo.SelectedViewIndex == 0)
{
var head = await new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").GetResultAsync();
_repo.NavigateToCommit(head, true);
}
return true;
}
private Models.MergeMode AutoSelectMergeMode()
{
var config = new Commands.Config(_repo.FullPath).Get($"branch.{Into}.mergeoptions");
var mode = config switch
{
"--ff-only" => Models.MergeMode.FastForward,
"--no-ff" => Models.MergeMode.NoFastForward,
"--squash" => Models.MergeMode.Squash,
"--no-commit" or "--no-ff --no-commit" => Models.MergeMode.DontCommit,
_ => null,
};
if (mode != null)
return mode;
var preferredMergeModeIdx = _repo.Settings.PreferredMergeMode;
if (preferredMergeModeIdx < 0 || preferredMergeModeIdx > Models.MergeMode.Supported.Length)
return Models.MergeMode.Default;
return Models.MergeMode.Supported[preferredMergeModeIdx];
}
private readonly Repository _repo = null;
private readonly string _sourceName;
private Models.MergeMode _mode = Models.MergeMode.Default;
private bool _canEditMessage = true;
}
}