Moving toolbar from HistoryView to Window

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs

@@ -305,33 +305,12 @@ public void ScrollTo(int index, float offset = 0f)
     [Serializable]
     class HistoryView : Subview
     {
-        private const string PullButton = "Pull";
-        private const string PullButtonCount = "Pull (<b>{0}</b>)";
-        private const string PushButton = "Push";
-        private const string PushButtonCount = "Push (<b>{0}</b>)";
-        private const string PullConfirmTitle = "Pull Changes?";
-        private const string PullConfirmDescription = "Would you like to pull changes from remote '{0}'?";
-        private const string PullConfirmYes = "Pull";
-        private const string PullConfirmCancel = "Cancel";
-        private const string PushConfirmTitle = "Push Changes?";
-        private const string PushConfirmDescription = "Would you like to push changes to remote '{0}'?";
-        private const string PushConfirmYes = "Push";
-        private const string PushConfirmCancel = "Cancel";
         private const string CommitDetailsTitle = "Commit details";
         private const string ClearSelectionButton = "×";
-        private const string PublishButton = "Publish";
-        private const string FetchActionTitle = "Fetch Changes";
-        private const string FetchButtonText = "Fetch";
-        private const string FetchFailureDescription = "Could not fetch changes";
 
         [NonSerialized] private bool currentLogHasUpdate;
-        [NonSerialized] private bool currentRemoteHasUpdate;
         [NonSerialized] private bool currentTrackingStatusHasUpdate;
 
-        [SerializeField] private bool hasItemsToCommit;
-        [SerializeField] private bool hasRemote;
-        [SerializeField] private string currentRemoteName;
-
         [SerializeField] private HistoryControl historyControl;
         [SerializeField] private GitLogEntry selectedEntry = GitLogEntry.Default;
 
@@ -340,13 +319,11 @@ class HistoryView : Subview
         [SerializeField] private List<GitLogEntry> logEntries = new List<GitLogEntry>();
 
         [SerializeField] private int statusAhead;
-        [SerializeField] private int statusBehind;
 
         [SerializeField] private ChangesTree treeChanges = new ChangesTree { IsSelectable = false, DisplayRootNode = false };
 
-        [SerializeField] private CacheUpdateEvent lastCurrentRemoteChangedEvent;
         [SerializeField] private CacheUpdateEvent lastLogChangedEvent;
-        [SerializeField] private CacheUpdateEvent lastAheadBehindChangedEvent;
+        [SerializeField] private CacheUpdateEvent lastTrackingStatusChangedEvent;
 
         public override void OnEnable()
         {
@@ -387,68 +364,6 @@ public override void OnFocusChanged()
 
         public override void OnGUI()
         {
-            // History toolbar
-            GUILayout.BeginHorizontal(EditorStyles.toolbar);
-            {
-                GUILayout.FlexibleSpace();
-
-                if (hasRemote)
-                {
-                    EditorGUI.BeginDisabledGroup(currentRemoteName == null);
-                    {
-                        // Fetch button
-                        var fetchClicked = GUILayout.Button(FetchButtonText, Styles.HistoryToolbarButtonStyle);
-                        if (fetchClicked)
-                        {
-                            Fetch();
-                        }
-
-                        // Pull button
-                        var pullButtonText = statusBehind > 0 ? String.Format(PullButtonCount, statusBehind) : PullButton;
-                        var pullClicked = GUILayout.Button(pullButtonText, Styles.HistoryToolbarButtonStyle);
-
-                        if (pullClicked &&
-                            EditorUtility.DisplayDialog(PullConfirmTitle,
-                                String.Format(PullConfirmDescription, currentRemoteName),
-                                PullConfirmYes,
-                                PullConfirmCancel)
-                        )
-                        {
-                            Pull();
-                        }
-                    }
-                    EditorGUI.EndDisabledGroup();
-
-                    // Push button
-                    EditorGUI.BeginDisabledGroup(currentRemoteName == null || statusBehind != 0);
-                    {
-                        var pushButtonText = statusAhead > 0 ? String.Format(PushButtonCount, statusAhead) : PushButton;
-                        var pushClicked = GUILayout.Button(pushButtonText, Styles.HistoryToolbarButtonStyle);
-
-                        if (pushClicked &&
-                            EditorUtility.DisplayDialog(PushConfirmTitle,
-                                String.Format(PushConfirmDescription, currentRemoteName),
-                                PushConfirmYes,
-                                PushConfirmCancel)
-                        )
-                        {
-                            Push();
-                        }
-                    }
-                    EditorGUI.EndDisabledGroup();
-                }
-                else
-                {
-                    // Publishing a repo
-                    var publishedClicked = GUILayout.Button(PublishButton, Styles.HistoryToolbarButtonStyle);
-                    if (publishedClicked)
-                    {
-                        PopupWindow.OpenWindow(PopupWindow.PopupViewType.PublishView);
-                    }
-                }
-            }
-            GUILayout.EndHorizontal();
-
             var rect = GUILayoutUtility.GetLastRect();
             if (historyControl != null)
             {
@@ -569,11 +484,11 @@ private void RevertCommit()
             }
         }
 
-        private void RepositoryTrackingOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
+        private void RepositoryOnTrackingStatusChanged(CacheUpdateEvent cacheUpdateEvent)
         {
-            if (!lastAheadBehindChangedEvent.Equals(cacheUpdateEvent))
+            if (!lastTrackingStatusChangedEvent.Equals(cacheUpdateEvent))
             {
-                lastAheadBehindChangedEvent = cacheUpdateEvent;
+                lastTrackingStatusChangedEvent = cacheUpdateEvent;
                 currentTrackingStatusHasUpdate = true;
                 Redraw();
             }
@@ -589,26 +504,15 @@ private void RepositoryOnLogChanged(CacheUpdateEvent cacheUpdateEvent)
             }
         }
 
-        private void RepositoryOnCurrentRemoteChanged(CacheUpdateEvent cacheUpdateEvent)
-        {
-            if (!lastCurrentRemoteChangedEvent.Equals(cacheUpdateEvent))
-            {
-                lastCurrentRemoteChangedEvent = cacheUpdateEvent;
-                currentRemoteHasUpdate = true;
-                Redraw();
-            }
-        }
-
         private void AttachHandlers(IRepository repository)
         {
             if (repository == null)
             {
                 return;
             }
 
-            repository.TrackingStatusChanged += RepositoryTrackingOnStatusChanged;
+            repository.TrackingStatusChanged += RepositoryOnTrackingStatusChanged;
             repository.LogChanged += RepositoryOnLogChanged;
-            repository.CurrentRemoteChanged += RepositoryOnCurrentRemoteChanged;
         }
 
         private void DetachHandlers(IRepository repository)
@@ -618,16 +522,14 @@ private void DetachHandlers(IRepository repository)
                 return;
             }
 
-            repository.TrackingStatusChanged -= RepositoryTrackingOnStatusChanged;
+            repository.TrackingStatusChanged -= RepositoryOnTrackingStatusChanged;
             repository.LogChanged -= RepositoryOnLogChanged;
-            repository.CurrentRemoteChanged -= RepositoryOnCurrentRemoteChanged;
         }
 
         private void ValidateCachedData(IRepository repository)
         {
             repository.CheckAndRaiseEventsIfCacheNewer(CacheType.GitLog, lastLogChangedEvent);
-            repository.CheckAndRaiseEventsIfCacheNewer(CacheType.GitAheadBehind, lastAheadBehindChangedEvent);
-            repository.CheckAndRaiseEventsIfCacheNewer(CacheType.RepositoryInfo, lastCurrentRemoteChangedEvent);
+            repository.CheckAndRaiseEventsIfCacheNewer(CacheType.GitAheadBehind, lastTrackingStatusChangedEvent);
         }
 
         private void MaybeUpdateData()
@@ -637,25 +539,11 @@ private void MaybeUpdateData()
                 return;
             }
 
-            if (currentRemoteHasUpdate)
-            {
-                currentRemoteHasUpdate = false;
-
-                var currentRemote = Repository.CurrentRemote;
-                hasRemote = currentRemote.HasValue;
-                currentRemoteName = hasRemote ? currentRemote.Value.Name : "placeholder";
-            }
-
             if (currentTrackingStatusHasUpdate)
             {
                 currentTrackingStatusHasUpdate = false;
 
                 statusAhead = Repository.CurrentAhead;
-                statusBehind = Repository.CurrentBehind;
-
-                var currentChanges = Repository.CurrentChanges;
-                hasItemsToCommit = currentChanges != null
-                    && currentChanges.Any(entry => entry.Status != GitFileStatus.Ignored && !entry.Staged);
             }
 
             if (currentLogHasUpdate)
@@ -683,75 +571,6 @@ private void BuildHistoryControl()
             }
         }
 
-        private void Pull()
-        {
-            if (hasItemsToCommit)
-            {
-                EditorUtility.DisplayDialog("Pull", "You need to commit your changes before pulling.", "Cancel");
-            }
-            else
-            {
-                Repository
-                    .Pull()
-                    .FinallyInUI((success, e) => {
-                        if (success)
-                        {
-                            TaskManager.Run(UsageTracker.IncrementHistoryViewToolbarPull);
-
-                            EditorUtility.DisplayDialog(Localization.PullActionTitle,
-                                String.Format(Localization.PullSuccessDescription, currentRemoteName),
-                            Localization.Ok);
-                        }
-                        else
-                        {
-                            EditorUtility.DisplayDialog(Localization.PullActionTitle,
-                                Localization.PullFailureDescription,
-                            Localization.Ok);
-                        }
-                    })
-                    .Start();
-            }
-        }
-
-        private void Push()
-        {
-            Repository
-                .Push()
-                .FinallyInUI((success, e) => {
-                    if (success)
-                    {
-                        TaskManager.Run(UsageTracker.IncrementHistoryViewToolbarPush);
-
-                        EditorUtility.DisplayDialog(Localization.PushActionTitle,
-                            String.Format(Localization.PushSuccessDescription, currentRemoteName),
-                        Localization.Ok);
-                    }
-                    else
-                    {
-                        EditorUtility.DisplayDialog(Localization.PushActionTitle,
-                            Localization.PushFailureDescription,
-                        Localization.Ok);
-                    }
-                })
-                .Start();
-        }
-
-        private void Fetch()
-        {
-            Repository
-                .Fetch()
-                .FinallyInUI((success, e) => {
-                    if (!success)
-                    {
-                        TaskManager.Run(UsageTracker.IncrementHistoryViewToolbarFetch);
-
-                        EditorUtility.DisplayDialog(FetchActionTitle, FetchFailureDescription,
-                            Localization.Ok);
-                    }
-                })
-                .Start();
-        }
-
         private void BuildTree()
         {
             treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString();