[squeak-dev] The Trunk: MonticelloConfigurations-mt.160.mcz

commits at source.squeak.org commits at source.squeak.org
Fri Apr 17 15:17:30 UTC 2020


Marcel Taeumel uploaded a new version of MonticelloConfigurations to project The Trunk:
http://source.squeak.org/trunk/MonticelloConfigurations-mt.160.mcz

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

Name: MonticelloConfigurations-mt.160
Author: mt
Time: 17 April 2020, 5:17:27.82286 pm
UUID: 6d32501e-f519-3b4a-ae1a-58b52360a937
Ancestors: MonticelloConfigurations-mt.159

Shows the current CI status in the update dialog.

=============== Diff against MonticelloConfigurations-mt.159 ===============

Item was changed:
  ----- Method: MCMcmUpdater>>doUpdate: (in category 'updating') -----
  doUpdate: interactive
  	"Update the image by loading all pending updates from the server. If this is
  	the default updater for the system, update the system version when complete.
  	If interteractive use a modal notifier, otherwise only update the transcript.
  	Flush all caches. If a previous download failed this is often helpful"
  
  	| config previousUpdateLevel ensureTranscriptSetting |
  	previousUpdateLevel := SystemVersion current highestUpdate.
  	MCFileBasedRepository flushAllCaches.	
  	ensureTranscriptSetting := MCConfiguration ensureOpenTranscript.
  	[ MCConfiguration ensureOpenTranscript: interactive.
  	config := self updateFromRepository.
  	config ifNil: [
  		interactive ifTrue: [ ^self inform: 'Unable to retrieve updates from remote repository.' translated ].
  		Transcript cr; show: '==========  Unable to retrieve updates from remote repository. ==========' translated; cr.
  		^ self ].
  	MCMcmUpdater default == self
  		ifTrue: [
  			config setSystemVersion.
+ 			interactive ifTrue: [
+ 				self inform: (self updateMessageFor: previousUpdateLevel)].
- 			interactive ifTrue: [ 
- 				self inform: ('Update completed.\\Version: {1}\Update: {3}{2}\\Url: {4}\Map: ''{5}''{6}' translated withCRs format: {
- 						SystemVersion current version.
- 						SystemVersion current highestUpdate.
- 						previousUpdateLevel = SystemVersion current highestUpdate
- 							ifTrue: ['']
- 							ifFalse: [previousUpdateLevel asString, ' -> '].
- 						self repository.
- 						MCMcmUpdater updateMapName.
- 						SystemVersion current description ifEmpty: [''] ifNotEmpty: [:d | String cr, String cr, d]})].
  			Transcript cr;
  				show: '==========  Update completed:  ' translated;
  				show: previousUpdateLevel;
  				show: ' -> ' ;
  				show: SystemVersion current highestUpdate;
  				show: ' =========='; cr ]
  		ifFalse: [
  			interactive
  				ifTrue: [ self inform: 'Update completed.' ].
  			Transcript cr; show: '==========  Update completed. ==========' translated; cr ] ]
  		ensure: [ MCConfiguration ensureOpenTranscript: ensureTranscriptSetting].
  
  	!

Item was changed:
  ----- Method: MCMcmUpdater>>doUpdate:upTo: (in category 'updating') -----
  doUpdate: interactive upTo: versionNumber
  	"Update the image by loading all pending updates from the server. If this is
  	the default updater for the system, update the system version when complete.
  	If interteractive use a modal notifier, otherwise only update the transcript.
  	Flush all caches. If a previous download failed this is often helpful"
  
  	| config previousUpdateLevel |
  	previousUpdateLevel := SystemVersion current highestUpdate.
  	MCFileBasedRepository flushAllCaches.
  	config := self updateFromRepositories: { self repository } upTo: versionNumber.
  	config ifNil: [
  		interactive ifTrue: [ ^self inform: 'Unable to retrieve updates from remote repository.' translated ].
  		Transcript cr; show: '==========  Unable to retrieve updates from remote repository. ==========' translated; cr.
  		^ self ].
  	MCMcmUpdater default == self
  		ifTrue: [
  			config setSystemVersion.
+ 			interactive ifTrue: [
+ 				self inform: (self updateMessageFor: previousUpdateLevel)].
- 			interactive ifTrue: [ 
- 				self inform: ('Update completed.\\Version: {1}\Update: {3}{2}\\Url: {4}\Map: ''{5}''{6}' translated withCRs format: {
- 						SystemVersion current version.
- 						SystemVersion current highestUpdate.
- 						previousUpdateLevel = SystemVersion current highestUpdate
- 							ifTrue: ['']
- 							ifFalse: [previousUpdateLevel asString, ' -> '].
- 						self repository.
- 						MCMcmUpdater updateMapName.
- 						SystemVersion current description ifEmpty: [''] ifNotEmpty: [:d | String cr, String cr, d]})].
  			Transcript cr;
  				show: '==========  Update completed:  ' translated;
  				show: previousUpdateLevel;
  				show: ' -> ' ;
  				show: SystemVersion current highestUpdate;
  				show: ' =========='; cr ]
  		ifFalse: [
  			interactive
  				ifTrue: [ self inform: 'Update completed.' ].
  			Transcript cr; show: '==========  Update completed. ==========' translated; cr ]
  	!

Item was added:
+ ----- Method: MCMcmUpdater>>updateMessageFor: (in category 'private') -----
+ updateMessageFor: previousUpdateLevel
+ 
+ 	^ ('Update completed.<br><br>Version: {1}<br>Update: {3}<b>{2}</b><br><br>Url: <a href="{4}">{4}</a><br>Map: ''{5}''<br>TravisCI status: <a href="{8}"><img src="{7}" /></a>{6}' translated format: {
+ 			SystemVersion current version.
+ 			SystemVersion current highestUpdate.
+ 			previousUpdateLevel = SystemVersion current highestUpdate
+ 				ifTrue: ['']
+ 				ifFalse: [previousUpdateLevel asString, ' -> '].
+ 			self repository.
+ 			MCMcmUpdater updateMapName.
+ 			SystemVersion current description ifEmpty: [''] ifNotEmpty: [:d |
+ 				'<br><br>', (d copyReplaceAll: String cr with: '<br>')].
+ 			SystemVersion current ciStatusBadgeUrl.
+ 			SystemVersion current ciStatusPageUrl.
+ 				}) asTextFromHtml!



More information about the Squeak-dev mailing list