ArbitratorController.cs 14 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403
  1. // Copyright (c) 2025 TerraByte Inc.
  2. //
  3. // This script acts as the Controller for the ArbitratorWindow. It manages all
  4. // state and business logic, separating it from the UI rendering code in the window.
  5. using System;
  6. using GitMerge;
  7. using System.Linq;
  8. using UnityEditor;
  9. using Terra.Arbitrator.Settings;
  10. using Terra.Arbitrator.Services;
  11. using Terra.Arbitrator.Promises;
  12. using System.Collections.Generic;
  13. using UnityEditor.SceneManagement;
  14. namespace Terra.Arbitrator.GUI
  15. {
  16. public enum UserAction { Proceed, SaveAndProceed, Cancel }
  17. public enum SortColumn { Commit, Status, FilePath }
  18. public class ArbitratorController
  19. {
  20. private List<GitChange> _changes = new();
  21. public IReadOnlyList<GitChange> Changes => _changes;
  22. public string InfoMessage { get; private set; }
  23. public string ErrorMessage { get; private set; }
  24. public bool IsLoading { get; private set; }
  25. public string LoadingMessage { get; private set; } = "";
  26. public bool IsInConflictState { get; private set; }
  27. public int CommitsToPull { get; private set; }
  28. public SortColumn CurrentSortColumn { get; private set; } = SortColumn.FilePath;
  29. private readonly Action _requestRepaint;
  30. private readonly Func<string, string, string, string, bool> _displayDialog;
  31. private readonly Func<UserAction> _promptForUnsavedChanges;
  32. /// <summary>
  33. /// Initializes the controller.
  34. /// </summary>
  35. /// <param name="requestRepaint">A callback to the window's Repaint() method.</param>
  36. /// <param name="displayDialog">A callback to EditorUtility.DisplayDialog for user confirmations.</param>
  37. /// <param name="promptForUnsavedChanges">A callback to EditorUtility.DisplayDialog for user confirmations.</param>
  38. public ArbitratorController(Action requestRepaint, Func<string, string, string, string, bool> displayDialog, Func<UserAction> promptForUnsavedChanges)
  39. {
  40. _requestRepaint = requestRepaint;
  41. _displayDialog = displayDialog;
  42. _promptForUnsavedChanges = promptForUnsavedChanges;
  43. }
  44. public void OnEnable()
  45. {
  46. if (SessionState.GetBool(BetterGitStatePersistence.ResetQueueKey, false))
  47. {
  48. SessionState.EraseString(BetterGitStatePersistence.ResetQueueKey);
  49. InfoMessage = "Multi-file reset complete. Pulling again to confirm...";
  50. Pull();
  51. }
  52. else
  53. {
  54. Refresh();
  55. }
  56. }
  57. public void Refresh()
  58. {
  59. StartOperation("Refreshing status...");
  60. CommitsToPull = 0;
  61. UnstageStep()
  62. .Then(CompareStep)
  63. .Then(FetchUpstreamStep)
  64. .Then(FinalizeRefresh)
  65. .Catch(HandleOperationError)
  66. .Finally(FinishOperation);
  67. }
  68. public void Pull()
  69. {
  70. if (IsLoading) return;
  71. if (CancelOperationIfUnsavedScenes()) return;
  72. if (CommitsToPull > 0)
  73. {
  74. if (!_displayDialog("Confirm Pull", $"There are {CommitsToPull} incoming changes. Are you sure you want to pull?", "Yes, Pull", "Cancel"))
  75. {
  76. return;
  77. }
  78. }
  79. StartOperation("Analyzing for conflicts...");
  80. GitService.AnalyzePullConflicts()
  81. .Then(analysisResult =>
  82. {
  83. FinishOperation(); // Stop loading before showing dialog
  84. if (analysisResult.HasConflicts)
  85. {
  86. ConflictResolutionWindow.ShowWindow(this, analysisResult.ConflictingFiles);
  87. }
  88. else
  89. {
  90. PerformSafePullWithLock();
  91. }
  92. })
  93. .Catch(ex => {
  94. HandleOperationError(ex);
  95. FinishOperation();
  96. })
  97. .Finally(FinishOperation);
  98. }
  99. public void PerformSafePullWithLock()
  100. {
  101. StartOperation("Pulling changes...");
  102. EditorApplication.LockReloadAssemblies();
  103. GitService.PerformSafePull()
  104. .Then(successMessage =>
  105. {
  106. InfoMessage = successMessage;
  107. Refresh();
  108. })
  109. .Catch(ex => {
  110. HandleOperationError(ex);
  111. FinishOperation();
  112. })
  113. .Finally(EditorApplication.UnlockReloadAssemblies);
  114. }
  115. public void ResetSingleConflictingFile(string filePath, Action onResetComplete)
  116. {
  117. var change = GitService.GetChangeForFile(filePath);
  118. if (change == null)
  119. {
  120. ErrorMessage = $"Could not find file '{filePath}' to reset.";
  121. onResetComplete?.Invoke();
  122. return;
  123. }
  124. GitService.ResetFileChanges(change)
  125. .Then(successMessage =>
  126. {
  127. InfoMessage = successMessage;
  128. })
  129. .Catch(HandleOperationError)
  130. .Finally(onResetComplete);
  131. }
  132. public void CommitAndPush(string commitMessage)
  133. {
  134. var selectedFiles = _changes.Where(c => c.IsSelectedForCommit).ToList();
  135. var username = BetterGitSettings.Username;
  136. var email = BetterGitSettings.Email;
  137. StartOperation("Staging, committing, and pushing files...");
  138. GitService.CommitAndPush(selectedFiles, commitMessage, username, email)
  139. .Then(successMessage => {
  140. InfoMessage = successMessage;
  141. Refresh();
  142. })
  143. .Catch(ex => {
  144. HandleOperationError(ex);
  145. FinishOperation();
  146. });
  147. }
  148. public void SetSortColumn(SortColumn newColumn)
  149. {
  150. // If it's already the active column, do nothing.
  151. if (CurrentSortColumn == newColumn) return;
  152. CurrentSortColumn = newColumn;
  153. ApplyGrouping();
  154. _requestRepaint?.Invoke();
  155. }
  156. private void ApplyGrouping()
  157. {
  158. if (_changes == null || !_changes.Any()) return;
  159. _changes = CurrentSortColumn switch
  160. {
  161. SortColumn.Commit => _changes.OrderByDescending(c => c.IsSelectedForCommit).ThenBy(c => c.FilePath).ToList(),
  162. SortColumn.Status => _changes.OrderBy(c => GetStatusSortPriority(c.Status)).ThenBy(c => c.FilePath).ToList(),
  163. SortColumn.FilePath => _changes.OrderBy(c => c.FilePath).ToList(),
  164. _ => _changes
  165. };
  166. }
  167. private int GetStatusSortPriority(LibGit2Sharp.ChangeKind status)
  168. {
  169. return status switch
  170. {
  171. LibGit2Sharp.ChangeKind.Conflicted => -1, // Always show conflicts on top
  172. LibGit2Sharp.ChangeKind.Modified => 0,
  173. LibGit2Sharp.ChangeKind.Added => 1,
  174. LibGit2Sharp.ChangeKind.Deleted => 2,
  175. LibGit2Sharp.ChangeKind.Renamed => 3,
  176. _ => 99
  177. };
  178. }
  179. public void ResetFile(GitChange change)
  180. {
  181. if (IsLoading) return;
  182. var userConfirmed = _displayDialog("Confirm Reset", $"Are you sure you want to revert all local changes to '{change.FilePath}'? This action cannot be undone.", "Yes, Revert", "Cancel");
  183. if (!userConfirmed) return;
  184. StartOperation($"Resetting {change.FilePath}...");
  185. GitService.ResetFileChanges(change)
  186. .Then(successMessage => {
  187. InfoMessage = successMessage;
  188. Refresh();
  189. })
  190. .Catch(ex => {
  191. HandleOperationError(ex);
  192. FinishOperation();
  193. });
  194. }
  195. public void DiffFile(GitChange change)
  196. {
  197. if (IsLoading) return;
  198. StartOperation($"Launching diff for {change.FilePath}...");
  199. GitService.LaunchExternalDiff(change)
  200. .Catch(HandleOperationError)
  201. .Finally(Refresh);
  202. }
  203. public void ResolveConflict(GitChange change)
  204. {
  205. if (IsLoading) return;
  206. StartOperation($"Opening merge tool for {change.FilePath}...");
  207. var fileExtension = System.IO.Path.GetExtension(change.FilePath).ToLower();
  208. if (fileExtension is ".prefab" or ".unity")
  209. {
  210. try
  211. {
  212. GitMergeWindow.ResolveConflict(change.FilePath);
  213. }
  214. catch (Exception e)
  215. {
  216. ErrorMessage = e.Message;
  217. }
  218. Refresh();
  219. return;
  220. }
  221. GitService.LaunchMergeTool(change)
  222. .Then(successMessage => { InfoMessage = successMessage; })
  223. .Catch(HandleOperationError)
  224. .Finally(Refresh);
  225. }
  226. public void ResetSelected()
  227. {
  228. var selectedFiles = _changes.Where(c => c.IsSelectedForCommit).ToList();
  229. if (!selectedFiles.Any()) return;
  230. var fileList = string.Join("\n - ", selectedFiles.Select(f => f.FilePath));
  231. if (!_displayDialog("Confirm Reset Selected", $"Are you sure you want to revert changes for the following {selectedFiles.Count} file(s)?\n\n - {fileList}", "Yes, Revert Selected", "Cancel")) return;
  232. var pathsToReset = selectedFiles.Select(c => c.FilePath).ToList();
  233. ResetMultipleFiles(pathsToReset);
  234. }
  235. public void SetAllSelection(bool selected)
  236. {
  237. if (_changes == null) return;
  238. foreach (var change in _changes.Where(change => change.Status != LibGit2Sharp.ChangeKind.Conflicted))
  239. {
  240. change.IsSelectedForCommit = selected;
  241. }
  242. }
  243. // --- Private Methods ---
  244. private static IPromise<bool> UnstageStep()
  245. {
  246. return GitService.UnstageAllFilesIfSafe();
  247. }
  248. private IPromise<List<GitChange>> CompareStep(bool wasUnstaged)
  249. {
  250. if (wasUnstaged)
  251. {
  252. InfoMessage = "Found and unstaged files for review.";
  253. }
  254. return GitService.CompareLocalToRemote();
  255. }
  256. private IPromise<int?> FetchUpstreamStep(List<GitChange> changes)
  257. {
  258. _changes = changes;
  259. IsInConflictState = _changes.Any(c => c.Status == LibGit2Sharp.ChangeKind.Conflicted);
  260. return IsInConflictState ?
  261. // If in conflict, we can't pull, so we don't need to check. Return a resolved promise.
  262. new Promise<int?>((resolve, _) => resolve(0)) : GitService.GetUpstreamAheadBy();
  263. }
  264. private void FinalizeRefresh(int? pullCount)
  265. {
  266. CommitsToPull = pullCount ?? 0;
  267. if (string.IsNullOrEmpty(InfoMessage) && (_changes == null || _changes.Count == 0))
  268. {
  269. InfoMessage = "You are up-to-date! No local changes detected.";
  270. }
  271. }
  272. // --- Shared Helper Methods ---
  273. private void StartOperation(string loadingMessage)
  274. {
  275. IsLoading = true;
  276. LoadingMessage = loadingMessage;
  277. ClearMessages();
  278. _changes = null;
  279. _requestRepaint?.Invoke();
  280. }
  281. private void HandleOperationError(Exception ex)
  282. {
  283. ErrorMessage = $"Operation Failed: {ex.Message}";
  284. }
  285. private void FinishOperation()
  286. {
  287. IsLoading = false;
  288. _requestRepaint?.Invoke();
  289. }
  290. private void ClearMessages()
  291. {
  292. ErrorMessage = null;
  293. InfoMessage = null;
  294. }
  295. private void ResetMultipleFiles(List<string> filePaths)
  296. {
  297. InfoMessage = $"Starting reset for {filePaths.Count} file(s)... This may trigger script compilation.";
  298. _requestRepaint?.Invoke();
  299. SessionState.SetString("BetterGit.ResetQueue", string.Join(";", filePaths));
  300. EditorApplication.delayCall += BetterGitStatePersistence.ContinueInterruptedReset;
  301. }
  302. private void ForcePull()
  303. {
  304. StartOperation("Attempting to pull and create conflicts...");
  305. EditorApplication.LockReloadAssemblies();
  306. GitService.ForcePull()
  307. .Then(_ =>
  308. {
  309. InfoMessage = "Pull resulted in conflicts. Please resolve them below.";
  310. })
  311. .Catch(HandleOperationError)
  312. .Finally(() =>
  313. {
  314. EditorApplication.UnlockReloadAssemblies();
  315. AssetDatabase.Refresh();
  316. Refresh();
  317. });
  318. }
  319. private bool CancelOperationIfUnsavedScenes()
  320. {
  321. var isAnySceneDirty = false;
  322. for (var i = 0; i < EditorSceneManager.sceneCount; i++)
  323. {
  324. var scene = EditorSceneManager.GetSceneAt(i);
  325. if (!scene.isDirty) continue;
  326. isAnySceneDirty = true;
  327. break;
  328. }
  329. if (!isAnySceneDirty)
  330. {
  331. return false;
  332. }
  333. var userChoice = _promptForUnsavedChanges();
  334. switch (userChoice)
  335. {
  336. case UserAction.SaveAndProceed:
  337. EditorSceneManager.SaveOpenScenes();
  338. return false;
  339. case UserAction.Proceed:
  340. return false;
  341. case UserAction.Cancel:
  342. default:
  343. return true;
  344. }
  345. }
  346. }
  347. }