[squeak-dev] The Trunk: Monticello-eem.593.mcz

commits at source.squeak.org commits at source.squeak.org
Thu Jun 26 18:55:43 UTC 2014


Eliot Miranda uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-eem.593.mcz

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

Name: Monticello-eem.593
Author: eem
Time: 26 June 2014, 11:55:05.97 am
UUID: bd48627d-4f58-4bfb-83b1-29cec650a8d4
Ancestors: Monticello-eem.592

Take branch names into account in repository inspectors.
Sort the package list, and select package by loaded
packageAndBranchName, not just packageName.

=============== Diff against Monticello-eem.592 ===============

Item was changed:
  ----- Method: MCRepositoryInspector>>packageList (in category 'morphic ui') -----
  packageList
  	| result loadedPackages |
  	packageNames ifNotNil: [ ^ packageNames ].
  	repository cacheAllFileNamesDuring: 
  		[ "Enjoy emphasis side-effects of populating my versionNames." 
  		self versionNames.
  		result := self class browseBranchedVersionsSeparately
  					ifTrue: [ repository allPackageAndBranchNames ]
  					ifFalse: [ repository allPackageNames ] ].
  	"sort loaded packages first, then alphabetically"
+ 	loadedPackages := loaded asSet collect: [ : each | each packageAndBranchName ].
- 	loadedPackages := Set new: loaded size.
- 	loaded do:
- 		[ : each | loadedPackages add: each packageName ].
  	result := result asArray sort:
  		[ : a : b | | loadedA loadedB |
  		loadedA := loadedPackages includes: a.
  		loadedB := loadedPackages includes: b.
  		loadedA = loadedB
  			ifTrue: [ a < b ]
  			ifFalse: [ loadedA ] ].
  	^ packageNames := result collect:
  		[ : each | self packageHighlight: each ]!

Item was changed:
  ----- Method: MCRepositoryInspector>>setRepository:workingCopy: (in category 'initialize-release') -----
  setRepository: aFileBasedRepository workingCopy: aWorkingCopy 
  	order := self class order.
  	repository := aFileBasedRepository.
  	self refresh.
  	aWorkingCopy
  		ifNil: [ self packageSelection: 1 ]
  		ifNotNil:
  			[ selectedPackage := aWorkingCopy ancestry ancestors ifNotEmpty:
+ 				[ : ancestors | ancestors anyOne name asMCVersionName packageAndBranchName ] ].
- 				[ : ancestors | ancestors anyOne name asMCVersionName packageName ] ].
  	MCWorkingCopy addDependent: self!



More information about the Squeak-dev mailing list