Check for existing mappers file before importing .squot

hpi-swa · Apr 18, 2024 · c39471f · c39471f
1 parent 782215c
commit c39471f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/src/Squot.package/SqueakWorkingCopy.class/instance/importSquotContents.st b/src/Squot.package/SqueakWorkingCopy.class/instance/importSquotContents.st
@@ -3,6 +3,7 @@ importSquotContents
 	| filesystem readStream loadOrder |
 	self mappers ifNotEmpty: [^ self].
 	filesystem := (self headFSCommit ifNil: [^ self]) filesystem.
+	(self mappersMapper hasMappersFile: filesystem) ifTrue: [^ self].
 	readStream := [filesystem readStreamOn: '.squot'] on: FileDoesNotExist do: [^ self].
 	loadOrder := STON fromStream: readStream.
 	loadOrder ifEmpty: [^ self].

diff --git a/src/Squot.package/SqueakWorkingCopy.class/methodProperties.json b/src/Squot.package/SqueakWorkingCopy.class/methodProperties.json
@@ -92,7 +92,7 @@
 		"ifRepositoryDoesNotExist:" : "mad 12/22/2023 17:47",
 		"imageHash" : "mad 11/28/2023 19:19",
 		"import" : "mad 4/3/2024 14:02",
-		"importSquotContents" : "mad 4/18/2024 18:44",
+		"importSquotContents" : "mad 4/18/2024 18:46",
 		"importSquotContents:from:fallbackSerializer:" : "mad 4/15/2024 20:37",
 		"initialRemoteRefNameFor:" : "mad 9/18/2023 13:58",
 		"initialize" : "mad 11/28/2023 19:19",

diff --git a/src/Squot.package/SquotMappersMapper.class/instance/hasMappersFile..st b/src/Squot.package/SquotMappersMapper.class/instance/hasMappersFile..st
@@ -0,0 +1,3 @@
+testing
+hasMappersFile: aFileSystem
+	^ (self referenceIn: aFileSystem) exists
diff --git a/src/Squot.package/SquotMappersMapper.class/methodProperties.json b/src/Squot.package/SquotMappersMapper.class/methodProperties.json
@@ -14,6 +14,7 @@
 		"changeSetsFromFSCommit:toImage:" : "mad 9/20/2023 12:51",
 		"changeSetsFromImage:toFSCommit:" : "mad 9/20/2023 12:51",
 		"changeSetsFromMappers:toMappers:old:common:new:in:" : "mad 2/20/2024 15:19",
+		"hasMappersFile:" : "mad 4/18/2024 18:33",
 		"loadMappersFromFSCommit:" : "mad 9/20/2023 12:05",
 		"loadMappersFromFileSystem:" : "mad 9/20/2023 12:05",
 		"loadMappersFromWorkingCopy:" : "mad 9/20/2023 12:09",