Merge branch 'develop' into swa-ui

.github/workflows/ci.yml

@@ -11,13 +11,14 @@ jobs:
         exclude:
           - os: macos-latest
             smalltalk: Squeak32-5.2 # 32bit no longer supported on macOS
+      fail-fast: false # Do not let failures on Squeak 5.2 stop other jobs.
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
-          smalltalk-version: ${{ matrix.smalltalk }}
+          smalltalk-image: ${{ matrix.smalltalk }}
       - run: smalltalkci -s ${{ matrix.smalltalk }}
         shell: bash
         timeout-minutes: 15

src/FileSystem-Git.package/GitCommit.class/instance/printOn..st

@@ -2,7 +2,7 @@ printing
 printOn: aStream
 	super printOn: aStream.
 	self message
-		ifNotNilDo: [ :msg|
+		ifNotNil: [ :msg|
 			aStream
 				nextPutAll: '(';
 				nextPutAll: (integerHash ifNil: [''] ifNotNil: [integerHash asHexHash first: 7]);

src/FileSystem-Git.package/GitCommit.class/methodProperties.json

@@ -25,7 +25,7 @@
 		"mergeBaseWithAnyOf:" : "jr 4/6/2020 20:23",
 		"parents" : "MaxLeske 2/26/2012 11:28",
 		"parents:" : "MaxLeske 5/26/2010 20:04",
-		"printOn:" : "jr 5/2/2020 16:43",
+		"printOn:" : "jr 9/10/2021 20:27",
 		"quickValidate" : "jr 4/13/2017 18:02",
 		"storeFixedKeysOn:" : "jr 7/1/2017 00:36",
 		"tags" : "jr 4/6/2020 20:23",

src/FileSystem-Git.package/GitFSCK.class/instance/validateHead.st

@@ -1,7 +1,7 @@
 public-validating
 validateHead
 	self validateHeadFile.
-	[ repository unitOfWork head ifNotNilDo: [ :head | self visit: head ] ]
+	[ repository unitOfWork head ifNotNil: [ :head | self visit: head ] ]
 		on: GitError
 		do: [ :error | 
 			self collectError: error for: repository ]

src/FileSystem-Git.package/GitFSCK.class/methodProperties.json

@@ -14,7 +14,7 @@
 		"validate" : "MaxLeske 6/24/2012 15:32",
 		"validate:" : "jr 11/20/2016 21:46",
 		"validateBranches" : "jr 4/6/2020 23:06",
-		"validateHead" : "jr 4/6/2020 23:06",
+		"validateHead" : "jr 9/10/2021 20:27",
 		"validateHeadFile" : "jr 4/6/2020 23:07",
 		"validateObjects" : "CamilloBruni 6/21/2011 06:27",
 		"validateTags" : "jr 4/6/2020 23:07",

src/FileSystem-Git.package/GitPackedObjectStore.class/instance/headerOfPackedObjectNamed.ifAbsent..st

@@ -1,5 +1,5 @@
 private
 headerOfPackedObjectNamed: aHexHash ifAbsent: aBlock
 	self packsDo: [ :pack |
-		(pack headerOfObjectNamed: aHexHash) ifNotNilDo: [:header | ^ header]].
+		(pack headerOfObjectNamed: aHexHash) ifNotNil: [:header | ^ header]].
 	^ aBlock value

src/FileSystem-Git.package/GitPackedObjectStore.class/instance/packedObjectNamed.ifAbsent..st

@@ -1,6 +1,6 @@
 private
 packedObjectNamed: aHexHash ifAbsent: aBlock
 	self packsDo: [ :pack |
-		(pack objectNamed: aHexHash) ifNotNilDo:
+		(pack objectNamed: aHexHash) ifNotNil:
 			[ :object | ^ object object ] ].
 	^ aBlock value

src/FileSystem-Git.package/GitPackedObjectStore.class/methodProperties.json

@@ -7,13 +7,13 @@
 		"hasObject:" : "jr 3/4/2020 23:45",
 		"hasPackedObject:" : "jr 6/28/2017 16:26",
 		"headerOfObjectNamed:ifAbsent:" : "jr 2/12/2020 23:37",
-		"headerOfPackedObjectNamed:ifAbsent:" : "jr 3/6/2017 23:06",
+		"headerOfPackedObjectNamed:ifAbsent:" : "jr 9/10/2021 20:27",
 		"objectNamed:" : "jr 2/17/2020 22:48",
 		"objectNamed:ifAbsent:" : "jr 2/17/2020 22:47",
 		"objectNamesDo:" : "jr 4/12/2020 11:40",
 		"pack" : "jr 2/23/2020 23:21",
 		"packedObjectNamed:" : "jr 2/17/2020 22:51",
-		"packedObjectNamed:ifAbsent:" : "jr 2/17/2020 21:30",
+		"packedObjectNamed:ifAbsent:" : "jr 9/10/2021 20:28",
 		"packs" : "jr 3/4/2020 23:35",
 		"packsDir" : "jr 2/12/2020 23:18",
 		"packsDir:" : "jr 2/12/2020 23:18",

src/FileSystem-Git.package/GitUnitOfWork.class/instance/tagNamed.ifAbsent..st

@@ -1,5 +1,5 @@
 branches and tags
 tagNamed: aString ifAbsent: aBlock
-	(self resolveRef: 'refs/tags/', aString) ifNotNilDo: [ :tagRef|
+	(self resolveRef: 'refs/tags/', aString) ifNotNil: [ :tagRef|
 		 ^ self objectNamed: tagRef ifAbsent: aBlock ].
 	^ aBlock value

src/FileSystem-Git.package/GitUnitOfWork.class/methodProperties.json

@@ -75,7 +75,7 @@
 		"storeObject:" : "jr 4/20/2020 21:19",
 		"streamObjectNamed:" : "jr 2/13/2020 00:25",
 		"tagNamed:" : "Camillobruni 8/18/2011 16:53",
-		"tagNamed:ifAbsent:" : "MaxLeske 2/26/2012 12:17",
+		"tagNamed:ifAbsent:" : "jr 9/10/2021 20:28",
 		"tagNames" : "jr 4/29/2020 23:49",
 		"tags" : "jr 4/30/2020 00:03",
 		"unitOfWork" : "jr 2/23/2020 23:13",

src/Squit.package/.squot-contents

@@ -0,0 +1,6 @@
+SquotTrackedObjectMetadata {
+	#objectClassName : #PackageInfo,
+	#slotOverrides : { },
+	#objectsReplacedByNames : true,
+	#serializer : #SquotCypressCodeSerializer
+}

src/Squit.package/SquitBrowser.class/instance/actionCommit.st

@@ -8,6 +8,5 @@ actionCommit
 			((workingCopy newInteractiveSaveOperation
 					title: 'Select changes and message for the new version';
 					applyToWorkingCopy)
-				then: [:result | self refresh]
-				ifRejected: [:reason | nil])]
-			on: BrokenPromise do: [:e | e ifNotError: []]].
+				then: [:result | self refresh])]
+			on: BrokenPromise do: [:e | "cancelled" e return]].

src/Squit.package/SquitBrowser.class/methodProperties.json

@@ -34,7 +34,7 @@
 		"actionBranchUnsetUpstream" : "jr 7/20/2020 13:02",
 		"actionBrowseWorkingCopy" : "jr 8/14/2018 10:25",
 		"actionClearSearch" : "fn 4/11/2017 18:49",
-		"actionCommit" : "jr 8/9/2020 22:44",
+		"actionCommit" : "jr 8/25/2021 09:57",
 		"actionCommitCherryPick" : "jr 8/8/2020 15:53",
 		"actionCommitDiffWithNextSelected" : "jr 7/2/2017 19:30",
 		"actionCommitDiffWithParent" : "jr 2/27/2020 01:00",

src/Squit.package/SquitInteractivePullFromUpstream.class/instance/save.st

@@ -7,6 +7,6 @@ save
 		(self workingCopy newInteractiveSaveOperation
 			title: 'Save the merge of ', localHistorian upstreamTrackingHistorian shortName;
 			message: 'Merge branch ''', (localHistorian repository historianNamed: localHistorian upstreamHistorianName) shortName, ''' of ', localHistorian upstreamRemote url, ' into ', localHistorian shortName;
-			patch: savePatch buildPatch;
+			patch: (savePatch updateRightArtifacts; buildPatch);
 			applyToWorkingCopy)]
 		on: BrokenPromise "cancelled" do: [:e | e ifNotError: [^ nil]].

src/Squit.package/SquitInteractivePullFromUpstream.class/methodProperties.json

@@ -5,4 +5,4 @@
 		"fetchFromUpstream" : "jr 8/2/2020 11:33",
 		"merge" : "jr 11/29/2020 23:50",
 		"pull" : "jr 11/29/2020 23:56",
-		"save" : "jr 11/6/2020 22:40" } }
+		"save" : "jr 7/17/2021 20:37" } }

src/Squot.package/.squot-contents

@@ -1,6 +1,6 @@
 SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
+	#slotOverrides : { },
 	#objectsReplacedByNames : true,
-	#slotOverrides : IdentityDictionary { },
 	#serializer : #SquotCypressCodeSerializer
 }

src/Squot.package/BoxedFloat64.extension/class/squotMirror.st

@@ -0,0 +1,3 @@
+*Squot-trackable
+squotMirror
+	^ SquotOpaqueValueMirror new

src/Squot.package/BoxedFloat64.extension/methodProperties.json

@@ -0,0 +1,5 @@
+{
+	"class" : {
+		"squotMirror" : "jr 7/30/2021 21:17" },
+	"instance" : {
+		 } }

src/Squot.package/BoxedFloat64.extension/properties.json

@@ -0,0 +1,2 @@
+{
+	"name" : "BoxedFloat64" }

src/Squot.package/BrokenPromise.extension/instance/ifError.ifNotError..st

@@ -0,0 +1,7 @@
+*Squot-Tools
+ifError: errorBlock ifNotError: rejectedBlock
+	| reason |
+	reason := self reason.
+	^ (reason isKindOf: Error)
+		ifTrue: [errorBlock cull: reason]
+		ifFalse: [rejectedBlock cull: reason]

src/Squot.package/BrokenPromise.extension/instance/ifNotError..st

@@ -1,12 +1,7 @@
 *Squot-Tools
 ifNotError: aBlock
 	"Workaround for bad Promise implementation up to Squeak 5.3: value of ifRejected: blocks is not used to resolve the then-Promise, but to reject it. Also Promises in Squeak 5.3 do not take on the outcome of nested promises, they just nest the rejected promise as the error reason. Check whether the promise error is a real Error exception or whether it is a custom error reason. If it is a real Error, pass the BrokenPromise on. Otherwise evaluate the block to run business logic."
-	| nested |
-	nested := promise.
-	[(nested isKindOf: Promise) and: [nested isRejected]] whileTrue: [nested := nested error].
-	(nested isKindOf: Error)
-		ifTrue: [self pass]
-		ifFalse: [^ aBlock cull: nested].
+	^ self ifError: [self pass] ifNotError: [:reason | aBlock cull: reason]
 	"[Promise new rejectWith: 42; wait]
 		on: BrokenPromise do: [:e | e ifNotError: []]" "expected: nil"
 	"[((Promise new rejectWith: 42) then: [:x|] ifRejected: [:x | nil]) wait]

src/Squot.package/BrokenPromise.extension/instance/reason.st

@@ -0,0 +1,6 @@
+*Squot-Tools
+reason
+	| nested |
+	nested := promise.
+	[(nested isKindOf: Promise) and: [nested isRejected]] whileTrue: [nested := nested error].
+	^ nested

src/Squot.package/BrokenPromise.extension/methodProperties.json

@@ -2,4 +2,6 @@
 	"class" : {
 		 },
 	"instance" : {
-		"ifNotError:" : "jr 8/9/2020 23:42" } }
+		"ifError:ifNotError:" : "jr 8/25/2021 09:49",
+		"ifNotError:" : "jr 8/25/2021 09:50",
+		"reason" : "jr 8/25/2021 09:48" } }

src/Squot.package/ClassDescription.extension/instance/captureWithSquot..st

@@ -1,5 +1,5 @@
 *Squot-trackable
 captureWithSquot: aCapturer
-	self flag: #deprecated. "Ask the mirror instead."
+	self deprecated: 'Ask the mirror instead'.
 	self isMeta ifTrue: [^ super captureWithSquot: aCapturer].
 	^ aCapturer shadowOf: self ifAbsentPut: [self captureWithSquot]

src/Squot.package/ClassDescription.extension/methodProperties.json

@@ -3,7 +3,7 @@
 		 },
 	"instance" : {
 		"captureWithSquot" : "jr 8/13/2017 18:23",
-		"captureWithSquot:" : "jr 1/11/2021 00:01",
+		"captureWithSquot:" : "jr 7/25/2021 16:36",
 		"package" : "jr 7/21/2017 17:31",
 		"squotAddTransientStoreInfoTo:" : "jr 7/27/2017 23:52",
 		"squotRemoveTransientStoreInfoFrom:" : "jr 7/27/2017 23:52" } }

src/Squot.package/GenericDiff.extension/instance/addReferenceDiff..st

@@ -0,0 +1,3 @@
+*Squot-diff-comparing
+addReferenceDiff: aSquotReferenceDiff
+	"Ignore since I compute my differences myself."

src/Squot.package/GenericDiff.extension/instance/initializeFrom.to..st

@@ -0,0 +1,3 @@
+*Squot-diff-comparing
+initializeFrom: aSquotBitsObjectShadow to: aSquotBitsObjectShadow2 
+	"Already done when constructed."

src/Squot.package/GenericDiff.extension/methodProperties.json

@@ -2,7 +2,9 @@
 	"class" : {
 		"squotDiffClass" : "jr 6/15/2017 17:49" },
 	"instance" : {
+		"addReferenceDiff:" : "jr 7/25/2021 17:49",
 		"applyToShadowNamed:inGraph:" : "jr 7/4/2021 17:50",
+		"initializeFrom:to:" : "jr 7/30/2021 19:28",
 		"initializeSquotDiffNodes:with:" : "jr 3/17/2018 14:09",
 		"isAddition" : "jr 6/26/2021 22:33",
 		"isModification" : "jr 6/26/2021 22:33",

src/Squot.package/Object.extension/instance/captureWithSquot..st

@@ -2,7 +2,7 @@
 captureWithSquot: aCapturer
 	"Use aCapturer to answer a conserved form of me that is suitable to be stored in Snapshots."
 	| replacementOrSelf |
-	self flag: #deprecated. "Ask the mirror instead."
+	self deprecated: 'Ask the mirror instead'.
 	self class isImmediateClass ifTrue: [^ aCapturer capturePrimitiveValue: self].
 	self class isBits ifTrue: [^ aCapturer captureBits: self].
 	replacementOrSelf := self squotReplacementFor: aCapturer.

src/Squot.package/Object.extension/methodProperties.json

@@ -9,7 +9,7 @@
 		"browseFromSquotWorkingCopyArtifact:" : "jr 11/1/2020 21:06",
 		"canHaveNameAssignedBySquot" : "jr 9/25/2019 14:34",
 		"captureWithSquot" : "jr 7/16/2017 00:16",
-		"captureWithSquot:" : "jr 1/10/2021 23:58",
+		"captureWithSquot:" : "jr 7/25/2021 16:36",
 		"hasSquotShadowName" : "jr 6/20/2017 13:15",
 		"shouldHaveNameAssignedBySquot" : "jr 6/22/2017 15:19",
 		"squotAddTransientStoreInfoTo:" : "jr 7/16/2017 18:57",

src/Squot.package/SquotArtifactDiffTest.class/instance/applyDiffToWorkingCopy..st

@@ -4,4 +4,5 @@ applyDiffToWorkingCopy: anArtifactDiff
 		applyPatch:
 			(workingCopy newPatchBuilder
 				addDiff: anArtifactDiff;
+				updateRightArtifacts;
 				buildPatch).

src/Squot.package/SquotArtifactDiffTest.class/methodProperties.json

@@ -2,7 +2,7 @@
 	"class" : {
 		 },
 	"instance" : {
-		"applyDiffToWorkingCopy:" : "jr 11/7/2020 23:21",
+		"applyDiffToWorkingCopy:" : "jr 7/17/2021 20:37",
 		"createWorkingCopyWithObjectAt:" : "jr 11/7/2020 23:16",
 		"testAdditionsAreLoadedByDefault" : "jr 11/7/2020 23:22",
 		"testAdditionsCanBeUnloaded" : "jr 11/7/2020 23:22",

src/Squot.package/SquotBitsMirror.class/instance/initializeSnapshot.of.with..st

@@ -0,0 +1,3 @@
+capturing
+initializeSnapshot: aSquotObjectShadow of: anObject with: aSquotObjectCapturer
+	aSquotObjectShadow copyBitsFrom: anObject.

src/Squot.package/SquotBitsMirror.class/instance/is.comparableTo..st

@@ -0,0 +1,4 @@
+comparing
+is: anObject comparableTo: anotherObject
+	self assert: anObject class isBits.
+	^ anObject isMemberOf: anotherObject class

src/Squot.package/SquotBitsMirror.class/methodProperties.json

@@ -2,5 +2,6 @@
 	"class" : {
 		 },
 	"instance" : {
-		"capture:with:" : "jr 4/8/2021 21:31",
+		"initializeSnapshot:of:with:" : "jr 7/17/2021 23:56",
+		"is:comparableTo:" : "jr 7/25/2021 16:42",
 		"shadowFactory" : "jr 4/8/2021 20:52" } }

src/Squot.package/SquotBitsObjectShadow.class/class/squotMirror.st

@@ -1,3 +1,3 @@
 reflecting
 squotMirror
-	^ SquotBitsMirror new
+	^ SquotBitsShadowMirror new

src/Squot.package/SquotBitsObjectShadow.class/instance/addVariablePartSlot..st

@@ -0,0 +1,5 @@
+accessing
+addVariablePartSlot: aVariablePartSlot
+	| primitiveValue |
+	primitiveValue := aVariablePartSlot value.
+	value basicAt: aVariablePartSlot index put: primitiveValue value.

src/Squot.package/SquotBitsObjectShadow.class/instance/isComparableTo..st

@@ -0,0 +1,3 @@
+comparing
+isComparableTo: aBitsObjectShadow
+	^ aBitsObjectShadow value isMemberOf: value class

src/Squot.package/SquotBitsObjectShadow.class/instance/references.st

@@ -0,0 +1,4 @@
+reflection
+references
+	^ (1 to: (thisContext objectSize: value))
+		collect: 	[:each | SquotIndexableField index: each]

src/Squot.package/SquotBitsObjectShadow.class/instance/sameIn.withName.ifAbsent..st

@@ -2,4 +2,4 @@ accessing
 sameIn: aShadowGraph withName: aName ifAbsent: aBlock
 	"Unlike objects of my superclass, I can have a name and an identity.
 	Answer the object with the same name from the other graph."
-	^ aShadowGraph shadowNamed: aName ifAbsent: aBlock
+	^ [aShadowGraph class squotMirror reflect: (SquotGraphElementWithName name: aName) of: aShadowGraph] on: KeyNotFound do: [:e | e return: aBlock value]

src/Squot.package/SquotBitsObjectShadow.class/instance/squotDiffAgainst..st

@@ -1,3 +1,6 @@
 Squot-shadow-diffing
 squotDiffAgainst: otherShadow
-	^ (otherShadow ifNil: [value class new: 0]) squotWith: nil diffFromSequence: value
+	^ GenericDiff squotDiffClass new
+		file1: value;
+		file2: (otherShadow value ifNil: [value class new: 0]);
+		yourself 

src/Squot.package/SquotBitsObjectShadow.class/instance/squotDiffAgainst.with..st

@@ -1,7 +1,7 @@
 Squot-shadow-diffing
 squotDiffAgainst: otherShadow with: aDiffBuilder
-	^ (value species = otherShadow value species)
-		ifTrue: [aDiffBuilder diffFrom: self to: otherShadow
-				ifNew: [otherShadow squotWith: aDiffBuilder diffFromSequence: value]
-				andInitialize: []]
-		ifFalse: [aDiffBuilder replacing: self with: otherShadow]
+	self deprecated: 'See SquotBitsShadowMirror newDiffFrom:to:'.
+	^ aDiffBuilder
+		diffFrom: self to: otherShadow
+		ifNew: [otherShadow squotWith: aDiffBuilder diffFromSequence: value]
+		andInitialize: []

src/Squot.package/SquotBitsObjectShadow.class/instance/squotWith.diffFromSequence..st

@@ -1,6 +1,7 @@
 Squot-shadow-diffing
 squotWith: aDiffBuilder diffFromSequence: leftSequence
 	"Double dispatch from a sequence."
+	self deprecated: 'Use squotDiffAgainst: instead, or better yet, use SquotBitsShadowMirror newDiffFrom:to:'.
 	^ GenericDiff squotDiffClass new
 		file1: leftSequence;
 		file2: value;

src/Squot.package/SquotBitsObjectShadow.class/instance/variablePartSlotWithIndex..st

@@ -0,0 +1,3 @@
+accessing
+variablePartSlotWithIndex: anInteger 
+	^ (value basicAt: anInteger) captureWithSquot