Merge branch 'master' into features/check-suite-annotations-expanders

Author: jcansdale

GitHubVS.sln

@@ -135,6 +135,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InstallAndStart", "test\Lau
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.16", "src\GitHub.TeamFoundation.16\GitHub.TeamFoundation.16.csproj", "{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Services.Vssdk.UnitTests", "test\GitHub.Services.Vssdk.UnitTests\GitHub.Services.Vssdk.UnitTests.csproj", "{65542DEE-D3BE-4810-B85A-08E970413A21}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -471,6 +473,16 @@ Global
 		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
 		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
+		{65542DEE-D3BE-4810-B85A-08E970413A21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65542DEE-D3BE-4810-B85A-08E970413A21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65542DEE-D3BE-4810-B85A-08E970413A21}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
+		{65542DEE-D3BE-4810-B85A-08E970413A21}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
+		{65542DEE-D3BE-4810-B85A-08E970413A21}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
+		{65542DEE-D3BE-4810-B85A-08E970413A21}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
+		{65542DEE-D3BE-4810-B85A-08E970413A21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65542DEE-D3BE-4810-B85A-08E970413A21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65542DEE-D3BE-4810-B85A-08E970413A21}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
+		{65542DEE-D3BE-4810-B85A-08E970413A21}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -502,6 +514,7 @@ Global
 		{86C54B27-717F-478C-AC8C-01F1C68A56C5} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9}
 		{C6E8D1E1-FAAC-4E02-B6A1-6164EC5E704E} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9}
 		{E899B03C-6E8E-4375-AB65-FC925D721D8B} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9}
+		{65542DEE-D3BE-4810-B85A-08E970413A21} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {556014CF-5B35-4CE5-B3EF-6AB0007001AC}

azure-pipelines.yml

@@ -0,0 +1,64 @@
+# .NET Desktop
+# Build and run tests for .NET Desktop or Windows classic desktop solutions.
+# Add steps that publish symbols, save build artifacts, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
+
+pool:
+  vmImage: 'VS2017-Win2016'
+
+variables:
+  solution: '**/*.sln'
+  buildPlatform: 'Any CPU'
+  buildConfiguration: 'Release'
+
+steps:
+- task: InstallSSHKey@0
+  inputs:
+    hostName: github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+    sshPublicKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCx/AxLjr4mhH7XFlbISb65GBxQnVnKh1owmAT1bK/Qt1b4/Z0SL68IvV88DpgLyKbica2giEVfKo/Z4dkO+P8M2bGXrNgazzfO910DlR+e1vt8BSU/Dbvscz0i1lsfKb3PnfSouCkQev6Th0v+hBdgkuackWgaBw22DDLkp9Uf/cAo+QYLz56p5KVctEESRRgGgIIlZyUc8OYDMSU2wQhG9x31mSyJ4ODuOZsi1RgBBHrgUb2QRhLJ9nZWfQgGBRDxGYTKLWiWIQwgSVQ9x1Az/Rei+CbPRvLcVGg+5vHt8lcu+HxEgrY4IsjXdMqosPqxQ+TT6f+G4GQDn8+IQ4wOpTVi84PkOQX3JPE2QSJwWA0AHNe5NTSns6WWYQyzxFJYBN2pLPuMnj9/+ozV3GaeQqn47WHfUH3s5IawNQPTFDxcl4qsmU66Ybfqa4eFIPEvCCp1leQcuXyDHxKLq80x1szN4kn0oyL2W0zbkwTaZG4I5l4Rto0hErUf3qx7FlZjMGEFMdJVskgnRMkKdqngF0FmSYQICpmqqYD8TydUc6jxZVOCvFF5gbqwxV/F2lk10D7FnetUNeWvpcZKbFUX4e5Ff15vibJZp4/5FUbksv+glfbPwk6tGuNj3xPFODP7KG8Y5wtcbknX11XI0vi+iL8TxL0Vk30TpZUMXWYYvQ==
+    sshKeySecureFile: id_rsa
+
+- script: git submodule init && git submodule deinit script && git submodule update
+  displayName: Submodule init
+
+# Can't use the NuGet tasks because of https://github.com/Microsoft/azure-pipelines-tasks/issues/6790
+#- task: NuGetToolInstaller@0
+#- task: NuGetCommand@2
+#  inputs:
+#    restoreSolution: '$(solution)'
+#    feedsToUse: 'config'
+#    nugetConfigPath: nuget.config
+
+# Instead run nuget manually.
+- script: tools\nuget\nuget.exe restore
+  displayName: NuGet restore
+
+# Ideally we'd run NerdBank.GitVersioning but that will come later. For now bump the
+# version with the azure BuildId
+- task: PowerShell@2
+  inputs:
+    targetType: filePath
+    filePath: '$(Build.SourcesDirectory)\scripts\Bump-Version.ps1'
+    arguments: -BumpBuild -BuildNumber:$(Build.BuildId)
+    displayName: Bump version
+
+- task: VSBuild@1
+  inputs:
+    solution: GitHubVS.sln
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+
+# VSTest is hanging. Skip tests for now; we're still running Appveyor which will handle the tests.
+#- task: VSTest@2
+#  inputs:
+#    searchFolder: '$(Build.SourcesDirectory)\test'
+#    testAssemblyVer2: '**\bin\**\*Tests.dll'
+#    platform: '$(buildPlatform)'
+#    configuration: '$(buildConfiguration)'
+#    diagnosticsEnabled: true
+#    runSettingsFile: '$(Build.SourcesDirectory)\test\test.runsettings'
+
+- task: PublishBuildArtifacts@1
+  inputs:
+    pathtoPublish: '$(Build.SourcesDirectory)\build\Release\GitHub.VisualStudio.vsix' 
+    artifactName: 'vsix' 

nuget.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="vsixtesting" value="https://www.myget.org/F/vsixtesting/api/v3/index.json" />
     <add key="Custom Packages for GHfVS" value="lib" />

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

@@ -45,6 +45,7 @@ public sealed class GitHubPaneViewModel : ViewModelBase, IGitHubPaneViewModel, I
         readonly ILoggedOutViewModel loggedOut;
         readonly INotAGitHubRepositoryViewModel notAGitHubRepository;
         readonly INotAGitRepositoryViewModel notAGitRepository;
+        readonly INoRemoteOriginViewModel noRemoteOrigin;
         readonly ILoginFailedViewModel loginFailed;
         readonly SemaphoreSlim navigating = new SemaphoreSlim(1);
         readonly ObservableAsPropertyHelper<ContentOverride> contentOverride;
@@ -72,6 +73,7 @@ public GitHubPaneViewModel(
             ILoggedOutViewModel loggedOut,
             INotAGitHubRepositoryViewModel notAGitHubRepository,
             INotAGitRepositoryViewModel notAGitRepository,
+            INoRemoteOriginViewModel noRemoteOrigin,
             ILoginFailedViewModel loginFailed)
         {
             Guard.ArgumentNotNull(viewModelFactory, nameof(viewModelFactory));
@@ -84,6 +86,7 @@ public GitHubPaneViewModel(
             Guard.ArgumentNotNull(loggedOut, nameof(loggedOut));
             Guard.ArgumentNotNull(notAGitHubRepository, nameof(notAGitHubRepository));
             Guard.ArgumentNotNull(notAGitRepository, nameof(notAGitRepository));
+            Guard.ArgumentNotNull(noRemoteOrigin, nameof(noRemoteOrigin));
             Guard.ArgumentNotNull(loginFailed, nameof(loginFailed));
 
             this.viewModelFactory = viewModelFactory;
@@ -94,6 +97,7 @@ public GitHubPaneViewModel(
             this.loggedOut = loggedOut;
             this.notAGitHubRepository = notAGitHubRepository;
             this.notAGitRepository = notAGitRepository;
+            this.noRemoteOrigin = noRemoteOrigin;
             this.loginFailed = loginFailed;
 
             var contentAndNavigatorContent = Observable.CombineLatest(
@@ -433,8 +437,17 @@ async Task UpdateContent(LocalRepositoryModel repository)
             }
             else if (string.IsNullOrWhiteSpace(repository.CloneUrl))
             {
-                log.Debug("Not a GitHub repository: {CloneUrl}", repository?.CloneUrl);
-                Content = notAGitHubRepository;
+                if (repository.HasRemotesButNoOrigin)
+                {
+                    log.Debug("No origin remote");
+                    Content = noRemoteOrigin;
+                }
+                else
+                {
+                    log.Debug("Not a GitHub repository: {CloneUrl}", repository?.CloneUrl);
+                    Content = notAGitHubRepository;
+                }
+
                 return;
             }
 
@@ -490,7 +503,7 @@ async Task UpdateContent(LocalRepositoryModel repository)
                     Content = loggedOut;
                 }
             }
-            
+
             if (notGitHubRepo)
             {
                 log.Debug("Not a GitHub repository: {CloneUrl}", repository?.CloneUrl);

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

@@ -0,0 +1,28 @@
+using System;
+using System.Reactive;
+using System.Threading.Tasks;
+using System.ComponentModel.Composition;
+using GitHub.Services;
+using ReactiveUI;
+
+namespace GitHub.ViewModels.GitHubPane
+{
+    /// <summary>
+    /// The view model for the "No Origin Remote" view in the GitHub pane.
+    /// </summary>
+    [Export(typeof(INoRemoteOriginViewModel))]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
+    public class NoRemoteOriginViewModel : PanePageViewModelBase, INoRemoteOriginViewModel
+    {
+        ITeamExplorerServices teamExplorerServices;
+
+        [ImportingConstructor]
+        public NoRemoteOriginViewModel(ITeamExplorerServices teamExplorerServices)
+        {
+            this.teamExplorerServices = teamExplorerServices;
+            EditRemotes = ReactiveCommand.CreateFromTask(teamExplorerServices.ShowRepositorySettingsRemotesAsync);
+        }
+
+        public ReactiveCommand<Unit, Unit> EditRemotes { get; }
+    }
+}

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/INoRemoteOriginViewModel.cs

@@ -0,0 +1,16 @@
+using System.Reactive;
+using ReactiveUI;
+
+namespace GitHub.ViewModels.GitHubPane
+{
+    /// <summary>
+    /// Defines the view model for the "No Origin Remote" view in the GitHub pane.
+    /// </summary>
+    public interface INoRemoteOriginViewModel : IPanePageViewModel
+    {
+        /// <summary>
+        /// Gets a command that will allow the user to rename remotes.
+        /// </summary>
+        ReactiveCommand<Unit, Unit> EditRemotes { get; }
+    }
+}

src/GitHub.Exports/Models/BranchModel.cs

@@ -7,12 +7,13 @@ namespace GitHub.Models
     public class BranchModel : ICopyable<BranchModel>,
         IEquatable<BranchModel>, IComparable<BranchModel>
     {
-        public BranchModel(string name, RepositoryModel repo, string sha, bool isTracking, string trackedSha) :
+        public BranchModel(string name, RepositoryModel repo, string sha, bool isTracking, string trackedSha, string trackedRemoteName) :
             this(name, repo)
         {
             IsTracking = isTracking;
             Sha = sha;
             TrackedSha = trackedSha;
+            TrackedRemoteName = trackedRemoteName;
         }
 
         public BranchModel(string name, RepositoryModel repo)
@@ -32,6 +33,7 @@ public BranchModel(string name, RepositoryModel repo)
         public string DisplayName { get; set; }
         public string Sha { get; private set; }
         public string TrackedSha { get; private set; }
+        public string TrackedRemoteName { get; private set; }
 
         #region Equality things
         public void CopyFrom(BranchModel other)

src/GitHub.Exports/Models/LocalRepositoryModel.cs

@@ -2,6 +2,8 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.ComponentModel;
+using System.Collections.Generic;
+using GitHub.Primitives;
 
 namespace GitHub.Models
 {
@@ -22,6 +24,14 @@ public string LocalPath
             get; set;
         }
 
+        /// <summary>
+        /// True if repository has remotes but none are named "origin".
+        /// </summary>
+        public bool HasRemotesButNoOrigin
+        {
+            get; set;
+        }
+
         /// <summary>
         /// Note: We don't consider CloneUrl a part of the hash code because it can change during the lifetime
         /// of a repository. Equals takes care of any hash collisions because of this

src/GitHub.Exports/Services/GitService.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using GitHub.UI;
 using GitHub.Models;
@@ -38,18 +39,29 @@ public LocalRepositoryModel CreateLocalRepositoryModel(string localPath)
                 throw new ArgumentException("Path does not exist", nameof(localPath));
             }
 
-            var cloneUrl = GetUri(localPath);
-            var name = cloneUrl?.RepositoryName ?? dir.Name;
-
-            var model = new LocalRepositoryModel
+            using (var repository = GetRepository(localPath))
             {
-                LocalPath = localPath,
-                CloneUrl = cloneUrl,
-                Name = name,
-                Icon = Octicon.repo
-            };
+                UriString cloneUrl = null;
+                bool noOrigin = false;
+                if (repository != null)
+                {
+                    cloneUrl = GetUri(repository);
+                    noOrigin = HasRemotesButNoOrigin(repository);
+                }
 
-            return model;
+                var name = cloneUrl?.RepositoryName ?? dir.Name;
+
+                var model = new LocalRepositoryModel
+                {
+                    LocalPath = localPath,
+                    CloneUrl = cloneUrl,
+                    HasRemotesButNoOrigin = noOrigin,
+                    Name = name,
+                    Icon = Octicon.repo
+                };
+
+                return model;
+            }
         }
 
         public BranchModel GetBranch(LocalRepositoryModel model)
@@ -68,7 +80,8 @@ public BranchModel GetBranch(LocalRepositoryModel model)
                     repo: model,
                     sha: branch.Tip?.Sha,
                     isTracking: branch.IsTracking,
-                    trackedSha: branch.TrackedBranch?.Tip?.Sha);
+                    trackedSha: branch.TrackedBranch?.Tip?.Sha,
+                    trackedRemoteName: branch.TrackedBranch?.RemoteName);
             }
         }
 
@@ -119,6 +132,17 @@ public IRepository GetRepository(string path)
             return repoPath == null ? null : repositoryFacade.NewRepository(repoPath);
         }
 
+        /// <summary>
+        /// Find out if repository has remotes but none are called "origin".
+        /// </summary>
+        /// <param name="repo">The target repository.</param>
+        /// <returns>True if repository has remotes but none are called "origin".</returns>
+        public bool HasRemotesButNoOrigin(IRepository repo)
+        {
+            var remotes = repo.Network.Remotes;
+            return remotes["origin"] == null && remotes.Any();
+        }
+
         /// <summary>
         /// Returns a <see cref="UriString"/> representing the uri of a remote
         /// </summary>

src/GitHub.Exports/Services/ITeamExplorerServices.cs

@@ -1,4 +1,4 @@
-using System.Windows.Input;
+using System.Threading.Tasks;
 
 namespace GitHub.Services
 {
@@ -7,6 +7,7 @@ public interface ITeamExplorerServices : INotificationService
         void ShowConnectPage();
         void ShowHomePage();
         void ShowPublishSection();
+        Task ShowRepositorySettingsRemotesAsync();
         void ClearNotifications();
         void OpenRepository(string repositoryPath);
     }