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

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

Name: Monticello-eem.512
Author: eem
Time: 7 June 2012, 10:17:48.386 am
UUID: a2addfac-e45d-4770-8f36-250da0d46b0b
Ancestors: Monticello-cmm.511

Provide a preference (Browse branched package versions separately)
that makes the repository inspector show branches as
separate groups.  e.g. makes it easier to find the newest
VMMaker.oscog amongst the trunk versions.

=============== Diff against Monticello-cmm.511 ===============

Item was added:
+ ----- Method: MCFileBasedRepository>>allPackageAndBranchNames (in category 'overriding') -----
+ allPackageAndBranchNames
+ 	| answer |
+ 	answer := Set new.
+ 	self allFileNamesOrCache do:
+ 		[ : each | | versionName |
+ 		versionName := each asMCVersionName.
+ 		versionName isValid ifTrue: [ answer add: versionName packageAndBranchName ] ].
+ 	^ answer!

Item was changed:
  ----- Method: MCFileRepositoryInspector>>versionNamesForSelectedPackage (in category 'private') -----
  versionNamesForSelectedPackage
  	^ self allVersionNames select:
+ 		(self class browseBranchedVersionsSeparately
+ 			ifTrue: [[:each| each packageAndBranchName = selectedPackage]]
+ 			ifFalse: [[:each| each packageName = selectedPackage]])!
- 		[ : each | each packageName = selectedPackage ]!

Item was changed:
+ ----- Method: MCGOODSRepository>>allPackageNames (in category 'packages') -----
- ----- Method: MCGOODSRepository>>allPackageNames (in category 'as yet unclassified') -----
  allPackageNames
  	^ self root collect:
  		[ : ea | ea package name ]!

Item was changed:
  MCVersionInspector subclass: #MCRepositoryInspector
  	instanceVariableNames: 'repository packageNames versionNames selectedPackage selectedVersion order versionInfo loaded newer inherited'
+ 	classVariableNames: 'BrowseBranchedVersionsSeparately Order'
- 	classVariableNames: 'Order'
  	poolDictionaries: ''
  	category: 'Monticello-UI'!

Item was added:
+ ----- Method: MCRepositoryInspector class>>browseBranchedVersionsSeparately (in category 'class initialization') -----
+ browseBranchedVersionsSeparately
+ 
+ 	<preference: 'Browse branched package versions separately'
+ 	category: 'Monticello'
+ 	description: 'If true, versions of packages on branches will be shown in a separate section from trunk package versions'
+ 	type: #Boolean>
+ 	^BrowseBranchedVersionsSeparately ifNil: [false]!

Item was added:
+ ----- Method: MCRepositoryInspector class>>browseBranchedVersionsSeparately: (in category 'class initialization') -----
+ browseBranchedVersionsSeparately: aBoolean
+ 	BrowseBranchedVersionsSeparately := aBoolean!

Item was changed:
+ ----- Method: MCRepositoryInspector class>>order (in category 'class initialization') -----
- ----- Method: MCRepositoryInspector class>>order (in category 'as yet unclassified') -----
  order
  	Order isNil
  		ifTrue: [ Order := 5 ].
  	^Order!

Item was changed:
+ ----- Method: MCRepositoryInspector class>>order: (in category 'class initialization') -----
- ----- Method: MCRepositoryInspector class>>order: (in category 'as yet unclassified') -----
  order: anInteger
  	Order := anInteger!

Item was changed:
+ ----- Method: MCRepositoryInspector class>>repository:workingCopy: (in category 'instance creation') -----
- ----- Method: MCRepositoryInspector class>>repository:workingCopy: (in category 'as yet unclassified') -----
  repository: aFileBasedRepository workingCopy: aWorkingCopy
  	^self new
  		setRepository: aFileBasedRepository workingCopy: aWorkingCopy;
  		yourself!

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 ] ].
- 		result := repository allPackageNames ].
  	"sort loaded packages first, then alphabetically"
  	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 ]!