lists.squeakfoundation.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Packages
December 2013
----- 2024 -----
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
packages@lists.squeakfoundation.org
1 participants
477 discussions
Start a n
N
ew thread
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
0
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
0
0
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
0
0
← Newer
1
...
41
42
43
44
45
46
47
48
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
Results per page:
10
25
50
100
200