Merge remote-tracking branch 'remotes/origin/enhancements/branches-view-rollup' into fixes/branches-view-remove-serialized-texture2d

# Conflicts:
#	src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs

Author: StanleyGoldman

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

@@ -8,6 +8,9 @@
 
 namespace GitHub.Unity
 {
+    [Serializable]
+    public class TreeNodeDictionary : SerializableDictionary<string, TreeNode> { }
+
     [Serializable]
     public abstract class Tree
     {
@@ -24,10 +27,9 @@ public abstract class Tree
         [SerializeField] private List<TreeNode> nodes = new List<TreeNode>();
         [SerializeField] private TreeNode selectedNode = null;
         [SerializeField] private TreeNode activeNode = null;
-        [SerializeField] private List<string> foldersKeys = new List<string>();
+        [SerializeField] private TreeNodeDictionary folders = new TreeNodeDictionary();
 
         [NonSerialized] private Stack<bool> indents = new Stack<bool>();
-        [NonSerialized] private Hashtable folders;
 
         public bool IsInitialized { get { return nodes != null && nodes.Count > 0 && !String.IsNullOrEmpty(nodes[0].Name); } }
         public bool RequiresRepaint { get; private set; }
@@ -48,26 +50,12 @@ private set
 
         public TreeNode ActiveNode { get { return activeNode; } }
 
-        private Hashtable Folders
-        {
-            get
-            {
-                if (folders == null)
-                {
-                    folders = new Hashtable();
-                    for (int i = 0; i < foldersKeys.Count; i++)
-                    {
-                        folders.Add(foldersKeys[i], null);
-                    }
-                }
-                return folders;
-            }
-        }
-
         public void Load(IEnumerable<ITreeData> data, string title)
         {
-            foldersKeys.Clear();
-            Folders.Clear();
+            var collapsedFoldersEnumerable = folders.Where(pair => pair.Value.IsCollapsed).Select(pair => pair.Key);
+            var collapsedFolders = new HashSet<string>(collapsedFoldersEnumerable);
+
+            folders.Clear();
             nodes.Clear();
 
             var titleNode = new TreeNode()
@@ -80,23 +68,27 @@ public void Load(IEnumerable<ITreeData> data, string title)
             SetNodeIcon(titleNode);
             nodes.Add(titleNode);
 
+            var hideChildren = false;
+            var hideChildrenBelowLevel = 0;
+
             foreach (var d in data)
             {
                 var parts = d.Name.Split('/');
                 for (int i = 0; i < parts.Length; i++)
                 {
                     var label = parts[i];
-                    var name = String.Join("/", parts, 0, i + 1);
+                    var level = i + 1;
+                    var name = String.Join("/", parts, 0, level);
                     var isFolder = i < parts.Length - 1;
-                    var alreadyExists = Folders.ContainsKey(name);
+                    var alreadyExists = folders.ContainsKey(name);
                     if (!alreadyExists)
                     {
-                        var node = new TreeNode()
+                        var node = new TreeNode
                         {
                             Name = name,
                             IsActive = d.IsActive,
                             Label = label,
-                            Level = i + 1,
+                            Level = level,
                             IsFolder = isFolder
                         };
 
@@ -105,17 +97,39 @@ public void Load(IEnumerable<ITreeData> data, string title)
                             activeNode = node;
                         }
 
+                        if (hideChildren)
+                        {
+                            if (level <= hideChildrenBelowLevel)
+                            {
+                                hideChildren = false;
+                            }
+                            else
+                            {
+                                node.IsHidden = true;
+                            }
+                        }
+
                         SetNodeIcon(node);
 
                         nodes.Add(node);
                         if (isFolder)
                         {
-                            Folders.Add(name, null);
+                            if (collapsedFolders.Contains(name))
+                            {
+                                node.IsCollapsed = true;
+
+                                if (!hideChildren)
+                                {
+                                    hideChildren = true;
+                                    hideChildrenBelowLevel = level;
+                                }
+                            }
+
+                            folders.Add(name, node);
                         }
                     }
                 }
             }
-            foldersKeys = Folders.Keys.Cast<string>().ToList();
         }
 
         public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null, Action<TreeNode> rightClick = null)