[squeak-dev] The Trunk: Monticello-cmm.596.mcz

commits at source.squeak.org commits at source.squeak.org
Sun Jul 27 00:30:49 UTC 2014


Chris Muller uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-cmm.596.mcz

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

Name: Monticello-cmm.596
Author: cmm
Time: 26 July 2014, 6:22:58.028 pm
UUID: 32e8bf38-ae20-4356-b7b3-32e6568012ac
Ancestors: Monticello-eem.595

- 'browse mc history' and 'browse mc origin' functions are now enabled all the time.  If selected, and the historical repository hasn't been added to the necessary package, the system will now prompt the user to confirm its okay to add it to that package, instead of simply reporting an error message.  Enablement.
- However, about to remove 'browse mc origin' from all but the PathOperations browser.  That's really where it belongs.  Versioning before I do that, though, just in case.

=============== Diff against Monticello-eem.595 ===============

Item was changed:
  ----- Method: BrowserRequestor>>browseMcMethodHistory (in category '*monticello-history') -----
  browseMcMethodHistory
  	"Open a browser on all versions of this method available in the MC repository for this package."
  	self selectedMethodReference
  		ifNil: [ UIManager inform: 'No method selected' ]
  		ifNotNilDo:
+ 			[ : methodReference | (MCWorkingCopyBrowser mcModelFor: methodReference) ifNotNil: [ (MCOperationsList operations: methodReference mcPatchOperations) browse ] ]!
- 			[ : methodReference | methodReference mcModel
- 				ifNil: [ UIManager inform: 'No Magma-based repository for ' , methodReference packageInfo packageName ]
- 				ifNotNilDo:
- 					[ : mcModel | (MCOperationsList operations: methodReference mcPatchOperations) browse ] ]!

Item was changed:
  ----- Method: BrowserRequestor>>browseMcMethodOrigin (in category '*monticello-history') -----
  browseMcMethodOrigin
  	"Open a Monticello version browser on the earliest version available in the repository known to contain this version."
  	self selectedMethodReference
  		ifNil: [ UIManager inform: 'No method selected' ]
  		ifNotNilDo:
+ 			[ : methodReference | (MCWorkingCopyBrowser mcModelFor: methodReference) ifNotNil:
+ 				[ : mcModel | (mcModel originOf: methodReference asMethodDefinition)
+ 					ifNil: [ UIManager inform: methodReference asString , ' was not found in the historical MC repository.' ]
+ 					ifNotNilDo: [ : version | version open ] ] ]!
- 			[ : methodReference | methodReference mcModel
- 				ifNil: [ UIManager inform: 'No Magma-based repository for ' , methodReference packageInfo packageName ]
- 				ifNotNilDo:
- 					[ : mcModel | (mcModel originOf: methodReference asMethodDefinition)
- 						ifNil: [ UIManager inform: methodReference asString , ' was not found in any Magma-based MC repository.' ]
- 						ifNotNilDo:
- 							[ : version | version open ] ] ]!

Item was removed:
- ----- Method: BrowserRequestor>>canBrowseMcMethodHistory (in category '*monticello-history') -----
- canBrowseMcMethodHistory
- 	^ self selectedMethodReference
- 		ifNil: [ false ]
- 		ifNotNilDo:
- 			[ : methodReference | methodReference mcModel notNil ]!

Item was changed:
  ----- Method: MCDefinition>>mcModel (in category 'private') -----
  mcModel
+ 	"Find my WorkingCopy, use the first mcModel-capable repository in its reposigoryGroup."
+ 	self repositoryGroup repositoriesDo:
+ 		[ : each | each mcModel ifNotNilDo:
+ 			[ : mcModel | ^ mcModel ] ].
+ 	^ nil!
- 	^ self findMcModel ifNil: [ super mcModel ]!

Item was added:
+ ----- Method: MCHttpRepository class>>trunkBackup (in category 'well-known repositories') -----
+ trunkBackup
+ 	^ MCRepositoryGroup default repositories
+ 		detect:
+ 			[ : each | each isTrunkBackup ]
+ 		ifNone:
+ 			[ MCHttpRepository
+ 				location: MCHttpRepository trunkBackupUrlString
+ 				user: 'squeak'
+ 				password: 'squeak' ]!

Item was added:
+ ----- Method: MCHttpRepository class>>trunkBackupUrlString (in category 'accessing') -----
+ trunkBackupUrlString
+ 	^ 'http://box4.squeak.org:8888/trunk'!

Item was added:
+ ----- Method: MCHttpRepository>>isTrunkBackup (in category 'testing') -----
+ isTrunkBackup
+ 	^ location = self class trunkBackupUrlString!

Item was changed:
  ----- Method: MCHttpRepository>>mcModel (in category 'overriding') -----
  mcModel
  	"Answer the object which can respond to #historyOf: and #originOf:."
+ 	^ ((location beginsWith: 'http://localhost:8888/') or: [ location beginsWith: self class trunkBackupUrlString ]) ifTrue: [ self ]!
- 	^ ((location beginsWith: 'http://localhost:8888/') or: [ location beginsWith: 'http://box4.squeak.org:8888/' ]) ifTrue: [ self ]!

Item was added:
+ ----- Method: MCOperationsBrowser>>browseSelectionOrigin (in category 'actions') -----
+ browseSelectionOrigin
+ 	selection ifNil: [ UIManager inform: 'Make a selection.' ].
+ 	selection definition isMethodDefinition ifTrue:
+ 		[ | methodReference |
+ 		methodReference := selection definition asMethodReference.
+ 		(MCWorkingCopyBrowser mcModelFor: methodReference) ifNotNil:
+ 			[ : mcModel | (mcModel originOf: methodReference asMethodDefinition)
+ 				ifNil: [ UIManager inform: methodReference asString , ' was not found in any historical MC repository.' ]
+ 				ifNotNilDo:
+ 					[ : version | version open ] ] ]!

Item was changed:
  ----- Method: MCOperationsBrowser>>methodListMenu: (in category 'menus') -----
  methodListMenu: aMenu
  	selection ifNotNil:
  		[aMenu addList:#(
  			('install'	 installSelection)
  			('revert'	 revertSelection)
+ 			('browse origin' browseSelectionOrigin)
  			-)].
  	self unchangedMethods ifNotEmpty:
  		[aMenu addList:#(
  			('revert unchanged methods...'	revertUnchangedMethods)
  			-)].
  	super methodListMenu: aMenu.
+ 	^ aMenu!
- 	^ aMenu
- !

Item was added:
+ ----- Method: MCPackageManager class>>forPackageNamed: (in category 'as yet unclassified') -----
+ forPackageNamed: aString 
+ 	^ self registry detect:
+ 		[ : each | each packageName = aString ]!

Item was changed:
  ----- Method: MCRepository class>>browseMcMethodHistoryService (in category 'ui-support') -----
  browseMcMethodHistoryService
  	^ ServiceAction
  		id: #browseMcMethodHistory
  		text: 'browse mc history'
  		button: 'mc'
  		description: 'Browse the Monticello history of this method from the code repository.'
  		action:
  			[ : aBrowserRequestor | aBrowserRequestor browseMcMethodHistory ]
  		condition:
+ 			[ : aBrowserRequestor | true ]!
- 			[ : aBrowserRequestor | aBrowserRequestor canBrowseMcMethodHistory ]!

Item was changed:
  ----- Method: MCRepository class>>browseMcMethodOriginService (in category 'ui-support') -----
  browseMcMethodOriginService
  	^ ServiceAction
  		id: #browseMcMethodOrigin
  		text: 'browse mc origin'
  		button: 'mc'
  		description: 'Browse the Monticello version comments in which this edition of this method was originally committed.'
  		action:
  			[ : aBrowserRequestor | aBrowserRequestor browseMcMethodOrigin ]
  		condition:
+ 			[ : aBrowserRequestor | true ]!
- 			[ : aBrowserRequestor | aBrowserRequestor canBrowseMcMethodHistory ]!

Item was added:
+ ----- Method: MCRepository>>isTrunkBackup (in category 'testing') -----
+ isTrunkBackup
+ 	^ false!

Item was added:
+ ----- Method: MCWorkingCopyBrowser class>>mcModelFor: (in category 'hooks') -----
+ mcModelFor: aClassOrMethodReference 
+ 	^ aClassOrMethodReference mcModel ifNil:
+ 		[ | pkgName | (UIManager confirm: 'Okay to add historical repository to ' , (pkgName := aClassOrMethodReference packageInfo packageName) , '?') ifTrue:
+ 			[ (MCWorkingCopy forPackageNamed: pkgName) repositoryGroup addRepository: MCHttpRepository trunkBackup.
+ 			aClassOrMethodReference mcModel ] ]!



More information about the Squeak-dev mailing list