Fix #341: Prevent that errors are hidden during commits

The ifRejected: [nil] in actionCommit turned the effective Promise
for the save into one that always gets resolved rather than rejected.

But the promise is also rejected if the user cancels the save dialog.
Now waitFor: will signal either the inner Error (or rather a copy of it)
or the BrokenPromise if it was not rejected with an Error.

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/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/SquotGUI.class/class/waitFor..st

@@ -8,8 +8,10 @@ waitFor: aWaitable
 	Project current spawnNewProcess.
 	"Start another process that waits in the background, then reinstantes oldProcess as UI process. The oldProcess waits until all of this is over. The reason for a third process is that oldProcess must be suspended temporarily before it can be reinstated in Project class>>resumeProcess:."
 	[[[answer := aWaitable wait]
+		on: BrokenPromise do:
+			[:bp | bp ifError: [:error | exception := error. bp return] ifNotError: [bp pass]]
 		on: Error do:
-			[:e | exception := e]]
+			[:e | exception := e. e return]]
 		ensure:
 			[| canContinue |
 			newProcess := Project uiProcess.

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

@@ -16,6 +16,6 @@
 		"requestPassword:" : "jr 7/24/2020 10:04",
 		"runInUiProcess:" : "jr 7/24/2020 09:59",
 		"updateProgress:text:" : "jr 9/13/2020 18:23",
-		"waitFor:" : "jr 5/14/2021 17:16" },
+		"waitFor:" : "jr 8/25/2021 09:56" },
 	"instance" : {
 		 } }