Do not warn about additional parents during merge

hpi-swa · Oct 31, 2022 · d9222c9 · d9222c9
1 parent 4bf8e3b
commit d9222c9
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 6 deletions.
diff --git a/src/Squit.package/.squot-contents b/src/Squit.package/.squot-contents
@@ -1,7 +1,7 @@
 SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
 	#id : UUID [ '207bca0df934e041b1e79b9ff315b588' ],
-	#slotOverrides : { },
 	#objectsReplacedByNames : true,
+	#slotOverrides : { },
 	#serializer : #SquotCypressCodeSerializer
 }
diff --git a/...SquitBrowser.class/instance/mergeCommit.into.mergeTitle.saveTitle.saveMessageTemplate..st b/...SquitBrowser.class/instance/mergeCommit.into.mergeTitle.saveTitle.saveMessageTemplate..st
@@ -15,9 +15,10 @@ mergeCommit: aVersion into: aWorkingCopy mergeTitle: mergeString saveTitle: save
 		^ self].
 	self flag: #todo. "Try to exclude changes that were already unsaved in the working copy before the merge."
 	[SquotGUI waitFor:
-		(aWorkingCopy newInteractiveSaveOperation
+		([aWorkingCopy newInteractiveSaveOperation
 			title: saveString;
 			message: messageString;
-			applyToWorkingCopy)]
+			applyToWorkingCopy]
+			on: SquotWorkingCopyHasAdditionalParents do: [:n | n confirmAndProceed])]
 		on: BrokenPromise "cancelled" do: [:e | e ifNotError: [^ nil]].
 	Project current addDeferredUIMessage: [self selectActiveHistorian].
diff --git a/src/Squit.package/SquitBrowser.class/methodProperties.json b/src/Squit.package/SquitBrowser.class/methodProperties.json
@@ -157,7 +157,7 @@
 		"menuProjectListWorkingCopyHook:" : "jr 3/13/2022 17:19",
 		"mergeBranch:into:" : "jr 8/7/2020 18:41",
 		"mergeCommit:into:" : "jr 8/7/2020 18:36",
-		"mergeCommit:into:mergeTitle:saveTitle:saveMessageTemplate:" : "jr 7/2/2022 22:44",
+		"mergeCommit:into:mergeTitle:saveTitle:saveMessageTemplate:" : "jr 10/31/2022 19:20",
 		"modelWakeUp" : "fn 4/26/2017 16:19",
 		"newHistorianFor:named:onError:" : "jr 7/24/2020 10:14",
 		"objectCache" : "fn 4/11/2017 18:39",

diff --git a/src/Squot.package/.squot-contents b/src/Squot.package/.squot-contents
@@ -1,7 +1,7 @@
 SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
 	#id : UUID [ '7e0624d4d6eca84f879c365f65ae74be' ],
-	#slotOverrides : { },
 	#objectsReplacedByNames : true,
+	#slotOverrides : { },
 	#serializer : #SquotCypressCodeSerializer
 }
diff --git a/src/Squot.package/SquotInteractiveSave.class/instance/confirmAdditionalParents.st b/src/Squot.package/SquotInteractiveSave.class/instance/confirmAdditionalParents.st
@@ -1,5 +1,7 @@
 private
 confirmAdditionalParents
+	(SquotWorkingCopyHasAdditionalParents workingCopy: self workingCopy operation: self)
+		signal ifNotNil: [:answer | ^ answer].
 	^ SquotGUI confirm: ('Your working copy has multiple parent versions:
 
 {1}

diff --git a/src/Squot.package/SquotInteractiveSave.class/methodProperties.json b/src/Squot.package/SquotInteractiveSave.class/methodProperties.json
@@ -4,6 +4,6 @@
 	"instance" : {
 		"applyToWorkingCopy" : "jr 3/9/2022 23:06",
 		"chooseChanges" : "jr 6/8/2020 21:21",
-		"confirmAdditionalParents" : "jr 3/9/2022 23:06",
+		"confirmAdditionalParents" : "jr 10/31/2022 19:17",
 		"validate" : "jr 11/19/2020 13:02",
 		"validateForCherryPick" : "jr 11/19/2020 13:01" } }
diff --git a/src/Squot.package/SquotWorkingCopyHasAdditionalParents.class/README.md b/src/Squot.package/SquotWorkingCopyHasAdditionalParents.class/README.md
@@ -0,0 +1 @@
+I am signalled when a new version is about to be saved, but the working copy has multiple parent versions. During merges this is natural, but if there has been some time between the addition of the additional parents and the saving of the new version, users may not desire to create a version with multiple parents anymore.
diff --git a/src/Squot.package/SquotWorkingCopyHasAdditionalParents.class/class/workingCopy.operation..st b/src/Squot.package/SquotWorkingCopyHasAdditionalParents.class/class/workingCopy.operation..st
@@ -0,0 +1,6 @@
+instance creation
+workingCopy: anObject1 operation: anObject2 
+	^ self new
+		setWorkingCopy: anObject1
+		operation: anObject2;
+		yourself
diff --git a/src/Squot.package/SquotWorkingCopyHasAdditionalParents.class/instance/confirmAndProceed.st b/src/Squot.package/SquotWorkingCopyHasAdditionalParents.class/instance/confirmAndProceed.st
@@ -0,0 +1,4 @@
+handling
+confirmAndProceed
+	self resume: true.
+
diff --git a/....package/SquotWorkingCopyHasAdditionalParents.class/instance/setWorkingCopy.operation..st b/....package/SquotWorkingCopyHasAdditionalParents.class/instance/setWorkingCopy.operation..st
@@ -0,0 +1,4 @@
+initialize-release
+setWorkingCopy: anObject1 operation: anObject2 
+	workingCopy := anObject1.
+	operation := anObject2.
diff --git a/src/Squot.package/SquotWorkingCopyHasAdditionalParents.class/methodProperties.json b/src/Squot.package/SquotWorkingCopyHasAdditionalParents.class/methodProperties.json
@@ -0,0 +1,6 @@
+{
+	"class" : {
+		"workingCopy:operation:" : "jr 10/31/2022 19:16" },
+	"instance" : {
+		"confirmAndProceed" : "jr 10/31/2022 19:19",
+		"setWorkingCopy:operation:" : "jr 10/31/2022 19:08" } }
diff --git a/src/Squot.package/SquotWorkingCopyHasAdditionalParents.class/properties.json b/src/Squot.package/SquotWorkingCopyHasAdditionalParents.class/properties.json
@@ -0,0 +1,15 @@
+{
+	"category" : "Squot-Tools",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "jr 10/31/2022 18:22",
+	"instvars" : [
+		"workingCopy",
+		"operation" ],
+	"name" : "SquotWorkingCopyHasAdditionalParents",
+	"pools" : [
+		 ],
+	"super" : "Notification",
+	"type" : "normal" }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		I am signalled when a new version is about to be saved, but the working copy has multiple parent versions. During merges this is natural, but if there has been some time between the addition of the additional parents and the saving of the new version, users may not desire to create a version with multiple parents anymore.