Merge branch 'master' into pull-request-status-circle

Author: StanleyGoldman

README.md

@@ -12,7 +12,7 @@ If you have an existing clone, make sure to run `git submodule sync` to update y
 
 ## About
 
-The GitHub Extension for Visual Studio provides GitHub integration in Visual Studio 2015.
+The GitHub Extension for Visual Studio provides GitHub integration in Visual Studio 2015 and newer.
 Most of the extension UI lives in the Team Explorer pane, which is available from the View menu.
 
 Official builds of this extension are available at [the official website](https://visualstudio.github.com).

src/GitHub.App/GitHub.App.csproj

@@ -46,10 +46,18 @@
     <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="1.0.164" />
     <PackageReference Include="Madskristensen.VisualStudio.SDK" Version="14.3.75-pre" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
+    <PackageReference Include="Microsoft.VisualStudio.StaticReviews.Embeddable" Version="0.1.14-alpha" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="Rothko" Version="0.0.3-ghfvs" />
     <PackageReference Include="Serilog" Version="2.5.0" />
     <PackageReference Include="SerilogAnalyzer" Version="0.12.0.0" />
     <PackageReference Include="Stateless" Version="2.5.56.0" targetFramework="net45" />
   </ItemGroup>
-</Project>
+  <Target Name="LinkStaticReviewsEmbeddableAssemblies" AfterTargets="ResolveReferences" BeforeTargets="FindReferenceAssembliesForReferences">
+    <ItemGroup>
+      <ReferencePath Condition="'%(FileName)' == 'Microsoft.VisualStudio.StaticReviews.Embeddable'">
+        <EmbedInteropTypes>true</EmbedInteropTypes>
+      </ReferencePath>
+    </ItemGroup>
+  </Target>
+</Project>

src/GitHub.App/SampleData/SampleViewModels.cs

@@ -29,7 +29,6 @@ public RepositoryCreationViewModelDesigner()
             RepositoryName = "Hello-World";
             Description = "A description";
             KeepPrivate = true;
-            CanKeepPrivate = true;
             Accounts = new ReactiveList<IAccount>
             {
                 new AccountDesigner { Login = "shana" },
@@ -80,12 +79,6 @@ public ReactiveCommand<Unit, Unit> BrowseForDirectory
             private set;
         }
 
-        public bool CanKeepPrivate
-        {
-            get;
-            private set;
-        }
-
         public ReactiveCommand<Unit, Unit> CreateRepository
         {
             get;
@@ -146,24 +139,6 @@ public IAccount SelectedAccount
             set;
         }
 
-        public bool ShowUpgradePlanWarning
-        {
-            get;
-            private set;
-        }
-
-        public bool ShowUpgradeToMicroPlanWarning
-        {
-            get;
-            private set;
-        }
-
-        public ICommand UpgradeAccountPlan
-        {
-            get;
-            private set;
-        }
-
         public IReadOnlyList<GitIgnoreItem> GitIgnoreTemplates
         {
             get; private set;

src/GitHub.App/Services/PullRequestService.cs

@@ -8,8 +8,10 @@
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Reactive.Threading.Tasks;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using GitHub.Api;
@@ -19,6 +21,7 @@
 using GitHub.Models;
 using GitHub.Primitives;
 using LibGit2Sharp;
+using Microsoft.VisualStudio.StaticReviews.Contracts;
 using Octokit.GraphQL;
 using Octokit.GraphQL.Model;
 using Rothko;
@@ -32,7 +35,7 @@ namespace GitHub.Services
 {
     [Export(typeof(IPullRequestService))]
     [PartCreationPolicy(CreationPolicy.Shared)]
-    public class PullRequestService : IPullRequestService
+    public class PullRequestService : IPullRequestService, IStaticReviewFileMap
     {
         const string SettingCreatedByGHfVS = "created-by-ghfvs";
         const string SettingGHfVSPullRequest = "ghfvs-pr-owner-number";
@@ -58,6 +61,8 @@ public class PullRequestService : IPullRequestService
         readonly IOperatingSystem os;
         readonly IUsageTracker usageTracker;
 
+        readonly IDictionary<string, (string commitId, string repoPath)> tempFileMappings;
+   
         [ImportingConstructor]
         public PullRequestService(
             IGitClient gitClient,
@@ -73,6 +78,7 @@ public PullRequestService(
             this.graphqlFactory = graphqlFactory;
             this.os = os;
             this.usageTracker = usageTracker;
+            this.tempFileMappings = new Dictionary<string, (string commitId, string repoPath)>(StringComparer.OrdinalIgnoreCase);
         }
 
         public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
@@ -756,6 +762,12 @@ public async Task<string> ExtractToTempFile(
                 }
             }
 
+            lock (this.tempFileMappings)
+            {
+                string gitRelativePath = relativePath.TrimStart('/').Replace('\\', '/');
+                this.tempFileMappings[CanonicalizeLocalFilePath(tempFilePath)] = (commitSha, gitRelativePath);
+            }
+
             return tempFilePath;
         }
 
@@ -828,6 +840,28 @@ public bool ConfirmCancelPendingReview()
                        MessageBoxIcon.Question) == DialogResult.Yes;
         }
 
+        /// <inheritdoc />
+        public Task<string> GetObjectishFromLocalPathAsync(string localPath, CancellationToken cancellationToken)
+        {
+            lock (this.tempFileMappings)
+            {
+                var canonicalizedPath = CanonicalizeLocalFilePath(localPath);
+                if (this.tempFileMappings.TryGetValue(canonicalizedPath, out (string commitId, string repoPath) result))
+                {
+                    return Task.FromResult($"{result.commitId}:{result.repoPath}");
+                }
+            }
+
+            return Task.FromResult<string>(null);
+        }
+
+        /// <inheritdoc />
+        public Task<string> GetLocalPathFromObjectishAsync(string objectish, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+
         async Task<string> CreateRemote(IRepository repo, UriString cloneUri)
         {
             foreach (var remote in repo.Network.Remotes)
@@ -1007,6 +1041,12 @@ static string BuildGHfVSConfigKeyValue(string owner, int number)
             return default;
         }
 
+        static string CanonicalizeLocalFilePath(string localPath)
+        {
+            localPath = localPath.Replace("\\\\", "\\");
+            return Path.GetFullPath(localPath);
+        }
+
         class ListItemAdapter : PullRequestListItemModel
         {
             public IList<ReviewAdapter> Reviews { get; set; }

src/GitHub.App/Services/RepositoryCloneService.cs

@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Api;
 using GitHub.Extensions;
@@ -69,13 +70,8 @@ public async Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress ad
             {
                 var order = new RepositoryOrder
                 {
-                    Field = RepositoryOrderField.Name,
-                    Direction = OrderDirection.Asc
-                };
-
-                var affiliation = new RepositoryAffiliation?[]
-                {
-                    RepositoryAffiliation.Owner, RepositoryAffiliation.Collaborator
+                    Field = RepositoryOrderField.PushedAt,
+                    Direction = OrderDirection.Desc
                 };
 
                 var repositorySelection = new Fragment<Repository, RepositoryListItemModel>(
@@ -94,14 +90,17 @@ public async Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress ad
                     .Select(viewer => new ViewerRepositoriesModel
                     {
                         Owner = viewer.Login,
-                        Repositories = viewer.Repositories(null, null, null, null, null, null, null, order, affiliation, null)
+                        Repositories = viewer.Repositories(null, null, null, null, null, null, null, order, null, null)
                             .AllPages()
                             .Select(repositorySelection).ToList(),
+                        ContributedToRepositories = viewer.RepositoriesContributedTo(100, null, null, null, null, null, null, order, null)
+                            .Nodes
+                            .Select(repositorySelection).ToList(),
                         Organizations = viewer.Organizations(null, null, null, null).AllPages().Select(org => new
                         {
                             org.Login,
-                            Repositories = org.Repositories(null, null, null, null, null, null, null, order, null, null)
-                                .AllPages()
+                            Repositories = org.Repositories(100, null, null, null, null, null, null, order, null, null)
+                                .Nodes
                                 .Select(repositorySelection).ToList()
                         }).ToDictionary(x => x.Login, x => (IReadOnlyList<RepositoryListItemModel>)x.Repositories),
                     }).Compile();

src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs

@@ -137,8 +137,8 @@ public async Task InitializeAsync(IConnection connection)
 
             this.WhenAnyValue(x => x.SelectedTabIndex).Subscribe(x => tabs[x].Activate().Forget());
 
-            // When a clipboard URL has been set or a user is in group A, show the URL tab by default
-            if (!string.IsNullOrEmpty(UrlTab.Url) || await IsGroupA().ConfigureAwait(false))
+            // When a clipboard URL has been set, show the URL tab by default
+            if (!string.IsNullOrEmpty(UrlTab.Url))
             {
                 SelectedTabIndex = 2;
             }
@@ -157,14 +157,6 @@ public async Task InitializeAsync(IConnection connection)
             }
         }
 
-        // Put 50% of users in group A
-        async Task<bool> IsGroupA()
-        {
-            var userGuid = await usageService.GetUserGuid().ConfigureAwait(false);
-            var lastByte = userGuid.ToByteArray().Last();
-            return lastByte % 2 == 0;
-        }
-
         void BrowseForDirectory()
         {
             var result = os.Dialog.BrowseForDirectory(Path, Resources.BrowseForDirectory);

src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.Composition;
+using System.Globalization;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
@@ -108,7 +109,8 @@ public async Task Activate()
 
             try
             {
-                var results = await service.ReadViewerRepositories(connection.HostAddress).ConfigureAwait(true);
+                var results = await log.TimeAsync(nameof(service.ReadViewerRepositories),
+                    () => service.ReadViewerRepositories(connection.HostAddress));
 
                 var yourRepositories = results.Repositories
                     .Where(r => r.Owner == results.Owner)
@@ -117,10 +119,17 @@ public async Task Activate()
                     .Where(r => r.Owner != results.Owner)
                     .OrderBy(r => r.Owner)
                     .Select(x => new RepositoryItemViewModel(x, "Collaborator repositories"));
+                var repositoriesContributedTo = results.ContributedToRepositories
+                    .Select(x => new RepositoryItemViewModel(x, "Contributed to repositories"));
                 var orgRepositories = results.Organizations
                     .OrderBy(x => x.Key)
-                    .SelectMany(x => x.Value.Select(y => new RepositoryItemViewModel(y, x.Key)));
-                Items = yourRepositories.Concat(collaboratorRepositories).Concat(orgRepositories).ToList();
+                    .SelectMany(x => x.Value.Select(y => new RepositoryItemViewModel(y, GroupName(x, 100))));
+                Items = yourRepositories
+                    .Concat(collaboratorRepositories)
+                    .Concat(repositoriesContributedTo)
+                    .Concat(orgRepositories)
+                    .ToList();
+                log.Information("Read {Total} viewer repositories", Items.Count);
                 ItemsView = CollectionViewSource.GetDefaultView(Items);
                 ItemsView.GroupDescriptions.Add(new PropertyGroupDescription(nameof(RepositoryItemViewModel.Group)));
                 ItemsView.Filter = FilterItem;
@@ -142,6 +151,17 @@ public async Task Activate()
             }
         }
 
+        static string GroupName(KeyValuePair<string, IReadOnlyList<RepositoryListItemModel>> group, int max)
+        {
+            var name = group.Key;
+            if (group.Value.Count == max)
+            {
+                name += $" ({string.Format(CultureInfo.InvariantCulture, Resources.MostRecentlyPushed, max)})";
+            }
+
+            return name;
+        }
+
         bool FilterItem(object obj)
         {
             if (obj is IRepositoryItemViewModel item && !string.IsNullOrWhiteSpace(Filter))

src/GitHub.App/ViewModels/Dialog/RepositoryCreationViewModel.cs

@@ -39,7 +39,6 @@ public class RepositoryCreationViewModel : RepositoryFormViewModel, IRepositoryC
         readonly IModelServiceFactory modelServiceFactory;
         readonly IRepositoryCreationService repositoryCreationService;
         readonly ObservableAsPropertyHelper<bool> isCreating;
-        readonly ObservableAsPropertyHelper<bool> canKeepPrivate;
         readonly IOperatingSystem operatingSystem;
         readonly IUsageTracker usageTracker;
         ObservableAsPropertyHelper<IReadOnlyList<IAccount>> accounts;
@@ -96,10 +95,6 @@ public RepositoryCreationViewModel(
 
             CreateRepository = InitializeCreateRepositoryCommand();
 
-            canKeepPrivate = CanKeepPrivateObservable.CombineLatest(CreateRepository.IsExecuting,
-                (canKeep, publishing) => canKeep && !publishing)
-                .ToProperty(this, x => x.CanKeepPrivate);
-
             isCreating = CreateRepository.IsExecuting
                 .ToProperty(this, x => x.IsCreating);
 
@@ -128,11 +123,6 @@ public string BaseRepositoryPath
         /// </summary>
         public bool IsCreating { get { return isCreating.Value; } }
 
-        /// <summary>
-        /// If the repo can be made private (depends on the user plan)
-        /// </summary>
-        public bool CanKeepPrivate { get { return canKeepPrivate.Value; } }
-
         IReadOnlyList<GitIgnoreItem> gitIgnoreTemplates;
         public IReadOnlyList<GitIgnoreItem> GitIgnoreTemplates
         {