Adaug proiectul Unity

2026-11-01 23:39:55 +02:00
parent cb14d9d37d
commit 863eac8f2c
23463 changed files with 5412601 additions and 0 deletions
@@ -0,0 +1,54 @@
+using Codice.Client.BaseCommands.Merge;
+using PlasticGui.WorkspaceWindow.Merge;
+
+namespace Unity.PlasticSCM.Editor.Views.Merge.Developer
+{
+    internal static class IsSolved
+    {
+        internal static bool Conflict(
+            MergeChangeInfo changeInfo,
+            MergeChangeInfo metaChangeInfo,
+            MergeSolvedFileConflicts solvedFileConflicts)
+        {
+            if (IsDirectoryConflict(changeInfo))
+            {
+                if (metaChangeInfo == null)
+                    return IsDirectoryConflictResolved(changeInfo);
+
+                return IsDirectoryConflictResolved(changeInfo) &&
+                       IsDirectoryConflictResolved(metaChangeInfo);
+            }
+
+            if (metaChangeInfo == null)
+            {
+                return IsFileConflictResolved(
+                    changeInfo, solvedFileConflicts);
+            }
+
+            return IsFileConflictResolved(changeInfo, solvedFileConflicts) && 
+                   IsFileConflictResolved(metaChangeInfo, solvedFileConflicts);
+        }
+
+        static bool IsFileConflictResolved(
+            MergeChangeInfo changeInfo,
+            MergeSolvedFileConflicts solvedFileConflicts)
+        {
+            if (solvedFileConflicts == null)
+                return false;
+
+            return solvedFileConflicts.IsResolved(
+                changeInfo.GetMount().Id,
+                changeInfo.GetRevision().ItemId);
+        }
+
+        static bool IsDirectoryConflictResolved(MergeChangeInfo changeInfo)
+        {
+            return changeInfo.DirectoryConflict.IsResolved();
+        }
+
+        static bool IsDirectoryConflict(MergeChangeInfo changeInfo)
+        {
+            return (changeInfo.DirectoryConflict != null);
+        }
+    }
+}