Merge branch 'master' into fixes/window-child-view-attach

StanleyGoldman · web-flow · commit 149ea4c9269a · 2017-11-02T16:25:35.000-04:00
diff --git a/src/GitHub.Api/Git/GitBranch.cs b/src/GitHub.Api/Git/GitBranch.cs
@@ -11,20 +11,23 @@ interface ITreeData
     [Serializable]
     public struct GitBranch : ITreeData
     {
-        private string name;
-        private string tracking;
-        private bool active;
+        public static GitBranch Default = new GitBranch();
+
+        public string name;
+        public string tracking;
+        public bool isActive;
+
         public string Name { get { return name; } }
         public string Tracking { get { return tracking; } }
-        public bool IsActive { get { return active; } }
+        public bool IsActive { get { return isActive; } }
 
         public GitBranch(string name, string tracking, bool active)
         {
             Guard.ArgumentNotNullOrWhiteSpace(name, "name");
 
             this.name = name;
             this.tracking = tracking;
-            this.active = active;
+            this.isActive = active;
         }
 
         public override string ToString()
diff --git a/src/GitHub.Api/Git/GitLock.cs b/src/GitHub.Api/Git/GitLock.cs
@@ -5,12 +5,12 @@ namespace GitHub.Unity
     [Serializable]
     public struct GitLock
     {
-        public static GitLock Default = new GitLock(null, null, null, -1);
+        public static GitLock Default = new GitLock { ID = -1 };
 
-        public readonly int ID;
-        public readonly string Path;
-        public readonly string FullPath;
-        public readonly string User;
+        public int ID;
+        public string Path;
+        public string FullPath;
+        public string User;
 
         public GitLock(string path, string fullPath, string user, int id)
         {
diff --git a/src/GitHub.Api/Git/Repository.cs b/src/GitHub.Api/Git/Repository.cs
@@ -303,9 +303,9 @@ private void RepositoryManager_OnRemoteBranchRemoved(string remote, string name)
             Dictionary<string, ConfigBranch> branchList;
             if (remoteBranches.TryGetValue(remote, out branchList))
             {
-                if (localBranches.ContainsKey(name))
+                if (branchList.ContainsKey(name))
                 {
-                    localBranches.Remove(name);
+                    branchList.Remove(name);
 
                     Logger.Trace("OnRemoteBranchListChanged");
                     OnRemoteBranchListChanged?.Invoke();
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs
@@ -123,56 +123,6 @@ public List<GitBranch> RemoteBranches
         }
     }
 
-    [Location("views/branches.yaml", LocationAttribute.Location.LibraryFolder)]
-    sealed class Favorites : ScriptObjectSingleton<Favorites>
-    {
-        [SerializeField] private List<string> favoriteBranches;
-        public List<string> FavoriteBranches
-        {
-            get
-            {
-                if (favoriteBranches == null)
-                    FavoriteBranches = new List<string>();
-                return favoriteBranches;
-            }
-            set
-            {
-                favoriteBranches = value;
-                Save(true);
-            }
-        }
-
-        public void SetFavorite(string branchName)
-        {
-            if (FavoriteBranches.Contains(branchName))
-                return;
-            FavoriteBranches.Add(branchName);
-            Save(true);
-        }
-
-        public void UnsetFavorite(string branchName)
-        {
-            if (!FavoriteBranches.Contains(branchName))
-                return;
-            FavoriteBranches.Remove(branchName);
-            Save(true);
-        }
-
-        public void ToggleFavorite(string branchName)
-        {
-            if (FavoriteBranches.Contains(branchName))
-                FavoriteBranches.Remove(branchName);
-            else
-                FavoriteBranches.Add(branchName);
-            Save(true);
-        }
-
-        public bool IsFavorite(string branchName)
-        {
-            return FavoriteBranches.Contains(branchName);
-        }
-    }
-
     [Location("cache/gitlog.yaml", LocationAttribute.Location.LibraryFolder)]
     sealed class GitLogCache : ScriptObjectSingleton<GitLogCache>
     {
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -24,8 +24,6 @@ class BranchesView : Subview
         private const string WarningCheckoutBranchExistsOK = "Ok";
         private const string NewBranchCancelButton = "x";
         private const string NewBranchConfirmButton = "Create";
-        private const string FavoritesSetting = "Favorites";
-        private const string FavoritesTitle = "Favorites";
         private const string CreateBranchTitle = "Create Branch";
         private const string LocalTitle = "Local branches";
         private const string RemoteTitle = "Remote branches";
@@ -38,11 +36,9 @@ class BranchesView : Subview
         private bool showLocalBranches = true;
         private bool showRemoteBranches = true;
 
-        [NonSerialized] private List<BranchTreeNode> favorites = new List<BranchTreeNode>();
         [NonSerialized] private int listID = -1;
         [NonSerialized] private BranchTreeNode newNodeSelection;
         [NonSerialized] private BranchesMode targetMode;
-        [NonSerialized] private bool favoritesHasChanged;
 
         [SerializeField] private BranchTreeNode activeBranchNode;
         [SerializeField] private BranchTreeNode localRoot;
@@ -51,7 +47,6 @@ class BranchesView : Subview
         [SerializeField] private List<Remote> remotes = new List<Remote>();
         [SerializeField] private Vector2 scroll;
         [SerializeField] private BranchTreeNode selectedNode;
-        [SerializeField] private List<string> favoritesList = new List<string>();
 
         public override void InitializeView(IView parent)
         {
@@ -63,7 +58,6 @@ public override void OnEnable()
         {
             base.OnEnable();
             AttachHandlers(Repository);
-            favoritesHasChanged = true;
             Refresh();
         }
 
@@ -81,11 +75,6 @@ public override void OnDataUpdate()
 
         private void MaybeUpdateData()
         {
-            if (favoritesHasChanged)
-            {
-                favoritesList = Manager.LocalSettings.Get(FavoritesSetting, new List<string>());
-                favoritesHasChanged = false;
-            }
         }
 
         private void AttachHandlers(IRepository repository)
@@ -150,28 +139,6 @@ public void OnEmbeddedGUI()
 
                 GUILayout.BeginVertical(Styles.CommitFileAreaStyle);
                 {
-                    // Favorites list
-                    if (favorites.Count > 0)
-                    {
-                        GUILayout.Label(FavoritesTitle);
-                        GUILayout.BeginHorizontal();
-                        {
-                            GUILayout.BeginVertical();
-                            {
-                                for (var index = 0; index < favorites.Count; ++index)
-                                {
-                                    OnTreeNodeGUI(favorites[index]);
-                                }
-                            }
-
-                            GUILayout.EndVertical();
-                        }
-
-                        GUILayout.EndHorizontal();
-
-                        GUILayout.Space(Styles.BranchListSeperation);
-                    }
-
                     // Local branches and "create branch" button
                     showLocalBranches = EditorGUILayout.Foldout(showLocalBranches, LocalTitle);
                     if (showLocalBranches)
@@ -254,16 +221,6 @@ public void OnEmbeddedGUI()
 
         private int CompareBranches(GitBranch a, GitBranch b)
         {
-            if (IsFavorite(a.Name))
-            {
-                return -1;
-            }
-
-            if (IsFavorite(b.Name))
-            {
-                return 1;
-            }
-
             if (a.Name.Equals("master"))
             {
                 return -1;
@@ -277,11 +234,6 @@ private int CompareBranches(GitBranch a, GitBranch b)
             return 0;
         }
 
-        private bool IsFavorite(string branchName)
-        {
-            return !String.IsNullOrEmpty(branchName) && favoritesList.Contains(branchName);
-        }
-
         private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remote)
         {
             //Clear the selected node
@@ -297,9 +249,6 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
             var tracking = new List<KeyValuePair<int, int>>();
             var localBranchNodes = new List<BranchTreeNode>();
 
-            // Prepare for updated favorites listing
-            favorites.Clear();
-
             // Just build directly on the local root, keep track of active branch
             localRoot = new BranchTreeNode("", NodeType.Folder, false);
             for (var index = 0; index < localBranches.Count; ++index)
@@ -327,12 +276,6 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
                     }
                 }
 
-                // Add to favorites
-                if (favoritesList.Contains(branch.Name))
-                {
-                    favorites.Add(node);
-                }
-
                 // Build into tree
                 BuildTree(localRoot, node);
             }
@@ -371,12 +314,6 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
                     }
                 }
 
-                // Add to favorites
-                if (favoritesList.Contains(branch.Name))
-                {
-                    favorites.Add(node);
-                }
-
                 // Build on the root of the remote, just like with locals
                 BuildTree(remotes[remoteIndex].Root, node);
             }
@@ -409,26 +346,6 @@ private void BuildTree(BranchTreeNode parent, BranchTreeNode child)
             BuildTree(folder, child);
         }
 
-        private void SetFavorite(BranchTreeNode branch, bool favorite)
-        {
-            if (string.IsNullOrEmpty(branch.Name))
-            {
-                return;
-            }
-
-            if (!favorite)
-            {
-                favorites.Remove(branch);
-                Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList());
-            }
-            else
-            {
-                favorites.Remove(branch);
-                favorites.Add(branch);
-                Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList());
-            }
-        }
-
         private void OnButtonBarGUI()
         {
             if (mode == BranchesMode.Default)
@@ -568,7 +485,6 @@ private void OnTreeNodeGUI(BranchTreeNode node)
             var style = node.Active ? Styles.BoldLabel : Styles.Label;
             var rect = GUILayoutUtility.GetRect(content, style, GUILayout.MaxHeight(EditorGUIUtility.singleLineHeight));
             var clickRect = new Rect(0f, rect.y, Position.width, rect.height);
-            var favoriteRect = new Rect(clickRect.xMax - clickRect.height * 2f, clickRect.y, clickRect.height, clickRect.height);
 
             var selected = selectedNode == node;
             var keyboardFocus = GUIUtility.keyboardControl == listID;
@@ -580,25 +496,6 @@ private void OnTreeNodeGUI(BranchTreeNode node)
                 {
                     style.Draw(clickRect, GUIContent.none, false, false, true, keyboardFocus);
                 }
-
-                if (node.Type != NodeType.Folder)
-                {
-                    var favorite = IsFavorite(node.Name);
-                    if (Event.current.type == EventType.Repaint)
-                    {
-                        GUI.DrawTexture(favoriteRect, favorite ? Styles.FavoriteIconOn : Styles.FavoriteIconOff);
-                    }
-                    else if (Event.current.type == EventType.MouseDown && favoriteRect.Contains(Event.current.mousePosition))
-                    {
-                        SetFavorite(node, !favorite);
-                        Event.current.Use();
-                    }
-                }
-            }
-            // Favorite status
-            else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && IsFavorite(node.Name))
-            {
-                GUI.DrawTexture(favoriteRect, Styles.FavoriteIconOn);
             }
 
             // The actual icon and label
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs
@@ -1,5 +1,3 @@
-#pragma warning disable 649
-
 using System;
 using System.Linq;
 using UnityEditor;
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesetTreeView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesetTreeView.cs
@@ -1,5 +1,3 @@
-#pragma warning disable 649
-
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
@@ -1,5 +1,3 @@
-#pragma warning disable 649
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -42,7 +40,6 @@ class HistoryView : Subview
         [NonSerialized] private int selectionIndex;
         [NonSerialized] private bool logHasChanged;
         [NonSerialized] private bool useScrollTime;
-        [NonSerialized] private bool isBusy;
 
         [SerializeField] private Vector2 detailsScroll;
         [SerializeField] private Vector2 scroll;
@@ -642,7 +639,7 @@ private void DrawTimelineRectAroundIconRect(Rect parentRect, Rect iconRect)
 
         public override bool IsBusy
         {
-            get { return isBusy; }
+            get { return false; }
         }
 
         private float EntryHeight
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
diff --git a/src/tests/IntegrationTests/Events/RepositoryManagerTests.cs b/src/tests/IntegrationTests/Events/RepositoryManagerTests.cs

Original file line number	Diff line number	Diff line change
`@@ -303,9 +303,9 @@ private void RepositoryManager_OnRemoteBranchRemoved(string remote, string name)`
`303`	`303`	`Dictionary<string, ConfigBranch> branchList;`
`304`	`304`	`if (remoteBranches.TryGetValue(remote, out branchList))`
`305`	`305`	`{`
`306`		`- if (localBranches.ContainsKey(name))`
	`306`	`+ if (branchList.ContainsKey(name))`
`307`	`307`	`{`
`308`		`- localBranches.Remove(name);`
	`308`	`+ branchList.Remove(name);`
`309`	`309`
`310`	`310`	`Logger.Trace("OnRemoteBranchListChanged");`
`311`	`311`	`OnRemoteBranchListChanged?.Invoke();`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#pragma warning disable 649`
`2`		`-`
`3`	`1`	`using System;`
`4`	`2`	`using System.Linq;`
`5`	`3`	`using UnityEditor;`