Merge remote-tracking branch 'remotes/origin/enhancements/history-detail-tree-view-rollup' into enhancements/removing-old-tree-code

Author: StanleyGoldman

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

@@ -39,8 +39,8 @@ class BranchesView : Subview
         [NonSerialized] private int listID = -1;
         [NonSerialized] private BranchesMode targetMode;
 
-        [SerializeField] private BranchesTree treeLocals;
-        [SerializeField] private BranchesTree treeRemotes;
+        [SerializeField] private BranchesTree treeLocals = new BranchesTree { Title = LocalTitle };
+        [SerializeField] private BranchesTree treeRemotes = new BranchesTree { Title = RemoteTitle, IsRemote = true };
         [SerializeField] private BranchesMode mode = BranchesMode.Default;
         [SerializeField] private string newBranchName;
         [SerializeField] private Vector2 scroll;
@@ -155,18 +155,6 @@ private void Render()
 
         private void BuildTree()
         {
-            if (treeLocals == null)
-            {
-                treeLocals = new BranchesTree();
-                treeLocals.Title = LocalTitle;
-
-                treeRemotes = new BranchesTree();
-                treeRemotes.Title = RemoteTitle;
-                treeRemotes.IsRemote = true;
-
-                TreeOnEnable();
-            }
-
             localBranches.Sort(CompareBranches);
             remoteBranches.Sort(CompareBranches);
 

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

@@ -28,7 +28,7 @@ class ChangesView : Subview
         [SerializeField] private string currentBranch = "[unknown]";
 
         [SerializeField] private Vector2 treeScroll;
-        [SerializeField] private ChangesTree treeChanges;
+        [SerializeField] private ChangesTree treeChanges = new ChangesTree { DisplayRootNode = false, IsCheckable = true };
 
         [SerializeField] private HashSet<string> gitLocks;
         [SerializeField] private List<GitStatusEntry> gitStatusEntries;
@@ -212,17 +212,7 @@ private void MaybeUpdateData()
 
         private void BuildTree()
         {
-            if (treeChanges == null)
-            {
-                treeChanges = new ChangesTree();
-                treeChanges.Title = "Changes";
-                treeChanges.DisplayRootNode = false;
-                treeChanges.IsCheckable = true;
-                treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString();
-
-                TreeOnEnable();
-            }
-
+            treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString();
             treeChanges.Load(gitStatusEntries.Select(entry => new GitStatusEntryTreeData(entry, gitLocks.Contains(entry.Path))));
             Redraw();
         }

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

@@ -342,7 +342,7 @@ class HistoryView : Subview
         [SerializeField] private int statusAhead;
         [SerializeField] private int statusBehind;
 
-        [SerializeField] private ChangesTree treeChanges;
+        [SerializeField] private ChangesTree treeChanges = new ChangesTree { IsSelectable = false, DisplayRootNode = false };
 
         [SerializeField] private CacheUpdateEvent lastCurrentRemoteChangedEvent;
         [SerializeField] private CacheUpdateEvent lastLogChangedEvent;
@@ -716,17 +716,7 @@ private void Fetch()
 
         private void BuildTree()
         {
-            if (treeChanges == null)
-            {
-                treeChanges = new ChangesTree();
-                treeChanges.Title = "Changes";
-                treeChanges.IsSelectable = false;
-                treeChanges.DisplayRootNode = false;
-                treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString();
-
-                TreeOnEnable();
-            }
-
+            treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString();
             treeChanges.Load(selectedEntry.changes.Select(entry => new GitStatusEntryTreeData(entry)));
             Redraw();
         }

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

@@ -10,11 +10,12 @@ class InitProjectView : Subview
         private const string NoRepoTitle = "To begin using GitHub, initialize a git repository";
         private const string NoUserOrEmailError = "Name and email not set in git. Go into the settings tab and enter the missing information";
 
-        [NonSerialized] private bool isBusy;
-        [NonSerialized] private bool isUserDataPresent;
-        [NonSerialized] private bool hasCompletedInitialCheck;
+        [SerializeField] private bool hasCompletedInitialCheck;
+        [SerializeField] private bool isUserDataPresent;
 
         [SerializeField] private CacheUpdateEvent lastCheckUserChangedEvent;
+
+        [NonSerialized] private bool isBusy;
         [NonSerialized] private bool userHasChanges;
 
         public override void OnEnable()