Handle deletion of default directory while cloning

Also handle addition of children.
hpi-swa · Jan 17, 2025 · c9d886f · c9d886f
1 parent 07470bc
commit c9d886f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/GitS-Core.package/GSGitWorkingCopy.class/class/requestEmptyFSReferenceForName..st b/src/GitS-Core.package/GSGitWorkingCopy.class/class/requestEmptyFSReferenceForName..st
@@ -3,5 +3,5 @@ requestEmptyFSReferenceForName: aString
 	| reference |
 	reference := (self requestFSReferenceForName: aString) ifNil: [^ nil].
 	reference children ifEmpty: [^ reference].
-	self inform: 'Please choose an empty directory.'.
+	self inform: 'Please choose an empty directory or manually delete the contents of the chosen directory before selecting it again.'.
 	^ self requestEmptyFSReferenceForName: aString
diff --git a/src/GitS-Core.package/GSGitWorkingCopy.class/class/requestFSReferenceForName..st b/src/GitS-Core.package/GSGitWorkingCopy.class/class/requestFSReferenceForName..st
@@ -1,10 +1,15 @@
 instance creation
 requestFSReferenceForName: aString
-	| defaultDirectory defaultDirectoryExisted defaultDirectoryReference chosen |
+	| defaultDirectory defaultDirectoryExisted defaultDirectoryReference chosen chosenReference |
 	defaultDirectory := self defaultDirectoryForName: aString.
 	defaultDirectoryExisted := defaultDirectory exists.
 	defaultDirectoryReference := defaultDirectory asFSReference.
 	defaultDirectoryReference ensureCreateDirectory.
 	chosen := UIManager default chooseDirectory: 'Repository location:' from: defaultDirectory.
-	(defaultDirectoryExisted not and: [chosen ~= defaultDirectory]) ifTrue: [defaultDirectoryReference delete].
-	^ chosen ifNotNil: #asFSReference
+	(defaultDirectoryExisted not
+		and: [chosen ~= defaultDirectory]
+		and: [defaultDirectoryReference isDirectory]
+		and: [defaultDirectoryReference children isEmpty]) ifTrue: [defaultDirectoryReference delete].
+	chosenReference := chosen ifNotNil: #asFSReference.
+	chosenReference ifNotNil: #ensureCreateDirectory. "might be deleted during popup"
+	^ chosenReference
diff --git a/src/GitS-Core.package/GSGitWorkingCopy.class/methodProperties.json b/src/GitS-Core.package/GSGitWorkingCopy.class/methodProperties.json
@@ -15,8 +15,8 @@
 		"newFromUserAndRegister" : "mad 10/22/2023 00:12",
 		"onFSGitRepository:named:" : "mad 9/19/2023 11:53",
 		"onFSReference:named:" : "mad 9/19/2023 11:53",
-		"requestEmptyFSReferenceForName:" : "mad 6/12/2024 11:58",
-		"requestFSReferenceForName:" : "mad 6/12/2024 11:59",
+		"requestEmptyFSReferenceForName:" : "mad 1/17/2025 11:27",
+		"requestFSReferenceForName:" : "mad 1/17/2025 11:26",
 		"withoutGitSuffix:" : "mad 11/13/2023 12:03" },
 	"instance" : {
 		"actionAddRemote" : "mad 10/9/2024 16:01",