Merge branch 'master' into i18n-merge-resources

 Conflicts:
	crowdin.yml

Author: grokys

crowdin.yml

@@ -1,3 +1,3 @@
 files:
   - source: /src/GitHub.Resources/Resources.resx
-    translation: /%original_path%/Resources.%locale%.resx
+    translation: /%original_path%/Resources.%locale%.resx

src/GitHub.App/Services/RepositoryCloneService.cs

@@ -105,30 +105,26 @@ public async Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress ad
         /// <inheritdoc/>
         public async Task CloneRepository(
             string cloneUrl,
-            string repositoryName,
             string repositoryPath,
             object progress = null)
         {
             Guard.ArgumentNotEmptyString(cloneUrl, nameof(cloneUrl));
-            Guard.ArgumentNotEmptyString(repositoryName, nameof(repositoryName));
             Guard.ArgumentNotEmptyString(repositoryPath, nameof(repositoryPath));
 
-            string path = Path.Combine(repositoryPath, repositoryName);
-
             // Switch to a thread pool thread for IO then back to the main thread to call
             // vsGitServices.Clone() as this must be called on the main thread.
             await ThreadingHelper.SwitchToPoolThreadAsync();
-            operatingSystem.Directory.CreateDirectory(path);
+            operatingSystem.Directory.CreateDirectory(repositoryPath);
             await ThreadingHelper.SwitchToMainThreadAsync();
 
             try
             {
-                await vsGitServices.Clone(cloneUrl, path, true, progress);
+                await vsGitServices.Clone(cloneUrl, repositoryPath, true, progress);
                 await usageTracker.IncrementCounter(x => x.NumberOfClones);
             }
             catch (Exception ex)
             {
-                log.Error(ex, "Could not clone {CloneUrl} to {Path}", cloneUrl, path);
+                log.Error(ex, "Could not clone {CloneUrl} to {Path}", cloneUrl, repositoryPath);
                 throw;
             }
         }

src/GitHub.App/Services/RepositoryCreationService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.ComponentModel.Composition;
 using System.Reactive;
 using System.Reactive.Linq;
@@ -36,7 +37,7 @@ public IObservable<Unit> CreateRepository(
             Guard.ArgumentNotEmptyString(directory, nameof(directory));
 
             return apiClient.CreateRepository(newRepository, account.Login, account.IsUser)
-                .Select(repository => cloneService.CloneRepository(repository.CloneUrl, repository.Name, directory))
+                .Select(repository => cloneService.CloneRepository(repository.CloneUrl, Path.Combine(directory, repository.Name)))
                 .SelectUnit();
         }
     }

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

@@ -21,7 +21,6 @@ public interface IRepositoryCloneService
         /// Clones the specificed repository into the specified directory.
         /// </summary>
         /// <param name="cloneUrl">The url of the repository to clone.</param>
-        /// <param name="repositoryName">The name of the repository to clone.</param>
         /// <param name="repositoryPath">The directory that will contain the repository directory.</param>
         /// <param name="progress">
         /// An object through which to report progress. This must be of type
@@ -31,7 +30,6 @@ public interface IRepositoryCloneService
         /// <returns></returns>
         Task CloneRepository(
             string cloneUrl,
-            string repositoryName,
             string repositoryPath,
             object progress = null);
 

src/GitHub.StartPage/StartPagePackage.cs

@@ -132,7 +132,8 @@ async Task<CloneDialogResult> ShowCloneDialog(
 
                 if (basePath != null)
                 {
-                    result = new CloneDialogResult(basePath, repository);
+                    var path = Path.Combine(basePath, repository.Name);
+                    result = new CloneDialogResult(path, repository);
                 }
             }
 
@@ -142,7 +143,6 @@ async Task<CloneDialogResult> ShowCloneDialog(
                 {
                     await cloneService.CloneRepository(
                         result.Repository.CloneUrl,
-                        result.Repository.Name,
                         result.Path,
                         progress);
 

src/GitHub.TeamFoundation.14/Connect/GitHubConnectSection.cs

@@ -153,7 +153,6 @@ async Task DoClone()
                     var cloneService = ServiceProvider.GetService<IRepositoryCloneService>();
                     await cloneService.CloneRepository(
                         result.Repository.CloneUrl,
-                        result.Repository.Name,
                         result.Path);
 
                     usageTracker.IncrementCounter(x => x.NumberOfGitHubConnectSectionClones).Forget();

src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs

@@ -94,7 +94,7 @@ public override async Task Execute(string url)
                 switch (result)
                 {
                     case VSConstants.MessageBoxResult.IDYES:
-                        await repositoryCloneService.Value.CloneRepository(cloneUrl, repositoryDirName, targetDir);
+                        await repositoryCloneService.Value.CloneRepository(cloneUrl, repositoryDir);
                         // Open the cloned repository
                         dte.Value.ExecuteCommand("File.OpenFolder", repositoryDir);
                         dte.Value.ExecuteCommand("View.TfsTeamExplorer");

test/GitHub.App.UnitTests/Services/RepositoryCloneServiceTests.cs

@@ -21,7 +21,7 @@ public async Task ClonesToRepositoryPathAsync()
             var vsGitServices = serviceProvider.GetVSGitServices();
             var cloneService = serviceProvider.GetRepositoryCloneService();
 
-            await cloneService.CloneRepository("https://github.com/foo/bar", "bar", @"c:\dev");
+            await cloneService.CloneRepository("https://github.com/foo/bar", @"c:\dev\bar");
 
             operatingSystem.Directory.Received().CreateDirectory(@"c:\dev\bar");
             await vsGitServices.Received().Clone("https://github.com/foo/bar", @"c:\dev\bar", true);
@@ -37,11 +37,11 @@ public async Task UpdatesMetricsWhenRepositoryClonedAsync()
             var usageTracker = Substitute.For<IUsageTracker>();
             var cloneService = new RepositoryCloneService(operatingSystem, vsGitServices, graphqlFactory, usageTracker);
 
-            await cloneService.CloneRepository("https://github.com/foo/bar", "bar", @"c:\dev");
+            await cloneService.CloneRepository("https://github.com/foo/bar", @"c:\dev\bar");
             var model = UsageModel.Create(Guid.NewGuid());
 
             await usageTracker.Received().IncrementCounter(
-                Arg.Is<Expression<Func<UsageModel.MeasuresModel, int>>>(x => 
+                Arg.Is<Expression<Func<UsageModel.MeasuresModel, int>>>(x =>
                     ((MemberExpression)x.Body).Member.Name == nameof(model.Measures.NumberOfClones)));
         }
     }