8000 Allow cloning of repositories into empty directories by YuPeiHenry · Pull Request #2316 · github/VisualStudio · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Allow cloning of repositories into empty directories #2316

Merged
merged 15 commits into from
Apr 8, 2019
Merged

Allow cloning of repositories into empty directories #2316

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7c998ec
Enable clone and disable open button on empty dir.
YuPeiHenry Apr 4, 2019
b7cd425
Add support for cloning into empty dir.
YuPeiHenry Apr 4, 2019
1618a86
Add tests for CloneService with empty directory.
YuPeiHenry Apr 4, 2019
43b5ef6
RepositoryCloneViewModel: Combine if condition.
YuPeiHenry Apr 4, 2019
933a105
Add tests for RespositoryCloneViewModel on empty directory.
YuPeiHenry Apr 4, 2019
37b05a7
Ammend some tests in RepositoryCloneServiceTests to not use data.
YuPeiHenry Apr 4, 2019
96d3844
Merge branch 'master' into 2250-allow-cloning-to-empty-dir
YuPeiHenry Apr 5, 2019
382969b
Merge branch 'master' into 2250-allow-cloning-to-empty-dir
StanleyGoldman Apr 5, 2019
c82ca09
Merge branch 'master' into 2250-allow-cloning-to-empty-dir
jcansdale Apr 5, 2019
473373c
Update error message for non-empty directory.
YuPeiHenry Apr 7, 2019
83095d5
Merge branch 'master' into 2250-allow-cloning-to-empty-dir
YuPeiHenry Apr 7, 2019
cb81d03
Copying english to all resources
StanleyGoldman Apr 8, 2019
68d7c8f
Simplifying logic
StanleyGoldman Apr 8, 2019
1d8e3e8
DestinationDirectoryEmpty is (should be) used responsibly and not cal…
StanleyGoldman Apr 8, 2019
ef0ed57
Update Resources.resx
StanleyGoldman Apr 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/GitHub.App/Services/RepositoryCloneService.cs
View file
Open in desktop
< 8000 tr data-hunk="4809085d1973a3dd3a7c52d3eae215f258e87601b60dc495aee16ce3992339ff" class="show-top-border">
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public async Task CloneOrOpenRepository(

var repositoryUrl = url.ToRepositoryUrl();
var isDotCom = HostAddress.IsGitHubDotComUri(repositoryUrl);
if (DestinationDirectoryExists(repositoryPath))
if (DestinationDirectoryExists(repositoryPath) && !DestinationDirectoryEmpty(repositoryPath))
{
if (!IsSolutionInRepository(repositoryPath))
{
Expand Down Expand Up @@ -232,6 +232,9 @@ public async Task CloneRepository(
/// <inheritdoc/>
public bool DestinationDirectoryExists(string path) => operatingSystem.Directory.DirectoryExists(path);

/// <inheritdoc/>
public bool DestinationDirectoryEmpty(string path) => !DestinationDirectoryExists(path) || operatingSystem.Directory.GetDirectory(path).IsEmpty;

/// <inheritdoc/>
public bool DestinationFileExists(string path) => operatingSystem.File.Exists(path);

Expand Down
11 changes: 9 additions & 2 deletions src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,13 @@ public RepositoryCloneViewModel(

var canClone = Observable.CombineLatest(
repository, this.WhenAnyValue(x => x.Path),
(repo, path) => repo != null && !service.DestinationFileExists(path) && !service.DestinationDirectoryExists(path));
(repo, path) => repo != null && !service.DestinationFileExists(path) &&
(!service.DestinationDirectoryExists(path)) || service.DestinationDirectoryEmpty(path));

var canOpen = Observable.CombineLatest(
repository, this.WhenAnyValue(x => x.Path),
(repo, path) => repo != null && !service.DestinationFileExists(path) && service.DestinationDirectoryExists(path));
(repo, path) => repo != null && !service.DestinationFileExists(path) && service.DestinationDirectoryExists(path)
&& !service.DestinationDirectoryEmpty(path));

Browse = ReactiveCommand.Create(() => BrowseForDirectory());
Clone = ReactiveCommand.CreateFromObservable(
Expand Down Expand Up @@ -240,6 +242,11 @@ string ValidatePathWarning(RepositoryModel repositoryModel, string path)
{
using (var repository = gitService.GetRepository(path))
{
if (service.DestinationDirectoryEmpty(path))
{
return null;
}

if (repository == null)
{
return Resources.CantFindARepositoryAtLocalPath;
Expand Down
9 changes: 9 additions & 0 deletions src/GitHub.Exports.Reactive/Services/IRepositoryCloneService.cs
< 832D path d="M8 9a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM1.5 9a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Zm13 0a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z">
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ Task CloneOrOpenRepository(
/// </returns>
bool DestinationDirectoryExists(string path);

/// <summary>
/// Checks whether the specified destination directory is empty.
/// </summary>
/// <param name="path">The destination path.</param>
/// <returns>
/// true if a directory is empty <paramref name="path"/>; otherwise false.
/// </returns>
bool DestinationDirectoryEmpty(string path);

/// <summary>
/// Checks whether the specified destination file already exists.
/// </summary>
Expand Down
0