[Pkg] Monticello Public: Monticello.impl-mtf.579.mcz

[squeak-dev-noreply at lists.squeakfoundation.org]

A new version of Monticello.impl was added to project Monticello Public:
http://www.squeaksource.com/mc/Monticello.impl-mtf.579.mcz

==================== Summary ====================

Name: Monticello.impl-mtf.579
Author: mtf
Time: 7 October 2008, 3:28:58 pm
UUID: 6be37648-104a-48e8-b3e2-b339f143e086
Ancestors: Monticello.impl-mtf.578

fixed bug 7208: merging or viewing changes of a package now shows diffs where packaged elements override things outside the package

=============== Diff against Monticello.impl-mtf.578 ===============

Item was changed:
  ----- Method: MCPackage>>patchSnapshot (in category 'patching') -----
  patchSnapshot
+ 	^ self snapshot asPatchSnapshot!
- 	^ MCImageBackedSnapshot fromDefinitions: (self snapshot definitions)!

Item was changed:
  ----- Method: MCThreeWayMerger>>addDefinition: (in category 'as yet unclassified') -----
  addDefinition: aDefinition
  	index
  		definitionLike: aDefinition
  		ifPresent: [:other |
  			(self removalForDefinition: aDefinition)
  				ifNotNilDo:
  					[:op |
  					self addOperation: (MCModification of: other to: aDefinition).
  					self removeOperation: op.
  					^ self].
  			other = aDefinition
+ 				ifFalse: [(aDefinition isMethodDefinition and: [aDefinition isOverrideMethod])
+ 					ifTrue: [self addOperation: (MCModification of: other to: aDefinition)]
+ 					ifFalse: [self addConflictWithOperation: (MCModification of: other to: aDefinition)]]
- 				ifFalse: [self addConflictWithOperation: (MCModification of: other to: aDefinition)]
  				ifTrue: [self redundantAdds add: aDefinition]]
  		ifAbsent: [self addOperation: (MCAddition of: aDefinition)]!

Item was changed:
  ----- Method: MCImageBackedDefinitionIndex>>definitionLike:ifPresent:ifAbsent: (in category 'as yet unclassified') -----
  definitionLike: aDefinition ifPresent: foundBlock ifAbsent: errorBlock
+ 	| definition |
+ 	^ super definitionLike: aDefinition ifPresent: foundBlock ifAbsent: [
+ 		definition := aDefinition fromImage.
+ 		definition
+ 			ifNil: [errorBlock value]
+ 			ifNotNil: [foundBlock value: definition]]!
- 	^ super definitionLike: aDefinition ifPresent: foundBlock
- 		ifAbsent: [aDefinition fromImage ifNil: [errorBlock value]]!

Item was changed:
  ----- Method: MCVersion>>changes (in category 'accessing') -----
  changes
+ 	^ self snapshot patchRelativeToBase: package patchSnapshot!
- 	^ self snapshot patchRelativeToBase: package snapshot!

Item was changed:
  ----- Method: MCThreeWayMerger>>initialize (in category 'as yet unclassified') -----
  initialize
+ 	index := MCImageBackedDefinitionIndex new.
- 	index := MCDefinitionIndex new.
  	provisions := Set new!

Item was added:
+ ----- Method: MCImageBackedDefinitionIndex>>asPatchSnapshot (in category 'as yet unclassified') -----
+ asPatchSnapshot
+ 	^ self!

Item was added:
+ ----- Method: MCSnapshot>>asPatchSnapshot (in category 'patching') -----
+ asPatchSnapshot
+ 	^ MCImageBackedSnapshot fromDefinitions: definitions!