Merge branch 'master' into feature/inline-reviews-tooltip

Author: paladique

GitHubVS.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26403.7
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio", "src\GitHub.VisualStudio\GitHub.VisualStudio.csproj", "{11569514-5AE5-4B5B-92A2-F10B0967DE5F}"
 	ProjectSection(ProjectDependencies) = postProject

src/GitHub.App/Services/PullRequestService.cs

@@ -105,10 +105,11 @@ public IObservable<Unit> Pull(ILocalRepositoryModel repository)
 
         public IObservable<Unit> Push(ILocalRepositoryModel repository)
         {
-            return Observable.Defer(() =>
+            return Observable.Defer(async () =>
             {
                 var repo = gitService.GetRepository(repository.LocalPath);
-                return gitClient.Push(repo, repo.Head.TrackedBranch.UpstreamBranchCanonicalName, repo.Head.Remote.Name).ToObservable();
+                var remote = await gitClient.GetHttpRemote(repo, repo.Head.Remote.Name);
+                return gitClient.Push(repo, repo.Head.TrackedBranch.UpstreamBranchCanonicalName, remote.Name).ToObservable();
             });
         }
 
@@ -171,8 +172,13 @@ public IObservable<BranchTrackingDetails> CalculateHistoryDivergence(ILocalRepos
             return Observable.Defer(async () =>
             {
                 var repo = gitService.GetRepository(repository.LocalPath);
+
                 if (repo.Head.Remote != null)
-                    await gitClient.Fetch(repo, repo.Head.Remote.Name);
+                {
+                    var remote = await gitClient.GetHttpRemote(repo, repo.Head.Remote.Name);
+                    await gitClient.Fetch(repo, remote.Name);
+                }
+
                 return Observable.Return(repo.Head.TrackingDetails);
             });
         }

src/GitHub.InlineReviews/Peek/InlineCommentPeekableItem.cs

@@ -7,20 +7,19 @@ namespace GitHub.InlineReviews.Peek
 {
     class InlineCommentPeekableItem : IPeekableItem
     {
-        readonly InlineCommentPeekViewModel viewModel;
-
         public InlineCommentPeekableItem(InlineCommentPeekViewModel viewModel)
         {
-            this.viewModel = viewModel;
+            ViewModel = viewModel;
         }
 
         public string DisplayName => "GitHub Code Review";
+        public InlineCommentPeekViewModel ViewModel { get; }
 
         public IEnumerable<IPeekRelationship> Relationships => new[] { InlineCommentPeekRelationship.Instance };
 
         public IPeekResultSource GetOrCreateResultSource(string relationshipName)
         {
-            return new InlineCommentPeekableResultSource(viewModel);
+            return new InlineCommentPeekableResultSource(ViewModel);
         }
     }
 }

src/GitHub.InlineReviews/Services/InlineCommentPeekService.cs

@@ -1,5 +1,7 @@
 using System;
 using System.ComponentModel.Composition;
+using System.Linq;
+using System.Reactive.Linq;
 using System.Threading.Tasks;
 using GitHub.Api;
 using GitHub.Extensions;
@@ -96,7 +98,15 @@ public ITrackingPoint Show(ITextView textView, AddInlineCommentTag tag)
 
             ExpandCollapsedRegions(textView, line.Extent);
 
-            peekBroker.TriggerPeekSession(textView, trackingPoint, InlineCommentPeekRelationship.Instance.Name);
+            var session = peekBroker.TriggerPeekSession(textView, trackingPoint, InlineCommentPeekRelationship.Instance.Name);
+            var item = session.PeekableItems.OfType<InlineCommentPeekableItem>().FirstOrDefault();
+
+            if (item != null)
+            {
+                var placeholder = item.ViewModel.Thread.Comments.Last();
+                placeholder.CancelEdit.Take(1).Subscribe(_ => session.Dismiss());
+            }
+
             return trackingPoint;
         }