Squeak-dev December 2013

squeak-dev@lists.squeakfoundation.org

45 participants
325 discussions

The Trunk: System-nice.636.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Nicolas Cellier uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-nice.636.mcz ==================== Summary ==================== Name: System-nice.636 Author: nice Time: 6 December 2013, 11:28:52.246 pm UUID: e1f5ee68-5a4c-4c7b-82d4-d093f2b6b571 Ancestors: System-fbs.635 Deprecate updateStream utilities =============== Diff against System-fbs.635 =============== Item was removed: - ----- Method: Utilities class>>applyUpdatesFromDisk (in category 'fetching updates') ----- - applyUpdatesFromDisk - "Utilities applyUpdatesFromDisk" - "compute highest update number" - | updateDirectory updateNumbers | - updateDirectory := self getUpdateDirectoryOrNil. - updateDirectory - ifNil: [^ self]. - updateNumbers := updateDirectory fileNames - collect: [:fn | fn initialIntegerOrNil] - thenSelect: [:fn | fn notNil]. - self - applyUpdatesFromDiskToUpdateNumber: (updateNumbers - inject: 0 - into: [:max :num | max max: num]) - stopIfGap: false! Item was removed: - ----- Method: Utilities class>>applyUpdatesFromDiskToUpdateNumber:stopIfGap: (in category 'fetching updates') ----- - applyUpdatesFromDiskToUpdateNumber: lastUpdateNumber stopIfGap: stopIfGapFlag - "To use this mechanism, be sure all updates you want to have considered - are in a folder named 'updates' which resides in the same directory as - your image. Having done that, simply evaluate: - - Utilities applyUpdatesFromDiskToUpdateNumber: 1234 stopIfGap: false - - and all numbered updates <= lastUpdateNumber not yet in the image will - be loaded in numerical order." - | previousHighest currentUpdateNumber done fileNames aMessage updateDirectory loaded | - updateDirectory := self getUpdateDirectoryOrNil. - updateDirectory ifNil: [^ self]. - previousHighest := SystemVersion current highestUpdate. - currentUpdateNumber := previousHighest. - done := false. - loaded := 0. - [done] - whileFalse: [currentUpdateNumber := currentUpdateNumber + 1. - currentUpdateNumber > lastUpdateNumber - ifTrue: [done := true] - ifFalse: [fileNames := updateDirectory fileNamesMatching: currentUpdateNumber printString , '*'. - fileNames size > 1 - ifTrue: [^ self inform: 'ambiguity -- two files both start with ' , currentUpdateNumber printString , ' - (at this point it is probably best to remedy - the situation on disk, then try again.)']. - fileNames size = 0 - ifTrue: [Transcript cr; show: 'gap in updates from disk for update number '; print: currentUpdateNumber; show: ' found...'. - done := stopIfGapFlag] - ifFalse: [ChangeSet - newChangesFromStream: (updateDirectory readOnlyFileNamed: fileNames first) - named: fileNames first. - SystemVersion current registerUpdate: currentUpdateNumber. - loaded := loaded + 1]]]. - aMessage := loaded = 0 - ifTrue: ['No new updates found.'] - ifFalse: [loaded printString , ' update(s) loaded.']. - self inform: aMessage , ' - Highest numbered update is now ' , (currentUpdateNumber - 1) printString , '.'! Item was removed: - ----- Method: Utilities class>>assureAbsenceOfUnstableUpdateStream (in category 'fetching updates') ----- - assureAbsenceOfUnstableUpdateStream - "Check to see if the unstable Updates stream is in the list; if it is, *remove* it. This is the *opposite* of #assureAvailabilityOfUnstableUpdateStream" - - UpdateUrlLists ifNil: [UpdateUrlLists := OrderedCollection new]. - UpdateUrlLists := UpdateUrlLists select: - [:pair | pair first ~= 'Unstable Updates*'] - - - "Utilities assureAbsenceOfUnstableUpdateStream"! Item was removed: - ----- Method: Utilities class>>assureAvailabilityOfUnstableUpdateStream (in category 'fetching updates') ----- - assureAvailabilityOfUnstableUpdateStream - "Check to see if the unstable Updates stream is in the list; if not, add it" - - UpdateUrlLists ifNil: [UpdateUrlLists := OrderedCollection new]. - UpdateUrlLists do: - [:pair | (pair first = 'Unstable Updates*') ifTrue: [^ self]]. - - UpdateUrlLists addFirst: #('Unstable Updates*' #('squeak.cs.uiuc.edu/Squeak2.0/' 'update.squeakfoundation.org/external/')) - - "Utilities assureAvailabilityOfUnstableUpdateStream"! Item was removed: - ----- Method: Utilities class>>broadcastUpdatesFrom:to:except: (in category 'fetching updates') ----- - broadcastUpdatesFrom: n1 to: n2 except: skipList - " - Note: This method takes its list of files from the directory named 'updates', - which will have been created and filled by, eg, - Utilities readServerUpdatesSaveLocally: true updateImage: true. - These can then be rebroadcast to any server using, eg, - Utilities broadcastUpdatesFrom: 1 to: 9999 except: #(223 224). - If the files are already on the server, and it is only a matter - of copying them to the index for a different version, then use... - (ServerDirectory serverInGroupNamed: 'SqC Internal Updates*') - exportUpdatesExcept: #(). - " - | fileNames fileNamesInOrder names choice file updateDirectory | - updateDirectory := FileDirectory default directoryNamed: 'updates'. - fileNames := updateDirectory fileNames select: - [:n | n first isDigit - and: [(n initialIntegerOrNil between: n1 and: n2) - and: [(skipList includes: n initialIntegerOrNil) not]]]. - (file := fileNames select: [:n | (n occurrencesOf: $.) > 1]) size > 0 - ifTrue: [self halt: file first , ' has multiple periods']. - fileNamesInOrder := fileNames asSortedCollection: - [:a :b | a initialIntegerOrNil < b initialIntegerOrNil]. - - names := ServerDirectory groupNames asSortedArray. - choice := UIManager default chooseFrom: names values: names. - choice == nil ifTrue: [^ self]. - (ServerDirectory serverInGroupNamed: choice) - putUpdateMulti: fileNamesInOrder fromDirectory: updateDirectory - ! Item was removed: - ----- Method: Utilities class>>chooseUpdateList (in category 'fetching updates') ----- - chooseUpdateList - "When there is more than one set of update servers, let the user choose which we will update from. Put it at the front of the list. Return false if the user aborted. If the preference #promptForUpdateServer is false, then suppress that prompt, in effect using the same server choice that was used the previous time (a convenience for those of us who always answer the same thing to the prompt.)" - - | index him | - ((UpdateUrlLists size > 1) and: [Preferences promptForUpdateServer]) - ifTrue: - [index := UIManager default - chooseFrom: (UpdateUrlLists collect: [:each | each first]) - lines: #() - title: 'Choose a group of servers\from which to fetch updates.' translated withCRs. - index > 0 ifTrue: - [him := UpdateUrlLists at: index. - UpdateUrlLists removeAt: index. - UpdateUrlLists addFirst: him]. - ^ index > 0]. - ^ true! Item was removed: - ----- Method: Utilities class>>extractThisVersion: (in category 'fetching updates') ----- - extractThisVersion: list - "Pull out the part of the list that applies to this version." - - | listContents version versIndex | - listContents := self parseListContents: list. - version := SystemVersion current version. - - versIndex := (listContents collect: [:pair | pair first]) indexOf: version. - versIndex = 0 ifTrue: [^ Array new]. "abort" - ^ (listContents at: versIndex) last! Item was removed: - ----- Method: Utilities class>>fileInFromUpdatesFolder: (in category 'fetching updates') ----- - fileInFromUpdatesFolder: numberList - "File in a series of updates with the given updates numbers, from the updates folder in the default directory. The file-ins are done in numeric order, even if numberList was not sorted upon entry. - This is useful for test-driving the retrofitting of a possibly discontinguous list of updates from an alpha version back to a stable release. - - Utilities fileInFromUpdatesFolder: #(4745 4746 4747 4748 4749 4750 4751 4752 4754 4755 4761 4762 4767 4769). - " - | fileNames fileNamesInOrder file updateDirectory | - updateDirectory := FileDirectory default directoryNamed: 'updates'. - fileNames := updateDirectory fileNames select: - [:n | n first isDigit - and: [numberList includes: n initialIntegerOrNil]]. - (file := fileNames select: [:n | (n occurrencesOf: $.) > 1]) size > 0 - ifTrue: [self error: file first , ' has multiple periods']. - fileNamesInOrder := fileNames asSortedCollection: - [:a :b | a initialIntegerOrNil < b initialIntegerOrNil]. - - fileNamesInOrder do: - [:aFileName | (updateDirectory readOnlyFileNamed: aFileName) fileIntoNewChangeSet]! Item was removed: - ----- Method: Utilities class>>getUpdateDirectoryOrNil (in category 'fetching updates') ----- - getUpdateDirectoryOrNil - ^ (FileDirectory default directoryNames includes: 'updates') - ifTrue: [FileDirectory default directoryNamed: 'updates'] - ifFalse: [self inform: 'Error: cannot find "updates" folder'. - nil]! Item was removed: - ----- Method: Utilities class>>lastUpdateNum: (in category 'fetching updates') ----- - lastUpdateNum: updatesFileStrm - "Look in the Updates file and see what the last sequence number is. Warn the user if the version it is under is not this image's version." - - | verIndex seqIndex char ver seqNum | - verIndex := seqIndex := 0. "last # starting a line and last digit starting a line" - seqNum := 0. - updatesFileStrm reset; ascii. - [char := updatesFileStrm next. - updatesFileStrm atEnd] whileFalse: [ - char == Character cr ifTrue: [ - updatesFileStrm peek == $# ifTrue: [verIndex := updatesFileStrm position +1. - seqIndex = 0 ifFalse: ["See if last num of old version if biggest so far" - updatesFileStrm position: seqIndex. - ver := SmallInteger readFrom: updatesFileStrm. - seqNum := seqNum max: ver. - updatesFileStrm position: verIndex-1]]. - updatesFileStrm peek isDigit ifTrue: [seqIndex := updatesFileStrm position]]]. - - seqIndex = 0 ifFalse: ["See if last num of old version if biggest so far" - updatesFileStrm position: seqIndex. - ver := SmallInteger readFrom: updatesFileStrm. - seqNum := seqNum max: ver. - updatesFileStrm setToEnd]. - ^ seqNum! Item was removed: - ----- Method: Utilities class>>newUpdatesOn:special:throughNumber: (in category 'fetching updates') ----- - newUpdatesOn: serverList special: indexPrefix throughNumber: aNumber - "Return a list of fully formed URLs of update files we do not yet have. Go to the listed servers and look at the file 'updates.list' for the names of the last N update files. We look backwards for the first one we have, and make the list from there. tk 9/10/97 - No updates numbered higher than aNumber (if it is not nil) are returned " - - | existing out maxNumber | - maxNumber := aNumber ifNil: [99999]. - out := OrderedCollection new. - existing := SystemVersion current updates. - serverList do: [:server | | raw doc list char | - doc := HTTPClient httpGet: 'http://' , server,indexPrefix,'updates.list'. - - "test here for server being up" - doc class == RWBinaryOrTextStream ifTrue: - [raw := doc reset; contents. "one file name per line" - list := self extractThisVersion: raw. - list reverseDo: [:fileName | | ff itsNumber | - ff := (fileName findTokens: '/') last. "allow subdirectories" - itsNumber := ff initialIntegerOrNil. - (existing includes: itsNumber) - ifFalse: - [ - (itsNumber == nil or: [itsNumber <= maxNumber]) - ifTrue: - [out addFirst: 'http://' , server, fileName]] - ifTrue: [^ out]]. - ((out size > 0) or: [char := doc reset; skipSeparators; next. - (char == $*) | (char == $#)]) ifTrue: - [^ out "we have our list"]]. "else got error msg instead of file" - "Server was down, try next one"]. - self inform: 'All code update servers seem to be unavailable'. - ^ out! Item was removed: - ----- Method: Utilities class>>objectStrmFromUpdates: (in category 'fetching updates') ----- - objectStrmFromUpdates: fileName - "Go to the known servers and look for this file in the updates folder. It is an auxillery file, like .morph or a .gif. Return a RWBinaryOrTextStream on it. Meant to be called from during the getting of updates from the server. That assures that (Utilities serverUrls) returns the right group of servers." - Cursor wait showWhile: - [ | urls | - urls := Utilities serverUrls collect: [:url | url, 'updates/', fileName]. - urls do: [:aUrl | | doc | - doc := HTTPSocket httpGet: aUrl accept: 'application/octet-stream'. - "test here for server being up" - doc class == RWBinaryOrTextStream ifTrue: [^ doc reset]]]. - - self inform: 'All update servers are unavailable, or bad file name'. - ^ nil! Item was removed: - ----- Method: Utilities class>>parseListContents: (in category 'fetching updates') ----- - parseListContents: listContents - | sections vers strm line fileNames | - "Parse the contents of updates.list into {{vers. {fileNames*}}*}, and return it." - - sections := OrderedCollection new. - fileNames := OrderedCollection new: 1000. - vers := nil. - strm := ReadStream on: listContents. - [strm atEnd] whileFalse: - [line := strm nextLine. - line size > 0 ifTrue: - [line first = $# - ifTrue: [vers ifNotNil: [sections addLast: {vers. fileNames asArray}]. - "Start a new section" - vers := line allButFirst. - fileNames resetTo: 1] - ifFalse: [line first = $* ifFalse: [fileNames addLast: line]]]]. - vers ifNotNil: [sections addLast: {vers. fileNames asArray}]. - ^ sections asArray - " TEST: - | list | - list := Utilities parseListContents: (FileStream oldFileNamed: 'updates.list') contentsOfEntireFile. - list = (Utilities parseListContents: (String streamContents: [:s | Utilities writeList: list toStream: s])) - ifFalse: [self error: 'test failed'] - ifTrue: [self inform: 'test OK'] - "! Item was removed: - ----- Method: Utilities class>>position:atVersion: (in category 'fetching updates') ----- - position: updateStrm atVersion: version - "Set the stream to the end of the last line of updates names for this version. Usually the end of the file. We will add a new update name. Return the contents of the rest of the file." - - | char foundIt where data | - updateStrm reset; ascii. - foundIt := false. - [char := updateStrm next. - updateStrm atEnd] whileFalse: [ - (char == Character cr or: [char == Character lf]) ifTrue: [ - updateStrm peek == $# ifTrue: [ - foundIt ifTrue: ["Next section" - where := updateStrm position. - data := updateStrm upTo: (255 asCharacter). - updateStrm position: where. - ^ data]. "won't be found -- copy all the way to the end" - updateStrm next. - (updateStrm nextMatchAll: version) ifTrue: [ - (updateStrm atEnd or: [(updateStrm peek = Character cr) | - (updateStrm peek = Character lf)]) ifTrue: [ - foundIt := true - ]]]]]. - foundIt ifTrue: [ - updateStrm setToEnd. - ^ '']. - self error: 'The current version does not have a section in the Updates file'. - ! Item was removed: - ----- Method: Utilities class>>readNextUpdateFromServer (in category 'fetching updates') ----- - readNextUpdateFromServer - "Utilities readNextUpdateFromServer" - self updateFromServerThroughUpdateNumber: (ChangeSet highestNumberedChangeSet + 1)! Item was removed: - ----- Method: Utilities class>>readNextUpdatesFromDisk: (in category 'fetching updates') ----- - readNextUpdatesFromDisk: n - "Read the updates up through the current highest-update-number plus n. Thus, - Utilities readNextUpdatesFromDisk: 7 - will read the next seven updates from disk" - - self applyUpdatesFromDiskToUpdateNumber: ChangeSet highestNumberedChangeSet + n - stopIfGap: false! Item was removed: - ----- Method: Utilities class>>readServer:special:updatesThrough:saveLocally:updateImage: (in category 'fetching updates') ----- - readServer: serverList special: indexPrefix updatesThrough: maxNumber saveLocally: saveLocally updateImage: updateImage - "Scan the update server(s) for unassimilated updates. If maxNumber is not nil, it represents the highest-numbered update to load. This makes it possible to update only up to a particular point. If saveLocally is true, then save local copies of the update files on disc. If updateImage is true, then absorb the updates into the current image." - - "Utilities readServer: Utilities serverUrls updatesThrough: 828 saveLocally: true updateImage: true" - - | str urls failed loaded | - Cursor wait showWhile: [ | docQueue docQueueSema | - - urls := self newUpdatesOn: (serverList collect: [:url | url, 'updates/']) - special: indexPrefix - throughNumber: maxNumber. - loaded := 0. - failed := nil. - - "send downloaded documents throuh this queue" - docQueue := SharedQueue new. - - "this semaphore keeps too many documents from beeing queueed up at a time" - docQueueSema := Semaphore new. - 5 timesRepeat: [ docQueueSema signal ]. - - "fork a process to download the updates" - self retrieveUrls: urls ontoQueue: docQueue withWaitSema: docQueueSema. - - "process downloaded updates in the foreground" - 'Processing updates' displayProgressFrom: 0 to: urls size during: [:bar | | nextDoc this updateName | - [ this := docQueue next. - nextDoc := docQueue next. - nextDoc = #failed ifTrue: [ failed := this ]. - (failed isNil and: [ nextDoc ~= #finished ]) - ] whileTrue: [ - failed ifNil: [ - nextDoc reset; text. - nextDoc size = 0 ifTrue: [ failed := this ]. ]. - failed ifNil: [ - nextDoc peek asciiValue = 4 "pure object file" - ifTrue: [failed := this]]. "Must be fileIn, not pure object file" - failed ifNil: [ - "(this endsWith: '.html') ifTrue: [doc := doc asHtml]." - "HTML source code not supported here yet" - updateImage - ifTrue: [ - updateName := (this findTokens: '/') last. - ChangeSet newChangesFromStream: nextDoc named: updateName. - SystemVersion current registerUpdate: updateName initialIntegerOrNil]. - saveLocally ifTrue: - [self saveUpdate: nextDoc onFile: (this findTokens: '/') last]. "if wanted" - loaded := loaded + 1. - bar value: loaded]. - - docQueueSema signal]. - ]]. - - failed ~~ nil & (urls size - loaded > 0) ifTrue: [ - str := loaded printString ,' new update file(s) processed.'. - str := str, '\Could not load ' withCRs, - (urls size - loaded) printString ,' update file(s).', - '\Starting with "' withCRs, failed, '".'. - self inform: str]. - ^ Array with: failed with: loaded - ! Item was removed: - ----- Method: Utilities class>>readServerUpdatesSaveLocally:updateImage: (in category 'fetching updates') ----- - readServerUpdatesSaveLocally: saveLocally updateImage: updateImage - ^ self readServerUpdatesThrough: nil saveLocally: saveLocally updateImage: updateImage! Item was removed: - ----- Method: Utilities class>>readServerUpdatesThrough:saveLocally:updateImage: (in category 'fetching updates') ----- - readServerUpdatesThrough: maxNumber saveLocally: saveLocally updateImage: updateImage - "Scan the update server(s) for unassimilated updates. If maxNumber is not nil, it represents the highest-numbered update to load. This makes it possible to update only up to a particular point. If saveLocally is true, then save local copies of the update files on disc. If updateImage is true, then absorb the updates into the current image. - - A file on the server called updates.list has the names of the last N update files. We look backwards for the first one we do not have, and start there" - "* To add a new update: Name it starting with a new two-digit code. - * Do not use %, /, *, space, or more than one period in the name of an update file. - * The update name does not need to have any relation to the version name. - * Figure out which versions of the system the update makes sense for. - * Add the name of the file to each version's category below. - * Put this file and the update file on all of the servers. - * - * To make a new version of the system: Pick a name for it (no restrictions) - * Put # and exactly that name on a new line at the end of this file. - * During the release process, fill in exactly that name in the dialog box. - * Put this file on the server." - "When two sets of updates need to use the same directory, one of them has a * in its - serverUrls description. When that is true, the first word of the description is put on - the front of 'updates.list', and that is the index file used." - - "Utilities readServerUpdatesThrough: 3922 saveLocally: true updateImage: true" - - | failed loaded str res servers triple tryAgain indexPrefix | - Utilities chooseUpdateList ifFalse: [^ self]. "ask the user which kind of updates" - - servers := Utilities serverUrls copy. - indexPrefix := (Utilities updateUrlLists first first includes: $*) - ifTrue: [(Utilities updateUrlLists first first findTokens: ' ') first] - "special for internal updates" - ifFalse: ['']. "normal" - [servers isEmpty] whileFalse: [ - triple := self readServer: servers special: indexPrefix - updatesThrough: maxNumber - saveLocally: saveLocally updateImage: updateImage. - - "report to user" - failed := triple first. - loaded := triple second. - tryAgain := false. - failed ifNil: ["is OK" - loaded = 0 ifTrue: ["found no updates" - servers size > 1 ifTrue: ["not the last server" - res := UIManager default - chooseFrom: #('Stop looking' 'Try next server') - title: - 'No new updates on the server - ', servers first, ' - Would you like to try the next server? - (Normally, all servers are identical, but sometimes a - server won''t let us store new files, and gets out of date.)' - . - res = 2 ifFalse: [^ self] - ifTrue: [servers := servers allButFirst. "try the next server" - tryAgain := true]]]]. - tryAgain ifFalse: [ - str := loaded printString ,' new update file(s) processed.'. - ^ self inform: str]. - ].! Item was removed: - ----- Method: Utilities class>>retrieveUrls:ontoQueue:withWaitSema: (in category 'fetching updates') ----- - retrieveUrls: urls ontoQueue: queue withWaitSema: waitSema - "download the given list of URLs. The queue will be loaded alternately - with url's and with the retrieved contents. If a download fails, the - contents will be #failed. If all goes well, a special pair with an empty - URL and the contents #finished will be put on the queue. waitSema is - waited on every time before a new document is downloaded; this keeps - the downloader from getting too far ahead of the main process" - "kill the existing downloader if there is one" - | updateCounter | - UpdateDownloader - ifNotNil: [UpdateDownloader terminate]. - updateCounter := 0. - "fork a new downloading process" - UpdateDownloader := [ - 'Downloading updates' displayProgressFrom: 0 to: urls size during: [:bar | - urls - do: [:url | | front canPeek doc | - waitSema wait. - queue nextPut: url. - doc := HTTPClient httpGet: url. - doc isString - ifTrue: [queue nextPut: #failed. - UpdateDownloader := nil. - Processor activeProcess terminate] - ifFalse: [canPeek := 120 min: doc size. - front := doc next: canPeek. doc skip: -1 * canPeek. - (front beginsWith: '<!!DOCTYPE') ifTrue: [ - (front includesSubString: 'Not Found') ifTrue: [ - queue nextPut: #failed. - UpdateDownloader := nil. - Processor activeProcess terminate]]]. - UpdateDownloader ifNotNil: [queue nextPut: doc. updateCounter := updateCounter + 1. bar value: updateCounter]]]. - queue nextPut: ''. - queue nextPut: #finished. - UpdateDownloader := nil] newProcess. - UpdateDownloader priority: Processor userInterruptPriority. - "start the process running" - UpdateDownloader resume! Item was removed: - ----- Method: Utilities class>>saveUpdate:onFile: (in category 'fetching updates') ----- - saveUpdate: doc onFile: fileName - "Save the update on a local file. With or without the update number on the front, depending on the preference #updateRemoveSequenceNum" - - | file fName pos updateDirectory | - - (FileDirectory default directoryNames includes: 'updates') ifFalse: - [FileDirectory default createDirectory: 'updates']. - updateDirectory := FileDirectory default directoryNamed: 'updates'. - - fName := fileName. - (Preferences valueOfFlag: #updateRemoveSequenceNum) ifTrue: - [pos := fName findFirst: [:c | c isDigit not]. - fName := fName copyFrom: pos to: fName size]. - doc reset; ascii. - (updateDirectory fileExists: fName) ifFalse: - [file := updateDirectory newFileNamed: fName. - file nextPutAll: doc contents. - file close]. - ! Item was removed: - ----- Method: Utilities class>>serverUrls (in category 'fetching updates') ----- - serverUrls - "Return the current list of server URLs. For code updates. Format of UpdateUrlLists is - #( ('squeak updates' ('url1' 'url2')) - ('some other updates' ('url3' 'url4')))" - - | list | - list := UpdateUrlLists first last. - - "If there is a dead server, return a copy with that server last" - Socket deadServer ifNotNil: [ - list clone withIndexDo: [:aName :ind | - (aName beginsWith: Socket deadServer) ifTrue: [ - list := list asOrderedCollection. "and it's a copy" - list removeAt: ind. - list addLast: aName]] - ]. - - ^ list asArray! Item was removed: - ----- Method: Utilities class>>setUpdateServer: (in category 'fetching updates') ----- - setUpdateServer: groupName - "Utilities setUpdateServer: 'Squeakland' " - | entry index | - - - entry := UpdateUrlLists detect: [:each | each first = groupName] ifNone: [^self]. - index := UpdateUrlLists indexOf: entry. - UpdateUrlLists removeAt: index. - UpdateUrlLists addFirst: entry! Item was removed: - ----- Method: Utilities class>>summariesForUpdates:through: (in category 'fetching updates') ----- - summariesForUpdates: startNumber through: stopNumber - "Answer the concatenation of summary strings for updates numbered in the given range" - - ^ String streamContents: [:aStream | - ((ChangeSet changeSetsNamedSuchThat: - [:aName | aName first isDigit - and: [aName initialIntegerOrNil >= startNumber - and: [aName initialIntegerOrNil <= stopNumber]]]) asSortedCollection: - [:a :b | a name < b name]) do: - [:aChangeSet | aStream cr; nextPutAll: aChangeSet summaryString]] - - "Utilities summariesForUpdates: 4899 through: 4903" - - ! Item was removed: - ----- Method: Utilities class>>updateComment (in category 'fetching updates') ----- - updateComment - "The following used to be at the beginning of the update file. - Now it is here to simplify parsing the file... - - * To add a new update: Name it starting with a new four-digit code. - * Do not use %, /, *, space, or more than one period in the name of an update file. - * The update name does not need to have any relation to the version name. - * Figure out which versions of the system the update makes sense for. - * Add the name of the file to each version's category below. - * Put this file and the update file on all of the servers. - * - * To make a new version of the system: Pick a name for it (no restrictions) - * Put # and exactly that name on a new line at the end of this file. - * During the release process, fill in exactly that name in the dialog box. - * Put a copy of updates.list on the server. - * - * Special file with a different name for Disney Internal Updates. - * No need to move or rename files to release them to external updates. - "! Item was removed: - ----- Method: Utilities class>>updateFromServerThroughUpdateNumber: (in category 'fetching updates') ----- - updateFromServerThroughUpdateNumber: aNumber - "Update the image by loading all pending updates from the server. Also save local copies of the update files if the #updateSavesFile preference is set to true" - - self readServerUpdatesThrough: aNumber saveLocally: Preferences updateSavesFile updateImage: true! Item was removed: - ----- Method: Utilities class>>updateUrlLists (in category 'fetching updates') ----- - updateUrlLists - - UpdateUrlLists ifNil: [UpdateUrlLists := OrderedCollection new]. - ^ UpdateUrlLists! Item was removed: - ----- Method: Utilities class>>writeList:toStream: (in category 'fetching updates') ----- - writeList: listContents toStream: strm - "Write a parsed updates.list out as text. - This is the inverse of parseListContents:" - - - strm reset. - listContents do: - [:pair | | version fileNames | - version := pair first. fileNames := pair last. - strm nextPut: $#; nextPutAll: version; cr. - fileNames do: [:fileName | strm nextPutAll: fileName; cr]]. - strm close! Item was removed: - ----- Method: Utilities class>>zapUpdateDownloader (in category 'fetching updates') ----- - zapUpdateDownloader - - UpdateDownloader ifNotNil: [UpdateDownloader terminate]. - UpdateDownloader := nil.!

1 0

The Trunk: 45Deprecated-nice.19.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Nicolas Cellier uploaded a new version of 45Deprecated to project The Trunk: http://source.squeak.org/trunk/45Deprecated-nice.19.mcz ==================== Summary ==================== Name: 45Deprecated-nice.19 Author: nice Time: 6 December 2013, 11:25:24.533 pm UUID: 8dad8959-2671-4eaf-8224-7c0d1d630483 Ancestors: 45Deprecated-fbs.18 Deprecate updateStream utilities =============== Diff against 45Deprecated-fbs.18 =============== Item was added: + ----- Method: Utilities class>>applyUpdatesFromDisk (in category '*45Deprecated-fetching updates') ----- + applyUpdatesFromDisk + self deprecated: 'Use UpdateStreamDownloader default >> #applyUpdatesFromDisk:'. + ^UpdateStreamDownloader default applyUpdatesFromDisk! Item was added: + ----- Method: Utilities class>>applyUpdatesFromDiskToUpdateNumber:stopIfGap: (in category '*45Deprecated-fetching updates') ----- + applyUpdatesFromDiskToUpdateNumber: lastUpdateNumber stopIfGap: stopIfGapFlag + self deprecated: 'Use UpdateStreamDownloader default >> #applyUpdatesFromDiskToUpdateNumber:stopIfGap:'. + ^UpdateStreamDownloader default applyUpdatesFromDiskToUpdateNumber: lastUpdateNumber stopIfGap: stopIfGapFlag ! Item was added: + ----- Method: Utilities class>>assureAbsenceOfUnstableUpdateStream (in category '*45Deprecated-fetching updates') ----- + assureAbsenceOfUnstableUpdateStream + self deprecated: 'Use UpdateStreamDownloader default >> #assureAbsenceOfUnstableUpdateStream'. + ^UpdateStreamDownloader default assureAbsenceOfUnstableUpdateStream! Item was added: + ----- Method: Utilities class>>assureAvailabilityOfUnstableUpdateStream (in category '*45Deprecated-fetching updates') ----- + assureAvailabilityOfUnstableUpdateStream + self deprecated: 'Use UpdateStreamDownloader default >> #assureAvailabilityOfUnstableUpdateStream'. + ^UpdateStreamDownloader default assureAvailabilityOfUnstableUpdateStream! Item was added: + ----- Method: Utilities class>>broadcastUpdatesFrom:to:except: (in category '*45Deprecated-fetching updates') ----- + broadcastUpdatesFrom: n1 to: n2 except: skipList + self deprecated: 'Use UpdateStreamDownloader default >> #broadcastUpdatesFrom:to:except:'. + ^UpdateStreamDownloader default broadcastUpdatesFrom: n1 to: n2 except: skipList! Item was added: + ----- Method: Utilities class>>chooseUpdateList (in category '*45Deprecated-fetching updates') ----- + chooseUpdateList + self deprecated: 'Use UpdateStreamDownloader default >> #chooseUpdateList'. + ^UpdateStreamDownloader default chooseUpdateList! Item was added: + ----- Method: Utilities class>>fileInFromUpdatesFolder: (in category '*45Deprecated-fetching updates') ----- + fileInFromUpdatesFolder: numberList + self deprecated: 'Use UpdateStreamDownloader default >> #fileInFromUpdatesFolder:'. + ^UpdateStreamDownloader default fileInFromUpdatesFolder: numberList! Item was added: + ----- Method: Utilities class>>getUpdateDirectoryOrNil (in category '*45Deprecated-fetching updates') ----- + getUpdateDirectoryOrNil + self deprecated: 'Use UpdateStreamDownloader default >> #getUpdateDirectoryOrNil'. + ^UpdateStreamDownloader default getUpdateDirectoryOrNil! Item was added: + ----- Method: Utilities class>>lastUpdateNum: (in category '*45Deprecated-fetching updates') ----- + lastUpdateNum: updatesFileStrm + self deprecated: 'Use UpdateStreamDownloader default >> #lastUpdateNum:'. + ^UpdateStreamDownloader default lastUpdateNum: updatesFileStrm! Item was added: + ----- Method: Utilities class>>newUpdatesOn:special:throughNumber: (in category '*45Deprecated-fetching updates') ----- + newUpdatesOn: serverList special: indexPrefix throughNumber: aNumber + self deprecated: 'Use UpdateStreamDownloader default >> #newUpdatesOn:special:throughNumber:'. + ^UpdateStreamDownloader default newUpdatesOn: serverList special: indexPrefix throughNumber: aNumber! Item was added: + ----- Method: Utilities class>>objectStrmFromUpdates: (in category '*45Deprecated-fetching updates') ----- + objectStrmFromUpdates: fileName + self deprecated: 'Use UpdateStreamDownloader default >> #objectStrmFromUpdates:'. + ^UpdateStreamDownloader default objectStrmFromUpdates: fileName! Item was added: + ----- Method: Utilities class>>parseListContents: (in category '*45Deprecated-fetching updates') ----- + parseListContents: listContents + self deprecated: 'Use UpdateStreamDownloader default >> #parseListContents:'. + ^UpdateStreamDownloader default parseListContents: listContents! Item was added: + ----- Method: Utilities class>>position:atVersion: (in category '*45Deprecated-fetching updates') ----- + position: updateStrm atVersion: version + self deprecated: 'Use UpdateStreamDownloader default >> #position:atVersion:'. + ^UpdateStreamDownloader default position: updateStrm atVersion: version! Item was added: + ----- Method: Utilities class>>readNextUpdateFromServer (in category '*45Deprecated-fetching updates') ----- + readNextUpdateFromServer + self deprecated: 'Use UpdateStreamDownloader default >> #readNextUpdateFromServer'. + ^UpdateStreamDownloader default readNextUpdateFromServer! Item was added: + ----- Method: Utilities class>>readNextUpdatesFromDisk: (in category '*45Deprecated-fetching updates') ----- + readNextUpdatesFromDisk: n + self deprecated: 'Use UpdateStreamDownloader default >> #readNextUpdatesFromDisk:'. + ^UpdateStreamDownloader default readNextUpdatesFromDisk: n! Item was added: + ----- Method: Utilities class>>readServer:special:updatesThrough:saveLocally:updateImage: (in category '*45Deprecated-fetching updates') ----- + readServer: serverList special: indexPrefix updatesThrough: maxNumber saveLocally: saveLocally updateImage: updateImage + self deprecated: 'Use UpdateStreamDownloader default >> #readServer:special:updatesThrough:saveLocally:updateImage:'. + ^UpdateStreamDownloader default readServer: serverList special: indexPrefix updatesThrough: maxNumber saveLocally: saveLocally updateImage: updateImage! Item was added: + ----- Method: Utilities class>>readServerUpdatesSaveLocally:updateImage: (in category '*45Deprecated-fetching updates') ----- + readServerUpdatesSaveLocally: saveLocally updateImage: updateImage + self deprecated: 'Use UpdateStreamDownloader default >> #readServerUpdatesSaveLocally:updateImage:'. + ^UpdateStreamDownloader default readServerUpdatesSaveLocally: saveLocally updateImage: updateImage! Item was added: + ----- Method: Utilities class>>readServerUpdatesThrough:saveLocally:updateImage: (in category '*45Deprecated-fetching updates') ----- + readServerUpdatesThrough: maxNumber saveLocally: saveLocally updateImage: updateImage + self deprecated: 'Use UpdateStreamDownloader default >> #readServerUpdatesThrough:saveLocally:updateImage:'. + ^UpdateStreamDownloader default readServerUpdatesThrough: maxNumber saveLocally: saveLocally updateImage: updateImage! Item was added: + ----- Method: Utilities class>>retrieveUrls:ontoQueue:withWaitSema: (in category '*45Deprecated-fetching updates') ----- + retrieveUrls: urls ontoQueue: queue withWaitSema: waitSema + self deprecated: 'Use UpdateStreamDownloader default >> #retrieveUrls:ontoQueue:withWaitSema:'. + ^UpdateStreamDownloader default retrieveUrls: urls ontoQueue: queue withWaitSema: waitSema ! Item was added: + ----- Method: Utilities class>>saveUpdate:onFile: (in category '*45Deprecated-fetching updates') ----- + saveUpdate: doc onFile: fileName + self deprecated: 'Use UpdateStreamDownloader default >> #saveUpdate:onFile:'. + ^UpdateStreamDownloader default saveUpdate: doc onFile: fileName! Item was added: + ----- Method: Utilities class>>serverUrls (in category '*45Deprecated-fetching updates') ----- + serverUrls + self deprecated: 'Use UpdateStreamDownloader default >> #serverUrls'. + ^UpdateStreamDownloader default serverUrls! Item was added: + ----- Method: Utilities class>>setUpdateServer: (in category '*45Deprecated-fetching updates') ----- + setUpdateServer: groupName + self deprecated: 'Use UpdateStreamDownloader default >> #setUpdateServer:'. + ^UpdateStreamDownloader default setUpdateServer: groupName! Item was added: + ----- Method: Utilities class>>summariesForUpdates:through: (in category '*45Deprecated-fetching updates') ----- + summariesForUpdates: startNumber through: stopNumber + self deprecated: 'Use UpdateStreamDownloader default >> #summariesForUpdates:through:'. + ^UpdateStreamDownloader default summariesForUpdates: startNumber through: stopNumber! Item was added: + ----- Method: Utilities class>>updateFromServerThroughUpdateNumber: (in category '*45Deprecated-fetching updates') ----- + updateFromServerThroughUpdateNumber: aNumber + self deprecated: 'Use UpdateStreamDownloader default >> #updateFromServerThroughUpdateNumber:'. + ^UpdateStreamDownloader default updateFromServerThroughUpdateNumber: aNumber! Item was added: + ----- Method: Utilities class>>updateUrlLists (in category '*45Deprecated-fetching updates') ----- + updateUrlLists + self deprecated: 'Use UpdateStreamDownloader default >> #updateUrlLists'. + ^UpdateStreamDownloader default updateUrlLists! Item was added: + ----- Method: Utilities class>>writeList:toStream: (in category '*45Deprecated-fetching updates') ----- + writeList: listContents toStream: strm + self deprecated: 'Use UpdateStreamDownloader default >> #writeList:toStream:'. + ^UpdateStreamDownloader default writeList: listContents toStream: strm! Item was added: + ----- Method: Utilities class>>zapUpdateDownloader (in category '*45Deprecated-fetching updates') ----- + zapUpdateDownloader + self deprecated: 'Use UpdateStreamDownloader default >> #zapUpdateDownloader'. + ^UpdateStreamDownloader default zapUpdateDownloader!

1 0

Re: [squeak-dev] The Trunk: Tests-fbs.270.mcz
by Frank Shearar 06 Dec '13

06 Dec '13

On 6 December 2013 20:57, <commits(a)source.squeak.org> wrote: > Frank Shearar uploaded a new version of Tests to project The Trunk: > http://source.squeak.org/trunk/Tests-fbs.270.mcz > > ==================== Summary ==================== > > Name: Tests-fbs.270 > Author: fbs > Time: 6 December 2013, 8:57:39.36 pm > UUID: 8b0c02e9-08e2-f043-8513-f62383cb73b9 > Ancestors: Tests-fbs.269 > > System -/-> Tools > > =============== Diff against Tests-fbs.269 =============== > > Item was changed: > ----- Method: PackageDependencyTest>>testSystem (in category 'tests') ----- > testSystem > self testPackage: 'System' dependsExactlyOn: #( <snip> > - Tools <snip> Whee! frank

1 0

The Trunk: Tests-fbs.270.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Frank Shearar uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-fbs.270.mcz ==================== Summary ==================== Name: Tests-fbs.270 Author: fbs Time: 6 December 2013, 8:57:39.36 pm UUID: 8b0c02e9-08e2-f043-8513-f62383cb73b9 Ancestors: Tests-fbs.269 System -/-> Tools =============== Diff against Tests-fbs.269 =============== Item was changed: ----- Method: PackageDependencyTest>>testSystem (in category 'tests') ----- testSystem self testPackage: 'System' dependsExactlyOn: #( Collections Compiler Compression Environments Files Graphics 'Installer-Core' Kernel Monticello MonticelloConfigurations Morphic MorphicExtras Multilingual Network 'PackageInfo-Base' Sound 'ToolBuilder-Kernel' - Tools TrueType ).!

1 0

The Trunk: UpdateStream-fbs.3.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Frank Shearar uploaded a new version of UpdateStream to project The Trunk: http://source.squeak.org/trunk/UpdateStream-fbs.3.mcz ==================== Summary ==================== Name: UpdateStream-fbs.3 Author: fbs Time: 6 December 2013, 8:56:59.9 pm UUID: 2d0c0933-b30f-da40-a681-f45f01308218 Ancestors: UpdateStream-nice.2 FilePackage has a bunch of logic around handling update streams' changesets. This logic now belongs in UpdateStream. =============== Diff against UpdateStream-nice.2 =============== Item was added: + ----- Method: FilePackage class>>conflictsWithUpdatedMethods: (in category '*UpdateStream-instance creation') ----- + conflictsWithUpdatedMethods: fullName + | conflicts changeList | + conflicts := (self fromFileNamed: fullName) conflictsWithUpdatedMethods. + conflicts isEmpty ifTrue: [^ self]. + changeList := ChangeList new. + changeList + changes: conflicts + file: (FileDirectory default readOnlyFileNamed: fullName) close. + ChangeList + open: changeList + name: 'Conflicts for ', (FileDirectory localNameFor: fullName) + multiSelect: true.! Item was added: + ----- Method: FilePackage class>>fileReaderServicesForFile:suffix: (in category '*UpdateStream-reader service') ----- + fileReaderServicesForFile: fullName suffix: suffix + + ^(suffix = 'st') | (suffix = 'cs') | (suffix = '*') + ifTrue: [self services] + ifFalse: [#()]! Item was added: + ----- Method: FilePackage class>>serviceConflictsWithUpdatedMethods (in category '*UpdateStream-reader service') ----- + serviceConflictsWithUpdatedMethods + ^ SimpleServiceEntry + provider: self + label: 'conflicts with updated methods' + selector: #conflictsWithUpdatedMethods: + description: 'check for conflicts with more recently updated methods in the image, showing the conflicts in a transcript window' + buttonLabel: 'conflicts'! Item was added: + ----- Method: FilePackage class>>services (in category '*UpdateStream-reader service') ----- + services + ^ Array with: self serviceConflictsWithUpdatedMethods! Item was added: + ----- Method: FilePackage>>checkForMoreRecentUpdateThanChangeSet:pseudoClass:selector: (in category '*UpdateStream-conflict checker') ----- + checkForMoreRecentUpdateThanChangeSet: updateNumberChangeSet pseudoClass: pseudoClass selector: selector + "Returns the source code for a conflict if a conflict is found, otherwise returns nil." + + | classOrMeta allChangeSets moreRecentChangeSets conflictingChangeSets changeRecordSource classAndMethodPrintString | + + classAndMethodPrintString := pseudoClass name, (pseudoClass hasMetaclass ifTrue: [' class'] ifFalse: ['']), '>>', selector asString. + + changeRecordSource := pseudoClass sourceCode at: selector. + changeRecordSource isText + ifTrue: [changeRecordSource := Text + fromString: 'method: ', classAndMethodPrintString, ' was removed'] + ifFalse: [changeRecordSource stamp isEmptyOrNil ifTrue: + [self notify: 'Warning: ', classAndMethodPrintString, ' in ', self packageName, ' has no timestamp/initials!!']]. + + pseudoClass exists ifFalse: + [(self classes at: pseudoClass name) hasDefinition + ifTrue: [^ nil "a method was added for a newly defined class; not a conflict"] + ifFalse: [self class logCr; log: 'CONFLICT found for ', classAndMethodPrintString, '... class ', pseudoClass name asString, ' does not exist in the image and is not defined in the file'. + ^ changeRecordSource]]. + + classOrMeta := pseudoClass realClass. + + "Only printout the replacing methods here, but we still check for removed methods too in the rest of this method." + (self class verboseConflicts and: [classOrMeta includesSelector: selector]) + ifTrue: [self class logCr; log: '...checking ', classOrMeta asString, '>>', selector asString]. + + allChangeSets := ChangesOrganizer allChangeSets. + moreRecentChangeSets := allChangeSets + copyFrom: (allChangeSets indexOf: updateNumberChangeSet) + to: (allChangeSets size). + conflictingChangeSets := (moreRecentChangeSets select: + [:cs | (cs atSelector: selector class: classOrMeta) ~~ #none]). + conflictingChangeSets isEmpty ifTrue: [^ nil]. + + self class logCr; log: 'CONFLICT found for ', classAndMethodPrintString, + (' with newer changeset' asPluralBasedOn: conflictingChangeSets). + conflictingChangeSets do: [:cs | self class log: ' ', cs name]. + ^ changeRecordSource + ! Item was added: + ----- Method: FilePackage>>conflictsWithUpdatedMethods (in category '*UpdateStream-conflict checker') ----- + conflictsWithUpdatedMethods + "Check this package for conflicts with methods in the image which are in newer updates." + + | localFileName stream updateNumberString updateNumber imageUpdateNumber updateNumberChangeSet conflicts fileStream | + + localFileName := FileDirectory localNameFor: fullName. + stream := ReadStream on: sourceSystem. + stream upToAll: 'latest update: #'. + updateNumberString := stream upTo: $]. + stream close. + + fileStream := FileStream readOnlyFileNamed: fullName. + (fileStream contentsOfEntireFile includes: Character linefeed) + ifTrue: [self notifyWithLabel: 'The changeset file ', localFileName, ' contains linefeeds. Proceed if... + you know that this is okay (e.g. the file contains raw binary data).']. + fileStream close. + + updateNumberString isEmpty ifFalse: "remove prepended junk, if any" + [updateNumberString := (updateNumberString findTokens: Character space) last]. + updateNumberString asInteger ifNil: + [(self confirm: 'Error: ', localFileName, ' has no valid Latest Update number in its header. + Do you want to enter an update number for this file?') + ifFalse: [^ self] + ifTrue: [updateNumberString := UIManager default + request: 'Please enter the estimated update number (e.g. 4332).']]. + updateNumberString asInteger ifNil: [self inform: 'Conflict check cancelled.'. ^ self]. + updateNumber := updateNumberString asInteger. + + imageUpdateNumber := SystemVersion current highestUpdate. + updateNumber > imageUpdateNumber ifTrue: + [(self confirm: 'Warning: The update number for this file (#', updateNumberString, ') + is greater than the highest update number for this image (#', imageUpdateNumber asString, '). + This probably means you need to update your image. + Should we proceed anyway as if the file update number is #', imageUpdateNumber asString, '?') + ifTrue: + [updateNumber := imageUpdateNumber. + updateNumberString := imageUpdateNumber asString] + ifFalse: [^ self]]. + + updateNumberChangeSet := self findUpdateChangeSetMatching: updateNumber. + updateNumberChangeSet ifNil: [^ self]. + + Smalltalk isMorphic ifTrue: [self currentWorld findATranscript: self currentEvent]. + self class logCr; logCr; log: 'Checking ', localFileName, ' (#', updateNumberString, ') for method conflicts with changesets after ', updateNumberChangeSet name, ' ...'. + + conflicts := OrderedCollection new. + self classes do: [:pseudoClass | + (Array with: pseudoClass with: pseudoClass metaClass) do: [:classOrMeta | + classOrMeta selectorsDo: [:selector | | conflict | + conflict := self + checkForMoreRecentUpdateThanChangeSet: updateNumberChangeSet + pseudoClass: classOrMeta + selector: selector. + conflict ifNotNil: [conflicts add: conflict]. + ]. + ]. + ]. + self class logCr; log: conflicts size asString, (' conflict' asPluralBasedOn: conflicts), ' found.'; logCr. + self class closeLog. + ^ conflicts! Item was added: + ----- Method: FilePackage>>findUpdateChangeSetMatching: (in category '*UpdateStream-conflict checker') ----- + findUpdateChangeSetMatching: updateNumber + "Find update-changeset beginning with updateNumber, or reasonably close." + "This is to account for the fact that many changeset files are output from final releases, but may be tested for conflicts in a following alpha image, which will often not include that particular update-changeset from the final release but will contain ones near it. For example, if the file updateNumber is 5180 (from 3.5 final), but the image has no update-changeset beginning with 5180 because it's a 3.6alpha image (which starts at 5181), it will try up to 5190 and down to 5170 for a close match." + | updateNumberChangeSet updateNumberToTry | + + updateNumberToTry := updateNumber. + updateNumberChangeSet := nil. + [updateNumberChangeSet isNil and: [updateNumberToTry notNil]] whileTrue: + [updateNumberChangeSet := ChangesOrganizer allChangeSets + detect: [:cs | (cs name beginsWith: updateNumberToTry asString) + and: [(cs name at: (updateNumberToTry asString size + 1)) isDigit not]] + ifNone: [nil]. + updateNumberToTry >= updateNumber ifTrue: + [updateNumberToTry < (updateNumber + 10) + ifTrue: [updateNumberToTry := updateNumberToTry + 1] + ifFalse: [updateNumberToTry := updateNumber]]. + updateNumberToTry <= updateNumber ifTrue: + [updateNumberToTry > (updateNumber - 10) + ifTrue: [updateNumberToTry := updateNumberToTry - 1] + ifFalse: [updateNumberToTry := nil "we're done trying"]]. + ]. + + updateNumberChangeSet ifNil: + [(self confirm: 'Warning: No changeset beginning with ', + updateNumber asString, ' (within +/- 10) was found in the image. + You must have changesets going back this far in your image + in order to accurately check for conflicts. + Proceed anyway?') + ifTrue: [updateNumberChangeSet := ChangesOrganizer allChangeSets first]]. + + ^ updateNumberChangeSet!

1 0

The Trunk: System-fbs.635.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Frank Shearar uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-fbs.635.mcz ==================== Summary ==================== Name: System-fbs.635 Author: fbs Time: 6 December 2013, 8:56:14.668 pm UUID: 4820fc6f-a7c9-fb40-a222-12354043706e Ancestors: System-fbs.634 FilePackage has a bunch of logic around handling update streams' changesets. This logic now belongs in UpdateStream. =============== Diff against System-fbs.634 =============== Item was removed: - ----- Method: FilePackage class>>conflictsWithUpdatedMethods: (in category 'instance creation') ----- - conflictsWithUpdatedMethods: fullName - | conflicts changeList | - conflicts := (self fromFileNamed: fullName) conflictsWithUpdatedMethods. - conflicts isEmpty ifTrue: [^ self]. - changeList := ChangeList new. - changeList - changes: conflicts - file: (FileDirectory default readOnlyFileNamed: fullName) close. - ChangeList - open: changeList - name: 'Conflicts for ', (FileDirectory localNameFor: fullName) - multiSelect: true.! Item was removed: - ----- Method: FilePackage class>>fileReaderServicesForFile:suffix: (in category 'reader service') ----- - fileReaderServicesForFile: fullName suffix: suffix - - ^(suffix = 'st') | (suffix = 'cs') | (suffix = '*') - ifTrue: [self services] - ifFalse: [#()]! Item was removed: - ----- Method: FilePackage class>>serviceConflictsWithUpdatedMethods (in category 'reader service') ----- - serviceConflictsWithUpdatedMethods - ^ SimpleServiceEntry - provider: self - label: 'conflicts with updated methods' - selector: #conflictsWithUpdatedMethods: - description: 'check for conflicts with more recently updated methods in the image, showing the conflicts in a transcript window' - buttonLabel: 'conflicts'! Item was removed: - ----- Method: FilePackage class>>services (in category 'reader service') ----- - services - ^ Array with: self serviceConflictsWithUpdatedMethods! Item was removed: - ----- Method: FilePackage>>checkForMoreRecentUpdateThanChangeSet:pseudoClass:selector: (in category 'conflict checker') ----- - checkForMoreRecentUpdateThanChangeSet: updateNumberChangeSet pseudoClass: pseudoClass selector: selector - "Returns the source code for a conflict if a conflict is found, otherwise returns nil." - - | classOrMeta allChangeSets moreRecentChangeSets conflictingChangeSets changeRecordSource classAndMethodPrintString | - - classAndMethodPrintString := pseudoClass name, (pseudoClass hasMetaclass ifTrue: [' class'] ifFalse: ['']), '>>', selector asString. - - changeRecordSource := pseudoClass sourceCode at: selector. - changeRecordSource isText - ifTrue: [changeRecordSource := Text - fromString: 'method: ', classAndMethodPrintString, ' was removed'] - ifFalse: [changeRecordSource stamp isEmptyOrNil ifTrue: - [self notify: 'Warning: ', classAndMethodPrintString, ' in ', self packageName, ' has no timestamp/initials!!']]. - - pseudoClass exists ifFalse: - [(self classes at: pseudoClass name) hasDefinition - ifTrue: [^ nil "a method was added for a newly defined class; not a conflict"] - ifFalse: [self class logCr; log: 'CONFLICT found for ', classAndMethodPrintString, '... class ', pseudoClass name asString, ' does not exist in the image and is not defined in the file'. - ^ changeRecordSource]]. - - classOrMeta := pseudoClass realClass. - - "Only printout the replacing methods here, but we still check for removed methods too in the rest of this method." - (self class verboseConflicts and: [classOrMeta includesSelector: selector]) - ifTrue: [self class logCr; log: '...checking ', classOrMeta asString, '>>', selector asString]. - - allChangeSets := ChangesOrganizer allChangeSets. - moreRecentChangeSets := allChangeSets - copyFrom: (allChangeSets indexOf: updateNumberChangeSet) - to: (allChangeSets size). - conflictingChangeSets := (moreRecentChangeSets select: - [:cs | (cs atSelector: selector class: classOrMeta) ~~ #none]). - conflictingChangeSets isEmpty ifTrue: [^ nil]. - - self class logCr; log: 'CONFLICT found for ', classAndMethodPrintString, - (' with newer changeset' asPluralBasedOn: conflictingChangeSets). - conflictingChangeSets do: [:cs | self class log: ' ', cs name]. - ^ changeRecordSource - ! Item was removed: - ----- Method: FilePackage>>conflictsWithUpdatedMethods (in category 'conflict checker') ----- - conflictsWithUpdatedMethods - "Check this package for conflicts with methods in the image which are in newer updates." - - | localFileName stream updateNumberString updateNumber imageUpdateNumber updateNumberChangeSet conflicts fileStream | - - localFileName := FileDirectory localNameFor: fullName. - stream := ReadStream on: sourceSystem. - stream upToAll: 'latest update: #'. - updateNumberString := stream upTo: $]. - stream close. - - fileStream := FileStream readOnlyFileNamed: fullName. - (fileStream contentsOfEntireFile includes: Character linefeed) - ifTrue: [self notifyWithLabel: 'The changeset file ', localFileName, ' contains linefeeds. Proceed if... - you know that this is okay (e.g. the file contains raw binary data).']. - fileStream close. - - updateNumberString isEmpty ifFalse: "remove prepended junk, if any" - [updateNumberString := (updateNumberString findTokens: Character space) last]. - updateNumberString asInteger ifNil: - [(self confirm: 'Error: ', localFileName, ' has no valid Latest Update number in its header. - Do you want to enter an update number for this file?') - ifFalse: [^ self] - ifTrue: [updateNumberString := UIManager default - request: 'Please enter the estimated update number (e.g. 4332).']]. - updateNumberString asInteger ifNil: [self inform: 'Conflict check cancelled.'. ^ self]. - updateNumber := updateNumberString asInteger. - - imageUpdateNumber := SystemVersion current highestUpdate. - updateNumber > imageUpdateNumber ifTrue: - [(self confirm: 'Warning: The update number for this file (#', updateNumberString, ') - is greater than the highest update number for this image (#', imageUpdateNumber asString, '). - This probably means you need to update your image. - Should we proceed anyway as if the file update number is #', imageUpdateNumber asString, '?') - ifTrue: - [updateNumber := imageUpdateNumber. - updateNumberString := imageUpdateNumber asString] - ifFalse: [^ self]]. - - updateNumberChangeSet := self findUpdateChangeSetMatching: updateNumber. - updateNumberChangeSet ifNil: [^ self]. - - Smalltalk isMorphic ifTrue: [self currentWorld findATranscript: self currentEvent]. - self class logCr; logCr; log: 'Checking ', localFileName, ' (#', updateNumberString, ') for method conflicts with changesets after ', updateNumberChangeSet name, ' ...'. - - conflicts := OrderedCollection new. - self classes do: [:pseudoClass | - (Array with: pseudoClass with: pseudoClass metaClass) do: [:classOrMeta | - classOrMeta selectorsDo: [:selector | | conflict | - conflict := self - checkForMoreRecentUpdateThanChangeSet: updateNumberChangeSet - pseudoClass: classOrMeta - selector: selector. - conflict ifNotNil: [conflicts add: conflict]. - ]. - ]. - ]. - self class logCr; log: conflicts size asString, (' conflict' asPluralBasedOn: conflicts), ' found.'; logCr. - self class closeLog. - ^ conflicts! Item was removed: - ----- Method: FilePackage>>findUpdateChangeSetMatching: (in category 'conflict checker') ----- - findUpdateChangeSetMatching: updateNumber - "Find update-changeset beginning with updateNumber, or reasonably close." - "This is to account for the fact that many changeset files are output from final releases, but may be tested for conflicts in a following alpha image, which will often not include that particular update-changeset from the final release but will contain ones near it. For example, if the file updateNumber is 5180 (from 3.5 final), but the image has no update-changeset beginning with 5180 because it's a 3.6alpha image (which starts at 5181), it will try up to 5190 and down to 5170 for a close match." - | updateNumberChangeSet updateNumberToTry | - - updateNumberToTry := updateNumber. - updateNumberChangeSet := nil. - [updateNumberChangeSet isNil and: [updateNumberToTry notNil]] whileTrue: - [updateNumberChangeSet := ChangesOrganizer allChangeSets - detect: [:cs | (cs name beginsWith: updateNumberToTry asString) - and: [(cs name at: (updateNumberToTry asString size + 1)) isDigit not]] - ifNone: [nil]. - updateNumberToTry >= updateNumber ifTrue: - [updateNumberToTry < (updateNumber + 10) - ifTrue: [updateNumberToTry := updateNumberToTry + 1] - ifFalse: [updateNumberToTry := updateNumber]]. - updateNumberToTry <= updateNumber ifTrue: - [updateNumberToTry > (updateNumber - 10) - ifTrue: [updateNumberToTry := updateNumberToTry - 1] - ifFalse: [updateNumberToTry := nil "we're done trying"]]. - ]. - - updateNumberChangeSet ifNil: - [(self confirm: 'Warning: No changeset beginning with ', - updateNumber asString, ' (within +/- 10) was found in the image. - You must have changesets going back this far in your image - in order to accurately check for conflicts. - Proceed anyway?') - ifTrue: [updateNumberChangeSet := ChangesOrganizer allChangeSets first]]. - - ^ updateNumberChangeSet!

1 0

Re: [squeak-dev] The Trunk: UpdateStream-nice.1.mcz
by Frank Shearar 06 Dec '13

06 Dec '13

On 6 December 2013 16:07, <commits(a)source.squeak.org> wrote: > Nicolas Cellier uploaded a new version of UpdateStream to project The Trunk: > http://source.squeak.org/trunk/UpdateStream-nice.1.mcz > > ==================== Summary ==================== > > Name: UpdateStream-nice.1 > Author: nice > Time: 6 December 2013, 5:07:25.049 pm > UUID: 4c14fa26-e847-4f2c-8217-ecb56f016112 > Ancestors: > > Create an UpdateStreamDownloader class to host Utilities class>>'fetching updates' methods. > Utilities class side methods are copied as is to UpdateStreamDownloader class side with original authors/stamps > The pre-trunk updateFromServer version has been restored. > > In the future, the UpdateStreamDownloader could create instances if this makes sense... > But since this is essentially unused, it might as well not happen. > > ==================== Snapshot ==================== I am too slow. I was wrapping up my work for submission tonight, doing exactly this. Ah, well! Please carry on though, and I'll find something else to do. There's a Browser preference I can remove. frank

2 4

The Trunk: Morphic-fbs.700.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Frank Shearar uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-fbs.700.mcz ==================== Summary ==================== Name: Morphic-fbs.700 Author: fbs Time: 6 December 2013, 8:38:31.673 pm UUID: a9c94f51-b544-f842-af48-c1d2e014573e Ancestors: Morphic-fbs.699 Systematically ask SystemBrowser for a Browser (class). =============== Diff against Morphic-fbs.699 =============== Item was changed: ----- Method: TextEditor>>browseIt (in category 'menu messages') ----- browseIt "Launch a browser for the current selection, if appropriate" | aSymbol anEntry brow | Preferences alternativeBrowseIt ifTrue: [^ self browseClassFromIt]. self lineSelectAndEmptyCheck: [^ self]. (aSymbol := self selectedSymbol) isNil ifTrue: [^ morph flash]. aSymbol first isUppercase ifTrue: [anEntry := (Smalltalk at: aSymbol ifAbsent: [ self systemNavigation browseAllImplementorsOf: aSymbol. ^ nil]). anEntry ifNil: [^ morph flash]. (anEntry isKindOf: Class) ifFalse: [anEntry := anEntry class]. + brow := SystemBrowser default new. - brow := Preferences browseToolClass new. brow setClass: anEntry selector: nil. brow class openBrowserView: (brow openEditString: nil) label: 'System Browser'] ifFalse: [self systemNavigation browseAllImplementorsOf: aSymbol]!

1 0

The Trunk: System-fbs.634.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Frank Shearar uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-fbs.634.mcz ==================== Summary ==================== Name: System-fbs.634 Author: fbs Time: 6 December 2013, 8:36:08.84 pm UUID: 18ae1969-821b-5945-b9cc-46109800ebc0 Ancestors: System-fbs.633 If you want to know what kind of Browser to use, ask the AppRegistry that knows - SystemBrowser. Also, the old #browseThemes implementation (a) referred directly to Browser, and (b) did almost exactly the usual thing - browsing a method selects the correct category, and just the label changes. Not worth extending ToolSet's API for such a small use case. =============== Diff against System-fbs.633 =============== Item was changed: ----- Method: Preferences class>>browseThemes (in category 'misc') ----- browseThemes "Open up a message-category browser on the theme-defining methods" + ToolSet browse: Preferences class selector: #outOfTheBox.! - - | aBrowser | - aBrowser := Browser new setClass: Preferences class selector: #outOfTheBox. - aBrowser messageCategoryListIndex: ((Preferences class organization categories indexOf: 'themes' ifAbsent: [^ self inform: 'no themes found']) + 1). - Browser openBrowserView: (aBrowser openMessageCatEditString: nil) - label: 'Preference themes' - - "Preferences browseThemes"! Item was removed: - ----- Method: Preferences class>>browseToolClass (in category 'hard-coded prefs') ----- - browseToolClass - "This method is used for returning the appropiate class for the #browserShowsPackagePane preference. Now that preference modifies the registry so here we query directly to the registry" - ^ SystemBrowser default.!

1 0

The Trunk: 45Deprecated-fbs.18.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Frank Shearar uploaded a new version of 45Deprecated to project The Trunk: http://source.squeak.org/trunk/45Deprecated-fbs.18.mcz ==================== Summary ==================== Name: 45Deprecated-fbs.18 Author: fbs Time: 6 December 2013, 8:33:53.794 pm UUID: fac83811-9a6f-6944-9d73-c1ef3d1e691d Ancestors: 45Deprecated-fbs.17 If you want to know what kind of Browser to use, ask the AppRegistry that knows - SystemBrowser. =============== Diff against 45Deprecated-fbs.17 =============== Item was added: + ----- Method: Preferences class>>browseToolClass (in category '*45Deprecated') ----- + browseToolClass + "This method is used for returning the appropiate class for the #browserShowsPackagePane preference. Now that preference modifies the registry so here we query directly to the registry" + self deprecated: 'Use SystemBrowser default'. + ^ SystemBrowser default.!

1 0

Jump to page: