Merge branch 'master' into fixes/stop-watcher-for-commit

Author: StanleyGoldman

common/SolutionInfo.cs

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

docs/contributing/how-to-build.md

@@ -6,7 +6,7 @@ This repository is LFS-enabled. To clone it, you should use a git client that su
 
 ### Windows
 
-- Visual Studio 2015+ or Mono 4.x + bash shell (git bash).
+- Visual Studio 2015+ or [Mono 4.x](https://download.mono-project.com/archive/4.8.1/windows-installer/) + bash shell (git bash).
   - Mono 5.x will not work
 - `UnityEngine.dll` and `UnityEditor.dll`.
   - If you've installed Unity in the default location of `C:\Program Files\Unity` or `C:\Program Files (x86)\Unity`, the build will be able to reference these DLLs automatically. Otherwise, you'll need to copy these DLLs from `[Unity installation path]\Unity\Editor\Data\Managed` into the `lib` directory in order for the build to work
@@ -48,7 +48,7 @@ To build with Visual Studio 2015+, open the solution file `GitHub.Unity.sln`. Se
 
 ### Mono and Bash (windows and mac)
 
-To build with Mono 4.x and Bash execute `build.sh` in a bash shell.
+To build with Mono 4.x and Bash, first ensure Mono is added to PATH. Mono installs to `C:\Program Files\Mono\bin\` by default. Then execute `build.sh` in a bash shell.
 
 ## Build Output
 

src/GitHub.Api/Cache/CacheInterfaces.cs

@@ -62,7 +62,7 @@ public interface ILocalConfigBranchDictionary : IDictionary<string, ConfigBranch
 
     }
 
-    public interface IRemoteConfigBranchDictionary : IDictionary<string, IDictionary<string, ConfigBranch>>
+    public interface IRemoteConfigBranchDictionary : IDictionary<string, Dictionary<string, ConfigBranch>>
     {
 
     }

src/GitHub.Api/Git/GitClient.cs

@@ -23,7 +23,7 @@ ITask<string> GetConfig(string key, GitConfigSource configSource,
         ITask<string> SetConfig(string key, string value, GitConfigSource configSource,
             IOutputProcessor<string> processor = null);
 
-        ITask<string[]> GetConfigUserAndEmail();
+        ITask<User> GetConfigUserAndEmail();
 
         ITask<List<GitLock>> ListLocks(bool local,
             BaseOutputListProcessor<GitLock> processor = null);
@@ -83,10 +83,14 @@ ITask<string> Unlock(string file, bool force,
         ITask<Version> Version(IOutputProcessor<Version> processor = null);
 
         ITask<Version> LfsVersion(IOutputProcessor<Version> processor = null);
+
+        ITask<User> SetConfigUserAndEmail(string username, string email);
     }
 
     class GitClient : IGitClient
     {
+        private const string UserNameConfigKey = "user.name";
+        private const string UserEmailConfigKey = "user.email";
         private readonly IEnvironment environment;
         private readonly IProcessManager processManager;
         private readonly ITaskManager taskManager;
@@ -255,28 +259,37 @@ public ITask<string> SetConfig(string key, string value, GitConfigSource configS
                 .Configure(processManager);
         }
 
-        public ITask<string[]> GetConfigUserAndEmail()
+        public ITask<User> GetConfigUserAndEmail()
         {
             string username = null;
             string email = null;
 
-            return GetConfig("user.name", GitConfigSource.User).Then((success, value) => {
-                if (success)
-                {
-                    username = value;
-                }
-
-            }).Then(GetConfig("user.email", GitConfigSource.User).Then((success, value) => {
-                if (success)
-                {
-                    email = value;
-                }
-            })).Then(success => {
-                Logger.Trace("user.name:{1} user.email:{2}", success, username, email);
-                return new[] { username, email };
+            return GetConfig(UserNameConfigKey, GitConfigSource.User)
+                .Then((success, value) => {
+                    if (success)
+                    {
+                        username = value;
+                    }
+                })
+                .Then(GetConfig(UserEmailConfigKey, GitConfigSource.User)
+                .Then((success, value) => {
+                    if (success)
+                    {
+                        email = value;
+                    }
+                })).Then(success => {
+                Logger.Trace("{0}:{1} {2}:{3}", UserNameConfigKey, username, UserEmailConfigKey, email);
+                return new User { Name = username, Email = email };
             });
         }
 
+        public ITask<User> SetConfigUserAndEmail(string username, string email)
+        {
+            return SetConfig(UserNameConfigKey, username, GitConfigSource.User)
+                .Then(SetConfig(UserEmailConfigKey, email, GitConfigSource.User))
+                .Then(b => new User { Name = username, Email = email });
+        }
+
         public ITask<List<GitLock>> ListLocks(bool local, BaseOutputListProcessor<GitLock> processor = null)
         {
             Logger.Trace("ListLocks");

src/GitHub.Api/Git/IRepository.cs

@@ -19,6 +19,9 @@ public interface IRepository : IEquatable<IRepository>
         ITask RequestLock(string file);
         ITask ReleaseLock(string file, bool force);
 
+        void RefreshLog();
+        void RefreshStatus();
+        void UpdateConfigData();
         void CheckLogChangedEvent(CacheUpdateEvent gitLogCacheUpdateEvent);
         void CheckStatusChangedEvent(CacheUpdateEvent cacheUpdateEvent);
         void CheckCurrentBranchChangedEvent(CacheUpdateEvent cacheUpdateEvent);

src/GitHub.Api/Git/Repository.cs

@@ -81,12 +81,22 @@ public ITask SetupRemote(string remote, string remoteUrl)
 
         public ITask CommitAllFiles(string message, string body)
         {
-            return repositoryManager.CommitAllFiles(message, body);
+            return repositoryManager
+                .CommitAllFiles(message, body)
+                .Then(() => {
+                    UpdateGitStatus();
+                    UpdateGitLog();
+                });
         }
 
         public ITask CommitFiles(List<string> files, string message, string body)
         {
-            return repositoryManager.CommitFiles(files, message, body);
+            return repositoryManager
+                .CommitFiles(files, message, body)
+                .Then(() => {
+                    UpdateGitStatus();
+                    UpdateGitLog();
+                });
         }
 
         public ITask Pull()
@@ -122,6 +132,21 @@ public ITask ReleaseLock(string file, bool force)
                 .Then(UpdateLocks);
         }
 
+        public void RefreshLog()
+        {
+            UpdateGitLog();
+        }
+
+        public void RefreshStatus()
+        {
+            UpdateGitStatus();
+        }
+
+        public void UpdateConfigData()
+        {
+            repositoryManager?.UpdateConfigData();
+        }
+
         public void CheckLogChangedEvent(CacheUpdateEvent cacheUpdateEvent)
         {
             var managedCache = cacheContainer.GitLogCache;

src/GitHub.Api/Git/RepositoryManager.cs

@@ -40,6 +40,7 @@ public interface IRepositoryManager : IDisposable
         ITask LockFile(string file);
         ITask UnlockFile(string file, bool force);
         int WaitForEvents();
+        void UpdateConfigData();
 
         IGitConfig Config { get; }
         IGitClient GitClient { get; }
@@ -95,7 +96,6 @@ class RepositoryManager : IRepositoryManager
         private readonly IGitClient gitClient;
         private readonly IPlatform platform;
         private readonly IRepositoryPathConfiguration repositoryPaths;
-        private readonly ITaskManager taskManager;
         private readonly IRepositoryWatcher watcher;
 
         private bool isBusy;
@@ -112,13 +112,12 @@ class RepositoryManager : IRepositoryManager
         public event Action<string, string> OnRemoteBranchRemoved;
         public event Action OnRepositoryUpdated;
 
-        public RepositoryManager(IPlatform platform, ITaskManager taskManager, IGitConfig gitConfig,
+        public RepositoryManager(IPlatform platform, IGitConfig gitConfig,
             IRepositoryWatcher repositoryWatcher, IGitClient gitClient,
             IRepositoryPathConfiguration repositoryPaths)
         {
             this.repositoryPaths = repositoryPaths;
             this.platform = platform;
-            this.taskManager = taskManager;
             this.gitClient = gitClient;
             this.watcher = repositoryWatcher;
             this.config = gitConfig;
@@ -135,7 +134,7 @@ public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager
 
             var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token);
 
-            return new RepositoryManager(platform, taskManager, gitConfig, repositoryWatcher,
+            return new RepositoryManager(platform, gitConfig, repositoryWatcher,
                 gitClient, repositoryPathConfiguration);
         }
 
@@ -296,21 +295,17 @@ public ITask UnlockFile(string file, bool force)
             return HookupHandlers(task);
         }
 
+        public void UpdateConfigData()
+        {
+            UpdateConfigData(false);
+        }
+
         private void LoadGitUser()
         {
             GitClient.GetConfigUserAndEmail()
-                .Then((success, strings) => {
-                    var username = strings[0];
-                    var email = strings[1];
-
-                    var user = new User {
-                        Name = username,
-                        Email = email
-                    };
-
+                .Then((success, user) => {
                     Logger.Trace("OnGitUserLoaded: {0}", user);
                     OnGitUserLoaded?.Invoke(user);
-
                 }).Start();
         }
 

src/GitHub.Api/Helpers/Constants.cs

@@ -9,6 +9,7 @@ static class Constants
         public const string UsageFile = "usage.json";
         public const string GitInstallPathKey = "GitInstallPath";
         public const string TraceLoggingKey = "EnableTraceLogging";
+        public const string Iso8601Format = "o";
 
         public static readonly Version MinimumGitVersion = new Version(2, 11, 0);
         public static readonly Version MinimumGitLfsVersion = new Version(2, 3, 4);

src/GitHub.Api/OutputProcessors/LogEntryOutputProcessor.cs

@@ -329,8 +329,8 @@ private void ReturnGitLogEntry()
                     Summary = summary,
                     Description = description,
                     CommitID = commitId,
-                    TimeString = time.Value.ToString(DateTimeFormatInfo.CurrentInfo),
-                    CommitTimeString = committerTime.Value.ToString(DateTimeFormatInfo.CurrentInfo)
+                    TimeString = time.Value.ToString(Constants.Iso8601Format),
+                    CommitTimeString = committerTime.Value.ToString(Constants.Iso8601Format)
                 });
             }