Merge pull request #542 from LinqLover/MCFileystemFetchOnlyRepository…

…-hasNoLoadConflicts-case-sensitivity Honor possible case-insensitivity of certain file system repositories
Metacello · Mar 28, 2022 · c047c7b · c047c7b
2 parents 89ff194 + 22af943
commit c047c7b
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 8 deletions.
diff --git a/...rm.squeak.package/MCFetchBitbucketRepository.class/instance/isProjectPathCaseSensitive.st b/...rm.squeak.package/MCFetchBitbucketRepository.class/instance/isProjectPathCaseSensitive.st
@@ -0,0 +1,4 @@
+testing
+isProjectPathCaseSensitive
+
+	^ false
diff --git a/.../Metacello-Platform.squeak.package/MCFetchBitbucketRepository.class/methodProperties.json b/.../Metacello-Platform.squeak.package/MCFetchBitbucketRepository.class/methodProperties.json
@@ -5,4 +5,5 @@
 		"isEnabled" : "tobe 5/6/2020 09:35",
 		"projectZipUrlFor:versionString:" : "tobe 5/6/2020 09:35" },
 	"instance" : {
+		"isProjectPathCaseSensitive" : "ct 4/26/2021 18:46",
 		"normalizeTagsData:" : "tobe 5/6/2020 09:33" } }
diff --git a/...tform.squeak.package/MCFetchGithubRepository.class/instance/isProjectPathCaseSensitive.st b/...tform.squeak.package/MCFetchGithubRepository.class/instance/isProjectPathCaseSensitive.st
@@ -0,0 +1,4 @@
+testing
+isProjectPathCaseSensitive
+
+	^ false
diff --git a/...ory/Metacello-Platform.squeak.package/MCFetchGithubRepository.class/methodProperties.json b/...ory/Metacello-Platform.squeak.package/MCFetchGithubRepository.class/methodProperties.json
@@ -8,4 +8,5 @@
 		"projectZipUrlFor:versionString:" : "ct 10/12/2020 19:38" },
 	"instance" : {
 		"downloadJSONTags" : "tobe 7/13/2020 07:56",
+		"isProjectPathCaseSensitive" : "ct 4/26/2021 18:46",
 		"normalizeTagsData:" : "tobe 5/3/2020 20:55" } }
diff --git a/...form.squeak.package/MCFilesystemFetchOnlyRepository.class/instance/hasNoLoadConflicts..st b/...form.squeak.package/MCFilesystemFetchOnlyRepository.class/instance/hasNoLoadConflicts..st
@@ -1,8 +1,16 @@
 initialize-release
 hasNoLoadConflicts: anMCGitBasedRepository
-  (anMCGitBasedRepository isKindOf: self class)
-    ifFalse: [ ^ false ].
-  ^ self projectPath = anMCGitBasedRepository projectPath
-    and: [ 
-      self repoPath = anMCGitBasedRepository repoPath
-        and: [ self projectVersion = anMCGitBasedRepository projectVersion ] ]
+
+	| projectPath otherProjectPath |
+	(anMCGitBasedRepository isKindOf: self class)
+		ifFalse: [ ^ false ].
+
+	projectPath := self projectPath.
+	otherProjectPath := anMCGitBasedRepository projectPath.
+	self isProjectPathCaseSensitive ifFalse: [
+		projectPath := projectPath asLowercase.
+		otherProjectPath := otherProjectPath asLowercase].
+
+	^ projectPath = otherProjectPath
+		and: [ self repoPath = anMCGitBasedRepository repoPath ]
+		and: [ self projectVersion = anMCGitBasedRepository projectVersion ]
diff --git a/...ueak.package/MCFilesystemFetchOnlyRepository.class/instance/isProjectPathCaseSensitive.st b/...ueak.package/MCFilesystemFetchOnlyRepository.class/instance/isProjectPathCaseSensitive.st
@@ -0,0 +1,4 @@
+testing
+isProjectPathCaseSensitive
+
+	^ FileDirectory default isCaseSensitive
diff --git a/...cello-Platform.squeak.package/MCFilesystemFetchOnlyRepository.class/methodProperties.json b/...cello-Platform.squeak.package/MCFilesystemFetchOnlyRepository.class/methodProperties.json
@@ -50,10 +50,11 @@
 		"goferPriority" : "tobe 5/7/2020 13:29",
 		"goferReferences" : "tobe 5/4/2020 00:23",
 		"goferVersionFrom:" : "tobe 5/6/2020 10:25",
-		"hasNoLoadConflicts:" : "tobe 5/3/2020 21:32",
+		"hasNoLoadConflicts:" : "ct 4/26/2021 18:38",
 		"hash" : "tobe 5/3/2020 21:08",
 		"includesVersionNamed:" : "tobe 5/7/2020 13:35",
 		"initialize" : "tobe 5/6/2020 10:12",
+		"isProjectPathCaseSensitive" : "ct 4/26/2021 18:45",
 		"isTonelRepo" : "tobe 5/15/2020 20:27",
 		"isValid" : "tobe 5/18/2020 15:27",
 		"metacelloProjectClassFor:" : "tobe 5/7/2020 12:51",

diff --git a/repository/Metacello-Platform.squeak.package/monticello.meta/version b/repository/Metacello-Platform.squeak.package/monticello.meta/version