From 6cbb37ea990cde83cd4383f38e37b70323b797ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= Date: Mon, 7 Oct 2024 19:35:53 +0200 Subject: [PATCH] Recategorize methods --- .../changeSetToMergeAssetFile.into.withBase..st | 2 +- .../changeSetToMergeFSCommit.into.withBase..st | 2 +- .../changeSetToMergeFSCommit.into.withBase..st | 2 +- .../changeSetsToMergeCommit.into.withBase..st | 2 +- .../changeSetsToMergeCommitIntoHead.withBase..st | 2 +- .../changeSetsToMergeFSCommit.into.withBase..st | 2 +- .../instance/commitChangeSets.message.parents..st | 13 +++++++++++++ .../commitChangeSets.onCommit.message.parents..st | 12 ++++++++++++ .../SquotGitWorkingCopy.class/methodProperties.json | 2 ++ .../changeSetToMergeFSCommit.into.withBase..st | 2 +- .../changeSetToMergeFSCommit.into.withBase..st | 2 +- ...MergeMetadata.into.withBase.mappersChangeSet..st | 2 +- .../instance/changeSetToMergeName.into.withBase..st | 2 +- .../changeSetsToMergeFSCommit.into.withBase.in..st | 2 +- .../instance/sources.at..st | 2 +- .../changeSetToMergeAssetFile.into.withBase..st | 2 +- 16 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 src/Squot-Core.package/SquotGitWorkingCopy.class/instance/commitChangeSets.message.parents..st create mode 100644 src/Squot-Core.package/SquotGitWorkingCopy.class/instance/commitChangeSets.onCommit.message.parents..st diff --git a/src/Squot-Core.package/SquotAssetMapper.class/instance/changeSetToMergeAssetFile.into.withBase..st b/src/Squot-Core.package/SquotAssetMapper.class/instance/changeSetToMergeAssetFile.into.withBase..st index ed37855e9..12bde1263 100644 --- a/src/Squot-Core.package/SquotAssetMapper.class/instance/changeSetToMergeAssetFile.into.withBase..st +++ b/src/Squot-Core.package/SquotAssetMapper.class/instance/changeSetToMergeAssetFile.into.withBase..st @@ -1,4 +1,4 @@ -merging +changes-creation changeSetToMergeAssetFile: right into: left withBase: base ^ SquotMergeUtilities atomicMergeLeft: left diff --git a/src/Squot-Core.package/SquotAssetMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st b/src/Squot-Core.package/SquotAssetMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st index 704642717..f02984d9b 100644 --- a/src/Squot-Core.package/SquotAssetMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st +++ b/src/Squot-Core.package/SquotAssetMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st @@ -1,4 +1,4 @@ -merging +changes-creation changeSetToMergeFSCommit: rightFSCommit into: leftFSCommit withBase: baseFSCommit | left right base | SquotMergeUtilities diff --git a/src/Squot-Core.package/SquotCodeMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st b/src/Squot-Core.package/SquotCodeMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st index 2d751e9bd..eb8f44c6f 100644 --- a/src/Squot-Core.package/SquotCodeMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st +++ b/src/Squot-Core.package/SquotCodeMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st @@ -1,4 +1,4 @@ -merging +changes-creation changeSetToMergeFSCommit: rightFSCommit into: leftFSCommit withBase: baseFSCommit | merger | SquotMergeUtilities diff --git a/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeCommit.into.withBase..st b/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeCommit.into.withBase..st index 808f63945..37d81e1b1 100644 --- a/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeCommit.into.withBase..st +++ b/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeCommit.into.withBase..st @@ -1,4 +1,4 @@ -git-operations +changes-creation changeSetsToMergeCommit: rightCommit into: leftCommit withBase: baseCommit ^ self changeSetsToMergeFSCommit: (self fsCommitFrom: rightCommit) diff --git a/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeCommitIntoHead.withBase..st b/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeCommitIntoHead.withBase..st index ccd54b6ec..8a09d1df6 100644 --- a/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeCommitIntoHead.withBase..st +++ b/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeCommitIntoHead.withBase..st @@ -1,4 +1,4 @@ -git-operations +changes-creation changeSetsToMergeCommitIntoHead: rightCommit withBase: baseCommit ^ self changeSetsToMergeCommit: rightCommit diff --git a/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeFSCommit.into.withBase..st b/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeFSCommit.into.withBase..st index a999b57af..79b42d5f1 100644 --- a/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeFSCommit.into.withBase..st +++ b/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/changeSetsToMergeFSCommit.into.withBase..st @@ -1,4 +1,4 @@ -git-operations +changes-creation changeSetsToMergeFSCommit: rightFSCommit into: leftFSCommit withBase: baseFSCommit ^ self metadataMapper changeSetsToMergeFSCommit: rightFSCommit diff --git a/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/commitChangeSets.message.parents..st b/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/commitChangeSets.message.parents..st new file mode 100644 index 000000000..f436bab35 --- /dev/null +++ b/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/commitChangeSets.message.parents..st @@ -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] \ No newline at end of file diff --git a/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/commitChangeSets.onCommit.message.parents..st b/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/commitChangeSets.onCommit.message.parents..st new file mode 100644 index 000000000..9177ba6c6 --- /dev/null +++ b/src/Squot-Core.package/SquotGitWorkingCopy.class/instance/commitChangeSets.onCommit.message.parents..st @@ -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 \ No newline at end of file diff --git a/src/Squot-Core.package/SquotGitWorkingCopy.class/methodProperties.json b/src/Squot-Core.package/SquotGitWorkingCopy.class/methodProperties.json index c48efea20..8583afd10 100644 --- a/src/Squot-Core.package/SquotGitWorkingCopy.class/methodProperties.json +++ b/src/Squot-Core.package/SquotGitWorkingCopy.class/methodProperties.json @@ -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", diff --git a/src/Squot-Core.package/SquotMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st b/src/Squot-Core.package/SquotMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st index 187b17260..d6df9fb63 100644 --- a/src/Squot-Core.package/SquotMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st +++ b/src/Squot-Core.package/SquotMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st @@ -1,3 +1,3 @@ -merging +changes-creation changeSetToMergeFSCommit: rightFSCommit into: leftFSCommit withBase: baseFSCommit self subclassResponsibility. \ No newline at end of file diff --git a/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st b/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st index 878b0e63b..e90596302 100644 --- a/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st +++ b/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeFSCommit.into.withBase..st @@ -1,3 +1,3 @@ -merging +changes-creation changeSetToMergeFSCommit: rightFSCommit into: leftFSCommit withBase: baseFSCommit self shouldNotImplement. \ No newline at end of file diff --git a/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeMetadata.into.withBase.mappersChangeSet..st b/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeMetadata.into.withBase.mappersChangeSet..st index 5f388a82e..57bdb0675 100644 --- a/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeMetadata.into.withBase.mappersChangeSet..st +++ b/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeMetadata.into.withBase.mappersChangeSet..st @@ -1,4 +1,4 @@ -merging +changes-creation changeSetToMergeMetadata: rightMetadata into: leftMetadata withBase: baseMetadata mappersChangeSet: aChangeSet | nameChangeSet | nameChangeSet := self diff --git a/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeName.into.withBase..st b/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeName.into.withBase..st index 224059a71..697cb85f4 100644 --- a/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeName.into.withBase..st +++ b/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetToMergeName.into.withBase..st @@ -1,4 +1,4 @@ -merging +changes-creation changeSetToMergeName: rightString into: leftString withBase: baseString ^ SquotMergeUtilities atomicMergeLeft: leftString diff --git a/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetsToMergeFSCommit.into.withBase.in..st b/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetsToMergeFSCommit.into.withBase.in..st index e7ccd699f..1df279162 100644 --- a/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetsToMergeFSCommit.into.withBase.in..st +++ b/src/Squot-Core.package/SquotMetadataMapper.class/instance/changeSetsToMergeFSCommit.into.withBase.in..st @@ -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. diff --git a/src/Squot-Core.package/SquotMultitextChange.class/instance/sources.at..st b/src/Squot-Core.package/SquotMultitextChange.class/instance/sources.at..st index ef08bc95f..2db9257a7 100644 --- a/src/Squot-Core.package/SquotMultitextChange.class/instance/sources.at..st +++ b/src/Squot-Core.package/SquotMultitextChange.class/instance/sources.at..st @@ -1,3 +1,3 @@ -merging +accessing sources: aCollectionOrNil at: aNumber ^ aCollectionOrNil ifNil: [''] ifNotNil: [aCollectionOrNil at: aNumber] \ No newline at end of file diff --git a/src/Squot-Core.package/SquotPlaintextMapper.class/instance/changeSetToMergeAssetFile.into.withBase..st b/src/Squot-Core.package/SquotPlaintextMapper.class/instance/changeSetToMergeAssetFile.into.withBase..st index ada342789..bbf2e37d8 100644 --- a/src/Squot-Core.package/SquotPlaintextMapper.class/instance/changeSetToMergeAssetFile.into.withBase..st +++ b/src/Squot-Core.package/SquotPlaintextMapper.class/instance/changeSetToMergeAssetFile.into.withBase..st @@ -1,4 +1,4 @@ -merging +changes-creation changeSetToMergeAssetFile: right into: left withBase: base ^ SquotMergeUtilities stringOrNilMergeLeft: (left ifNotNil: #asset)