Merge branch 'master' into fixes/popup-window-refactor

Author: StanleyGoldman

src/GitHub.Api/Application/ApiClient.cs

@@ -61,7 +61,15 @@ private async Task LogoutInternal(UriString host)
         public async Task CreateRepository(NewRepository newRepository, Action<Octokit.Repository, Exception> callback, string organization = null)
         {
             Guard.ArgumentNotNull(callback, "callback");
-            await CreateRepositoryInternal(newRepository, callback, organization);
+            try
+            {
+                var repository = await CreateRepositoryInternal(newRepository, organization);
+                callback(repository, null);
+            }
+            catch (Exception e)
+            {
+                callback(null, e);
+            }
         }
 
         public async Task GetOrganizations(Action<IList<Organization>> callback)
@@ -71,6 +79,13 @@ public async Task GetOrganizations(Action<IList<Organization>> callback)
             callback(organizations);
         }
 
+        public async Task LoadKeychain(Action<bool> callback)
+        {
+            Guard.ArgumentNotNull(callback, "callback");
+            var hasLoadedKeys = await LoadKeychainInternal();
+            callback(hasLoadedKeys);
+        }
+
         public async Task GetCurrentUser(Action<Octokit.User> callback)
         {
             Guard.ArgumentNotNull(callback, "callback");
@@ -174,16 +189,15 @@ public async Task<bool> ContinueLoginAsync(LoginResult loginResult, Func<LoginRe
             return result.Code == LoginResultCodes.Success;
         }
 
-        private async Task CreateRepositoryInternal(NewRepository newRepository, Action<Octokit.Repository, Exception> callback, string organization)
+        private async Task<Octokit.Repository> CreateRepositoryInternal(NewRepository newRepository, string organization)
         {
             try
             {
                 logger.Trace("Creating repository");
 
-                if (!await EnsureKeychainLoaded())
+                if (!await LoadKeychainInternal())
                 {
-                    callback(null, new Exception("Keychain Not Loaded"));
-                    return;
+                    throw new InvalidOperationException("The keychain did not load");
                 }
 
                 Octokit.Repository repository;
@@ -201,13 +215,12 @@ private async Task CreateRepositoryInternal(NewRepository newRepository, Action<
                 }
 
                 logger.Trace("Created Repository");
-
-                callback(repository, null);
+                return repository;
             }
             catch (Exception ex)
             {
                 logger.Error(ex, "Error Creating Repository");
-                callback(null, ex);
+                throw;
             }
         }
 
@@ -217,9 +230,9 @@ private async Task<IList<Organization>> GetOrganizationInternal()
             {
                 logger.Trace("Getting Organizations");
 
-                if (!await EnsureKeychainLoaded())
+                if (!await LoadKeychainInternal())
                 {
-                    return null;
+                    return new List<Organization>();
                 }
 
                 var organizations = await githubClient.Organization.GetAllForCurrent();
@@ -246,7 +259,7 @@ private async Task<IList<Organization>> GetOrganizationInternal()
             {
                 logger.Trace("Getting Organizations");
 
-                if (!await EnsureKeychainLoaded())
+                if (!await LoadKeychainInternal())
                 {
                     return null;
                 }
@@ -262,27 +275,28 @@ private async Task<IList<Organization>> GetOrganizationInternal()
             return userCache;
         }
 
-        private async Task<bool> EnsureKeychainLoaded()
+        private async Task<bool> LoadKeychainInternal()
         {
-            logger.Trace("EnsureKeychainLoaded");
+            logger.Trace("LoadKeychainInternal");
 
             if (keychain.HasKeys)
             {
                 if (!keychain.NeedsLoad)
                 {
-                    logger.Trace("EnsureKeychainLoaded: Has keys does not need load");
+                    logger.Trace("LoadKeychainInternal: Has keys does not need load");
                     return true;
                 }
 
-                logger.Trace("EnsureKeychainLoaded: Loading");
+                logger.Trace("LoadKeychainInternal: Loading");
 
+                //TODO: ONE_USER_LOGIN This assumes only ever one user can login
                 var uriString = keychain.Connections.First().Host;
                 var keychainAdapter = await keychain.Load(uriString);
 
                 return keychainAdapter.OctokitCredentials != Credentials.Anonymous;
             }
 
-            logger.Trace("EnsureKeychainLoaded: No keys to load");
+            logger.Trace("LoadKeychainInternal: No keys to load");
 
             return false;
         }

src/GitHub.Api/Application/IApiClient.cs

@@ -17,5 +17,6 @@ interface IApiClient
         Task<bool> ValidateCredentials();
         Task Logout(UriString host);
         Task GetCurrentUser(Action<Octokit.User> callback);
+        Task LoadKeychain(Action<bool> callback);
     }
 }

src/GitHub.Api/Git/Tasks/GitCommitTask.cs

@@ -15,7 +15,7 @@ public GitCommitTask(string message, string body,
             Guard.ArgumentNotNullOrWhiteSpace(message, "message");
 
             Name = TaskName;
-            arguments = "commit ";
+            arguments = "-c i18n.commitencoding=utf8 commit ";
             arguments += String.Format(" -m \"{0}\"", message);
             if (!String.IsNullOrEmpty(body))
                 arguments += String.Format(" -m \"{0}\"", body);

src/GitHub.Api/Git/Tasks/GitLogTask.cs

@@ -15,7 +15,7 @@ public GitLogTask(IGitObjectFactory gitObjectFactory,
 
         public override string ProcessArguments
         {
-            get { return @"log --pretty=format:""%H%n%P%n%aN%n%aE%n%aI%n%cN%n%cE%n%cI%n%B---GHUBODYEND---"" --name-status"; }
+            get { return @"-c i18n.logoutputencoding=utf8 -c core.quotepath=false log --pretty=format:""%H%n%P%n%aN%n%aE%n%aI%n%cN%n%cE%n%cI%n%B---GHUBODYEND---"" --name-status"; }
         }
     }
 }

src/GitHub.Api/Git/Tasks/GitStatusTask.cs

@@ -15,7 +15,7 @@ public GitStatusTask(IGitObjectFactory gitObjectFactory,
 
         public override string ProcessArguments
         {
-            get { return "status -b -u --ignored --porcelain"; }
+            get { return "-c i18n.logoutputencoding=utf8 -c core.quotepath=false status -b -u --ignored --porcelain"; }
         }
         public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } }
     }