From 3969d1a2d5f1c28fc7f95aeb37a887426018ec27 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 1 Aug 2024 13:54:09 +0200 Subject: [PATCH] Remove dead code from Iceberg Mostly code extending Monticello that is dead --- Iceberg/IceMetacelloRepositoryAdapter.class.st | 12 ------------ Iceberg/IcePackage.class.st | 6 ------ Iceberg/MCAddition.extension.st | 7 ------- Iceberg/MCDefinition.extension.st | 5 ----- Iceberg/MCGitHubRepository.extension.st | 6 ------ Iceberg/MCModification.extension.st | 15 --------------- Iceberg/MCOrganizationDefinition.extension.st | 11 ----------- Iceberg/MCPatchOperation.extension.st | 13 ------------- Iceberg/MCPostscriptDefinition.extension.st | 6 ------ Iceberg/MCRemoval.extension.st | 7 ------- Iceberg/MCRepository.extension.st | 6 ------ Iceberg/MCVersion.extension.st | 6 ------ Iceberg/MCWorkingCopy.extension.st | 17 ----------------- 13 files changed, 117 deletions(-) delete mode 100644 Iceberg/MCAddition.extension.st delete mode 100644 Iceberg/MCModification.extension.st delete mode 100644 Iceberg/MCOrganizationDefinition.extension.st delete mode 100644 Iceberg/MCPatchOperation.extension.st delete mode 100644 Iceberg/MCPostscriptDefinition.extension.st delete mode 100644 Iceberg/MCRemoval.extension.st delete mode 100644 Iceberg/MCRepository.extension.st delete mode 100644 Iceberg/MCVersion.extension.st diff --git a/Iceberg/IceMetacelloRepositoryAdapter.class.st b/Iceberg/IceMetacelloRepositoryAdapter.class.st index e7257b660a..d976fe4f05 100644 --- a/Iceberg/IceMetacelloRepositoryAdapter.class.st +++ b/Iceberg/IceMetacelloRepositoryAdapter.class.st @@ -47,12 +47,6 @@ IceMetacelloRepositoryAdapter >> canUpgradeTo: anMCGitBasedRepository [ and: [ self repoPath = anMCGitBasedRepository repoPath and: [ self projectVersion = anMCGitBasedRepository projectVersion ]] ] -{ #category : 'accessing' } -IceMetacelloRepositoryAdapter >> commitIdFor: aWorkingCopy ifFound: aBlock [ - - self flag: #pharoTodo. "Do nothing?" -] - { #category : 'accessing' } IceMetacelloRepositoryAdapter >> description [ @@ -95,12 +89,6 @@ IceMetacelloRepositoryAdapter >> hash [ ^ self description hash ] -{ #category : 'compatibility' } -IceMetacelloRepositoryAdapter >> isCache [ - "User for Kommiter and Versionner" - ^ false -] - { #category : 'compatibility' } IceMetacelloRepositoryAdapter >> isRemote [ "User for Komitter" diff --git a/Iceberg/IcePackage.class.st b/Iceberg/IcePackage.class.st index eab1f1a677..0be1a96e02 100644 --- a/Iceberg/IcePackage.class.st +++ b/Iceberg/IcePackage.class.st @@ -70,12 +70,6 @@ IcePackage >> currentCommits [ ^ workingCopy referenceCommits ] -{ #category : 'accessing' } -IcePackage >> directoryName [ - - ^ self repository directoryNameForPackage: self -] - { #category : 'comparing' } IcePackage >> hash [ ^ self name hash diff --git a/Iceberg/MCAddition.extension.st b/Iceberg/MCAddition.extension.st deleted file mode 100644 index ea963353cb..0000000000 --- a/Iceberg/MCAddition.extension.st +++ /dev/null @@ -1,7 +0,0 @@ -Extension { #name : 'MCAddition' } - -{ #category : '*Iceberg-Changes' } -MCAddition >> myVersionOn: aDiff [ - - ^ aDiff versionFromDefinition: definition -] diff --git a/Iceberg/MCDefinition.extension.st b/Iceberg/MCDefinition.extension.st index 3ad3333f24..cdd51ddbd9 100644 --- a/Iceberg/MCDefinition.extension.st +++ b/Iceberg/MCDefinition.extension.st @@ -1,10 +1,5 @@ Extension { #name : 'MCDefinition' } -{ #category : '*Iceberg-Changes' } -MCDefinition >> addAnalysisToPackageChangeSet: aPackageChangeSet change: aChange [ - aPackageChangeSet addChange: aChange -] - { #category : '*Iceberg-changes' } MCDefinition >> isFileDefinition [ diff --git a/Iceberg/MCGitHubRepository.extension.st b/Iceberg/MCGitHubRepository.extension.st index 0c6f750239..37e4d65592 100644 --- a/Iceberg/MCGitHubRepository.extension.st +++ b/Iceberg/MCGitHubRepository.extension.st @@ -18,12 +18,6 @@ MCGitHubRepository class >> commitIdFor: aWorkingCopy [ ] -{ #category : '*Iceberg-Adapters' } -MCGitHubRepository >> commitIdFor: aMCWorkingCopy ifFound: aBlockClosure [ - (aMCWorkingCopy repositoryGroup includes: self) - ifTrue: [ aBlockClosure value: self commitId ] -] - { #category : '*Iceberg-Adapters' } MCGitHubRepository >> httpsUrl [ ^ 'https://github.com/', projectPath, '.git' diff --git a/Iceberg/MCModification.extension.st b/Iceberg/MCModification.extension.st deleted file mode 100644 index fc5f066656..0000000000 --- a/Iceberg/MCModification.extension.st +++ /dev/null @@ -1,15 +0,0 @@ -Extension { #name : 'MCModification' } - -{ #category : '*Iceberg-Changes' } -MCModification >> asIceOperationOn: aNode diff: anIceDiff [ - - ^ MCModification - of: aNode - to: aNode -] - -{ #category : '*Iceberg-Changes' } -MCModification >> myVersionOn: aDiff [ - - ^ aDiff versionFromDefinition: modification -] diff --git a/Iceberg/MCOrganizationDefinition.extension.st b/Iceberg/MCOrganizationDefinition.extension.st deleted file mode 100644 index 16ee3d611a..0000000000 --- a/Iceberg/MCOrganizationDefinition.extension.st +++ /dev/null @@ -1,11 +0,0 @@ -Extension { #name : 'MCOrganizationDefinition' } - -{ #category : '*Iceberg-Changes' } -MCOrganizationDefinition >> addAnalysisToPackageChangeSet: aPackageChangeSet change: aChange [ - aPackageChangeSet addOrganisationChange: aChange -] - -{ #category : '*Iceberg-Core' } -MCOrganizationDefinition >> iceClass [ - ^ nil -] diff --git a/Iceberg/MCPatchOperation.extension.st b/Iceberg/MCPatchOperation.extension.st deleted file mode 100644 index 98247cd427..0000000000 --- a/Iceberg/MCPatchOperation.extension.st +++ /dev/null @@ -1,13 +0,0 @@ -Extension { #name : 'MCPatchOperation' } - -{ #category : '*Iceberg-Changes' } -MCPatchOperation >> asIceOperationOn: aNode diff: anIceDiff [ - - ^ MCAddition of: aNode -] - -{ #category : '*Iceberg-Changes' } -MCPatchOperation >> myVersionOn: aDiff [ - - self subclassResponsibility -] diff --git a/Iceberg/MCPostscriptDefinition.extension.st b/Iceberg/MCPostscriptDefinition.extension.st deleted file mode 100644 index 738352dab2..0000000000 --- a/Iceberg/MCPostscriptDefinition.extension.st +++ /dev/null @@ -1,6 +0,0 @@ -Extension { #name : 'MCPostscriptDefinition' } - -{ #category : '*Iceberg-Changes' } -MCPostscriptDefinition >> addToPackageChangeSet: anIcePackageChangeSet [ - "By doing nothing, this definition will not be shown in the changes tree." -] diff --git a/Iceberg/MCRemoval.extension.st b/Iceberg/MCRemoval.extension.st deleted file mode 100644 index c369ece39b..0000000000 --- a/Iceberg/MCRemoval.extension.st +++ /dev/null @@ -1,7 +0,0 @@ -Extension { #name : 'MCRemoval' } - -{ #category : '*Iceberg-Changes' } -MCRemoval >> myVersionOn: aDiff [ - - ^ nil -] diff --git a/Iceberg/MCRepository.extension.st b/Iceberg/MCRepository.extension.st deleted file mode 100644 index 868ca6e212..0000000000 --- a/Iceberg/MCRepository.extension.st +++ /dev/null @@ -1,6 +0,0 @@ -Extension { #name : 'MCRepository' } - -{ #category : '*Iceberg-Adapters' } -MCRepository >> commitIdFor: aMCWorkingCopy ifFound: aBlockClosure [ - "Do nothing. By default MCRepositories can not provide a commitId for you." -] diff --git a/Iceberg/MCVersion.extension.st b/Iceberg/MCVersion.extension.st deleted file mode 100644 index c5c6b51a60..0000000000 --- a/Iceberg/MCVersion.extension.st +++ /dev/null @@ -1,6 +0,0 @@ -Extension { #name : 'MCVersion' } - -{ #category : '*Iceberg-Adapters' } -MCVersion >> directoryName [ - ^ (MCFileTreeRepository parseName: self info name) first , '.package' -] diff --git a/Iceberg/MCWorkingCopy.extension.st b/Iceberg/MCWorkingCopy.extension.st index 0f5ad52273..71f7f3156c 100644 --- a/Iceberg/MCWorkingCopy.extension.st +++ b/Iceberg/MCWorkingCopy.extension.st @@ -1,23 +1,6 @@ Extension { #name : 'MCWorkingCopy' } -{ #category : '*Iceberg' } -MCWorkingCopy >> ancestry: anAncestry [ - - ancestry := anAncestry -] - { #category : '*Iceberg' } MCWorkingCopy >> info [ ^ self versionInfo ] - -{ #category : '*Iceberg-Adapters' } -MCWorkingCopy >> loadedVersion [ - self ancestors do: [ :ancestor | - (self repositoryGroup - versionWithInfo: ancestor - ifNone: [ MCRepositoryGroup default versionWithInfo: ancestor ifNone: [] ]) - ifNotNil: [ :version | ^ version ] - ]. - -]