[Pkg] The Trunk: Monticello-ul.466.mcz

commits at source.squeak.org commits at source.squeak.org
Sun May 8 19:21:21 UTC 2011


Levente Uzonyi uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-ul.466.mcz

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

Name: Monticello-ul.466
Author: ul
Time: 8 May 2011, 8:57:07.136 pm
UUID: 50cce975-d1fa-2143-82b8-66789145c20b
Ancestors: Monticello-ul.465

- fix: MCAncestry >> #allAncestorsDo: doesn't enumerate the same elements twice, which resulted in exponential slowdown for each merge in the ancestry
- enh: cache allFileNames during MCRepository >> #possiblyNewerVersionsOfAnyOf:
- fix: removed noise from the confirmation dialog of MCWorkingCopyBrowser >> #checkForNewerVersions

=============== Diff against Monticello-ul.465 ===============

Item was added:
+ ----- Method: MCAncestry>>allAncestors (in category 'ancestry') -----
+ allAncestors
+ 	
+ 	| allAncestors |
+ 	allAncestors := Set new.
+ 	self allAncestorsDo: [ :each | ] visitedAncestors: allAncestors.
+ 	^allAncestors !

Item was changed:
  ----- Method: MCAncestry>>allAncestorsDo: (in category 'ancestry') -----
  allAncestorsDo: aBlock
+ 	
+ 	self allAncestorsDo: aBlock visitedAncestors: Set new!
- 	self ancestors do:
- 		[:ea |
- 		aBlock value: ea.
- 		ea allAncestorsDo: aBlock]!

Item was added:
+ ----- Method: MCAncestry>>allAncestorsDo:visitedAncestors: (in category 'ancestry') -----
+ allAncestorsDo: aBlock visitedAncestors: visitedAncestors
+ 
+ 	self ancestors do: [ :each |
+ 		(visitedAncestors includes: each) ifFalse: [
+ 			visitedAncestors add: each.
+ 			aBlock value: each.
+ 			each allAncestorsDo: aBlock visitedAncestors: visitedAncestors ] ]!

Item was changed:
  ----- Method: MCRepository>>possiblyNewerVersionsOfAnyOf: (in category 'versions') -----
  possiblyNewerVersionsOfAnyOf: versionNames 
  	"Answer a collection of MCVersionNames which might be newer versions of the versions identified by versionNames."
+ 	^self cacheAllFileNamesDuring: [
+ 		versionNames
- 	^ versionNames
  		inject: OrderedCollection new
  		into:
  			[ : coll : eachVersionName | | eachPackageName |
  			eachPackageName := eachVersionName packageName.
  			(self versionNamesForPackageNamed: eachPackageName) do:
  				[ : eachInSelf | (eachInSelf versionNumber > eachVersionName versionNumber or:
  					[ eachInSelf versionNumber = eachVersionName versionNumber and: [ eachInSelf author ~= eachVersionName author ] ]) ifTrue: [ coll add: eachInSelf ] ].
+ 			coll ] ]!
- 			coll ]!

Item was changed:
  ----- Method: MCWorkingCopyBrowser>>checkForNewerVersions (in category 'actions') -----
  checkForNewerVersions
  	| newer |
  	newer := workingCopy possiblyNewerVersionsIn: self repository.
  	^ newer isEmpty or: [
  		self confirm: 'CAUTION!! These versions in the repository may be newer:', 
+ 			String cr, ((newer asCommaString withNoLineLongerThan:  150) truncateWithElipsisTo: 5 * 149), String cr,
- 			String cr, (newer asString truncateWithElipsisTo: 150), String cr,
  			'Do you really want to save this version?'].!



More information about the Packages mailing list