Merge branch 'master' into fixes/1654-pr-authoring-link

Author: jcansdale

src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs

@@ -5,7 +5,10 @@
 using System.Windows.Controls.Primitives;
 using System.ComponentModel.Composition;
 using System.Reactive.Linq;
+using System.Threading.Tasks;
 using GitHub.Commands;
+using GitHub.Extensions;
+using GitHub.Primitives;
 using GitHub.InlineReviews.Views;
 using GitHub.InlineReviews.ViewModels;
 using GitHub.Services;
@@ -32,6 +35,7 @@ public class PullRequestStatusBarManager
         // TeamExplorerContext needs to retrieve DTE using GetService.
         readonly Lazy<IPullRequestSessionManager> pullRequestSessionManager;
         readonly Lazy<ITeamExplorerContext> teamExplorerContext;
+        readonly Lazy<IConnectionManager> connectionManager;
 
         IDisposable currentSessionSubscription;
 
@@ -41,7 +45,8 @@ public PullRequestStatusBarManager(
             IOpenPullRequestsCommand openPullRequestsCommand,
             IShowCurrentPullRequestCommand showCurrentPullRequestCommand,
             Lazy<IPullRequestSessionManager> pullRequestSessionManager,
-            Lazy<ITeamExplorerContext> teamExplorerContext)
+            Lazy<ITeamExplorerContext> teamExplorerContext,
+            Lazy<IConnectionManager> connectionManager)
         {
             this.openPullRequestsCommand = new UsageTrackingCommand(usageTracker,
                 x => x.NumberOfStatusBarOpenPullRequestList, openPullRequestsCommand);
@@ -50,6 +55,7 @@ public PullRequestStatusBarManager(
 
             this.pullRequestSessionManager = pullRequestSessionManager;
             this.teamExplorerContext = teamExplorerContext;
+            this.connectionManager = connectionManager;
         }
 
         /// <summary>
@@ -76,24 +82,55 @@ void RefreshActiveRepository(ILocalRepositoryModel repository)
         {
             currentSessionSubscription?.Dispose();
             currentSessionSubscription = pullRequestSessionManager.Value.WhenAnyValue(x => x.CurrentSession)
-                .Subscribe(x => RefreshCurrentSession(repository, x));
+                .Subscribe(x => RefreshCurrentSession(repository, x).Forget());
         }
 
-        void RefreshCurrentSession(ILocalRepositoryModel repository, IPullRequestSession session)
+        async Task RefreshCurrentSession(ILocalRepositoryModel repository, IPullRequestSession session)
         {
-            var cloneUrl = repository?.CloneUrl;
-            if (cloneUrl != null)
+            try
             {
-                // Only show PR status bar if repo has remote
+                var showStatus = await IsDotComOrEnterpriseRepository(repository);
+                if (!showStatus)
+                {
+                    ShowStatus(null);
+                    return;
+                }
+
                 var viewModel = CreatePullRequestStatusViewModel(session);
                 ShowStatus(viewModel);
             }
-            else
+            catch (Exception e)
             {
-                ShowStatus(null);
+                log.Error(e, nameof(RefreshCurrentSession));
             }
         }
 
+        async Task<bool> IsDotComOrEnterpriseRepository(ILocalRepositoryModel repository)
+        {
+            var cloneUrl = repository?.CloneUrl;
+            if (cloneUrl == null)
+            {
+                // No active repository or remote
+                return false;
+            }
+
+            var isDotCom = HostAddress.IsGitHubDotComUri(cloneUrl.ToRepositoryUrl());
+            if (isDotCom)
+            {
+                // This is a github.com repository
+                return true;
+            }
+
+            var connection = await connectionManager.Value.GetConnection(repository);
+            if (connection != null)
+            {
+                // This is an enterprise repository
+                return true;
+            }
+
+            return false;
+        }
+
         PullRequestStatusViewModel CreatePullRequestStatusViewModel(IPullRequestSession session)
         {
             var pullRequestStatusViewModel = new PullRequestStatusViewModel(openPullRequestsCommand, showCurrentPullRequestCommand);

src/GitHub.InlineReviews/Views/PullRequestStatusView.xaml

@@ -49,14 +49,11 @@
                         VerticalAlignment="Bottom"
                         Margin="0 0 4 0 "
                         Icon="git_pull_request" />
-                    <TextBlock VerticalAlignment="Center">
-                        Pull requests
-                    </TextBlock>
                 </StackPanel>
             </Button>
             <Grid.ToolTip>
                 <TextBlock VerticalAlignment="Center">
-                    Open or Create a Pull request
+                    View, Checkout or Create a Pull request
                 </TextBlock>
             </Grid.ToolTip>
         </Grid>

src/GitHub.VisualStudio/Services/UsageService.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
-using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Threading;
@@ -17,14 +16,15 @@
 namespace GitHub.Services
 {
     [Export(typeof(IUsageService))]
-    public class UsageService : IUsageService
+    public sealed class UsageService : IUsageService, IDisposable
     {
         const string StoreFileName = "metrics.json";
         const string UserStoreFileName = "user.json";
         static readonly ILogger log = LogManager.ForContext<UsageService>();
 
         readonly IGitHubServiceProvider serviceProvider;
         readonly IEnvironment environment;
+        readonly SemaphoreSlim writeSemaphoreSlim = new SemaphoreSlim(1, 1);
 
         string storePath;
         string userStorePath;
@@ -37,6 +37,11 @@ public UsageService(IGitHubServiceProvider serviceProvider, IEnvironment environ
             this.environment = environment;
         }
 
+        public void Dispose()
+        {
+            writeSemaphoreSlim.Dispose();
+        }
+
         public async Task<Guid> GetUserGuid()
         {
             await Initialize();
@@ -102,7 +107,7 @@ public async Task<UsageData> ReadLocalData()
                     SimpleJson.DeserializeObject<UsageData>(json) :
                     new UsageData { Reports = new List<UsageModel>() };
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 log.Error(ex, "Error deserializing usage");
                 return new UsageData { Reports = new List<UsageModel>() };
@@ -115,11 +120,12 @@ public async Task WriteLocalData(UsageData data)
             {
                 Directory.CreateDirectory(Path.GetDirectoryName(storePath));
                 var json = SimpleJson.SerializeObject(data);
+
                 await WriteAllTextAsync(storePath, json);
             }
             catch (Exception ex)
             {
-                log.Error(ex,"Failed to write usage data");
+                log.Error(ex, "Failed to write usage data");
             }
         }
 
@@ -149,10 +155,19 @@ async Task<string> ReadAllTextAsync(string path)
 
         async Task WriteAllTextAsync(string path, string text)
         {
-            using (var s = new FileStream(path, FileMode.Create))
-            using (var w = new StreamWriter(s, Encoding.UTF8))
+            // Avoid IOException when metrics updated multiple times in quick succession
+            await writeSemaphoreSlim.WaitAsync();
+            try
+            {
+                using (var s = new FileStream(path, FileMode.Create))
+                using (var w = new StreamWriter(s, Encoding.UTF8))
+                {
+                    await w.WriteAsync(text);
+                }
+            }
+            finally
             {
-                await w.WriteAsync(text);
+                writeSemaphoreSlim.Release();
             }
         }