Add compare to image menu item

hpi-swa · Nov 29, 2023 · 7801bb0 · 7801bb0
1 parent 71d842b
commit 7801bb0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/src/Squot.package/SquotBrowser.class/instance/actionCompareActiveCommitToImage.st b/src/Squot.package/SquotBrowser.class/instance/actionCompareActiveCommitToImage.st
@@ -0,0 +1,5 @@
+actions
+actionCompareActiveCommitToImage
+	self activeWorkingCopyIfNilInformAnd: [^ self].
+	self activeCommit ifNil: [^ self inform: 'Please select a commit first.'].
+	self openDialogToShowChangeSetsFromImageTo: self activeCommit.
diff --git a/src/Squot.package/SquotBrowser.class/instance/commitMenu.forRef..st b/src/Squot.package/SquotBrowser.class/instance/commitMenu.forRef..st
@@ -26,5 +26,6 @@ commitMenu: aMenu forRef: aStringOrNil
 			add: resetLabel, ' and restore it' action: #actionResetToActiveCommitAndRestoreIt].
 	aMenu
 		addLine;
-		add: 'Compare this ', refTypeName, ' to its parent commit' action: #actionCompareActiveCommitToParent.
+		add: 'Compare this ', refTypeName, ' to its parent commit' action: #actionCompareActiveCommitToParent;
+		add: 'Compare this ', refTypeName, ' to the image' action: #actionCompareActiveCommitToImage.
 	^ aMenu
diff --git a/src/Squot.package/SquotBrowser.class/instance/openDialogToShowChangeSetsFromImageTo..st b/src/Squot.package/SquotBrowser.class/instance/openDialogToShowChangeSetsFromImageTo..st
@@ -0,0 +1,7 @@
+dialog
+openDialogToShowChangeSetsFromImageTo: aCommit
+	self
+		openDialogToShowChangeSets:
+			(self activeWorkingCopy changeSetsFromImageToCommit: aCommit)
+		fromDisplayName: 'the image'
+		toDisplayName: (aCommit ifNotNil: #showOneLine ifNil: ['[no commit]']).
diff --git a/src/Squot.package/SquotBrowser.class/methodProperties.json b/src/Squot.package/SquotBrowser.class/methodProperties.json
@@ -10,6 +10,7 @@
 	"instance" : {
 		"actionCloneProject" : "mad 9/21/2023 11:43",
 		"actionCommit" : "mad 10/22/2023 00:35",
+		"actionCompareActiveCommitToImage" : "mad 11/29/2023 16:48",
 		"actionCompareActiveCommitToParent" : "mad 10/22/2023 00:57",
 		"actionCreateBranchAtActiveCommit" : "mad 11/29/2023 16:11",
 		"actionCreateBranchAtActiveCommitAndSwitchToIt" : "mad 11/29/2023 16:35",
@@ -69,7 +70,7 @@
 		"commitList" : "mad 9/19/2023 12:45",
 		"commitListMenu:" : "mad 11/29/2023 15:58",
 		"commitListStartingCommits" : "mad 9/19/2023 12:32",
-		"commitMenu:forRef:" : "mad 11/29/2023 16:40",
+		"commitMenu:forRef:" : "mad 11/29/2023 16:49",
 		"currentBranchIfNilInformAnd:" : "mad 9/26/2023 16:56",
 		"doesRef:comeBeforeRef:" : "mad 9/19/2023 14:45",
 		"mergeCommitIntoHead:" : "mad 9/21/2023 13:47",
@@ -88,6 +89,7 @@
 		"openDialogToShowChangeSets:fromDisplayName:toDisplayName:" : "mad 10/22/2023 00:48",
 		"openDialogToShowChangeSets:windowTitle:" : "mad 10/22/2023 00:36",
 		"openDialogToShowChangeSetsFromCommit:to:" : "mad 10/22/2023 00:56",
+		"openDialogToShowChangeSetsFromImageTo:" : "mad 11/29/2023 16:48",
 		"otherMenu:" : "mad 10/24/2023 17:14",
 		"projectListMenu:" : "mad 11/3/2023 15:11",
 		"refChanged:" : "mad 9/15/2023 11:04",