ArbitratorController.cs 14 KB

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