Merge master into fixes/api-failure-switch-auth-view

Author: Andreia Gaita

README.md

@@ -47,8 +47,8 @@ The GitHub for Unity extension brings [Git](https://git-scm.com/) and GitHub int
 
 ### Requirements
 
-- Unity 5.4-5.6
-   - We've only tested the extension so far on Unity 5.4 to 5.6. There's currently an blocker issue opened for 5.3 support, so we know it doesn't run there. There are some issues for 2017.x, so it may or may not run well on that version. Personal edition is fine.
+- Unity 5.4-2017.1
+   - We've only tested the extension so far on Unity 5.4 to 2017.1. There's currently an blocker issue opened for 5.3 support, so we know it doesn't run there. There are some issues for 2017.2, so it may or may not run well on that version. Personal edition is fine.
 - Git and Git LFS 2.x
 
 #### Git on macOS

src/GitHub.Api/Application/ApiClient.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Octokit;
 
@@ -28,9 +27,6 @@ public static IApiClient Create(UriString repositoryUrl, IKeychain keychain)
         private readonly IGitHubClient githubClient;
         private readonly ILoginManager loginManager;
 
-        string owner;
-        bool? isEnterprise;
-
         public ApiClient(UriString hostUrl, IKeychain keychain, IGitHubClient githubClient)
         {
             Guard.ArgumentNotNull(hostUrl, nameof(hostUrl));

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -39,7 +39,7 @@ protected void Initialize()
             Logging.TracingEnabled = UserSettings.Get(Constants.TraceLoggingKey, false);
             ProcessManager = new ProcessManager(Environment, Platform.GitEnvironment, CancellationToken);
             Platform.Initialize(ProcessManager, TaskManager);
-            GitClient = new GitClient(Environment, ProcessManager, Platform.CredentialManager, TaskManager);
+            GitClient = new GitClient(Environment, ProcessManager, TaskManager);
             SetupMetrics();
         }
 
@@ -127,7 +127,7 @@ public void RestartRepository()
         {
             if (Environment.RepositoryPath != null)
             {
-                repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, UsageTracker, GitClient, Environment.RepositoryPath);
+                repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, Environment.RepositoryPath);
                 repositoryManager.Initialize();
                 Environment.Repository.Initialize(repositoryManager);
                 repositoryManager.Start();

src/GitHub.Api/Events/RepositoryWatcher.cs

@@ -30,10 +30,8 @@ class RepositoryWatcher : IRepositoryWatcher
         private readonly CancellationToken cancellationToken;
         private readonly NPath[] ignoredPaths;
         private readonly ManualResetEventSlim pauseEvent;
-        private readonly bool disableNative;
         private NativeInterface nativeInterface;
         private bool running;
-        private Task task;
         private int lastCountOfProcessedEvents = 0;
         private bool processingEvents;
         private readonly ManualResetEventSlim signalProcessingEventsDone = new ManualResetEventSlim(false);
@@ -68,8 +66,7 @@ public void Initialize()
 
             try
             {
-                if (!disableNative)
-                    nativeInterface = new NativeInterface(pathsRepositoryPath);
+                nativeInterface = new NativeInterface(pathsRepositoryPath);
             }
             catch (Exception ex)
             {
@@ -79,12 +76,6 @@ public void Initialize()
 
         public void Start()
         {
-            if (disableNative)
-            {
-                Logger.Trace("Native interface is disabled");
-                return;
-            }
-
             if (nativeInterface == null)
             {
                 Logger.Warning("NativeInterface is null");
@@ -95,7 +86,7 @@ public void Start()
 
             running = true;
             pauseEvent.Reset();
-            task = Task.Factory.StartNew(WatcherLoop, cancellationToken, TaskCreationOptions.None, TaskScheduler.Default);
+            Task.Factory.StartNew(WatcherLoop, cancellationToken, TaskCreationOptions.None, TaskScheduler.Default);
         }
 
         public void Stop()

src/GitHub.Api/Git/GitClient.cs

@@ -23,6 +23,8 @@ ITask<string> GetConfig(string key, GitConfigSource configSource,
         ITask<string> SetConfig(string key, string value, GitConfigSource configSource,
             IOutputProcessor<string> processor = null);
 
+        ITask<string[]> GetConfigUserAndEmail();
+
         ITask<List<GitLock>> ListLocks(bool local,
             BaseOutputListProcessor<GitLock> processor = null);
 
@@ -87,16 +89,13 @@ class GitClient : IGitClient
     {
         private readonly IEnvironment environment;
         private readonly IProcessManager processManager;
-        private readonly ICredentialManager credentialManager;
         private readonly ITaskManager taskManager;
         private readonly CancellationToken cancellationToken;
 
-        public GitClient(IEnvironment environment, IProcessManager processManager,
-            ICredentialManager credentialManager, ITaskManager taskManager)
+        public GitClient(IEnvironment environment, IProcessManager processManager, ITaskManager taskManager)
         {
             this.environment = environment;
             this.processManager = processManager;
-            this.credentialManager = credentialManager;
             this.taskManager = taskManager;
             this.cancellationToken = taskManager.Token;
         }
@@ -242,7 +241,7 @@ public ITask<Version> LfsVersion(IOutputProcessor<Version> processor = null)
 
         public ITask<string> GetConfig(string key, GitConfigSource configSource, IOutputProcessor<string> processor = null)
         {
-            Logger.Trace("GetConfig");
+            Logger.Trace("GetConfig: {0}", key);
 
             return new GitConfigGetTask(key, configSource, cancellationToken, processor)
                 .Configure(processManager);
@@ -256,6 +255,28 @@ public ITask<string> SetConfig(string key, string value, GitConfigSource configS
                 .Configure(processManager);
         }
 
+        public ITask<string[]> 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 };
+            });
+        }
+
         public ITask<List<GitLock>> ListLocks(bool local, BaseOutputListProcessor<GitLock> processor = null)
         {
             Logger.Trace("ListLocks");

src/GitHub.Api/Git/GitConfig.cs

@@ -216,16 +216,16 @@ public string GetString(string key)
             public int GetInt(string key)
             {
                 var value = this[key];
-                var result = 0;
-                var success = int.TryParse(value, out result);
+                int result = 0;
+                int.TryParse(value, out result);
                 return result;
             }
 
             public float GetFloat(string key)
             {
                 var value = this[key];
-                var result = 0F;
-                var success = float.TryParse(value, out result);
+                float result = 0F;
+                float.TryParse(value, out result);
                 return result;
             }
 

src/GitHub.Api/Git/GitCredentialManager.cs

@@ -11,14 +11,12 @@ class GitCredentialManager : ICredentialManager
         private ICredential credential;
         private string credHelper = null;
 
-        private readonly IEnvironment environment;
         private readonly IProcessManager processManager;
         private readonly ITaskManager taskManager;
 
-        public GitCredentialManager(IEnvironment environment, IProcessManager processManager,
+        public GitCredentialManager(IProcessManager processManager,
             ITaskManager taskManager)
         {
-            this.environment = environment;
             this.processManager = processManager;
             this.taskManager = taskManager;
         }

src/GitHub.Api/Git/Repository.cs

@@ -85,7 +85,7 @@ public ITask SetupRemote(string remote, string remoteUrl)
         public ITask<List<GitLogEntry>> Log()
         {
             if (repositoryManager == null)
-                return new FuncListTask<GitLogEntry>(TaskHelpers.GetCompletedTask(new List<GitLogEntry>()));
+                return new FuncListTask<GitLogEntry>(new NotReadyException().ToTask<List<GitLogEntry>>());
 
             return repositoryManager.Log();
         }
@@ -123,7 +123,7 @@ public ITask Revert(string changeset)
         public ITask ListLocks()
         {
             if (repositoryManager == null)
-                return new ActionTask(TaskExtensions.CompletedTask);
+                return new ActionTask(new NotReadyException().ToTask<bool>());
             return repositoryManager.ListLocks(false);
         }
 

src/GitHub.Api/Git/RepositoryManager.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace GitHub.Unity
@@ -94,13 +93,11 @@ public RepositoryPathConfiguration(NPath repositoryPath)
 
     class RepositoryManager : IRepositoryManager
     {
-        private readonly CancellationToken cancellationToken;
         private readonly IGitConfig config;
         private readonly IGitClient gitClient;
         private readonly IPlatform platform;
         private readonly IRepositoryPathConfiguration repositoryPaths;
         private readonly ITaskManager taskManager;
-        private readonly IUsageTracker usageTracker;
         private readonly IRepositoryWatcher watcher;
 
         private bool isBusy;
@@ -119,23 +116,21 @@ class RepositoryManager : IRepositoryManager
         public event Action<string, string> OnRemoteBranchRemoved;
         public event Action<GitStatus> OnStatusUpdated;
 
-        public RepositoryManager(IPlatform platform, ITaskManager taskManager, IUsageTracker usageTracker, IGitConfig gitConfig,
+        public RepositoryManager(IPlatform platform, ITaskManager taskManager, IGitConfig gitConfig,
             IRepositoryWatcher repositoryWatcher, IGitClient gitClient,
-            IRepositoryPathConfiguration repositoryPaths, CancellationToken cancellationToken)
+            IRepositoryPathConfiguration repositoryPaths)
         {
             this.repositoryPaths = repositoryPaths;
             this.platform = platform;
             this.taskManager = taskManager;
-            this.usageTracker = usageTracker;
-            this.cancellationToken = cancellationToken;
             this.gitClient = gitClient;
             this.watcher = repositoryWatcher;
             this.config = gitConfig;
 
             SetupWatcher();
         }
 
-        public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager, IUsageTracker usageTracker,
+        public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager,
             IGitClient gitClient, NPath repositoryRoot)
         {
             var repositoryPathConfiguration = new RepositoryPathConfiguration(repositoryRoot);
@@ -144,8 +139,8 @@ public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager
 
             var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token);
 
-            return new RepositoryManager(platform, taskManager, usageTracker, gitConfig, repositoryWatcher,
-                gitClient, repositoryPathConfiguration, taskManager.Token);
+            return new RepositoryManager(platform, taskManager, gitConfig, repositoryWatcher,
+                gitClient, repositoryPathConfiguration);
         }
 
         public void Initialize()
@@ -318,16 +313,20 @@ public ITask UnlockFile(string file, bool force)
 
         private void LoadGitUser()
         {
-            var user = new User();
-            GitClient.GetConfig("user.name", GitConfigSource.User)
-                .Then((success, value) => user.Name = value).Then(
-            GitClient.GetConfig("user.email", GitConfigSource.User)
-                .Then((success, value) => user.Email = value))
-            .Then(() => {
-                        Logger.Trace("OnGitUserLoaded: {0}", user);
-                        OnGitUserLoaded?.Invoke(user);
-                     })
-            .Start();
+            GitClient.GetConfigUserAndEmail()
+                .Then((success, strings) => {
+                    var username = strings[0];
+                    var email = strings[1];
+
+                    var user = new User {
+                        Name = username,
+                        Email = email
+                    };
+
+                    Logger.Trace("OnGitUserLoaded: {0}", user);
+                    OnGitUserLoaded?.Invoke(user);
+
+                }).Start();
         }
 
         private void SetupWatcher()

src/GitHub.Api/Helpers/SimpleJson.cs

@@ -517,7 +517,6 @@ static class SimpleJson
 
         private static readonly char[] EscapeTable;
         private static readonly char[] EscapeCharacters = new char[] { '"', '\\', '\b', '\f', '\n', '\r', '\t' };
-        private static readonly string EscapeCharactersString = new string(EscapeCharacters);
 
         static SimpleJson()
         {