Merge branch 'master' into branches-view

Author: StanleyGoldman

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

@@ -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;
@@ -260,23 +264,30 @@ public ITask<User> GetConfigUserAndEmail()
             string username = null;
             string email = null;
 
-            return GetConfig("user.name", GitConfigSource.User)
+            return GetConfig(UserNameConfigKey, GitConfigSource.User)
                 .Then((success, value) => {
                     if (success)
                     {
                         username = value;
                     }
                 })
-                .Then(GetConfig("user.email", GitConfigSource.User)
+                .Then(GetConfig(UserEmailConfigKey, GitConfigSource.User)
                 .Then((success, value) => {
                     if (success)
                     {
                         email = value;
                     }
                 })).Then(success => {
-                    Logger.Trace("{0}:{1} {2}:{3}", "user.name", username, "user.email", email);
-                    return new User { Name= username, Email = email };
-                });
+                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)

src/GitHub.Api/Git/Repository.cs

@@ -323,6 +323,9 @@ private void CacheContainer_OnCacheInvalidated(CacheType cacheType)
                 case CacheType.GitUserCache:
                     break;
 
+                case CacheType.RepositoryInfoCache:
+                    break;
+
                 default:
                     throw new ArgumentOutOfRangeException(nameof(cacheType), cacheType, null);
             }
@@ -442,7 +445,7 @@ private void RepositoryManager_OnCurrentBranchAndRemoteUpdated(ConfigBranch? bra
                 {
                         CurrentConfigRemote = remote;
                         CurrentRemote = GetGitRemote(remote.Value);
-                        UpdateRepositoryInfo();
+                        ClearRepositoryInfo();
                 }
             }) { Affinity = TaskAffinity.UI }.Start();
         }
@@ -485,20 +488,10 @@ private void UpdateLocalBranches()
             LocalBranches = LocalConfigBranches.Values.Select(GetLocalGitBranch).ToArray();
         }
 
-        private void UpdateRepositoryInfo()
+        private void ClearRepositoryInfo()
         {
-            if (CurrentRemote.HasValue)
-            {
-                CloneUrl = new UriString(CurrentRemote.Value.Url);
-                Name = CloneUrl.RepositoryName;
-                Logger.Trace("CloneUrl: {0}", CloneUrl.ToString());
-            }
-            else
-            {
-                CloneUrl = null;
-                Name = LocalPath.FileName;
-                Logger.Trace("CloneUrl: [NULL]");
-            }
+            CloneUrl = null;
+            Name = null;
         }
 
         private void RepositoryManager_OnLocalBranchRemoved(string name)

src/GitHub.Api/Git/RepositoryManager.cs

@@ -96,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;
@@ -113,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;
@@ -136,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);
         }
 

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)
                 });
             }