Merge branch 'master' into fixes/git-pull-update-log

Author: StanleyGoldman

common/SolutionInfo.cs

@@ -31,6 +31,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "0.24.0";
+        internal const string Version = "0.25.0";
     }
 }

src/GitHub.Api/Git/GitStatusEntry.cs

@@ -5,28 +5,45 @@ 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");
+
+            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}'";
         }
     }
 }

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

@@ -91,10 +91,16 @@ public void Load(IEnumerable<ITreeData> data, string title)
                     var alreadyExists = folders.ContainsKey(name);
                     if (!alreadyExists)
                     {
+                        var isActive = false;
+                        if (name == d.Name)
+                        {
+                            isActive = d.IsActive;
+                        }
+
                         var node = new TreeNode
                         {
                             Name = name,
-                            IsActive = d.IsActive,
+                            IsActive = isActive,
                             Label = label,
                             Level = level,
                             IsFolder = isFolder