-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add GSChangesTo{Show,Materialize,Commit}
- Loading branch information
Showing
89 changed files
with
435 additions
and
0 deletions.
There are no files selected for viewing
Empty file.
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/actionLabel.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| actionLabel | ||
| ^ self isMerge ifTrue: ['Merge'] ifFalse: ['Commit'] |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/actionLabelInIngForm.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| actionLabelInIngForm | ||
| ^ self isMerge ifTrue: ['merging'] ifFalse: ['committing'] |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/alwaysMaterialize.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| alwaysMaterialize | ||
| self shouldAlwaysMaterialize: true. |
6 changes: 6 additions & 0 deletions
6
src/GitS-Core.package/GSChangesToCommit.class/instance/basicCommit.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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. |
5 changes: 5 additions & 0 deletions
5
src/GitS-Core.package/GSChangesToCommit.class/instance/basicRunNow.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| actions-private | ||
| basicRunNow | ||
| self | ||
| basicCommit; | ||
| materializeIfNecessary. |
4 changes: 4 additions & 0 deletions
4
src/GitS-Core.package/GSChangesToCommit.class/instance/beforeDialogOpen.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| actions-private | ||
| beforeDialogOpen | ||
| super beforeDialogOpen. | ||
| self dialog message: self initialMessage. |
5 changes: 5 additions & 0 deletions
5
src/GitS-Core.package/GSChangesToCommit.class/instance/checkIsAtOriginalHeadCommit.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| checking | ||
| checkIsAtOriginalHeadCommit | ||
| self isAtOriginalHeadCommit ifTrue: [^ true]. | ||
| self inform: 'These changes are outdated. Aborting.'. | ||
| ^ false |
5 changes: 5 additions & 0 deletions
5
src/GitS-Core.package/GSChangesToCommit.class/instance/checkIsMessageEmpty.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| checking | ||
| checkIsMessageEmpty | ||
| self isMessageEmpty ifFalse: [^ false]. | ||
| self inform: 'Empty message, aborting.'. | ||
| ^ true |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/commit.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| actions | ||
| commit | ||
| ^ self runAs: GSChangesToCommit |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/currentHeadCommit.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| currentHeadCommit | ||
| ^ self workingCopy headCommit |
6 changes: 6 additions & 0 deletions
6
src/GitS-Core.package/GSChangesToCommit.class/instance/dialogAction.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| actions-private | ||
| dialogAction | ||
| self checkIsAtOriginalHeadCommit ifFalse: [^ self]. | ||
| self checkHasConflicts ifTrue: [^ self]. | ||
| self checkIsMessageEmpty ifTrue: [^ self]. | ||
| self runNow. |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/dialogClass.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| dialogClass | ||
| ^ GSChangesDialogWithMessage |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/doAmend.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
5
src/GitS-Core.package/GSChangesToCommit.class/instance/doMerge..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
3
src/GitS-Core.package/GSChangesToCommit.class/instance/doRegularCommit.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| configuring | ||
| doRegularCommit | ||
| self parents: {self originalHeadCommit}. |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/initialMessage..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
3
src/GitS-Core.package/GSChangesToCommit.class/instance/initialMessage.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| initialMessage | ||
| ^ initialMessage |
4 changes: 4 additions & 0 deletions
4
src/GitS-Core.package/GSChangesToCommit.class/instance/initialize.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| initialize-release | ||
| initialize | ||
| super initialize. | ||
| self shouldAlwaysMaterialize: false. |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/isAtOriginalHeadCommit.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
3
src/GitS-Core.package/GSChangesToCommit.class/instance/isEmpty.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| testing | ||
| isEmpty | ||
| ^ self isMerge not and: [super isEmpty] |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/isMerge.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| testing | ||
| isMerge | ||
| ^ self parents size > 1 |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/isMessageEmpty.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| testing | ||
| isMessageEmpty | ||
| ^ self message isEmpty |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/materializeIfNecessary.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| actions-private | ||
| materializeIfNecessary | ||
| self shouldMaterialize ifTrue: [self basicMaterialize]. |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/message.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| message | ||
| ^ self dialog ifNotNil: #message ifNil: [self initialMessage] |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/nothingToDoMessage.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| nothingToDoMessage | ||
| ^ 'No changes to {1}.' format: {self actionLabel withFirstCharacterDownshifted} |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/originalHeadCommit..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| originalHeadCommit: aCommit | ||
| originalHeadCommit := aCommit |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/originalHeadCommit.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| originalHeadCommit | ||
| ^ originalHeadCommit |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/parents..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| parents: aCollection | ||
| parents := aCollection |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/parents.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| parents | ||
| ^ parents |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/shouldAlwaysMaterialize..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| shouldAlwaysMaterialize: aBoolean | ||
| shouldAlwaysMaterialize := aBoolean |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToCommit.class/instance/shouldAlwaysMaterialize.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| shouldAlwaysMaterialize | ||
| ^ shouldAlwaysMaterialize |
6 changes: 6 additions & 0 deletions
6
src/GitS-Core.package/GSChangesToCommit.class/instance/shouldMaterialize.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| testing | ||
| shouldMaterialize | ||
| self shouldAlwaysMaterialize ifTrue: [^ true]. | ||
| self dialog ifNil: [^ false]. | ||
| self dialog wasEdited ifFalse: [^ false]. | ||
| ^ self confirm: 'You edited some changes. Do you wish to load them into the image?' |
6 changes: 6 additions & 0 deletions
6
src/GitS-Core.package/GSChangesToCommit.class/instance/workingCopy..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| accessing | ||
| workingCopy: aWorkingCopy | ||
| super workingCopy: aWorkingCopy. | ||
| self | ||
| originalHeadCommit: self currentHeadCommit; | ||
| doRegularCommit. |
37 changes: 37 additions & 0 deletions
37
src/GitS-Core.package/GSChangesToCommit.class/methodProperties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| { | ||
| "class" : { | ||
| }, | ||
| "instance" : { | ||
| "actionLabel" : "mad 10/8/2024 21:21", | ||
| "actionLabelInIngForm" : "mad 10/8/2024 21:21", | ||
| "alwaysMaterialize" : "mad 10/8/2024 21:22", | ||
| "basicCommit" : "mad 10/8/2024 21:14", | ||
| "basicRunNow" : "mad 10/8/2024 21:14", | ||
| "beforeDialogOpen" : "mad 10/8/2024 21:28", | ||
| "checkIsAtOriginalHeadCommit" : "mad 10/8/2024 21:20", | ||
| "checkIsMessageEmpty" : "mad 10/8/2024 21:20", | ||
| "commit" : "mad 10/8/2024 21:22", | ||
| "currentHeadCommit" : "mad 10/8/2024 21:32", | ||
| "dialogAction" : "mad 10/8/2024 21:24", | ||
| "dialogClass" : "mad 10/9/2024 14:51", | ||
| "doAmend" : "mad 10/8/2024 21:31", | ||
| "doMerge:" : "mad 10/8/2024 21:31", | ||
| "doRegularCommit" : "mad 10/8/2024 21:31", | ||
| "initialMessage" : "mad 10/8/2024 21:15", | ||
| "initialMessage:" : "mad 10/8/2024 21:22", | ||
| "initialize" : "mad 10/8/2024 21:31", | ||
| "isAtOriginalHeadCommit" : "mad 10/8/2024 21:30", | ||
| "isEmpty" : "mad 10/8/2024 21:12", | ||
| "isMerge" : "mad 10/8/2024 21:13", | ||
| "isMessageEmpty" : "mad 10/9/2024 14:52", | ||
| "materializeIfNecessary" : "mad 10/8/2024 21:14", | ||
| "message" : "mad 10/8/2024 21:26", | ||
| "nothingToDoMessage" : "mad 10/8/2024 21:13", | ||
| "originalHeadCommit" : "mad 10/8/2024 21:16", | ||
| "originalHeadCommit:" : "mad 10/8/2024 21:22", | ||
| "parents" : "mad 10/8/2024 21:15", | ||
| "parents:" : "mad 10/8/2024 21:22", | ||
| "shouldAlwaysMaterialize" : "mad 10/8/2024 21:15", | ||
| "shouldAlwaysMaterialize:" : "mad 10/8/2024 21:22", | ||
| "shouldMaterialize" : "mad 10/8/2024 21:14", | ||
| "workingCopy:" : "mad 10/8/2024 21:17" } } |
17 changes: 17 additions & 0 deletions
17
src/GitS-Core.package/GSChangesToCommit.class/properties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "category" : "GitS-Core", | ||
| "classinstvars" : [ | ||
| ], | ||
| "classvars" : [ | ||
| ], | ||
| "commentStamp" : "", | ||
| "instvars" : [ | ||
| "initialMessage", | ||
| "parents", | ||
| "originalHeadCommit", | ||
| "shouldAlwaysMaterialize" ], | ||
| "name" : "GSChangesToCommit", | ||
| "pools" : [ | ||
| ], | ||
| "super" : "GSChangesToMaterialize", | ||
| "type" : "normal" } |
Empty file.
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/actionLabel.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| actionLabel | ||
| ^ 'Load changes' |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/actionLabelInIngForm.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| actionLabelInIngForm | ||
| ^ 'loading changes' |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/alwaysOpenDialog.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| alwaysOpenDialog | ||
| self shouldAlwaysOpenDialog: true. |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/basicMaterialize.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/basicRunNow.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| actions-private | ||
| basicRunNow | ||
| self basicMaterialize. |
4 changes: 4 additions & 0 deletions
4
src/GitS-Core.package/GSChangesToMaterialize.class/instance/beforeDialogOpen.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| actions-private | ||
| beforeDialogOpen | ||
| super beforeDialogOpen. | ||
| self dialog addButton: self actionLabel action: [self dialogAction]. |
6 changes: 6 additions & 0 deletions
6
src/GitS-Core.package/GSChangesToMaterialize.class/instance/checkHasConflicts.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| checking | ||
| checkHasConflicts | ||
| self hasConflicts ifFalse: [^ false]. | ||
| self inform: ('There are conflicts. Please resolve them before {1}. Aborting.' | ||
| format: {self actionLabelInIngForm}). | ||
| ^ true |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/closeButtonName.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| closeButtonName | ||
| ^ 'Cancel' |
4 changes: 4 additions & 0 deletions
4
src/GitS-Core.package/GSChangesToMaterialize.class/instance/dialogAction.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| actions-private | ||
| dialogAction | ||
| self checkHasConflicts ifTrue: [^ self]. | ||
| self runNow. |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/hasConflicts.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| testing | ||
| hasConflicts | ||
| ^ self changeSets anySatisfy: #hasConflicts |
4 changes: 4 additions & 0 deletions
4
src/GitS-Core.package/GSChangesToMaterialize.class/instance/initialize.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| initialize-release | ||
| initialize | ||
| super initialize. | ||
| self shouldAlwaysOpenDialog: false. |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/materialize.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| actions | ||
| materialize | ||
| ^ self runAs: GSChangesToMaterialize |
6 changes: 6 additions & 0 deletions
6
src/GitS-Core.package/GSChangesToMaterialize.class/instance/materializeNow.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/nothingToDoMessage.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| nothingToDoMessage | ||
| ^ 'No changes to load.' |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/openDialogToMaterialize.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| actions-private | ||
| openDialogToMaterialize | ||
| ^ self openDialogWithAction: [self postDialogMaterialize] doing: [] |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/openDialogWithAction.doing..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| actions-private | ||
| openDialogWithAction: aBlock doing: anotherBlock | ||
| ^ self openDialogDoing: [self dialog addButton: self actionLabel action: aBlock. anotherBlock value] |
4 changes: 4 additions & 0 deletions
4
src/GitS-Core.package/GSChangesToMaterialize.class/instance/runIfNotEmpty.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| actions-private | ||
| runIfNotEmpty | ||
| self shouldOpenDialog ifTrue: [^ self openDialog]. | ||
| ^ self runNow |
6 changes: 6 additions & 0 deletions
6
src/GitS-Core.package/GSChangesToMaterialize.class/instance/runNow.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| actions-private | ||
| runNow | ||
| ^ self | ||
| assert: self hasConflicts not; | ||
| basicRunNow; | ||
| done |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/shouldAlwaysOpenDialog..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| shouldAlwaysOpenDialog: aBoolean | ||
| shouldAlwaysOpenDialog := aBoolean |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/shouldAlwaysOpenDialog.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| shouldAlwaysOpenDialog | ||
| ^ shouldAlwaysOpenDialog |
4 changes: 4 additions & 0 deletions
4
src/GitS-Core.package/GSChangesToMaterialize.class/instance/shouldOpenDialog.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| testing | ||
| shouldOpenDialog | ||
| self shouldAlwaysOpenDialog ifTrue: [^ true]. | ||
| ^ GSChangeSet anyIncludesConflicts: self changeSets |
5 changes: 5 additions & 0 deletions
5
src/GitS-Core.package/GSChangesToMaterialize.class/instance/windowTitle.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| accessing | ||
| windowTitle | ||
| ^ self shouldAlwaysOpenDialog | ||
| ifTrue: [self basicWindowTitle] | ||
| ifFalse: ['Resolve conflicts to ', self basicWindowTitle withFirstCharacterDownshifted] |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/workingCopy..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| workingCopy: aWorkingCopy | ||
| workingCopy := aWorkingCopy |
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSChangesToMaterialize.class/instance/workingCopy.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| workingCopy | ||
| ^ workingCopy |
Oops, something went wrong.