[squeak-dev] The Trunk: Monticello-topa.600.mcz

commits at source.squeak.org commits at source.squeak.org
Fri Sep 5 20:33:32 UTC 2014


Tobias Pape uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-topa.600.mcz

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

Name: Monticello-topa.600
Author: topa
Time: 5 September 2014, 10:33:07.063 pm
UUID: d3c39c60-0f4d-4452-bd4c-7b76ce3c0c55
Ancestors: Monticello-topa.599

Correction to topa.599: Do not break existing users of MCVersionNameAndMessageRequest.

=============== Diff against Monticello-topa.599 ===============

Item was changed:
  ----- Method: MCWorkingCopy>>newVersion (in category 'operations') -----
  newVersion
+ 	| packageSnapshot parentSnapshot patch patchBlock |
- 	| packageSnapshot parentSnapshot patch |
  	parentSnapshot := self parentSnapshot.
+ 	patchBlock :=  [patch := (packageSnapshot := package snapshot) patchRelativeToBase: parentSnapshot].
+ 	patchBlock value. "Ensure that this is called at least once."
  	^ (self requestVersionNameAndMessageWithSuggestion: self uniqueVersionName
  		initialMessage: self patchMessageSuggestion
+ 		patchBlock: patchBlock
- 		patchBlock: [patch := (packageSnapshot := package snapshot) patchRelativeToBase: parentSnapshot]
  	) ifNotNil: [:tuple |
  		self newVersionWithName: tuple first withBlanksTrimmed
  			message: (self patchMessageStripped: tuple second)
+ 			snapshot: ((tuple size >= 3 and: [tuple third notEmpty])
+ 				ifTrue: [	MCPatcher apply: (patch ignoring: tuple third) to: parentSnapshot]
+ 				ifFalse: [packageSnapshot])]!
- 			snapshot: (tuple third
- 				ifEmpty: [packageSnapshot]
- 				ifNotEmpty: [
- 					MCPatcher apply: (patch ignoring: tuple third)
- 						to: parentSnapshot])]
- !



More information about the Squeak-dev mailing list