Starting to figure out the ChangesView

Author: StanleyGoldman

src/GitHub.Api/Git/GitStatusEntry.cs

@@ -5,28 +5,63 @@ namespace GitHub.Unity
     [Serializable]
     public struct GitStatusEntry
     {
-        public string Path;
-        public string FullPath;
-        public string ProjectPath;
-        public string OriginalPath;
-        public GitFileStatus Status;
-        public bool Staged;
+        public static GitStatusEntry Default = new GitStatusEntry();
+        
+        public string path;
+        public string fullPath;
+        public string projectPath;
+        public string originalPath;
+        public GitFileStatus status;
+        public bool staged;
 
         public GitStatusEntry(string path, string fullPath, string projectPath,
             GitFileStatus status,
             string originalPath = null, bool staged = false)
         {
-            Path = path;
-            Status = status;
-            FullPath = fullPath;
-            ProjectPath = projectPath;
-            OriginalPath = originalPath;
-            Staged = staged;
+            Guard.ArgumentNotNullOrWhiteSpace(path, "path");
+            Guard.ArgumentNotNullOrWhiteSpace(fullPath, "fullPath");
+            Guard.ArgumentNotNullOrWhiteSpace(projectPath, "projectPath");
+
+            this.path = path;
+            this.status = status;
+            this.fullPath = fullPath;
+            this.projectPath = projectPath;
+            this.originalPath = originalPath;
+            this.staged = staged;
         }
 
+        public string Path => path;
+
+        public string FullPath => fullPath;
+
+        public string ProjectPath => projectPath;
+
+        public string OriginalPath => originalPath;
+
+        public GitFileStatus Status => status;
+
+        public bool Staged => staged;
+
         public override string ToString()
         {
-            return String.Format("Path:'{0}' Status:'{1}' FullPath:'{2}' ProjectPath:'{3}' OriginalPath:'{4}' Staged:'{5}'", Path, Status, FullPath, ProjectPath, OriginalPath, Staged);
+            return $"Path:'{Path}' Status:'{Status}' FullPath:'{FullPath}' ProjectPath:'{ProjectPath}' OriginalPath:'{OriginalPath}' Staged:'{Staged}'";
+        }
+    }
+
+    [Serializable]
+    public struct GitStatusEntryTreeData : ITreeData
+    {
+        public static GitStatusEntryTreeData Default = new GitStatusEntryTreeData(GitStatusEntry.Default);
+
+        public GitStatusEntry gitStatusEntry;
+
+        public GitStatusEntryTreeData(GitStatusEntry gitStatusEntry)
+        {
+            this.gitStatusEntry = gitStatusEntry;
         }
+
+        public string Name => gitStatusEntry.FullPath;
+        public bool IsActive => false;
+        public GitStatusEntry GitStatusEntry => gitStatusEntry;
     }
 }

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
@@ -27,13 +28,6 @@ class ChangesView : Subview
         [SerializeField] private Vector2 horizontalScroll;
         [SerializeField] private CacheUpdateEvent lastCurrentBranchChangedEvent;
         [SerializeField] private CacheUpdateEvent lastStatusChangedEvent;
-        [SerializeField] private ChangesetTreeView tree = new ChangesetTreeView();
-
-        public override void InitializeView(IView parent)
-        {
-            base.InitializeView(parent);
-            tree.InitializeView(this);
-        }
 
         public override void OnEnable()
         {
@@ -64,7 +58,7 @@ public override void OnGUI()
         {
             GUILayout.BeginHorizontal();
             {
-                EditorGUI.BeginDisabledGroup(tree.Entries.Count == 0);
+                EditorGUI.BeginDisabledGroup(false);
                 {
                     if (GUILayout.Button(SelectAllButton, EditorStyles.miniButtonLeft))
                     {
@@ -80,23 +74,18 @@ public override void OnGUI()
 
                 GUILayout.FlexibleSpace();
 
-                GUILayout.Label(
-                    tree.Entries.Count == 0
-                        ? NoChangedFilesLabel
-                        : tree.Entries.Count == 1
-                            ? OneChangedFileLabel
-                            : String.Format(ChangedFilesLabel, tree.Entries.Count), EditorStyles.miniLabel);
+//                GUILayout.Label(
+//                    tree.Entries.Count == 0
+//                        ? NoChangedFilesLabel
+//                        : tree.Entries.Count == 1
+//                            ? OneChangedFileLabel
+//                            : String.Format(ChangedFilesLabel, tree.Entries.Count), EditorStyles.miniLabel);
             }
             GUILayout.EndHorizontal();
 
             horizontalScroll = GUILayout.BeginScrollView(horizontalScroll);
-            GUILayout.BeginHorizontal();
-            GUILayout.BeginVertical(Styles.CommitFileAreaStyle);
             {
-                tree.OnGUI();
             }
-            GUILayout.EndVertical();
-            GUILayout.EndHorizontal();
             GUILayout.EndScrollView();
 
             // Do the commit details area
@@ -156,8 +145,6 @@ private void MaybeUpdateData()
             if (currentStatusHasUpdate)
             {
                 currentStatusHasUpdate = false;
-                var gitStatus = Repository.CurrentStatus;
-                tree.UpdateEntries(gitStatus.Entries.Where(x => x.Status != GitFileStatus.Ignored).ToList());
             }
         }
 
@@ -186,7 +173,8 @@ private void OnCommitDetailsAreaGUI()
                     GUILayout.Space(Styles.CommitAreaPadding);
 
                     // Disable committing when already committing or if we don't have all the data needed
-                    EditorGUI.BeginDisabledGroup(isBusy || string.IsNullOrEmpty(commitMessage) || !tree.CommitTargets.Any(t => t.Any));
+                    //EditorGUI.BeginDisabledGroup(isBusy || string.IsNullOrEmpty(commitMessage) || !tree.CommitTargets.Any(t => t.Any));
+                    EditorGUI.BeginDisabledGroup(isBusy || string.IsNullOrEmpty(commitMessage));
                     {
                         GUILayout.BeginHorizontal();
                         {
@@ -212,48 +200,48 @@ private void OnCommitDetailsAreaGUI()
 
         private void SelectAll()
         {
-            for (var index = 0; index < tree.CommitTargets.Count; ++index)
-            {
-                tree.CommitTargets[index].All = true;
-            }
+//            for (var index = 0; index < tree.CommitTargets.Count; ++index)
+//            {
+//                tree.CommitTargets[index].All = true;
+//            }
         }
 
         private void SelectNone()
         {
-            for (var index = 0; index < tree.CommitTargets.Count; ++index)
-            {
-                tree.CommitTargets[index].All = false;
-            }
+//            for (var index = 0; index < tree.CommitTargets.Count; ++index)
+//            {
+//                tree.CommitTargets[index].All = false;
+//            }
         }
 
         private void Commit()
         {
             // Do not allow new commits before we have received one successful update
-            isBusy = true;
-
-            var files = Enumerable.Range(0, tree.Entries.Count)
-                .Where(i => tree.CommitTargets[i].All)
-                .Select(i => tree.Entries[i].Path)
-                .ToList();
-
-            ITask addTask;
-
-            if (files.Count == tree.Entries.Count)
-            {
-                addTask = Repository.CommitAllFiles(commitMessage, commitBody);
-            }
-            else
-            {
-                addTask = Repository.CommitFiles(files, commitMessage, commitBody);
-            }
-
-            addTask
-                .FinallyInUI((b, exception) => 
-                    {
-                        commitMessage = "";
-                        commitBody = "";
-                        isBusy = false;
-                    }).Start();
+//            isBusy = true;
+//
+//            var files = Enumerable.Range(0, tree.Entries.Count)
+//                .Where(i => tree.CommitTargets[i].All)
+//                .Select(i => tree.Entries[i].Path)
+//                .ToList();
+//
+//            ITask addTask;
+//
+//            if (files.Count == tree.Entries.Count)
+//            {
+//                addTask = Repository.CommitAllFiles(commitMessage, commitBody);
+//            }
+//            else
+//            {
+//                addTask = Repository.CommitFiles(files, commitMessage, commitBody);
+//            }
+//
+//            addTask
+//                .FinallyInUI((b, exception) => 
+//                    {
+//                        commitMessage = "";
+//                        commitBody = "";
+//                        isBusy = false;
+//                    }).Start();
         }
 
         public override bool IsBusy