Adding generalized FileHistoryWindow and HistoryBase

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs

@@ -472,14 +472,14 @@ public static GUIStyle ToolbarButtonStyle
             }
         }
 
-        public static GUIStyle HistoryLockStyle
+        public static GUIStyle LockButtonStyle
         {
             get
             {
                 if (historyLockStyle == null)
                 {
                     historyLockStyle = new GUIStyle(GUI.skin.FindStyle("IN LockButton"));
-                    historyLockStyle.name = "HistoryLockStyle";
+                    historyLockStyle.name = "LockStyle";
                 }
                 historyLockStyle.margin = new RectOffset(3, 3, 2, 2);
                 return historyLockStyle;

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

@@ -17,7 +17,7 @@ private static void GitFileHistory()
                 foreach(var guid in Selection.assetGUIDs)
                 {
                     var assetPath = AssetDatabase.GUIDToAssetPath(guid);
-                    FileHistoryWindow.OpenWindow(assetPath);
+                    FileHistoryWindow.OpenWindow(EntryPoint.ApplicationManager, assetPath);
                     windowsOpened++;
                     if (windowsOpened >= maxWindowsToOpen)
                     {

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

@@ -1,244 +1,149 @@
-using System.Collections.Generic;
-using System.Linq;
-using System;
-using UnityEngine;
+using System;
 using UnityEditor;
+using UnityEngine;
 
 namespace GitHub.Unity
 {
     public class FileHistoryWindow : BaseWindow
     {
+        private const string Title = "File History";
+
+        [NonSerialized] private bool firstOnGUI = true;
+
+        [SerializeField] private bool locked;
         [SerializeField] private string assetPath;
-        [SerializeField] private List<GitLogEntry> history;
-        [SerializeField] private Vector2 scroll;
-        [SerializeField] private Vector2 detailsScroll;
-        [NonSerialized] private bool busy;
-        [SerializeField] private HistoryControl historyControl;
-        [SerializeField] private GitLogEntry selectedEntry = GitLogEntry.Default;
-        [SerializeField] private ChangesTree treeChanges = new ChangesTree { IsSelectable = false, DisplayRootNode = false };
+        [SerializeField] private FileHistoryView fileHistoryView = new FileHistoryView();
 
-        public static FileHistoryWindow OpenWindow(string assetPath)
+        public static FileHistoryWindow OpenWindow(IApplicationManager applicationManager, string assetPath)
         {
-            var popupWindow = CreateInstance<FileHistoryWindow>();
+            var fileHistoryWindow = CreateInstance<FileHistoryWindow>();
+            fileHistoryWindow.InitializeWindow(applicationManager);
 
-            popupWindow.titleContent = new GUIContent(assetPath + " History");
-            popupWindow.Open(assetPath);
+            fileHistoryWindow.Open(assetPath);
+            fileHistoryWindow.Show();
 
-            popupWindow.Show();
+            return fileHistoryWindow;
+        }
 
-            return popupWindow;
+        public void Open(string path)
+        {
+            assetPath = path;
+            fileHistoryView.SetPath(path);
         }
 
-        public override bool IsBusy { get { return this.busy; } }
+        public override void Initialize(IApplicationManager applicationManager)
+        {
+            base.Initialize(applicationManager);
 
-        public void Open(string assetPath)
+            fileHistoryView.InitializeView(this);
+        }
+
+        public override bool IsBusy
         {
-            this.assetPath = assetPath;
+            get { return false; }
+        }
 
-            this.RefreshLog();
+        public override void OnEnable()
+        {
+            base.OnEnable();
+
+            if (fileHistoryView != null)
+                fileHistoryView.OnEnable();
         }
 
-        public void RefreshLog()
+        public override void OnDisable()
         {
-            var path =  Application.dataPath.ToNPath().Parent.Combine(assetPath.ToNPath());
-            this.busy = true;
-            this.GitClient.LogFile(path).ThenInUI((success, logEntries) => {
-                this.history = logEntries;
-                this.BuildHistoryControl();
-                this.Repaint();
-                this.busy = false;
-            }).Start();
+            base.OnDisable();
+            if (fileHistoryView != null)
+                fileHistoryView.OnDisable();
         }
 
-        private void CheckoutVersion(string commitID)
+        public override void OnDataUpdate()
         {
-            this.busy = true;
-            this.GitClient.CheckoutVersion(commitID, new string[]{assetPath}).ThenInUI((success, result) => {
-                AssetDatabase.Refresh();
-                this.busy = false;
-            }).Start();
+            base.OnDataUpdate();
+            MaybeUpdateData();
+
+            if (fileHistoryView != null)
+                fileHistoryView.OnDataUpdate();
         }
 
-        private void Checkout()
+        public override void OnFocusChanged()
         {
-            // TODO:  This is a destructive, irreversible operation; we should prompt user if
-            // there are any changes to the file
-            this.CheckoutVersion(this.selectedEntry.CommitID);
+            if (fileHistoryView != null)
+                fileHistoryView.OnFocusChanged();
         }
 
-        public override void OnUI()
+        public override void OnRepositoryChanged(IRepository oldRepository)
         {
-            // TODO:
-            //   - should handle case where the file is outside of the repository (handle exceptional cases)
-            //   - should display a spinner while history is still loading...
-            base.OnUI();
-            GUILayout.BeginHorizontal(Styles.HeaderStyle);
+            base.OnRepositoryChanged(oldRepository);
+
+            DetachHandlers(oldRepository);
+            AttachHandlers(Repository);
+
+            if (HasRepository)
             {
-                GUILayout.Label("GIT File History for: ", Styles.BoldLabel);
-                if (HyperlinkLabel(this.assetPath))
-                {
-                    var asset = AssetDatabase.LoadMainAssetAtPath(this.assetPath);
-                    Selection.activeObject = asset;
-                    EditorGUIUtility.PingObject(asset);
-                }
-                GUILayout.FlexibleSpace();
+                
             }
-            GUILayout.EndHorizontal();
-
-            if (historyControl != null)
+            else
             {
-                var rect = GUILayoutUtility.GetLastRect();
-                var historyControlRect = new Rect(0f, 0f, Position.width, Position.height - rect.height);
-
-                var requiresRepaint = historyControl.Render(historyControlRect,  
-                    entry => {
-                        selectedEntry = entry;
-                        BuildTree();
-                    },
-                    entry => { }, entry => {
-                        GenericMenu menu = new GenericMenu();
-                        menu.AddItem(new GUIContent("Checkout version " + entry.ShortID), false, Checkout);
-                        menu.ShowAsContext();
-                    });
-
-                if (requiresRepaint)
-                    Redraw();
+               
             }
+        }
 
-            // DrawDetails is maybe irrelevant?  Would be a nice place to put the short id perhaps?
-            DrawDetails();
+        public override void OnSelectionChange()
+        {
+            base.OnSelectionChange();
+            if (fileHistoryView != null)
+                fileHistoryView.OnSelectionChange();
         }
 
-        private bool HyperlinkLabel(string label)
+        public override void Refresh()
         {
-            bool returnValue = false;
-            if (GUILayout.Button(label, HyperlinkStyle))
-            {
-                returnValue = true;
-            }
-            var rect = GUILayoutUtility.GetLastRect();
-            var size = HyperlinkStyle.CalcSize(new GUIContent(label));
-            rect.width = size.x;
-            EditorGUIUtility.AddCursorRect(rect, MouseCursor.Link);
-            return returnValue;
+            base.Refresh();
+            if (fileHistoryView != null)
+                fileHistoryView.Refresh();
+            Refresh(CacheType.GitLocks);
+            Redraw();
         }
 
-        private void BuildHistoryControl()
+        public override void OnUI()
         {
-            if (historyControl == null)
-            {
-                historyControl = new HistoryControl();
-            }
+            base.OnUI();
 
-            historyControl.Load(0, this.history);
+            fileHistoryView.OnGUI();
         }
 
-        private const string CommitDetailsTitle = "Commit details";
-        private const string ClearSelectionButton = "×";
-
-        private void DrawDetails()
+        private void MaybeUpdateData()
         {
-            if (!selectedEntry.Equals(GitLogEntry.Default))
+            if (firstOnGUI)
             {
-                // Top bar for scrolling to selection or clearing it
-                GUILayout.BeginHorizontal(EditorStyles.toolbar);
-                {
-                    if (GUILayout.Button(CommitDetailsTitle, Styles.ToolbarButtonStyle))
-                    {
-                        historyControl.ScrollTo(historyControl.SelectedIndex);
-                    }
-                    if (GUILayout.Button(ClearSelectionButton, Styles.ToolbarButtonStyle, GUILayout.ExpandWidth(false)))
-                    {
-                        selectedEntry = GitLogEntry.Default;
-                        historyControl.SelectedIndex = -1;
-                    }
-                }
-                GUILayout.EndHorizontal();
-
-                // Log entry details - including changeset tree (if any changes are found)
-                detailsScroll = GUILayout.BeginScrollView(detailsScroll, GUILayout.Height(250));
-                {
-                    HistoryDetailsEntry(selectedEntry);
-
-                    GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
-                    GUILayout.Label("Files changed", EditorStyles.boldLabel);
-                    GUILayout.Space(-5);
-
-                    var rect = GUILayoutUtility.GetLastRect();
-                    GUILayout.BeginHorizontal(Styles.HistoryFileTreeBoxStyle);
-                    GUILayout.BeginVertical();
-                    {
-                        var borderLeft = Styles.Label.margin.left;
-                        var treeControlRect = new Rect(rect.x + borderLeft, rect.y, Position.width - borderLeft * 2, Position.height - rect.height + Styles.CommitAreaPadding);
-                        var treeRect = new Rect(0f, 0f, 0f, 0f);
-                        if (treeChanges != null)
-                        {
-                            treeChanges.FolderStyle = Styles.Foldout;
-                            treeChanges.TreeNodeStyle = Styles.TreeNode;
-                            treeChanges.ActiveTreeNodeStyle = Styles.ActiveTreeNode;
-                            treeChanges.FocusedTreeNodeStyle = Styles.FocusedTreeNode;
-                            treeChanges.FocusedActiveTreeNodeStyle = Styles.FocusedActiveTreeNode;
-
-                            treeRect = treeChanges.Render(treeControlRect, detailsScroll,
-                                node => {
-                                },
-                                node => {
-                                },
-                                node => {
-                                });
-
-                            if (treeChanges.RequiresRepaint)
-                                Redraw();
-                        }
-
-                        GUILayout.Space(treeRect.y - treeControlRect.y);
-                    }
-                    GUILayout.EndVertical();
-                    GUILayout.EndHorizontal();
-
-                    GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
-                }
-                GUILayout.EndScrollView();
+                titleContent = new GUIContent(Title, Styles.SmallLogo);
             }
+            firstOnGUI = false;
         }
 
-        private void HistoryDetailsEntry(GitLogEntry entry)
+        private void AttachHandlers(IRepository repository)
         {
-            GUILayout.BeginVertical(Styles.HeaderBoxStyle);
-            GUILayout.Label(entry.Summary, Styles.HistoryDetailsTitleStyle);
-
-            GUILayout.Space(-5);
-
-            GUILayout.BeginHorizontal();
-            GUILayout.Label(entry.PrettyTimeString, Styles.HistoryDetailsMetaInfoStyle);
-            GUILayout.Label(entry.AuthorName, Styles.HistoryDetailsMetaInfoStyle);
-            GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal();
-
-            GUILayout.Space(3);
-            GUILayout.EndVertical();
+            if (repository == null)
+                return;
         }
 
-        private void BuildTree()
+        private void DetachHandlers(IRepository repository)
         {
-            treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString();
-            treeChanges.Load(selectedEntry.changes.Select(entry => new GitStatusEntryTreeData(entry)));
-            Redraw();
+            if (repository == null)
+                return;
         }
 
-        protected static GUIStyle hyperlinkStyle = null;
-
-        public static GUIStyle HyperlinkStyle
+        private void ShowButton(Rect rect)
         {
-            get
-            {
-                if (hyperlinkStyle == null)
-                {
-                    hyperlinkStyle = new GUIStyle(EditorStyles.wordWrappedLabel);
-                    hyperlinkStyle.normal.textColor = new Color(95.0f/255.0f, 170.0f/255.0f, 247.0f/255.0f);
-                }
-                return hyperlinkStyle;
-            }
-        }        
+            EditorGUI.BeginChangeCheck();
+            
+            locked = GUI.Toggle(rect, locked, GUIContent.none, Styles.LockButtonStyle);
+
+            if (!EditorGUI.EndChangeCheck())
+                return;
+
+            this.OnSelectionChange();
+        }
     }
-}
+}