[Pkg] Sake : Sake-Core-kph.88.mcz

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

A new version of Sake-Core was added to project Sake :
http://www.squeaksource.com/Sake/Sake-Core-kph.88.mcz

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

Name: Sake-Core-kph.88
Author: kph
Time: 14 December 2008, 1:57:29 am
UUID: 7b190154-4895-4d83-8f80-59501195553a
Ancestors: Sake-Core-kph.87

adoptHistoryFrom:saveWithComment: 

will attempt to adopt the history even when not saving to the repo

=============== Diff against Sake-Core-kph.87 ===============

Item was changed:
  ----- Method: MCWorkingCopy>>taskSaveWithComment: (in category '*sake-core') -----
  taskSaveWithComment: message
   
+ 	^ (self taskAdoptHistoryFrom: self repository saveWithComment: message) defined
- 	^ (self taskSaveIn: self repository withComment: message) defined
   !

Item was added:
+ ----- Method: MCWorkingCopy>>taskAdoptHistoryFrom:saveWithComment: (in category '*sake-core') -----
+ taskAdoptHistoryFrom: repo saveWithComment: message
+  
+ 	"The repo is the one we are maintaining. If there are no changes then adopt the one in the repo as the master"
+ 	
+ 	| closest |
+ 	^ SakeTask define: [ :task |
+  
+ 		task if: [ self needsSaving ].
+  				
+ 		task action: [ self repositoryGroup addRepository: repo.
+ 			self setMyRepositoryFromLastAdded.
+ 			closest := repo closestAncestorVersionFor: ancestry ifNone:[nil].
+ 			closest ifNotNil: [ ancestry := MCWorkingAncestry new addAncestor: closest info ].
+ 			
+ 		(self changesRelativeToRepository: repo) isEmpty 
+ 				ifTrue: [  
+ 						 self modified: false.
+ 						 ] 
+ 				ifFalse: [
+ 					message ifNotNil: [  
+ 						repo storeVersion: (self newVersionWithName: self uniqueVersionName message: message)]
+ 				] 
+ 	  	]
+ 	]
+  !

Item was removed:
- ----- Method: MCWorkingCopy>>taskSaveIn:withComment: (in category '*sake-core') -----
- taskSaveIn: repo withComment: message
-  
- 	"The repo is the one we are maintaining. If there are no changes then adopt the one in the repo as the master"
- 	
- 	^ SakeTask define: [ :task |
-  
- 		task if: [ self needsSaving ].
-  				
- 		task action: [ self repositoryGroup addRepository: repo.
- 			
- 			(self changesRelativeToRepository: repo) isEmpty 
- 				ifTrue: [ ancestry := MCWorkingAncestry new addAncestor: (repo closestAncestorVersionFor: ancestry ifNone:[]) info; yourself.
- 						 self modified: false.
- 						 self setMyRepositoryFromLastAdded ] 
- 				ifFalse: [
- 					repo storeVersion: (self newVersionWithName: self uniqueVersionName message: message)] 
- 	  	]
- 	]
-  !