38 lines
1.2 KiB
C#
38 lines
1.2 KiB
C#
using Codice.Client.BaseCommands.Merge;
|
|
using PlasticGui.WorkspaceWindow.Merge;
|
|
|
|
namespace Unity.PlasticSCM.Editor.Views.Merge.Developer
|
|
{
|
|
// internal for testing purpuses
|
|
internal static class IsCurrent
|
|
{
|
|
internal static bool Conflict(
|
|
MergeChangeInfo changeInfo,
|
|
MergeChangeInfo metaChangeInfo,
|
|
MergeSolvedFileConflicts solvedFileConflicts)
|
|
{
|
|
if (solvedFileConflicts == null)
|
|
return false;
|
|
|
|
MergeSolvedFileConflicts.CurrentConflict currentConflict;
|
|
|
|
if (!solvedFileConflicts.TryGetCurrentConflict(out currentConflict))
|
|
return false;
|
|
|
|
return IsSameConflict(currentConflict, changeInfo) ||
|
|
IsSameConflict(currentConflict, metaChangeInfo);
|
|
}
|
|
|
|
static bool IsSameConflict(
|
|
MergeSolvedFileConflicts.CurrentConflict currentConflict,
|
|
MergeChangeInfo changeInfo)
|
|
{
|
|
if (changeInfo == null)
|
|
return false;
|
|
|
|
return currentConflict.MountId.Equals(changeInfo.GetMount().Id)
|
|
&& currentConflict.ItemId == changeInfo.GetRevision().ItemId;
|
|
}
|
|
}
|
|
}
|