A game about forced loneliness, made by TACStudios
1using Codice.Client.BaseCommands.Merge;
2using PlasticGui.WorkspaceWindow.Merge;
3
4namespace Unity.PlasticSCM.Editor.Views.Merge.Developer
5{
6 // internal for testing purpuses
7 internal static class IsCurrent
8 {
9 internal static bool Conflict(
10 MergeChangeInfo changeInfo,
11 MergeChangeInfo metaChangeInfo,
12 MergeSolvedFileConflicts solvedFileConflicts)
13 {
14 if (solvedFileConflicts == null)
15 return false;
16
17 MergeSolvedFileConflicts.CurrentConflict currentConflict;
18
19 if (!solvedFileConflicts.TryGetCurrentConflict(out currentConflict))
20 return false;
21
22 return IsSameConflict(currentConflict, changeInfo) ||
23 IsSameConflict(currentConflict, metaChangeInfo);
24 }
25
26 static bool IsSameConflict(
27 MergeSolvedFileConflicts.CurrentConflict currentConflict,
28 MergeChangeInfo changeInfo)
29 {
30 if (changeInfo == null)
31 return false;
32
33 return currentConflict.MountId.Equals(changeInfo.GetMount().Id)
34 && currentConflict.ItemId == changeInfo.GetRevision().ItemId;
35 }
36 }
37}