Merge branch 'master' into fixes/1704-clean-MEF-log-VS2017

Author: jcansdale

appveyor.yml

@@ -1,4 +1,4 @@
-version: '2.5.3.{build}'
+version: '2.5.4.{build}'
 skip_tags: true
 install:
 - ps: |

src/CredentialManagement/CredentialManagement.csproj

@@ -9,6 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CredentialManagement</RootNamespace>
     <AssemblyName>GitHub.CredentialManagement</AssemblyName>
+    <LangVersion>6</LangVersion>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>

src/GitHub.Api/GitHub.Api.csproj

@@ -9,6 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>GitHub.Api</RootNamespace>
     <AssemblyName>GitHub.Api</AssemblyName>
+    <LangVersion>6</LangVersion>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>

src/GitHub.App/Api/ApiClient.cs

@@ -110,6 +110,24 @@ public IObservable<PullRequestReviewComment> CreatePullRequestReviewComment(
             return gitHubClient.PullRequest.ReviewComment.CreateReply(owner, name, number, comment);
         }
 
+        public IObservable<PullRequestReviewComment> EditPullRequestReviewComment(
+            string owner,
+            string name,
+            int number,
+            string body)
+        {
+            var pullRequestReviewCommentEdit = new PullRequestReviewCommentEdit(body);
+            return gitHubClient.PullRequest.ReviewComment.Edit(owner, name, number, pullRequestReviewCommentEdit);
+        }
+
+        public IObservable<Unit> DeletePullRequestReviewComment(
+            string owner,
+            string name,
+            int number)
+        {
+            return gitHubClient.PullRequest.ReviewComment.Delete(owner, name, number);
+        }
+
         public IObservable<Gist> CreateGist(NewGist newGist)
         {
             return gitHubClient.Gist.Create(newGist);

src/GitHub.App/GitHub.App.csproj

@@ -11,6 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>GitHub.App</RootNamespace>
     <AssemblyName>GitHub.App</AssemblyName>
+    <LangVersion>6</LangVersion>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>

src/GitHub.App/Services/GitClient.cs

@@ -96,20 +96,30 @@ public Task Fetch(IRepository repository, string remoteName)
 
         public Task Fetch(IRepository repo, UriString cloneUrl, params string[] refspecs)
         {
-            var httpsUrl = UriString.ToUriString(cloneUrl.ToRepositoryUrl());
+            var httpsString = cloneUrl.ToRepositoryUrl().ToString();
 
-            var originRemote = repo.Network.Remotes[defaultOriginName];
-            if (originRemote != null && originRemote.Url == httpsUrl)
+            foreach (var remote in repo.Network.Remotes)
             {
-                return Fetch(repo, defaultOriginName, refspecs);
+                var remoteUrl = new UriString(remote.Url);
+                if (!remoteUrl.IsHypertextTransferProtocol)
+                {
+                    // Only match http urls
+                    continue;
+                }
+
+                var remoteHttpsString = remoteUrl.ToRepositoryUrl().ToString();
+                if (remoteHttpsString.Equals(httpsString, StringComparison.OrdinalIgnoreCase))
+                {
+                    return Fetch(repo, defaultOriginName, refspecs);
+                }
             }
 
             return Task.Factory.StartNew(() =>
             {
                 try
                 {
                     var tempRemoteName = cloneUrl.Owner + "-" + Guid.NewGuid();
-                    var remote = repo.Network.Remotes.Add(tempRemoteName, httpsUrl);
+                    var remote = repo.Network.Remotes.Add(tempRemoteName, httpsString);
                     try
                     {
 #pragma warning disable 0618 // TODO: Replace `Network.Fetch` with `Commands.Fetch`.

src/GitHub.App/Services/PullRequestService.cs

@@ -150,25 +150,40 @@ public IObservable<bool> IsWorkingDirectoryClean(ILocalRepositoryModel repositor
             using (var repo = gitService.GetRepository(repository.LocalPath))
             {
                 var statusOptions = new StatusOptions { ExcludeSubmodules = true };
-                var isClean = !IsFilthy(repo.RetrieveStatus(statusOptions));
+                var status = repo.RetrieveStatus(statusOptions);
+                var isClean = !IsCheckoutBlockingDirty(status);
                 return Observable.Return(isClean);
             }
         }
 
-        static bool IsFilthy(RepositoryStatus status)
+        static bool IsCheckoutBlockingDirty(RepositoryStatus status)
         {
             if (status.IsDirty)
             {
-                // This is similar to IsDirty, but also allows NewInWorkdir files
-                return status.Any(entry =>
-                    entry.State != FileStatus.Ignored &&
-                    entry.State != FileStatus.Unaltered &&
-                    entry.State != FileStatus.NewInWorkdir);
+                return status.Any(entry => IsCheckoutBlockingChange(entry));
             }
 
             return false;
         }
 
+        // This is similar to IsDirty, but also allows NewInWorkdir and DeletedFromWorkdir files
+        static bool IsCheckoutBlockingChange(StatusEntry entry)
+        {
+            switch (entry.State)
+            {
+                case FileStatus.Ignored:
+                    return false;
+                case FileStatus.Unaltered:
+                    return false;
+                case FileStatus.NewInWorkdir:
+                    return false;
+                case FileStatus.DeletedFromWorkdir:
+                    return false;
+                default:
+                    return true;
+            }
+        }
+
         public IObservable<Unit> Pull(ILocalRepositoryModel repository)
         {
             return Observable.Defer(async () =>

src/GitHub.App/Services/TeamExplorerContext.cs

@@ -78,7 +78,7 @@ async void Refresh()
                     var newBranchName = repo?.CurrentBranch?.Name;
                     var newHeadSha = repo?.CurrentBranch?.Sha;
                     var newTrackedSha = repo?.CurrentBranch?.TrackedSha;
-                    var newPullRequest = await pullRequestService.GetPullRequestForCurrentBranch(repo);
+                    var newPullRequest = repo != null ? await pullRequestService.GetPullRequestForCurrentBranch(repo) : null;
 
                     if (newRepositoryPath != repositoryPath)
                     {

src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;
@@ -328,7 +329,7 @@ public async Task InitializeAsync(
                 LocalRepository = localRepository;
                 RemoteRepositoryOwner = owner;
                 Number = number;
-                WebUrl = LocalRepository.CloneUrl.ToRepositoryUrl().Append("pull/" + number);
+                WebUrl = localRepository.CloneUrl.ToRepositoryUrl(owner).Append("pull/" + number);
                 modelService = await modelServiceFactory.CreateAsync(connection);
 
                 await Refresh();

src/GitHub.Exports.Reactive/Api/IApiClient.cs

@@ -90,6 +90,30 @@ IObservable<PullRequestReviewComment> CreatePullRequestReviewComment(
         /// <returns></returns>
         IObservable<PullRequestReviewComment> CreatePullRequestReviewComment(string owner, string name, int number, string body, int inReplyTo);
 
+        /// <summary>
+        /// Delete a PR review comment.
+        /// </summary>
+        /// <param name="owner">The repository owner.</param>
+        /// <param name="name">The repository name.</param>
+        /// <param name="number">The pull request comment number.</param>
+        IObservable<Unit> DeletePullRequestReviewComment(
+            string owner,
+            string name,
+            int number);
+
+        /// <summary>
+        /// Edits a PR review comment.
+        /// </summary>
+        /// <param name="owner">The repository owner.</param>
+        /// <param name="name">The repository name.</param>
+        /// <param name="number">The pull request comment number.</param>
+        /// <param name="body">The replacement comment body.</param>
+        IObservable<PullRequestReviewComment> EditPullRequestReviewComment(
+            string owner,
+            string name,
+            int number,
+            string body);
+
         IObservable<Branch> GetBranches(string owner, string repo);
         IObservable<Repository> GetRepositories();
         IObservable<Repository> GetRepository(string owner, string repo);