Use modern clone dialog when re-cloning a repository

src/GitHub.App/Services/DialogService.cs

@@ -69,15 +69,6 @@ public async Task<CloneDialogResult> ShowCloneDialog(IConnection connection, str
             }
         }
 
-        public async Task<string> ShowReCloneDialog(RepositoryModel repository)
-        {
-            Guard.ArgumentNotNull(repository, nameof(repository));
-
-            var viewModel = factory.CreateViewModel<IRepositoryRecloneViewModel>();
-            viewModel.SelectedRepository = repository;
-            return (string)await showDialog.ShowWithFirstConnection(viewModel);
-        }
-
         public async Task ShowCreateGist(IConnection connection)
         {
             var viewModel = factory.CreateViewModel<IGistCreationViewModel>();

src/GitHub.App/Services/RepositoryCloneService.cs

@@ -114,7 +114,8 @@ public async Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress ad
         /// <inheritdoc/>
         public async Task CloneOrOpenRepository(
             CloneDialogResult cloneDialogResult,
-            object progress = null)
+            object progress = null,
+            CancellationToken? cancellationToken = null)
         {
             Guard.ArgumentNotNull(cloneDialogResult, nameof(cloneDialogResult));
 
@@ -147,7 +148,7 @@ public async Task CloneOrOpenRepository(
             else
             {
                 var cloneUrl = repositoryUrl.ToString();
-                await CloneRepository(cloneUrl, repositoryPath, progress).ConfigureAwait(true);
+                await CloneRepository(cloneUrl, repositoryPath, progress, cancellationToken).ConfigureAwait(true);
 
                 if (isDotCom)
                 {
@@ -197,7 +198,8 @@ bool IsSolutionInRepository(string repositoryPath)
         public async Task CloneRepository(
             string cloneUrl,
             string repositoryPath,
-            object progress = null)
+            object progress = null,
+            CancellationToken? cancellationToken = null)
         {
             Guard.ArgumentNotEmptyString(cloneUrl, nameof(cloneUrl));
             Guard.ArgumentNotEmptyString(repositoryPath, nameof(repositoryPath));
@@ -210,7 +212,7 @@ public async Task CloneRepository(
 
             try
             {
-                await vsGitServices.Clone(cloneUrl, repositoryPath, true, progress);
+                await vsGitServices.Clone(cloneUrl, repositoryPath, true, progress, cancellationToken);
                 await usageTracker.IncrementCounter(x => x.NumberOfClones);
 
                 if (repositoryPath.StartsWith(DefaultClonePath, StringComparison.OrdinalIgnoreCase))

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

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Models;
 using GitHub.Primitives;
@@ -27,11 +26,13 @@ public interface IRepositoryCloneService
         /// System.IProgress<Microsoft.VisualStudio.Shell.ServiceProgressData>, but
         /// as that type is only available in VS2017+ it is typed as <see cref="object"/> here.
         /// </param>
+        /// <param name="cancellationToken">A cancellation token.</param>
         /// <returns></returns>
         Task CloneRepository(
             string cloneUrl,
             string repositoryPath,
-            object progress = null);
+            object progress = null,
+            CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Clones the specified repository into the specified directory or opens it if the directory already exists.
@@ -45,7 +46,8 @@ Task CloneRepository(
         /// <returns></returns>
         Task CloneOrOpenRepository(
             CloneDialogResult cloneDialogResult,
-            object progress = null);
+            object progress = null,
+            CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Checks whether the specified destination directory already exists.

src/GitHub.Exports/Services/IDialogService.cs

@@ -25,20 +25,6 @@ public interface IDialogService
         /// </returns>
         Task<CloneDialogResult> ShowCloneDialog(IConnection connection, string url = null);
 
-        /// <summary>
-        /// Shows the re-clone dialog.
-        /// </summary>
-        /// <param name="repository">The repository to clone.</param>
-        /// <returns>
-        /// A task that returns the base path for the clone on success, or null if the dialog was
-        /// cancelled.
-        /// </returns>
-        /// <remarks>
-        /// The re-clone dialog is shown from the VS2017+ start page when the user wants to check
-        /// out a repository that was previously checked out on another machine.
-        /// </remarks>
-        Task<string> ShowReCloneDialog(RepositoryModel repository);
-
         /// <summary>
         /// Shows the Create Gist dialog.
         /// </summary>

src/GitHub.Exports/Services/IVSGitServices.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Models;
 
@@ -20,13 +21,15 @@ public interface IVSGitServices
         /// System.IProgress<Microsoft.VisualStudio.Shell.ServiceProgressData>, but
         /// as that type is only available in VS2017+ it is typed as <see cref="object"/> here.
         /// </param>
+        /// <param name="cancellationToken">A cancellation token.</param>
         /// <seealso cref="System.IProgress{T}"/>
         /// <seealso cref="Microsoft.VisualStudio.Shell.ServiceProgressData"/>
         Task Clone(
             string cloneUrl,
             string clonePath,
             bool recurseSubmodules,
-            object progress = null);
+            object progress = null,
+            CancellationToken? cancellationToken = null);
 
         string GetActiveRepoPath();
         LibGit2Sharp.IRepository GetActiveRepo();

src/GitHub.StartPage/StartPagePackage.cs

@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -57,7 +56,7 @@ async Task<CodeContainer> RunAcquisition(IProgress<ServiceProgressData> download
             try
             {
                 var uiProvider = await Task.Run(() => Package.GetGlobalService(typeof(IGitHubServiceProvider)) as IGitHubServiceProvider);
-                request = await ShowCloneDialog(uiProvider, downloadProgress, repository);
+                request = await ShowCloneDialog(uiProvider, downloadProgress, cancellationToken, repository);
             }
             catch (Exception e)
             {
@@ -84,44 +83,30 @@ async Task<CodeContainer> RunAcquisition(IProgress<ServiceProgressData> download
         async Task<CloneDialogResult> ShowCloneDialog(
             IGitHubServiceProvider gitHubServiceProvider,
             IProgress<ServiceProgressData> progress,
+            CancellationToken cancellationToken,
             RepositoryModel repository = null)
         {
             var dialogService = gitHubServiceProvider.GetService<IDialogService>();
             var cloneService = gitHubServiceProvider.GetService<IRepositoryCloneService>();
             var usageTracker = gitHubServiceProvider.GetService<IUsageTracker>();
-            CloneDialogResult result = null;
 
-            if (repository == null)
-            {
-                result = await dialogService.ShowCloneDialog(null);
-            }
-            else
-            {
-                var basePath = await dialogService.ShowReCloneDialog(repository);
-
-                if (basePath != null)
-                {
-                    var path = Path.Combine(basePath, repository.Name);
-                    result = new CloneDialogResult(path, repository.CloneUrl);
-                }
-            }
-
-            if (result != null)
+            var cloneUrl = repository?.CloneUrl;
+            if (await dialogService.ShowCloneDialog(null, cloneUrl) is CloneDialogResult result)
             {
                 try
                 {
-                    await cloneService.CloneOrOpenRepository(result, progress);
+                    await cloneService.CloneOrOpenRepository(result, progress, cancellationToken);
                     usageTracker.IncrementCounter(x => x.NumberOfStartPageClones).Forget();
+                    return result;
                 }
                 catch
                 {
                     var teServices = gitHubServiceProvider.TryGetService<ITeamExplorerServices>();
                     teServices.ShowError($"Failed to clone the repository '{result.Url.RepositoryName}'");
-                    result = null;
                 }
             }
 
-            return result;
+            return null;
         }
     }
 }