Merge pull request #989 from tesonep/issue/988

issue/988
pharo-vcs · Sep 5, 2018 · 45d8f6f · 45d8f6f
2 parents 34d68a2 + df9ce8b
commit 45d8f6f
Show file tree

Hide file tree

Showing 14 changed files with 57 additions and 39 deletions.
diff --git a/...erg-Memory.package/IceRingWorkingCopy.class/instance/impactPackageChanges.currentNode..st b/...erg-Memory.package/IceRingWorkingCopy.class/instance/impactPackageChanges.currentNode..st
diff --git a/Iceberg-Memory.package/IceRingWorkingCopy.class/instance/loadChangesInWorkingCopy..st b/Iceberg-Memory.package/IceRingWorkingCopy.class/instance/loadChangesInWorkingCopy..st
@@ -0,0 +1,9 @@
+private-changes
+loadChangesInWorkingCopy: aTree
+
+	| visitor |
+	visitor := IceRingWorkingCopyChangerVisitor on: self.
+
+	self ignoreNotificationsDuring: [
+		aTree accept: visitor.
+	]
diff --git a/Iceberg-Memory.package/IceRingWorkingCopyChangerVisitor.class/instance/environment.st b/Iceberg-Memory.package/IceRingWorkingCopyChangerVisitor.class/instance/environment.st
@@ -0,0 +1,4 @@
+accessing
+environment
+
+	^ self workingCopy environment
diff --git a/Iceberg-Memory.package/IceRingWorkingCopyChangerVisitor.class/instance/packages.st b/Iceberg-Memory.package/IceRingWorkingCopyChangerVisitor.class/instance/packages.st
@@ -0,0 +1,4 @@
+accessing
+packages
+
+	^ self workingCopy packages
diff --git a/Iceberg-Memory.package/IceRingWorkingCopyChangerVisitor.class/instance/visitPackage..st b/Iceberg-Memory.package/IceRingWorkingCopyChangerVisitor.class/instance/visitPackage..st
@@ -1,6 +1,15 @@
 visiting
 visitPackage: anIcePackageDefinition 
 
-	workingCopy
-		impactPackageChanges: anIcePackageDefinition
-		currentNode: currentNode
+	| visitor |
+
+	anIcePackageDefinition categories do: [ :categoryName | 
+		self workingCopy packages
+			detect: [ :package | categoryName beginsWith: package name ]
+			ifFound: [ :package | 
+				(self environment ensurePackageNamed: package name)
+					addClassTag: categoryName ]
+			ifNone: [ self environment ensurePackageNamed: categoryName ] ].
+
+	visitor := IceRingWorkingCopyChangerVisitor on: self workingCopy.
+	currentNode childrenDo: [ :each | each accept: visitor ]	
diff --git a/Iceberg-Memory.package/IceRingWorkingCopyChangerVisitor.class/instance/workingCopy.st b/Iceberg-Memory.package/IceRingWorkingCopyChangerVisitor.class/instance/workingCopy.st
@@ -0,0 +1,4 @@
+accessing
+workingCopy
+
+	^ workingCopy
diff --git a/Iceberg-TipUI.package/IceCheckoutAllPackages.extension/class/description.st b/Iceberg-TipUI.package/IceCheckoutAllPackages.extension/class/description.st
@@ -1,3 +1,3 @@
 *Iceberg-TipUI
 description
-	^ 'Checkout ALL packages in the repository, in alphabetical order'
+	^ 'Checkout ALL packages in the repository'
diff --git a/Iceberg-TipUI.package/IceCheckoutAlreadyLoadedPackages.extension/class/description.st b/Iceberg-TipUI.package/IceCheckoutAlreadyLoadedPackages.extension/class/description.st
@@ -1,3 +1,3 @@
 *Iceberg-TipUI
 description
-	^ 'Checkout packages ALREADY LOADED in the image, in alphabetical order'
+	^ 'Checkout packages ALREADY LOADED in the image'
diff --git a/Iceberg.package/IceWorkingCopy.class/instance/impactPackageChanges.currentNode..st b/Iceberg.package/IceWorkingCopy.class/instance/impactPackageChanges.currentNode..st
diff --git a/Iceberg.package/IceWorkingCopy.class/instance/loadChangesInWorkingCopy..st b/Iceberg.package/IceWorkingCopy.class/instance/loadChangesInWorkingCopy..st
@@ -1,6 +1,10 @@
 private-changes
 loadChangesInWorkingCopy: aTree
 
+	| visitor |
+	visitor := IceWorkingCopyPatcherVisitor on: self repository.
+	aTree accept: visitor.
+
 	self ignoreNotificationsDuring: [
-		aTree accept: (IceWorkingCopyPatcherVisitor on: self repository)
-	]
+		visitor load.
+	]
diff --git a/Iceberg.package/IceWorkingCopyPatcherVisitor.class/instance/initialize.st b/Iceberg.package/IceWorkingCopyPatcherVisitor.class/instance/initialize.st
@@ -0,0 +1,4 @@
+initialization
+initialize
+	super initialize.
+	loader := MCPackageLoader new
diff --git a/Iceberg.package/IceWorkingCopyPatcherVisitor.class/instance/load.st b/Iceberg.package/IceWorkingCopyPatcherVisitor.class/instance/load.st
@@ -0,0 +1,3 @@
+loading
+load
+	loader load
diff --git a/Iceberg.package/IceWorkingCopyPatcherVisitor.class/instance/visitPackage..st b/Iceberg.package/IceWorkingCopyPatcherVisitor.class/instance/visitPackage..st
@@ -1,6 +1,9 @@
 visiting
 visitPackage: anIcePackageDefinition
-
-	self repository workingCopy
-		impactPackageChanges: anIcePackageDefinition
-		currentNode: currentNode
+
+	(self repository packageNamed: anIcePackageDefinition name) isLoaded
+		ifFalse: [ ^ self ].
+
+	currentNode accept: (IceMCSnapshotPatchVisitor new
+		patcher: loader;
+		yourself).
diff --git a/Iceberg.package/IceWorkingCopyPatcherVisitor.class/properties.json b/Iceberg.package/IceWorkingCopyPatcherVisitor.class/properties.json
@@ -6,7 +6,8 @@
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [
-		"repository"
+		"repository",
+		"loader"
 	],
 	"name" : "IceWorkingCopyPatcherVisitor",
 	"type" : "normal"