Merge branch 'Pharo13' into Pharo12

pharo-vcs · Sep 4, 2024 · 55630f0 · 55630f0
2 parents 4a53622 + 2ccf2af
commit 55630f0
Show file tree

Hide file tree

Showing 25 changed files with 44 additions and 180 deletions.
diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml
@@ -9,12 +9,12 @@ env:
 
 on:
   push:
-    branches: [ Pharo12 ]
+    branches: [ Pharo13 ]
     paths-ignore:
     - 'README.md'
     - 'docs/**'
   pull_request:
-    branches: [ Pharo12 ]
+    branches: [ Pharo13 ]
     paths-ignore:
     - 'README.md'
     - 'docs/**'
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        smalltalk: [ Pharo64-12 ]
+        smalltalk: [ Pharo64-alpha ]
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,14 +19,14 @@ jobs:
       # Default value means that a failure in one OS cancels all 
       fail-fast: false
       matrix:
-        smalltalk: [ Pharo64-12 ]
+        smalltalk: [ Pharo64-alpha ]
         os: [ ubuntu-latest, macos-latest ]
         ston: [ .smalltalk.ston ]
         # Test Windows with some exclusions. 
         # At least a part of the problem is reported here: 
         # https://github.com/pharo-vcs/iceberg/issues/1394
         include:
-          - smalltalk: Pharo64-12
+          - smalltalk: Pharo64-alpha
             os: windows-latest
             ston: .smalltalk.windows.ston
     runs-on: ${{ matrix.os }}

diff --git a/BaselineOfIceberg/BaselineOfIceberg.class.st b/BaselineOfIceberg/BaselineOfIceberg.class.st
@@ -76,8 +76,8 @@ BaselineOfIceberg >> libgit: spec [
 		baseline: 'LibGit' 
 		with: [ 
 			spec
-				repository: 'github://pharo-vcs/libgit2-pharo-bindings:v3.1.1';
-  			loads: 'default' ].
+				repository: 'github://pharo-vcs/libgit2-pharo-bindings:Pharo13';
+  				loads: 'default' ].
 	spec  
 		project: 'LibGit-Tests'
 		copyFrom: 'LibGit'
@@ -128,5 +128,5 @@ BaselineOfIceberg >> resetKMRepository [
 BaselineOfIceberg >> tonel: spec [
 	spec
 		baseline: 'Tonel' 
-		with: [ spec repository: 'github://pharo-vcs/tonel:v1.1.0' ]
+		with: [ spec repository: 'github://pharo-vcs/tonel:Pharo13' ]
 ]
diff --git a/Iceberg-TipUI/IceMergeResolutionRequest.extension.st b/Iceberg-TipUI/IceMergeResolutionRequest.extension.st
@@ -0,0 +1,19 @@
+Extension { #name : 'IceMergeResolutionRequest' }
+
+{ #category : '*Iceberg-TipUI' }
+IceMergeResolutionRequest >> defaultAction [
+
+	| window mergeMorph |
+	mergeMorph := (IceTipMergeMorph forMerger: merge).
+
+	mergeMorph
+		fromDescription: merge sourceDescription;
+		toDescription: merge targetDescription.
+
+	window := mergeMorph newWindow
+		title: 'Merge';
+		yourself.
+
+	window openModal.
+	^ mergeMorph merged
+]
diff --git a/Iceberg-TipUI/IceTipDiffPanel.class.st b/Iceberg-TipUI/IceTipDiffPanel.class.st
@@ -97,7 +97,7 @@ IceTipDiffPanel >> diffEntryRemoved: announcement [
 	no parent, but it's fine to just leave it there empty--though perhaps we should
 	close the browser instead in that case?"
 	[
-	parent parent notNil and: [
+	parent parent isNotNil and: [
 		parent isEmpty and: [
 			parent value isNoModification or: [
 				parent value definition isExtensionDefinition ] ] ] ] whileTrue: [

diff --git a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st
@@ -18,7 +18,7 @@ IceTipResetBranchToThisCommitCommand class >> defaultDescription [
 { #category : 'testing' }
 IceTipResetBranchToThisCommitCommand >> canBeExecuted [
 
-	^ self selectedBranch notNil
+	^ self selectedBranch isNotNil
 ]
 
 { #category : 'executing' }
@@ -57,7 +57,7 @@ IceTipResetBranchToThisCommitCommand >> selectedBranch [
 
 	| selected |
 	selected := self context model.
-	^ (selected notNil and: [ selected isBranch ]) ifTrue: [ selected ]
+	^ (selected isNotNil and: [ selected isBranch ]) ifTrue: [ selected ]
 ]
 
 { #category : 'accessing' }

diff --git a/...erg-TipUI/IceExperimentalFeature.class.st → Iceberg/IceExperimentalFeature.class.st b/...erg-TipUI/IceExperimentalFeature.class.st → Iceberg/IceExperimentalFeature.class.st
@@ -6,9 +6,9 @@ This is useful to guarantee the correct keeping of the changes.
 Class {
 	#name : 'IceExperimentalFeature',
 	#superclass : 'IceWarning',
-	#category : 'Iceberg-TipUI-Exceptions',
-	#package : 'Iceberg-TipUI',
-	#tag : 'Exceptions'
+	#category : 'Iceberg-Errors',
+	#package : 'Iceberg',
+	#tag : 'Errors'
 }
 
 { #category : 'visiting' }

diff --git a/Iceberg/IceMCVersionInfo.class.st b/Iceberg/IceMCVersionInfo.class.st
@@ -55,21 +55,19 @@ IceMCVersionInfo >> fromCommit: aCommit package: aPackage [
 	"See #fromPackage:message:"
 	commit := aCommit.
 	package := aPackage.
-	
+
    	date := commit datetime asDate.
    	time := commit datetime asTime.
-	
+
 	name := ('{1}-{2}.{3}' format: {
 		package name. 
 		commit compatibleUsername. 
 		commit datetime asUnixTime 
 	}).
-
-	id := self class uuidFromCommit: aCommit package: aPackage.
 
-   	message := commit comment.
-   	author := commit compatibleUsername
+	id := self class uuidFromCommit: aCommit package: aPackage.
 
+   	message := commit comment
 ]
 
 { #category : 'initialization' }
@@ -80,7 +78,7 @@ IceMCVersionInfo >> fromPackage: aPackage message: commitMessage [
 	
 	To improve this implementation we should review the fileout process."
 
-	name := ('{1}-{2}.{3}' format: {aPackage name. Author fullName. 'unknown'}).
+	name := ('{1}-{2}.{3}' format: {aPackage name. 'CompatibleUserName'. 'unknown'}).
 	package := aPackage.
 	message := commitMessage.
 	id := UUID new

diff --git a/Iceberg/IceMergeResolutionRequest.class.st b/Iceberg/IceMergeResolutionRequest.class.st
@@ -9,24 +9,6 @@ Class {
 	#tag : 'Errors'
 }
 
-{ #category : 'exception description' }
-IceMergeResolutionRequest >> defaultAction [
-
-	| window mergeMorph |
-	mergeMorph := (IceTipMergeMorph forMerger: merge).
-
-	mergeMorph
-		fromDescription: merge sourceDescription;
-		toDescription: merge targetDescription.
-
-	window := mergeMorph newWindow
-		title: 'Merge';
-		yourself.
-
-	window openModal.
-	^ mergeMorph merged
-]
-
 { #category : 'accessing' }
 IceMergeResolutionRequest >> merge [
 	^ merge

diff --git 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"
@@ -124,24 +112,6 @@ IceMetacelloRepositoryAdapter >> loadPackageNamed: aName intoLoader: aLoader [
 		  self }
 ]
 
-{ #category : 'MonticelloGUI' }
-IceMetacelloRepositoryAdapter >> morphicOpen: workingCopy [
-
-	| shouldOpenIceberg |
-	shouldOpenIceberg := 
-		SpApplication defaultApplication newConfirm
-			title: 'Browsing an iceberg repository';
-			label:  ('{1} belongs to {2} and cannot be browsed here. 
-Do you want to open the Iceberg Browser instead?' format: {
-					                      workingCopy packageName.
-					                      self repository name });
-			acceptLabel: 'Open';
-			cancelLabel: 'Cancel';
-		   openModal.
-	shouldOpenIceberg ifFalse: [ ^ self ].
-	IceTipRepositoriesBrowser new open
-]
-
 { #category : 'accessing' }
 IceMetacelloRepositoryAdapter >> packageNamed: aName [
 

diff --git 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/IceSystemEventListener.class.st b/Iceberg/IceSystemEventListener.class.st
@@ -82,7 +82,7 @@ IceSystemEventListener class >> registerSystemAnnouncements [
 	SystemAnnouncer uniqueInstance weak
 		when: ClassAnnouncement send: #handleClassChange: to: self;
 		when: MethodAnnouncement send: #handleMethodChange: to: self;
-		when: ClassTagAnnouncement send: #handlePackageChange: to: self;
+		when: PackageTagAnnouncement send: #handlePackageChange: to: self;
 		when: MCVersionLoaderStopped send: #handleVersionLoaded: to: self.
 ]
 

diff --git a/Iceberg-TipUI/IceWarning.class.st → Iceberg/IceWarning.class.st b/Iceberg-TipUI/IceWarning.class.st → Iceberg/IceWarning.class.st
@@ -1,12 +1,12 @@
 "
-I'm a general warning in the context of iceberg UI.
+I'm a general warning in the context of iceberg.
 "
 Class {
 	#name : 'IceWarning',
 	#superclass : 'Warning',
-	#category : 'Iceberg-TipUI-Exceptions',
-	#package : 'Iceberg-TipUI',
-	#tag : 'Exceptions'
+	#category : 'Iceberg-Errors',
+	#package : 'Iceberg',
+	#tag : 'Errors'
 }
 
 { #category : 'visiting' }

diff --git a/Iceberg/MCAddition.extension.st b/Iceberg/MCAddition.extension.st
diff --git 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
@@ -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
diff --git a/Iceberg/MCOrganizationDefinition.extension.st b/Iceberg/MCOrganizationDefinition.extension.st
diff --git a/Iceberg/MCPatchOperation.extension.st b/Iceberg/MCPatchOperation.extension.st
diff --git a/Iceberg/MCPostscriptDefinition.extension.st b/Iceberg/MCPostscriptDefinition.extension.st
diff --git a/Iceberg/MCRemoval.extension.st b/Iceberg/MCRemoval.extension.st
diff --git a/Iceberg/MCRepository.extension.st b/Iceberg/MCRepository.extension.st
diff --git a/Iceberg/MCVersion.extension.st b/Iceberg/MCVersion.extension.st
diff --git 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 ]
-	].
-
-]