Merge branch 'master' into enhancements/removing-old-tree-code

Author: StanleyGoldman

src/GitHub.Api/Cache/CacheInterfaces.cs

@@ -8,7 +8,8 @@ public enum CacheType
         RepositoryInfoCache,
         BranchCache,
         GitLogCache,
-        GitStatusCache,
+        GitTrackingStatusCache,
+        GitStatusEntriesCache,
         GitLocksCache,
         GitUserCache
     }
@@ -20,7 +21,8 @@ public interface ICacheContainer
 
         IBranchCache BranchCache { get; }
         IGitLogCache GitLogCache { get; }
-        IGitStatusCache GitStatusCache { get; }
+        IGitTrackingStatusCache GitTrackingStatusCache { get; }
+        IGitStatusEntriesCache GitStatusEntriesCache { get; }
         IGitLocksCache GitLocksCache { get; }
         IGitUserCache GitUserCache { get; }
         IRepositoryInfoCache RepositoryInfoCache { get; }
@@ -53,10 +55,14 @@ public interface IGitUserCache : IManagedCache
         string Email { get; set; }
     }
 
-    public interface IGitStatusCache : IManagedCache
+    public interface IGitTrackingStatusCache : IManagedCache
     {
         int Ahead { get; set; }
         int Behind { get; set; }
+    }
+
+    public interface IGitStatusEntriesCache : IManagedCache
+    {
         List<GitStatusEntry> Entries { get; set; }
     }
 

src/GitHub.Api/Git/GitConfig.cs

@@ -9,25 +9,56 @@ namespace GitHub.Unity
     [Serializable]
     public struct ConfigRemote
     {
-        public string Name;
-        public string Url;
+        public static ConfigRemote Default = new ConfigRemote(String.Empty, String.Empty);
+
+        public string name;
+        public string url;
+
+        public ConfigRemote(string name, string url)
+        {
+            this.name = name;
+            this.url = url;
+        }
+
+        public string Name => name;
+
+        public string Url => url;
 
         public override string ToString()
         {
-            return String.Format("{{Remote {0} {1}}}", Name, Url);
+            return $"{{Remote {Name} {Url}}}";
         }
     }
 
     [Serializable]
     public struct ConfigBranch
     {
-        public string Name;
-        public ConfigRemote? Remote;
+        public static ConfigBranch Default = new ConfigBranch(String.Empty);
+
+        public string name;
+        public ConfigRemote remote;
+
+        public ConfigBranch(string name)
+        {
+            this.name = name;
+            remote = ConfigRemote.Default;
+        }
+
+        public ConfigBranch(string name, ConfigRemote? remote)
+        {
+            this.name = name;
+            this.remote = remote ?? ConfigRemote.Default;
+        }
+
         public bool IsTracking => Remote.HasValue;
 
+        public string Name => name;
+
+        public ConfigRemote? Remote => Equals(remote, ConfigRemote.Default) ? (ConfigRemote?) null : remote;
+
         public override string ToString()
         {
-            return String.Format("{{Branch {0} {1}}}", Name, Remote?.ToString() ?? "Untracked");
+            return $"{{Branch {Name} {Remote?.ToString() ?? "Untracked"}}}";
         }
     }
 
@@ -74,11 +105,7 @@ public IEnumerable<ConfigBranch> GetBranches()
             return groups
                 .Where(x => x.Key == "branch")
                 .SelectMany(x => x.Value)
-                .Select(x => new ConfigBranch
-                {
-                    Name = x.Key,
-                    Remote = GetRemote(x.Value.TryGetString("remote"))
-                });
+                .Select(x => new ConfigBranch(x.Key, GetRemote(x.Value.TryGetString("remote"))));
         }
 
         public IEnumerable<ConfigRemote> GetRemotes()
@@ -87,11 +114,7 @@ public IEnumerable<ConfigRemote> GetRemotes()
                 .Where(x => x.Key == "remote")
                 .SelectMany(x => x.Value)
                 .Where(x => x.Value.TryGetString("url") != null)
-                .Select(x => new ConfigRemote
-                {
-                    Name = x.Key,
-                    Url = x.Value.TryGetString("url")
-                });
+                .Select(x => new ConfigRemote(x.Key, x.Value.TryGetString("url")));
         }
 
         public ConfigRemote? GetRemote(string remote)
@@ -100,11 +123,7 @@ public IEnumerable<ConfigRemote> GetRemotes()
                 .Where(x => x.Key == "remote")
                 .SelectMany(x => x.Value)
                 .Where(x => x.Key == remote && x.Value.TryGetString("url") != null)
-                .Select(x => new ConfigRemote
-                {
-                    Name = x.Key,
-                    Url = x.Value.GetString("url")
-                } as ConfigRemote?)
+                .Select(x => new ConfigRemote(x.Key,x.Value.GetString("url")) as ConfigRemote?)
                 .FirstOrDefault();
         }
 
@@ -114,11 +133,7 @@ public IEnumerable<ConfigRemote> GetRemotes()
                 .Where(x => x.Key == "branch")
                 .SelectMany(x => x.Value)
                 .Where(x => x.Key == branch)
-                .Select(x => new ConfigBranch
-                {
-                    Name = x.Key,
-                    Remote = GetRemote(x.Value.TryGetString("remote"))
-                } as ConfigBranch?)
+                .Select(x => new ConfigBranch(x.Key,GetRemote(x.Value.TryGetString("remote"))) as ConfigBranch?)
                 .FirstOrDefault();
         }
 

src/GitHub.Api/Git/IRepository.cs

@@ -21,6 +21,7 @@ public interface IRepository : IEquatable<IRepository>
 
         void CheckLogChangedEvent(CacheUpdateEvent gitLogCacheUpdateEvent);
         void CheckStatusChangedEvent(CacheUpdateEvent cacheUpdateEvent);
+        void CheckStatusEntriesChangedEvent(CacheUpdateEvent cacheUpdateEvent);
         void CheckCurrentBranchChangedEvent(CacheUpdateEvent cacheUpdateEvent);
         void CheckCurrentRemoteChangedEvent(CacheUpdateEvent cacheUpdateEvent);
         void CheckCurrentBranchAndRemoteChangedEvent(CacheUpdateEvent cacheUpdateEvent);
@@ -68,7 +69,8 @@ public interface IRepository : IEquatable<IRepository>
         List<GitLogEntry> CurrentLog { get; }
 
         event Action<CacheUpdateEvent> LogChanged;
-        event Action<CacheUpdateEvent> StatusChanged;
+        event Action<CacheUpdateEvent> TrackingStatusChanged;
+        event Action<CacheUpdateEvent> StatusEntriesChanged;
         event Action<CacheUpdateEvent> CurrentBranchChanged;
         event Action<CacheUpdateEvent> CurrentRemoteChanged;
         event Action<CacheUpdateEvent> CurrentBranchAndRemoteChanged;