Use the Repository as the data container

Given that the repository object is created and managed by
the RepositoryManager, there's no reason to keep data in the
repository manager object. We can keep all the data in the repository
object and have it trigger events for data updates, while events
that are not directly related to data changes in the repository data
model are triggered directly from the repository manager.

This way, the manager manages things and the repository models things,
which feels like a nicer separation of duties.

The repository listens for events from the repository manager in order
to update its data, so the repository manager doesn't have to have a
reference to the repository (breaking the circular dependency)

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -109,13 +109,11 @@ public ITask InitializeRepository()
 
         public void RestartRepository()
         {
-            Environment.InitializeRepository();
             if (Environment.RepositoryPath != null)
             {
                 repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, UsageTracker, GitClient, Environment.RepositoryPath);
-                Environment.Repository = new Repository(GitClient, repositoryManager, Environment.RepositoryPath);
                 repositoryManager.Initialize();
-                Environment.Repository.Initialize();
+                Environment.Repository.Initialize(repositoryManager);
                 repositoryManager.Start();
                 Logger.Trace($"Got a repository? {Environment.Repository}");
             }

src/GitHub.Api/Git/GitConfig.cs

@@ -1,27 +1,28 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 
 namespace GitHub.Unity
 {
+    [Serializable]
     public struct ConfigRemote
     {
-        public string Name { get; set; }
-        public string Url { get; set; }
+        public string Name;
+        public string Url;
 
         public override string ToString()
         {
             return String.Format("{{Remote {0} {1}}}", Name, Url);
         }
     }
 
+    [Serializable]
     public struct ConfigBranch
     {
-        public string Name { get; set; }
-        public ConfigRemote? Remote { get; set; }
+        public string Name;
+        public ConfigRemote? Remote;
         public bool IsTracking => Remote.HasValue;
 
         public override string ToString()

src/GitHub.Api/Git/GitRemote.cs

@@ -29,7 +29,6 @@ public override string ToString()
             sb.AppendLine(String.Format("URL: {0}", Url));
             sb.AppendLine(String.Format("Login: {0}", Login));
             sb.AppendLine(String.Format("User: {0}", User));
-            sb.AppendLine(String.Format("Token: {0}", Token));
             sb.AppendLine(String.Format("Host: {0}", Host));
             sb.AppendLine(String.Format("Function: {0}", Function));
             return sb.ToString();

src/GitHub.Api/Git/IRepository.cs

@@ -8,7 +8,7 @@ namespace GitHub.Unity
     /// </summary>
     interface IRepository : IEquatable<IRepository>
     {
-        void Initialize();
+        void Initialize(IRepositoryManager repositoryManager);
         void Refresh();
         ITask SetupRemote(string remoteName, string remoteUrl);
         ITask Pull();
@@ -42,16 +42,17 @@ interface IRepository : IEquatable<IRepository>
         /// <summary>
         /// Gets the current remote of the repository.
         /// </summary>
-        ConfigRemote? CurrentRemote { get; }
+        ConfigRemote? CurrentRemote { get; set; }
         /// <summary>
         /// Gets the current branch of the repository.
         /// </summary>
-        string CurrentBranch { get; }
-        GitStatus CurrentStatus { get; }
+        ConfigBranch? CurrentBranch { get; set; }
+        GitStatus CurrentStatus { get; set; }
         IEnumerable<GitBranch> LocalBranches { get; }
         IEnumerable<GitBranch> RemoteBranches { get; }
         IUser User { get; set; }
         IEnumerable<GitLock> CurrentLocks { get; }
+        string CurrentBranchName { get; }
 
         event Action<GitStatus> OnStatusUpdated;
         event Action<string> OnActiveBranchChanged;

src/GitHub.Api/Git/Repository.cs

@@ -3,15 +3,16 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace GitHub.Unity
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     class Repository : IRepository, IEquatable<Repository>
     {
-        private readonly IGitClient gitClient;
-        private readonly IRepositoryManager repositoryManager;
+        private IRepositoryManager repositoryManager;
+        private ConfigBranch? currentBranch;
+        private ConfigRemote? currentRemote;
+        private GitStatus currentStatus;
 
         public event Action<GitStatus> OnStatusUpdated;
         public event Action<string> OnActiveBranchChanged;
@@ -22,54 +23,43 @@ class Repository : IRepository, IEquatable<Repository>
         public event Action OnRepositoryInfoChanged;
 
         public IEnumerable<GitBranch> LocalBranches => repositoryManager.LocalBranches.Values.Select(
-            x => new GitBranch(x.Name, (x.IsTracking ? (x.Remote.Value.Name + "/" + x.Name) : "[None]"), x.Name == CurrentBranch));
+            x => new GitBranch(x.Name, (x.IsTracking ? (x.Remote.Value.Name + "/" + x.Name) : "[None]"), x.Name == CurrentBranch?.Name));
 
         public IEnumerable<GitBranch> RemoteBranches => repositoryManager.RemoteBranches.Values.SelectMany(
             x => x.Values).Select(x => new GitBranch(x.Remote.Value.Name + "/" + x.Name, "[None]", false));
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Repository"/> class.
         /// </summary>
-        /// <param name="gitClient"></param>
         /// <param name="repositoryManager"></param>
         /// <param name="name">The repository name.</param>
         /// <param name="cloneUrl">The repository's clone URL.</param>
         /// <param name="localPath"></param>
-        public Repository(IGitClient gitClient, IRepositoryManager repositoryManager, NPath localPath)
+        public Repository(string name, NPath localPath)
         {
-            Guard.ArgumentNotNull(repositoryManager, nameof(repositoryManager));
+            Guard.ArgumentNotNullOrWhiteSpace(name, nameof(name));
+            Guard.ArgumentNotNull(localPath, nameof(localPath));
 
-            this.gitClient = gitClient;
-            this.repositoryManager = repositoryManager;
+            Name = name;
             LocalPath = localPath;
-            if (repositoryManager.ActiveBranch.HasValue)
-                RepositoryManager_OnActiveBranchChanged(repositoryManager.ActiveBranch?.Name);
-            if (repositoryManager.ActiveRemote.HasValue)
-                RepositoryManager_OnActiveRemoteChanged(repositoryManager.ActiveRemote);
-            SetCloneUrl();
-
-            repositoryManager.OnStatusUpdated += RepositoryManager_OnStatusUpdated;
-            repositoryManager.OnActiveBranchChanged += RepositoryManager_OnActiveBranchChanged;
-            repositoryManager.OnActiveRemoteChanged += RepositoryManager_OnActiveRemoteChanged;
-            repositoryManager.OnLocalBranchListChanged += RepositoryManager_OnLocalBranchListChanged;
-            repositoryManager.OnHeadChanged += RepositoryManager_OnHeadChanged;
-            repositoryManager.OnLocksUpdated += RepositoryManager_OnLocksUpdated;
-            repositoryManager.OnRemoteOrTrackingChanged += SetCloneUrl;
         }
 
-        public void Initialize()
+        public void Initialize(IRepositoryManager repositoryManager)
         {
-            User = new User();
-            gitClient.GetConfig("user.name", GitConfigSource.User)
-                .Then((s, x) => User.Name = x)
-                .Then(gitClient.GetConfig("user.email", GitConfigSource.User))
-                .Then((s, x) => User.Email = x)
-                .Start();
+            Guard.ArgumentNotNull(repositoryManager, nameof(repositoryManager));
+
+            this.repositoryManager = repositoryManager;
+            repositoryManager.OnLocalBranchListChanged += RepositoryManager_OnLocalBranchListChanged;
+            repositoryManager.OnCommitChanged += RepositoryManager_OnHeadChanged;
+            repositoryManager.OnLocksUpdated += RepositoryManager_OnLocksUpdated;
+            repositoryManager.OnStatusUpdated += status => CurrentStatus = status;
+            repositoryManager.OnActiveBranchChanged += branch => CurrentBranch = branch;
+            repositoryManager.OnActiveRemoteChanged += remote => CurrentRemote = remote;
         }
 
         public void Refresh()
         {
-            repositoryManager.Refresh();
+            repositoryManager?.Refresh();
         }
 
         public ITask SetupRemote(string remote, string remoteUrl)
@@ -88,12 +78,12 @@ public ITask SetupRemote(string remote, string remoteUrl)
 
         public ITask Pull()
         {
-            return repositoryManager.Pull(CurrentRemote.Value.Name, CurrentBranch);
+            return repositoryManager.Pull(CurrentRemote.Value.Name, CurrentBranch?.Name);
         }
 
         public ITask Push()
         {
-            return repositoryManager.Push(CurrentRemote.Value.Name, CurrentBranch);
+            return repositoryManager.Push(CurrentRemote.Value.Name, CurrentBranch?.Name);
         }
 
         public ITask Fetch()
@@ -154,12 +144,6 @@ private void RepositoryManager_OnLocalBranchListChanged()
             OnLocalBranchListChanged?.Invoke();
         }
 
-        private void RepositoryManager_OnStatusUpdated(GitStatus status)
-        {
-            CurrentStatus = status;
-            OnStatusUpdated?.Invoke(CurrentStatus);
-        }
-
         private void RepositoryManager_OnLocksUpdated(IEnumerable<GitLock> locks)
         {
             CurrentLocks = locks;
@@ -197,23 +181,55 @@ public bool Equals(IRepository other)
                 object.Equals(LocalPath, other.LocalPath);
         }
 
-        public override string ToString()
+        public ConfigBranch? CurrentBranch
         {
-            return DebuggerDisplay;
+            get { return currentBranch; }
+            set
+            {
+                if (currentBranch.HasValue != value.HasValue || (currentBranch.HasValue && !currentBranch.Value.Equals(value.Value)))
+                {
+                    currentBranch = value;
+                    Logger.Trace("OnActiveBranchChanged: {0}", value?.ToString() ?? "NULL");
+                    OnActiveBranchChanged?.Invoke(currentBranch?.Name);
+                }
+            }
         }
-
         /// <summary>
         /// Gets the current branch of the repository.
         /// </summary>
-        public string CurrentBranch { get; private set; }
+
+        public string CurrentBranchName => currentBranch?.Name;
 
         /// <summary>
         /// Gets the current remote of the repository.
         /// </summary>
-        public ConfigRemote? CurrentRemote { get; private set; }
+        public ConfigRemote? CurrentRemote
+        {
+            get { return currentRemote; }
+            set
+            {
+                if (currentRemote.HasValue != value.HasValue || (currentRemote.HasValue && !currentRemote.Value.Equals(value.Value)))
+                {
+                    currentRemote = value;
+                    Logger.Trace("OnActiveRemoteChanged: {0}", value?.ToString() ?? "NULL");
+                    OnActiveRemoteChanged?.Invoke(value?.Name);
+                }
+            }
+        }
+
+        public UriString CloneUrl
+        {
+            get
+            {
+                if (CurrentRemote.HasValue && CurrentRemote.Value.Url != null)
+                    return new UriString(CurrentRemote.Value.Url).ToRepositoryUrl();
+
+                return null;
+            }
+        }
+
 
         public string Name { get; private set; }
-        public UriString CloneUrl { get; private set; }
         public NPath LocalPath { get; private set; }
         public string Owner => CloneUrl?.Owner ?? null;
         public bool IsGitHub { get { return HostAddress.IsGitHubDotCom(CloneUrl); } }
@@ -226,11 +242,19 @@ public override string ToString()
             Name,
             CloneUrl,
             LocalPath,
-            CurrentBranch,
-            CurrentRemote?.Name
-            );
+            GetHashCode());
+
+        public GitStatus CurrentStatus
+        {
+            get { return currentStatus; }
+            set
+            {
+                Logger.Trace("OnStatusUpdated: {0}", value.ToString());
+                currentStatus = value;
+                OnStatusUpdated?.Invoke(value);
+            }
+        }
 
-        public GitStatus CurrentStatus { get; private set; }
         public IUser User { get; set; }
         public IEnumerable<GitLock> CurrentLocks { get; private set; }
         protected static ILogging Logger { get; } = Logging.GetLogger<Repository>();