Skip to content

Commit

Permalink
Recategorize methods
Browse files Browse the repository at this point in the history
  • Loading branch information
@MariusDoe
MariusDoe committed Oct 7, 2024
1 parent d66e29c commit 6cbb37e
Show file tree
Hide file tree
Showing 16 changed files with 40 additions and 13 deletions.
2 changes: 1 addition & 1 deletion ...-Core.package/SquotAssetMapper.class/instance/changeSetToMergeAssetFile.into.withBase..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
merging
changes-creation
changeSetToMergeAssetFile: right into: left withBase: base
^ SquotMergeUtilities
atomicMergeLeft: left
Expand Down
2 changes: 1 addition & 1 deletion ...t-Core.package/SquotAssetMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
merging
changes-creation
changeSetToMergeFSCommit: rightFSCommit into: leftFSCommit withBase: baseFSCommit
| left right base |
SquotMergeUtilities
Expand Down
2 changes: 1 addition & 1 deletion ...ot-Core.package/SquotCodeMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
merging
changes-creation
changeSetToMergeFSCommit: rightFSCommit into: leftFSCommit withBase: baseFSCommit
| merger |
SquotMergeUtilities
Expand Down
2 changes: 1 addition & 1 deletion ...Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeCommit.into.withBase..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
git-operations
changes-creation
changeSetsToMergeCommit: rightCommit into: leftCommit withBase: baseCommit
^ self
changeSetsToMergeFSCommit: (self fsCommitFrom: rightCommit)
Expand Down
2 changes: 1 addition & 1 deletion ...e.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeCommitIntoHead.withBase..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
git-operations
changes-creation
changeSetsToMergeCommitIntoHead: rightCommit withBase: baseCommit
^ self
changeSetsToMergeCommit: rightCommit
Expand Down
2 changes: 1 addition & 1 deletion ...re.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeFSCommit.into.withBase..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
git-operations
changes-creation
changeSetsToMergeFSCommit: rightFSCommit into: leftFSCommit withBase: baseFSCommit
^ self metadataMapper
changeSetsToMergeFSCommit: rightFSCommit
Expand Down
13 changes: 13 additions & 0 deletions ...quot-Core.package/SquotGitWorkingCopy.class/instance/commitChangeSets.message.parents..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
git-operations
commitChangeSets: aCollection
message: aString
parents: anotherCollection
^ self withUnitOfWork: [
| newCommit |
newCommit := self
commitChangeSets: aCollection
onCommit: self headCommit
message: aString
parents: anotherCollection.
self updateHeadRefToNewCommit: newCommit.
newCommit]
12 changes: 12 additions & 0 deletions ....package/SquotGitWorkingCopy.class/instance/commitChangeSets.onCommit.message.parents..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
changes-operations
commitChangeSets: aCollection
onCommit: aCommitOrNil
message: aString
parents: anotherCollection
| fileSystem |
fileSystem := self serializeChangeSets: aCollection onCommit: aCommitOrNil.
^ fileSystem prepareNewCommit
message: aString withUnixLineEndings;
parents: (anotherCollection collect: #asHexHash);
store;
yourself
2 changes: 2 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 @@ -43,7 +43,9 @@
"clearLastImageHashForMigration" : "mad 11/29/2023 15:08",
"cloneFrom:" : "mad 5/23/2024 21:00",
"commitChangeSets:message:additionalParents:onlyAdditionalParents:" : "mad 4/29/2024 20:55",
"commitChangeSets:message:parents:" : "mad 10/7/2024 15:53",
"commitChangeSets:onCommit:message:additionalParents:onlyAdditionalParents:" : "mad 10/4/2024 20:35",
"commitChangeSets:onCommit:message:parents:" : "mad 10/7/2024 15:54",
"computeRefsForCommits" : "mad 9/11/2023 16:47",
"createBranchNamed:at:" : "mad 10/16/2023 21:32",
"credentials" : "mad 9/18/2023 12:52",
Expand Down
2 changes: 1 addition & 1 deletion src/Squot-Core.package/SquotMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
merging
changes-creation
changeSetToMergeFSCommit: rightFSCommit into: leftFSCommit withBase: baseFSCommit
self subclassResponsibility.
2 changes: 1 addition & 1 deletion ...ore.package/SquotMetadataMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
merging
changes-creation
changeSetToMergeFSCommit: rightFSCommit into: leftFSCommit withBase: baseFSCommit
self shouldNotImplement.
2 changes: 1 addition & 1 deletion ...MetadataMapper.class/instance/changeSetToMergeMetadata.into.withBase.mappersChangeSet..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
merging
changes-creation
changeSetToMergeMetadata: rightMetadata into: leftMetadata withBase: baseMetadata mappersChangeSet: aChangeSet
| nameChangeSet |
nameChangeSet := self
Expand Down
2 changes: 1 addition & 1 deletion ...ot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeName.into.withBase..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
merging
changes-creation
changeSetToMergeName: rightString into: leftString withBase: baseString
^ SquotMergeUtilities
atomicMergeLeft: leftString
Expand Down
2 changes: 1 addition & 1 deletion ...package/SquotMetadataMapper.class/instance/changeSetsToMergeFSCommit.into.withBase.in..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
merging
changes-creation
changeSetsToMergeFSCommit: rightFSCommit into: leftFSCommit withBase: baseFSCommit in: aWorkingCopy
| emptyCommit commits metadataForCommits commitsForMappers potentiallyRemovedMappers mapperChangeSets mappersChangeSet metadataChangeSet |
emptyCommit := aWorkingCopy emptyCommit.
Expand Down
2 changes: 1 addition & 1 deletion src/Squot-Core.package/SquotMultitextChange.class/instance/sources.at..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
merging
accessing
sources: aCollectionOrNil at: aNumber
^ aCollectionOrNil ifNil: [''] ifNotNil: [aCollectionOrNil at: aNumber]
2 changes: 1 addition & 1 deletion ...e.package/SquotPlaintextMapper.class/instance/changeSetToMergeAssetFile.into.withBase..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
merging
changes-creation
changeSetToMergeAssetFile: right into: left withBase: base
^ SquotMergeUtilities
stringOrNilMergeLeft: (left ifNotNil: #asset)
Expand Down

0 comments on commit 6cbb37e

Please sign in to comment.