WIP

src/GitS-Core.package/GSBaseWorkingCopy.class/instance/actionExportToSar.st

@@ -0,0 +1,3 @@
+actions
+actionExportToSar
+	self actionExportToSarNamed: self requestSarFileName.

src/GitS-Core.package/GSBaseWorkingCopy.class/instance/writeSarToFileNamed..st → src/GitS-Core.package/GSBaseWorkingCopy.class/instance/actionExportToSarNamed..st

@@ -1,3 +1,3 @@
-sar
-writeSarToFileNamed: aString
+actions
+actionExportToSarNamed: aString
 	self buildSar writeToFileNamed: aString.

src/GitS-Core.package/GSBaseWorkingCopy.class/instance/actionRemove.st

@@ -0,0 +1,8 @@
+actions
+actionRemove
+	(self confirm:
+		('Do you really want to remove the project {1}? ',
+		'The files on disk will remain, but the project will be no longer be visible here.'
+			format: {self name printString}))
+		ifFalse: [^ self].
+	self unregister.

src/GitS-Core.package/GSBaseWorkingCopy.class/instance/actionRename.st

@@ -0,0 +1,14 @@
+actions
+actionRename
+	| newName |
+	newName :=
+		self class
+			requestUnregisteredNameFrom: self name
+			title:
+				('Rename project {1}. Beware that this name is used for identifying the project,
+				e. g. when loading assets via {2} for: ''project-name-here''.
+				Make sure the other users and team members of your project use the same name. New name:'
+					withoutLineEndings withBlanksCondensed
+					format: {self name printString. GitAssetLoader printString}).
+	newName ifNil: [^ self].
+	self name: newName.

src/GitS-Core.package/GSBaseWorkingCopy.class/methodProperties.json

@@ -25,6 +25,10 @@
 		"uninstallSquot" : "mad 10/9/2024 21:51",
 		"unregister:" : "mad 10/6/2024 21:07" },
 	"instance" : {
+		"actionExportToSar" : "mad 12/1/2024 18:00",
+		"actionExportToSarNamed:" : "mad 12/1/2024 18:00",
+		"actionRemove" : "mad 12/2/2024 00:12",
+		"actionRename" : "mad 12/2/2024 00:14",
 		"addMapper:" : "mad 10/6/2024 21:13",
 		"allMappers" : "mad 10/6/2024 21:13",
 		"basicName:" : "mad 10/6/2024 21:13",
@@ -55,12 +59,9 @@
 		"nameIfTakenDeriveAndInform:" : "mad 10/6/2024 21:18",
 		"register" : "mad 10/6/2024 21:18",
 		"removeMapper:" : "mad 10/6/2024 21:18",
-		"rename" : "mad 10/6/2024 21:18",
 		"replaceMapper:with:" : "mad 10/6/2024 21:18",
 		"requestOptionForUnmappedPath:mapper:additionalOptions:" : "mad 10/9/2024 16:01",
 		"requestSarFileName" : "mad 10/6/2024 21:19",
 		"requestUnmappedPathWithTitle:initialAnswer:" : "mad 10/6/2024 21:19",
 		"requestUnmappedPathWithTitle:initialAnswer:additionalOptions:" : "mad 10/9/2024 16:01",
-		"unregister" : "mad 10/6/2024 21:19",
-		"writeSarToFileNamed:" : "mad 10/6/2024 21:20",
-		"writeSarToRequestedFileName" : "mad 10/6/2024 21:20" } }
+		"unregister" : "mad 10/6/2024 21:19" } }

src/GitS-Core.package/GSBrowser.class/instance/actionChooseNewRepositoryLocationForActiveProject.st

@@ -1,5 +1,5 @@
-actions
+actions-working-copy
 actionChooseNewRepositoryLocationForActiveProject
 	self activeWorkingCopyAction: [:workingCopy |
-		workingCopy requestAndMoveToNewRepositoryLocation.
+		workingCopy actionChooseNewRepositoryLocation.
 		self everythingChanged].

src/GitS-Core.package/GSBrowser.class/instance/actionCloneProject.st

@@ -1,3 +1,3 @@
-actions
+actions-working-copy
 actionCloneProject
 	self newProject: GSGitWorkingCopy cloneFromUserAndRegister.

src/GitS-Core.package/GSBrowser.class/instance/actionCommit.st

@@ -1,3 +1,3 @@
-actions
+actions-committing
 actionCommit
-	self activeWorkingCopyAction: #openDialogToCommitImage.
+	self activeWorkingCopyAction: #actionCommit.

src/GitS-Core.package/GSBrowser.class/instance/actionCompareCommitToImage..st

@@ -1,4 +1,4 @@
-actions
+actions-comparing
 actionCompareCommitToImage: aCommit
 	self activeWorkingCopyAction: [:workingCopy |
-		workingCopy openDialogToShowChangeSetsFromImageTo: aCommit].
+		workingCopy actionCompareCommitToImage: aCommit].

src/GitS-Core.package/GSBrowser.class/instance/actionCompareCommitToParent..st

@@ -1,4 +1,4 @@
-actions
+actions-comparing
 actionCompareCommitToParent: aCommit
 	self activeWorkingCopyAction: [:workingCopy |
-		workingCopy openDialogToCompareCommitToParent: aCommit]
+		workingCopy actionCompareCommitToParent: aCommit]

src/GitS-Core.package/GSBrowser.class/instance/actionCreateBranchAtActiveCommit.st

@@ -1,3 +1,3 @@
-actions
+actions-branches
 actionCreateBranchAtActiveCommit
-	^ self actionCreateBranchAtCommit: (self activeCommitIfNilInformAnd: [^ self])
+	self activeCommitAction: #actionCreateBranchAtCommit:.

src/GitS-Core.package/GSBrowser.class/instance/actionCreateBranchAtCommit..st

@@ -1,4 +1,4 @@
-actions
+actions-branches
 actionCreateBranchAtCommit: aCommit
 	self activeWorkingCopyAction: [:workingCopy |
-		workingCopy createBranchAtCommit: aCommit].
+		workingCopy actionCreateBranchAtCommit: aCommit].

src/GitS-Core.package/GSBrowser.class/instance/actionCreateBranchAtCommitAndSwitchToIt..st

@@ -1,3 +1,4 @@
-actions
+actions-branches
 actionCreateBranchAtCommitAndSwitchToIt: aCommit
-	self actionSwitchToBranch: ((self actionCreateBranchAtCommit: aCommit) ifNil: [^ self]).
+	self activeWorkingCopyAction: [:workingCopy |
+		workingCopy actionCreateBranchAtCommitAndSwitchToIt: aCommit].

src/GitS-Core.package/GSBrowser.class/instance/actionCreateBranchAtRef..st

@@ -1,4 +1,4 @@
-actions
+actions-branches
 actionCreateBranchAtRef: aString
 	self activeWorkingCopyAction: [:workingCopy |
-		workingCopy createBranchAtRef: aString].
+		workingCopy actionCreateBranchAtRef: aString].

src/GitS-Core.package/GSBrowser.class/instance/actionCreateBranchAtRefAndSwitchToIt..st

@@ -1,3 +1,4 @@
-actions
+actions-branches
 actionCreateBranchAtRefAndSwitchToIt: aString
-	self actionSwitchToBranch: ((self actionCreateBranchAtRef: aString) ifNil: [^ self]).
+	self activeWorkingCopyAction: [:workingCopy |
+		workingCopy actionCreateBranchAtRefAndSwitchToIt: aString].

src/GitS-Core.package/GSBrowser.class/instance/actionCreateGitBranchAtCommit..st

@@ -1,3 +1,4 @@
-actions
+actions-branches
 actionCreateGitBranchAtCommit: aCommit
-	^ self actionCreateGitBranchAtCommit: aCommit fromRef: nil
+	self activeWorkingCopyAction: [:workingCopy |
+		workingCopy actionCreateGitBranchAtCommit: aCommit].

src/GitS-Core.package/GSBrowser.class/instance/actionCreateGitBranchAtRef..st

@@ -1,5 +1,4 @@
-actions
+actions-branches
 actionCreateGitBranchAtRef: aString
-	| commit |
-	commit := (self commitReferencedBy: aString to: 'create an external branch') ifNil: [^ nil].
-	^ self actionCreateGitBranchAtCommit: commit fromRef: aString
+	self activeWorkingCopyAction: [:workingCopy |
+		workingCopy actionCreateGitBranchAtRef: aString].

src/GitS-Core.package/GSBrowser.class/instance/actionDeleteRef..st

@@ -1,8 +1,4 @@
-actions
+actions-refs
 actionDeleteRef: aString
-	(self activeWorkingCopy checkCanDeleteRef: aString) ifFalse: [^ self].
-	(self confirm:
-		('Are you sure you want to delete the ref {1}?'
-			format: {(GitReference shortName: aString) printString}))
-		ifFalse: [^ self].
-	self unitOfWork deleteRef: aString.
+	self activeWorkingCopyAction: [:workingCopy |
+		workingCopy actionDeleteRef: aString]

src/GitS-Core.package/GSBrowser.class/instance/actionExportActiveProjectToSar.st

@@ -1,5 +1,3 @@
-actions
+actions-working-copy
 actionExportActiveProjectToSar
-	| workingCopy |
-	workingCopy := self activeWorkingCopyIfNilInformAnd: [^ self].
-	workingCopy writeSarToRequestedFileName.
+	self activeWorkingCopyAction: #actionExportToSar.

src/GitS-Core.package/GSBrowser.class/instance/actionFetchAll.st

@@ -1,3 +1,3 @@
-actions
+actions-network
 actionFetchAll
-	(self activeWorkingCopyIfNilInformAnd: [^ self]) fetchAll.
+	self activeWorkingCopyAction: #actionFetchAll.

src/GitS-Core.package/GSBrowser.class/instance/actionForcePush.st

@@ -1,4 +1,3 @@
-actions
+actions-network
 actionForcePush
-	self activeWorkingCopyIfNilInformAnd: [^ self].
-	self actionForcePush: (self currentBranchIfNilInformAnd: [^ self]).
+	self activeWorkingCopyAction: #actionForcePush.

src/GitS-Core.package/GSBrowser.class/instance/actionManageRemotes.st

@@ -1,3 +1,4 @@
-actions
+actions-network
 actionManageRemotes
-	GSRemotesBrowser openOnWorkingCopy: self activeWorkingCopy.
+	self activeWorkingCopyAction: [:workingCopy |
+		workingCopy actionManageRemotes].

src/GitS-Core.package/GSBrowser.class/instance/actionMaterializeCommit..st

@@ -1,3 +1,4 @@
-actions
+actions-materializing
 actionMaterializeCommit: aCommit
-	self openDialogToMaterializeCommit: aCommit.
+	self activeWorkingCopyAction: [:workingCopy |
+		workingCopy actionMaterializeCommit: aCommit].

src/GitS-Core.package/GSBrowser.class/instance/actionMergeCommit..st

@@ -1,3 +1,4 @@
-actions
+actions-merging
 actionMergeCommit: aCommit
-	self mergeCommitIntoHead: aCommit.
+	self activeWorkingCopyAction: [:workingCopy |
+		workingCopy actionMergeCommit: aCommit].

src/GitS-Core.package/GSBrowser.class/instance/actionMergeRef..st

@@ -1,3 +1,4 @@
-actions
+actions-refs
 actionMergeRef: aString
-	self mergeRefIntoHead: aString.
+	self activeWorkingCopyAction: [:workingCopy |
+		workingCopy actionMergeRef: aString].

src/GitS-Core.package/GSBrowser.class/instance/actionNewProject.st

@@ -1,3 +1,3 @@
-actions
+actions-working-copy
 actionNewProject
 	self newProject: GSGitWorkingCopy newFromUserAndRegister.

src/GitS-Core.package/GSBrowser.class/instance/actionPull.st

@@ -1,15 +1,3 @@
-actions
+actions-network
 actionPull
-	| branch remoteNameAndRef remoteName remoteRef remote trackingRef |
-	self activeWorkingCopyIfNilInformAnd: [^ self].
-	branch := self currentBranchIfNilInformAnd: [^ self].
-	remoteNameAndRef := self activeWorkingCopy upstreamRemoteNameAndRefFor: branch.
-	remoteNameAndRef ifNil: [^ self].
-	remoteName := remoteNameAndRef key.
-	remoteRef := remoteNameAndRef value.
-	self activeWorkingCopy fetch: remoteName.
-	remote := self unitOfWork remoteNamed: remoteName.
-	trackingRef := remote trackingRefOf: remoteRef.
-	(self unitOfWork objectReferenced: trackingRef) ifNil: [
-		^ self inform: 'Cannot pull, the branch does not exist on the remote.'].
-	self mergeRefIntoHead: trackingRef.
+	self activeWorkingCopyAction: #actionPull.

src/GitS-Core.package/GSBrowser.class/instance/actionPush.st

@@ -1,4 +1,3 @@
-actions
+actions-network
 actionPush
-	self activeWorkingCopyIfNilInformAnd: [^ self].
-	self actionPush: (self currentBranchIfNilInformAnd: [^ self]).
+	self activeWorkingCopyAction: #actionPush.

src/GitS-Core.package/GSBrowser.class/instance/actionRebaseOntoCommit..st

@@ -1,13 +1,4 @@
-actions
+actions-rebasing
 actionRebaseOntoCommit: aCommit
-	| workingCopy commits rebase |
-	workingCopy := self activeWorkingCopyIfNilInformAnd: [^ self].
-	commits := (GitHistoryWalker new
-					excludeAncestorsOf: aCommit;
-					yourself) startingFrom: workingCopy headCommit.
-	rebase := GSRebase newWithBrowser: self commits: commits reversed.
-	rebase start then: [:x |
-		workingCopy
-			updateHeadToAndMaterialize: aCommit
-			message: 'rebase (start): checkout ', aCommit hexHash.
-		rebase open].
+	self activeWorkingCopyAction: [:workingCopy |
+		workingCopy actionRebaseOntoCommit: aCommit].

src/GitS-Core.package/GSBrowser.class/instance/actionRefreshRefList.st

@@ -1,3 +1,3 @@
-actions
+actions-refs
 actionRefreshRefList
 	self changed: #refList.