Merge pull request #471 from github-for-unity/enhancements/changes-tree-view-rollup

Changes TreeView Rollup

Author: StanleyGoldman

src/GitHub.Api/Git/GitBranch.cs

@@ -2,14 +2,8 @@
 
 namespace GitHub.Unity
 {
-    public interface ITreeData
-    {
-        string Name { get; }
-        bool IsActive { get; }
-    }
-
     [Serializable]
-    public struct GitBranch : ITreeData
+    public struct GitBranch
     {
         public static GitBranch Default = new GitBranch();
 

src/GitHub.Api/Git/TreeData.cs

@@ -0,0 +1,46 @@
+using System;
+
+namespace GitHub.Unity
+{
+    public interface ITreeData
+    {
+        string Path { get; }
+        bool IsActive { get; }
+    }
+
+    [Serializable]
+    public struct GitBranchTreeData : ITreeData
+    {
+        public static GitBranchTreeData Default = new GitBranchTreeData(Unity.GitBranch.Default);
+
+        public GitBranch GitBranch;
+
+        public GitBranchTreeData(GitBranch gitBranch)
+        {
+            GitBranch = gitBranch;
+        }
+
+        public string Path => GitBranch.Name;
+        public bool IsActive => GitBranch.IsActive;
+    }
+
+    [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 Path => gitStatusEntry.Path;
+        public string ProjectPath => gitStatusEntry.ProjectPath;
+        public bool IsActive => false;
+        public GitStatusEntry GitStatusEntry => gitStatusEntry;
+
+        public GitFileStatus FileStatus => gitStatusEntry.Status;
+    }
+}

src/GitHub.Api/GitHub.Api.csproj

@@ -107,6 +107,7 @@
     <Compile Include="Git\Tasks\GitAheadBehindStatusTask.cs" />
     <Compile Include="Git\Tasks\GitLfsVersionTask.cs" />
     <Compile Include="Git\Tasks\GitVersionTask.cs" />
+    <Compile Include="Git\TreeData.cs" />
     <Compile Include="Git\ValidateGitInstallResult.cs" />
     <Compile Include="Helpers\AssemblyResources.cs" />
     <Compile Include="Authentication\IKeychain.cs" />
@@ -237,6 +238,7 @@
     <Compile Include="Git\GitCredentialManager.cs" />
     <Compile Include="UI\FileTreeNode.cs" />
     <Compile Include="UI\GitCommitTarget.cs" />
+    <Compile Include="UI\TreeBase.cs" />
     <Compile Include="UI\TreeBuilder.cs" />
   </ItemGroup>
   <Choose>
@@ -294,6 +296,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.