Merge remote-tracking branch 'upstream/master' into fixes/1666-filter-pr-solution-explorer

Author: laurentkempe

src/GitHub.App/SampleData/Dialog/Clone/RepositoryCloneViewModelDesigner.cs

@@ -16,7 +16,7 @@ public RepositoryCloneViewModelDesigner()
         }
 
         public string Path { get; set; }
-        public string PathError { get; set; }
+        public string PathWarning { get; set; }
         public int SelectedTabIndex { get; set; }
         public string Title => null;
         public IObservable<object> Done => null;

src/GitHub.App/Services/DialogService.cs

@@ -29,9 +29,13 @@ public DialogService(
             this.showDialog = showDialog;
         }
 
-        public async Task<CloneDialogResult> ShowCloneDialog(IConnection connection)
+        public async Task<CloneDialogResult> ShowCloneDialog(IConnection connection, string url = null)
         {
             var viewModel = factory.CreateViewModel<IRepositoryCloneViewModel>();
+            if (url != null)
+            {
+                viewModel.UrlTab.Url = url;
+            }
 
             if (connection != null)
             {

src/GitHub.App/Services/RepositoryCloneService.cs

@@ -34,6 +34,7 @@ public class RepositoryCloneService : IRepositoryCloneService
         readonly IOperatingSystem operatingSystem;
         readonly string defaultClonePath;
         readonly IVSGitServices vsGitServices;
+        readonly ITeamExplorerServices teamExplorerServices;
         readonly IGraphQLClientFactory graphqlFactory;
         readonly IUsageTracker usageTracker;
         ICompiledQuery<ViewerRepositoriesModel> readViewerRepositories;
@@ -42,11 +43,13 @@ public class RepositoryCloneService : IRepositoryCloneService
         public RepositoryCloneService(
             IOperatingSystem operatingSystem,
             IVSGitServices vsGitServices,
+            ITeamExplorerServices teamExplorerServices,
             IGraphQLClientFactory graphqlFactory,
             IUsageTracker usageTracker)
         {
             this.operatingSystem = operatingSystem;
             this.vsGitServices = vsGitServices;
+            this.teamExplorerServices = teamExplorerServices;
             this.graphqlFactory = graphqlFactory;
             this.usageTracker = usageTracker;
 
@@ -103,6 +106,54 @@ public async Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress ad
             return result;
         }
 
+        /// <inheritdoc/>
+        public async Task CloneOrOpenRepository(
+            CloneDialogResult cloneDialogResult,
+            object progress = null)
+        {
+            Guard.ArgumentNotNull(cloneDialogResult, nameof(cloneDialogResult));
+
+            var repositoryPath = cloneDialogResult.Path;
+            var url = cloneDialogResult.Url;
+
+            if (DestinationFileExists(repositoryPath))
+            {
+                throw new InvalidOperationException("Can't clone or open a repository because a file exists at: " + repositoryPath);
+            }
+
+            var repositoryUrl = url.ToRepositoryUrl();
+            var isDotCom = HostAddress.IsGitHubDotComUri(repositoryUrl);
+            if (DestinationDirectoryExists(repositoryPath))
+            {
+                teamExplorerServices.OpenRepository(repositoryPath);
+
+                if (isDotCom)
+                {
+                    await usageTracker.IncrementCounter(x => x.NumberOfGitHubOpens);
+                }
+                else
+                {
+                    await usageTracker.IncrementCounter(x => x.NumberOfEnterpriseOpens);
+                }
+            }
+            else
+            {
+                var cloneUrl = repositoryUrl.ToString();
+                await CloneRepository(cloneUrl, repositoryPath, progress).ConfigureAwait(true);
+
+                if (isDotCom)
+                {
+                    await usageTracker.IncrementCounter(x => x.NumberOfGitHubClones);
+                }
+                else
+                {
+                    await usageTracker.IncrementCounter(x => x.NumberOfEnterpriseClones);
+                }
+            }
+
+            teamExplorerServices.ShowHomePage();
+        }
+
         /// <inheritdoc/>
         public async Task CloneRepository(
             string cloneUrl,
@@ -121,19 +172,12 @@ public async Task CloneRepository(
             try
             {
                 await vsGitServices.Clone(cloneUrl, repositoryPath, true, progress);
-
                 await usageTracker.IncrementCounter(x => x.NumberOfClones);
 
-                var repositoryUrl = new UriString(cloneUrl).ToRepositoryUrl();
-                var isDotCom = HostAddress.IsGitHubDotComUri(repositoryUrl);
-                if (isDotCom)
-                {
-                    await usageTracker.IncrementCounter(x => x.NumberOfGitHubClones);
-                }
-                else
+                if (repositoryPath.StartsWith(DefaultClonePath, StringComparison.OrdinalIgnoreCase))
                 {
-                    // If it isn't a GitHub URL, assume it's an Enterprise URL
-                    await usageTracker.IncrementCounter(x => x.NumberOfEnterpriseClones);
+                    // Count the number of times users clone into the Default Repository Location
+                    await usageTracker.IncrementCounter(x => x.NumberOfClonesToDefaultClonePath);
                 }
             }
             catch (Exception ex)
@@ -144,7 +188,10 @@ public async Task CloneRepository(
         }
 
         /// <inheritdoc/>
-        public bool DestinationExists(string path) => Directory.Exists(path) || File.Exists(path);
+        public bool DestinationDirectoryExists(string path) => operatingSystem.Directory.DirectoryExists(path);
+
+        /// <inheritdoc/>
+        public bool DestinationFileExists(string path) => operatingSystem.File.Exists(path);
 
         string GetLocalClonePathFromGitProvider(string fallbackPath)
         {

src/GitHub.App/Services/StandardUserErrors.cs

@@ -25,7 +25,7 @@ public enum ErrorType
         CannotDropFolder,
         CannotDropFolderUnauthorizedAccess,
         ClipboardFailed,
-        ClonedFailed,
+        CloneOrOpenFailed,
         CloneFailedNotLoggedIn,
         CommitCreateFailed,
         CommitRevertFailed,
@@ -123,7 +123,7 @@ public static class StandardUserErrors
             },
             { ErrorType.ClipboardFailed, Map(Defaults("Failed to copy text to the clipboard.")) },
             {
-                ErrorType.ClonedFailed, Map(Defaults("Failed to clone the repository '{0}'", "Email [email protected] if you continue to have problems."),
+                ErrorType.CloneOrOpenFailed, Map(Defaults("Failed to clone or open the repository '{0}'", "Email [email protected] if you continue to have problems."),
                     new[]
                     {
                         new Translation(@"fatal: bad config file line (\d+) in (.+)", "Failed to clone the repository '{0}'", @"The config file '$2' is corrupted at line $1. You may need to open the file and try to fix any errors."),

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

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
+using System.Globalization;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using GitHub.App;
 using GitHub.Extensions;
 using GitHub.Logging;
 using GitHub.Models;
@@ -23,19 +23,21 @@ public class RepositoryCloneViewModel : ViewModelBase, IRepositoryCloneViewModel
         readonly IOperatingSystem os;
         readonly IConnectionManager connectionManager;
         readonly IRepositoryCloneService service;
+        readonly IGitService gitService;
         readonly IUsageService usageService;
         readonly IUsageTracker usageTracker;
         readonly IReadOnlyList<IRepositoryCloneTabViewModel> tabs;
         string path;
         IRepositoryModel previousRepository;
-        ObservableAsPropertyHelper<string> pathError;
+        ObservableAsPropertyHelper<string> pathWarning;
         int selectedTabIndex;
 
         [ImportingConstructor]
         public RepositoryCloneViewModel(
             IOperatingSystem os,
             IConnectionManager connectionManager,
             IRepositoryCloneService service,
+            IGitService gitService,
             IUsageService usageService,
             IUsageTracker usageTracker,
             IRepositorySelectViewModel gitHubTab,
@@ -45,6 +47,7 @@ public RepositoryCloneViewModel(
             this.os = os;
             this.connectionManager = connectionManager;
             this.service = service;
+            this.gitService = gitService;
             this.usageService = usageService;
             this.usageTracker = usageTracker;
 
@@ -59,22 +62,27 @@ public RepositoryCloneViewModel(
             Path = service.DefaultClonePath;
             repository.Subscribe(x => UpdatePath(x));
 
-            pathError = Observable.CombineLatest(
+            pathWarning = Observable.CombineLatest(
                 repository,
                 this.WhenAnyValue(x => x.Path),
-                ValidatePath)
-                .ToProperty(this, x => x.PathError);
+                ValidatePathWarning)
+                .ToProperty(this, x => x.PathWarning);
 
             var canClone = Observable.CombineLatest(
-                repository,
-                this.WhenAnyValue(x => x.PathError),
-                (repo, error) => (repo, error))
-                .Select(x => x.repo != null && x.error == null);
+                repository, this.WhenAnyValue(x => x.Path),
+                (repo, path) => repo != null && !service.DestinationFileExists(path) && !service.DestinationDirectoryExists(path));
+
+            var canOpen = Observable.CombineLatest(
+                repository, this.WhenAnyValue(x => x.Path),
+                (repo, path) => repo != null && !service.DestinationFileExists(path) && service.DestinationDirectoryExists(path));
 
             Browse = ReactiveCommand.Create().OnExecuteCompleted(_ => BrowseForDirectory());
             Clone = ReactiveCommand.CreateAsyncObservable(
                 canClone,
-                _ => repository.Select(x => new CloneDialogResult(Path, x)));
+                _ => repository.Select(x => new CloneDialogResult(Path, x?.CloneUrl)));
+            Open = ReactiveCommand.CreateAsyncObservable(
+                canOpen,
+                _ => repository.Select(x => new CloneDialogResult(Path, x?.CloneUrl)));
         }
 
         public IRepositorySelectViewModel GitHubTab { get; }
@@ -87,22 +95,24 @@ public string Path
             set => this.RaiseAndSetIfChanged(ref path, value);
         }
 
-        public string PathError => pathError.Value;
+        public string PathWarning => pathWarning.Value;
 
         public int SelectedTabIndex
         {
             get => selectedTabIndex;
             set => this.RaiseAndSetIfChanged(ref selectedTabIndex, value);
         }
 
-        public string Title => Resources.CloneTitle;
+        public string Title => Resources.OpenFromGitHubTitle;
 
-        public IObservable<object> Done => Clone;
+        public IObservable<object> Done => Observable.Merge(Clone, Open);
 
         public ReactiveCommand<object> Browse { get; }
 
         public ReactiveCommand<CloneDialogResult> Clone { get; }
 
+        public ReactiveCommand<CloneDialogResult> Open { get; }
+
         public async Task InitializeAsync(IConnection connection)
         {
             var connections = await connectionManager.GetLoadedConnections().ConfigureAwait(false);
@@ -228,13 +238,39 @@ string FindDirWithout(string dir, string match, int levels)
             }
         }
 
-        string ValidatePath(IRepositoryModel repository, string path)
+        string ValidatePathWarning(IRepositoryModel repositoryModel, string path)
         {
-            if (repository != null)
+            if (repositoryModel != null)
             {
-                return service.DestinationExists(path) ?
-                    Resources.DestinationAlreadyExists :
-                    null;
+                if (service.DestinationFileExists(path))
+                {
+                    return Resources.DestinationAlreadyExists;
+                }
+
+                if (service.DestinationDirectoryExists(path))
+                {
+                    using (var repository = gitService.GetRepository(path))
+                    {
+                        if (repository == null)
+                        {
+                            return Resources.CantFindARepositoryAtLocalPath;
+                        }
+
+                        var localUrl = gitService.GetRemoteUri(repository)?.ToRepositoryUrl();
+                        if (localUrl == null)
+                        {
+                            return Resources.LocalRepositoryDoesntHaveARemoteOrigin;
+                        }
+
+                        var targetUrl = repositoryModel.CloneUrl?.ToRepositoryUrl();
+                        if (localUrl != targetUrl)
+                        {
+                            return string.Format(CultureInfo.CurrentCulture, Resources.LocalRepositoryHasARemoteOf, localUrl);
+                        }
+
+                        return Resources.YouHaveAlreadyClonedToThisLocation;
+                    }
+                }
             }
 
             return null;

src/GitHub.Exports.Reactive/Services/IRepositoryCloneService.cs

@@ -34,13 +34,36 @@ Task CloneRepository(
             object progress = null);
 
         /// <summary>
-        /// Checks whether the specified destination path already exists.
+        /// Clones the specified repository into the specified directory or opens it if the directory already exists.
+        /// </summary>
+        /// <param name="cloneDialogResult">The URL and path of the repository to clone or open.</param>
+        /// <param name="progress">
+        /// An object through which to report progress. This must be of type
+        /// System.IProgress&lt;Microsoft.VisualStudio.Shell.ServiceProgressData&gt;, but
+        /// as that type is only available in VS2017+ it is typed as <see cref="object"/> here.
+        /// </param>
+        /// <returns></returns>
+        Task CloneOrOpenRepository(
+            CloneDialogResult cloneDialogResult,
+            object progress = null);
+
+        /// <summary>
+        /// Checks whether the specified destination directory already exists.
         /// </summary>
         /// <param name="path">The destination path.</param>
         /// <returns>
-        /// true if a file or directory is already present at <paramref name="path"/>; otherwise false.
+        /// true if a directory is already present at <paramref name="path"/>; otherwise false.
+        /// </returns>
+        bool DestinationDirectoryExists(string path);
+
+        /// <summary>
+        /// Checks whether the specified destination file already exists.
+        /// </summary>
+        /// <param name="path">The destination file.</param>
+        /// <returns>
+        /// true if a file is already present at <paramref name="path"/>; otherwise false.
         /// </returns>
-        bool DestinationExists(string path);
+        bool DestinationFileExists(string path);
 
         Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress address);
     }

src/GitHub.Exports.Reactive/ViewModels/Dialog/Clone/IRepositoryCloneViewModel.cs

@@ -5,7 +5,7 @@
 namespace GitHub.ViewModels.Dialog.Clone
 {
     /// <summary>
-    /// ViewModel for the the Clone Repository dialog
+    /// ViewModel for the Clone Repository dialog
     /// </summary>
     public interface IRepositoryCloneViewModel : IDialogContentViewModel, IConnectionInitializedViewModel
     {
@@ -30,9 +30,9 @@ public interface IRepositoryCloneViewModel : IDialogContentViewModel, IConnectio
         string Path { get; set; }
 
         /// <summary>
-        /// Gets an error message that explains why <see cref="Path"/> is not valid.
+        /// Gets a warning message that explains why <see cref="Path"/> is suspect.
         /// </summary>
-        string PathError { get; }
+        string PathWarning { get; }
 
         /// <summary>
         /// Gets the index of the selected tab.

src/GitHub.Exports/Models/CloneDialogResult.cs

@@ -1,4 +1,5 @@
 using System;
+using GitHub.Primitives;
 
 namespace GitHub.Models
 {
@@ -12,10 +13,10 @@ public class CloneDialogResult
         /// </summary>
         /// <param name="path">The path to clone the repository to.</param>
         /// <param name="repository">The selected repository.</param>
-        public CloneDialogResult(string path, IRepositoryModel repository)
+        public CloneDialogResult(string path, UriString cloneUrl)
         {
             Path = path;
-            Repository = repository;
+            Url = cloneUrl;
         }
 
         /// <summary>
@@ -24,8 +25,8 @@ public CloneDialogResult(string path, IRepositoryModel repository)
         public string Path { get; }
 
         /// <summary>
-        /// Gets the repository selected by the user.
+        /// Gets the url selected by the user.
         /// </summary>
-        public IRepositoryModel Repository { get; }
+        public UriString Url { get; }
     }
 }