Skip to content

Commit

Permalink
WIP: add SquotPendingChanges
Browse files Browse the repository at this point in the history
  • Loading branch information
@MariusDoe
MariusDoe committed Oct 8, 2024
1 parent 6cbb37e commit bc02589
Show file tree
Hide file tree
Showing 77 changed files with 370 additions and 41 deletions.
9 changes: 0 additions & 9 deletions src/Squot-Core.package/SquotBrowser.class/instance/actionCherryPick..st
View file

This file was deleted.

5 changes: 3 additions & 2 deletions ....package/SquotBrowser.class/instance/actionChooseNewRepositoryLocationForActiveProject.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
actions
actionChooseNewRepositoryLocationForActiveProject
(self activeWorkingCopyIfNilInformAnd: [^ self]) requestAndMoveToNewRepositoryLocation.
self everythingChanged.
self workingCopyAction: [:workingCopy |
workingCopy requestAndMoveToNewRepositoryLocation.
self everythingChanged].
3 changes: 1 addition & 2 deletions src/Squot-Core.package/SquotBrowser.class/instance/actionCommit.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
actions
actionCommit
self activeWorkingCopyIfNilInformAnd: [^ self].
self openDialogToCommitImageWithInitialMessage: ''.
self workingCopyAction: #openDialogToCommitImage.
9 changes: 0 additions & 9 deletions ...-Core.package/SquotBrowser.class/instance/openDialogToCommitChangeSets.initialMessage..st
View file

This file was deleted.

9 changes: 0 additions & 9 deletions ...ot-Core.package/SquotBrowser.class/instance/openDialogToCommitImageWithInitialMessage..st
View file

This file was deleted.

6 changes: 6 additions & 0 deletions src/Squot-Core.package/SquotBrowser.class/instance/workingCopyAction..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
actions
workingCopyAction: aBlock
self activeWorkingCopy ifNil: [
self inform: 'Please select a project first.'.
^ self].
aBlock value: self activeWorkingCopy.
10 changes: 4 additions & 6 deletions src/Squot-Core.package/SquotBrowser.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
"unload" : "mad 9/26/2023 15:50",
"unregisterFromWorldMenu" : "mad 9/19/2023 13:45" },
"instance" : {
"actionCherryPick:" : "mad 4/5/2024 00:37",
"actionChooseNewRepositoryLocationForActiveProject" : "mad 12/22/2023 18:15",
"actionChooseNewRepositoryLocationForActiveProject" : "mad 10/7/2024 22:56",
"actionCloneProject" : "mad 10/6/2024 20:42",
"actionCommit" : "mad 4/5/2024 15:21",
"actionCommit" : "mad 10/7/2024 19:52",
"actionCompareActiveCommitToImage" : "mad 4/5/2024 19:07",
"actionCompareActiveCommitToParent" : "mad 4/5/2024 19:07",
"actionCompareCommitToImage:" : "mad 4/5/2024 19:00",
Expand Down Expand Up @@ -129,9 +128,7 @@
"newProject:" : "mad 3/19/2024 21:29",
"onConflictOpenDialogToMaterializeChangeSets:windowTitle:" : "mad 4/10/2024 16:16",
"open" : "mad 8/30/2023 17:41",
"openDialogToCommitChangeSets:initialMessage:" : "mad 4/5/2024 15:17",
"openDialogToCommitChangeSets:windowTitle:initialMessage:additionalParents:onlyAdditionalParents:materializeChangeSets:" : "mad 4/5/2024 01:20",
"openDialogToCommitImageWithInitialMessage:" : "mad 4/5/2024 15:20",
"openDialogToMaterializeChangeSets:windowTitle:" : "mad 10/24/2023 16:22",
"openDialogToMaterializeCommit:" : "mad 10/24/2023 17:36",
"openDialogToMaterializeCommit:displayName:windowTitlePrefix:" : "mad 8/13/2024 17:56",
Expand Down Expand Up @@ -160,4 +157,5 @@
"validateDialogState:andOriginalHeadCommit:before:" : "mad 9/19/2023 12:37",
"warnIfImageNotClean:" : "mad 11/7/2023 15:24",
"windowTitle" : "mad 10/18/2023 15:14",
"withUnitOfWork:" : "mad 9/19/2023 12:37" } }
"withUnitOfWork:" : "mad 9/19/2023 12:37",
"workingCopyAction:" : "mad 10/7/2024 19:52" } }
6 changes: 6 additions & 0 deletions src/Squot-Core.package/SquotGitWorkingCopy.class/instance/cherryPick..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
git-operations
cherryPick: aCommit
^ (self pendingChangeSetsForPick: aCommit)
prefixWindowTitle: 'Cherry-pick ';
initialMessage: aCommit message;
commit
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotGitWorkingCopy.class/instance/openDialogToCommitImage.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dialog
openDialogToCommitImage
^ self openDialogToCommitImageWithInitialMessage: ''
6 changes: 6 additions & 0 deletions ....package/SquotGitWorkingCopy.class/instance/openDialogToCommitImageWithInitialMessage..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dialog
openDialogToCommitImageWithInitialMessage: aString
^ (self pendingChangeSetsToCommit: self changeSetsFromHeadCommitToImage)
initialMessage: aString;
alwaysOpenDialog;
commit
5 changes: 5 additions & 0 deletions src/Squot-Core.package/SquotGitWorkingCopy.class/instance/pendingChangeSets..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pending-changes
pendingChangeSets: aCollection
^ self pendingChanges
changeSets: aCollection;
yourself
8 changes: 8 additions & 0 deletions src/Squot-Core.package/SquotGitWorkingCopy.class/instance/pendingChangeSetsForPick..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
pending-changes
pendingChangeSetsForPick: aCommit
^ (self pendingChangeSets:
(self
changeSetsToMergeCommitIntoHead: aCommit
withBase: (self parentForPick: aCommit)))
windowTitle: aCommit showOneLine;
yourself
8 changes: 8 additions & 0 deletions ...package/SquotGitWorkingCopy.class/instance/pendingChangeSetsForPick.windowTitlePrefix..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
pending-changes
pendingChangeSetsForPick: aCommit
windowTitlePrefix: aString
^ (self pendingChangeSets: (self
changeSetsToMergeCommitIntoHead: aCommit
withBase: (self parentForPick: aCommit)))
windowTitle: ('{1} {2}' format: {aString. aCommit showOneLine});
yourself
5 changes: 5 additions & 0 deletions src/Squot-Core.package/SquotGitWorkingCopy.class/instance/pendingChangeSetsToCommit..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pending-changes
pendingChangeSetsToCommit: aCollection
^ (self pendingChangeSets: aCollection)
windowTitle: 'Changes to commit';
yourself
5 changes: 5 additions & 0 deletions src/Squot-Core.package/SquotGitWorkingCopy.class/instance/pendingChanges.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pending-changes
pendingChanges
^ SquotPendingChanges new
workingCopy: self;
yourself
8 changes: 8 additions & 0 deletions src/Squot-Core.package/SquotGitWorkingCopy.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"checkForMissingHead" : "mad 3/19/2024 21:45",
"checkRefExists:displayName:" : "mad 10/16/2023 21:31",
"checkoutReflogMessageTo:" : "mad 11/30/2023 13:19",
"cherryPick:" : "mad 10/7/2024 22:54",
"chooseRemoteName" : "mad 10/16/2023 20:48",
"clearLastImageHashForMigration" : "mad 11/29/2023 15:08",
"cloneFrom:" : "mad 5/23/2024 21:00",
Expand Down Expand Up @@ -97,6 +98,13 @@
"materializeCommit:" : "mad 9/6/2023 19:27",
"materializeHead" : "mad 8/24/2023 23:49",
"moveToNewRepositoryLocation:" : "mad 12/22/2023 17:50",
"openDialogToCommitImage" : "mad 10/7/2024 19:46",
"openDialogToCommitImageWithInitialMessage:" : "mad 10/7/2024 19:46",
"pendingChangeSets:" : "mad 10/7/2024 19:36",
"pendingChangeSetsForPick:" : "mad 10/7/2024 22:54",
"pendingChangeSetsForPick:windowTitlePrefix:" : "mad 10/7/2024 19:59",
"pendingChangeSetsToCommit:" : "mad 10/7/2024 19:46",
"pendingChanges" : "mad 10/7/2024 19:36",
"pushRef:force:" : "mad 5/18/2024 11:31",
"refChanged:" : "mad 5/15/2024 21:20",
"refName:" : "mad 6/3/2023 14:17",
Expand Down
Empty file added src/Squot-Core.package/SquotPendingChanges.class/README.md
View file
Empty file.
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/alwaysMaterialize.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
alwaysMaterialize
self shouldAlwaysMaterialize: true.
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/alwaysOpenDialog.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
alwaysOpenDialog
self shouldAlwaysOpenDialog: true.
6 changes: 6 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/basicCommit.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
actions-private
basicCommit
self workingCopy
commitChangeSets: self changeSets
message: self message
parents: self parents.
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/basicMaterialize.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
actions-private
basicMaterialize
self workingCopy materializeChangeSets: self changeSets.
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/basicWindowTitle.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
basicWindowTitle
^ windowTitle
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/changeSets..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
changeSets: aCollection
changeSets := aCollection
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/changeSets.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
changeSets
^ changeSets
5 changes: 5 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/checkHasConflictsWhile..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
checks
checkHasConflictsWhile: aString
self hasConflicts ifFalse: [^ false].
self inform: ('There are conflicts. Please resolve them before {1}. Aborting.' format: {aString}).
^ true
5 changes: 5 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/checkIsAtOriginalHeadCommit.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
checks
checkIsAtOriginalHeadCommit
self isAtOriginalHeadCommit ifTrue: [^ true].
self inform: 'These changes are outdated. Aborting.'.
^ false
5 changes: 5 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/checkIsMessageEmpty.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
checks
checkIsMessageEmpty
self isMessageEmpty ifFalse: [^ false].
self inform: 'Empty message, aborting.'.
^ true
5 changes: 5 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/commit.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
actions
commit
(self isMerge not and: [self isEmpty]) ifTrue: [^ self nothingToCommit].
self shouldOpenDialog ifTrue: [^ self openDialogToCommit].
^ self commitNow
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/commitActionName.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
commitActionName
^ self isMerge ifTrue: ['merging'] ifFalse: ['committing']
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/commitButtonLabel.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
commitButtonLabel
^ self isMerge ifTrue: ['Merge'] ifFalse: ['Commit']
6 changes: 6 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/commitNow.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
actions-private
commitNow
^ self
basicCommit;
materializeIfNecessary;
done
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/currentHeadCommit.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
currentHeadCommit
^ self workingCopy headCommit
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/dialog..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
dialog: aChangesDialog
dialog := aChangesDialog
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/dialog.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
dialog
^ dialog
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/doAmend.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
configuring
doAmend
self parents: self originalHeadCommit parents.
5 changes: 5 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/doMerge..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
configuring
doMerge: aCommit
self
parents: {self originalHeadCommit. aCommit};
alwaysMaterialize.
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/doRegularCommit.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
configuring
doRegularCommit
self parents: {self originalHeadCommit}.
5 changes: 5 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/done.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
actions-private
done
self dialog ifNotNil: #close.
self promise resolveWith: nil.
^ self promise
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/hasConflicts.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
testing
hasConflicts
^ self changeSets anySatisfy: #hasConflicts
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/initialMessage..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
initialMessage: aString
initialMessage := aString
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/initialMessage.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
initialMessage
^ initialMessage
6 changes: 6 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/initialize.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
initialize-release
initialize
super initialize.
self
shouldAlwaysOpenDialog: false;
shouldAlwaysMaterialize: false.
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/isAtOriginalHeadCommit.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
testing
isAtOriginalHeadCommit
^ self currentHeadCommit = self originalHeadCommit
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/isMerge.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
testing
isMerge
^ self parents size > 1
5 changes: 5 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/materialize.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
actions
materialize
self isEmpty ifTrue: [^ self nothingToMaterialize].
self shouldOpenDialog ifTrue: [^ self openDialogToMaterialize].
^ self materializeNow
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/materializeIfNecessary.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
actions-private
materializeIfNecessary
self shouldMaterialize ifTrue: [self basicMaterialize].
6 changes: 6 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/materializeNow.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
actions-private
materializeNow
self assert: self hasConflicts not.
^ self
basicMaterialize;
done
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/message.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
message
^ self dialog ifNotNil: #message ifNil: [self initialMessage]
4 changes: 4 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/nothingToCommit.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
actions-private
nothingToCommit
self inform: 'Nothing to commit.'.
^ self done
4 changes: 4 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/nothingToMaterialize.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
actions-private
nothingToMaterialize
self inform: 'No changes to load.'.
^ self done
9 changes: 9 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/openDialog.action.label..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
actions-private
openDialog: aChangesDialogClass action: aBlock label: aString
self dialog: (aChangesDialogClass onChangeSets: self changeSets).
self dialog
windowTitle: self windowTitle;
addCloseButton: 'Cancel';
addButton: aString action: aBlock;
open.
^ self promise
8 changes: 8 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/openDialogToCommit.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
actions-private
openDialogToCommit
self
openDialog: SquotChangesDialogWithMessage
action: [self postDialogCommit]
label: self commitButtonLabel.
self dialog message: self initialMessage.
^ self promise
6 changes: 6 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/openDialogToMaterialize.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
actions-private
openDialogToMaterialize
^ self
openDialog: SquotChangesDialog
action: [self postDialogMaterialize]
label: 'Load changes'.
3 changes: 3 additions & 0 deletions src/Squot-Core.package/SquotPendingChanges.class/instance/originalHeadCommit..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
originalHeadCommit: aCommit
originalHeadCommit := aCommit
Loading

0 comments on commit bc02589

Please sign in to comment.