Squeak-dev August 2012

squeak-dev@lists.squeakfoundation.org

43 participants
179 discussions

Re: [squeak-dev] The Trunk: Collections-fbs.482.mcz
by Aran Lunzer 03 Aug '12

03 Aug '12

Frank Shearar wrote: > Re-remove WeakRegistry class>>migrateOldRegistries. Accidental commit during a merge. ... > Grr. Ael's commit didn't change this method, and I merged it in, so I > don't know why it got added. Seperate commit re-removes it. I did see this method when saving my change, and explicitly reverted it in my image to persuade Monticello not to regard it as part of the update. Sorry if that wasn't the right form of persuasion to use in this case. Aran

1 0

The Trunk: MonticelloConfigurations-cmm.106.mcz
by commits＠source.squeak.org 03 Aug '12

03 Aug '12

Chris Muller uploaded a new version of MonticelloConfigurations to project The Trunk: http://source.squeak.org/trunk/MonticelloConfigurations-cmm.106.mcz ==================== Summary ==================== Name: MonticelloConfigurations-cmm.106 Author: cmm Time: 3 August 2012, 4:14:52.814 pm UUID: 72e1b1a7-37c9-4588-89b5-6bbf3391edd3 Ancestors: MonticelloConfigurations-bf.105 - Reassign MCConfiguration>>#mustMerge: to MCVersion as #shouldMerge. I need it outside the context of a MCConfiguration. =============== Diff against MonticelloConfigurations-bf.105 =============== Item was changed: ----- Method: MCConfiguration>>upgrade (in category 'actions') ----- upgrade ^self depsSatisfying: [:dep | dep isFulfilledByAncestors not] versionDo: [:ver | + (Preferences upgradeIsMerge and: [ver shouldMerge]) - (Preferences upgradeIsMerge and: [self mustMerge: ver]) ifFalse: [ver load] ifTrue: [[ver merge] on: MCMergeResolutionRequest do: [:request | request merger conflicts isEmpty ifTrue: [request resume: true] ifFalse: [request pass]]]] displayingProgress: 'upgrading packages' !

1 0

The Trunk: Monticello-cmm.520.mcz
by commits＠source.squeak.org 03 Aug '12

03 Aug '12

Chris Muller uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-cmm.520.mcz ==================== Summary ==================== Name: Monticello-cmm.520 Author: cmm Time: 3 August 2012, 4:14:13.148 pm UUID: 43782747-5008-4be8-a1fb-76f693a20517 Ancestors: Monticello-eem.519 - Reassign MCConfiguration>>#mustMerge: to MCVersion as #shouldMerge. I need it outside the context of a MCConfiguration. =============== Diff against Monticello-eem.519 =============== Item was changed: ----- Method: MCRepository class>>location:username:password: (in category 'instance creation') ----- location: urlOrPath username: user password: pass "Answer an MCRepository for the given url or path. Accepted locations are: - http, and ftp urls (i.e., http://source.squeak.org/trunk) - directory paths (i.e., C:\Squeak\packages) - directory matches (i.e., C:\Squeak\packages\*) If provided, the supplied user name and password will be used." | url | (urlOrPath findString: '://') > 0 ifTrue:[ url := urlOrPath asUrl. + ^ url scheme caseOf: { + ['ftp'] -> [MCFtpRepository - url scheme caseOf: { - ['ftp'] -> [^MCFtpRepository host: url authority directory: url pathString allButFirst user: user password: user]. + ['http'] -> [MCHttpRepository - ['http'] -> [^MCHttpRepository location: urlOrPath user: user password: pass]. + } otherwise:[self error: 'Unsupported scheme: ', url scheme]. - } otherwise:[^self error: 'Unsupported scheme: ', url scheme]. ]. (urlOrPath endsWith: '*') ifTrue:[ ^MCSubDirectoryRepository new directory: (FileDirectory on: urlOrPath allButLast)]. ^MCDirectoryRepository directory: (FileDirectory on: urlOrPath)! Item was added: + ----- Method: MCRepository>>highestNumberedVersionForPackageNamed: (in category 'versions') ----- + highestNumberedVersionForPackageNamed: aString + ^ self versionNamed: (self highestNumberedVersionNameForPackageNamed: aString)! Item was added: + ----- Method: MCVersion>>shouldMerge (in category 'testing') ----- + shouldMerge + "answer true if we have to do a full merge and false if we can simply load instead" + | pkg wc current | + (pkg := self package) hasWorkingCopy ifFalse: [^false "no wc -> load"]. + (wc := pkg workingCopy) modified ifTrue: [^true "modified -> merge"]. + wc ancestors isEmpty ifTrue: [^true "no ancestor info -> merge"]. + current := wc ancestors first. + (self info hasAncestor: current) ifTrue: [^false "direct descendant of wc -> load"]. + "new branch -> merge" + ^true!

1 0

The Trunk: Collections-fbs.483.mcz
by commits＠source.squeak.org 03 Aug '12

03 Aug '12

Frank Shearar uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-fbs.483.mcz ==================== Summary ==================== Name: Collections-fbs.483 Author: fbs Time: 3 August 2012, 9:30:41.524 pm UUID: 30032276-9f6d-43d6-8c2a-763acea1a80a Ancestors: Collections-fbs.482 Re-remove WeakRegistry class>>migrateOldRegistries. Accidental commit during a merge. =============== Diff against Collections-fbs.482 =============== Item was removed: - ----- Method: WeakRegistry class>>migrateOldRegistries (in category 'migrating registry') ----- - migrateOldRegistries - Smalltalk at: #WeakFinalizationRegistry ifAbsent: [ ^ self "already done" ]. - - Smalltalk recreateSpecialObjectsArray. - WeakArray restartFinalizationProcess. - - Smalltalk garbageCollect; garbageCollect. - - "leave no chance to interrupt migration" - Compiler evaluate: ' - [ | old new oldClass newClass | - old := OrderedCollection new. - new := OrderedCollection new. - WeakRegistry allInstancesDo: [:registry | | newr | - old add: registry. - newr := WeakFinalizationRegistry basicNew initialize. - registry migrateTo: newr. - new add: newr ]. - old asArray elementsForwardIdentityTo: new asArray. - - oldClass := WeakRegistry. - newClass := WeakFinalizationRegistry. - - Smalltalk forgetClass: newClass logged: false. - newClass superclass removeSubclass: newClass. - newClass setName: #WeakRegistry. - oldClass becomeForward: newClass. - ] forkAt: Processor highestPriority. - '. - !

1 0

The Trunk: CollectionsTests-ael.187.mcz
by commits＠source.squeak.org 03 Aug '12

03 Aug '12

Frank Shearar uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-ael.187.mcz ==================== Summary ==================== Name: CollectionsTests-ael.187 Author: ael Time: 30 July 2012, 2:40:57.923 pm UUID: b4b909c2-e655-4b7e-94f8-0f5c40a227d0 Ancestors: CollectionsTests-ul.186 test case for isolation of dictionary created using newFrom: =============== Diff against CollectionsTests-ul.186 =============== Item was added: + ----- Method: DictionaryTest>>testNewFromIsolation (in category 'basic tests') ----- + testNewFromIsolation + "self run:#testNewFromIsolation" + "self debug:#testNewFromIsolation" + + | dict1 dict2 | + dict1 := Dictionary new. + dict1 at: #one put: 'foo'; at: #two put: 0@0. + dict2 := Dictionary newFrom: dict1. + dict2 at: #one put: 'bar'. + + self assert: (dict1 at: #one) = 'foo'. + !

1 0

The Trunk: Collections-fbs.482.mcz
by commits＠source.squeak.org 03 Aug '12

03 Aug '12

Frank Shearar uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-fbs.482.mcz ==================== Summary ==================== Name: Collections-fbs.482 Author: fbs Time: 3 August 2012, 9:26:33.402 pm UUID: f236f58a-ba49-4c8c-8314-731f82206158 Ancestors: Collections-ael.481 Merge Collections-ael.481 remove spurious sharing of associations between a dictionary and another created from it =============== Diff against Collections-cwp.480 =============== Item was changed: ----- Method: Dictionary class>>newFrom: (in category 'instance creation') ----- newFrom: aDict "Answer an instance of me containing the same associations as aDict. Error if any key appears twice." | newDictionary | newDictionary := self new: aDict size. aDict associationsDo: [:x | (newDictionary includesKey: x key) ifTrue: [self error: 'Duplicate key: ', x key printString] + ifFalse: [newDictionary add: x copy]]. - ifFalse: [newDictionary add: x]]. ^ newDictionary " NewDictionary newFrom: {1->#a. 2->#b. 3->#c} {1->#a. 2->#b. 3->#c} as: NewDictionary NewDictionary newFrom: {1->#a. 2->#b. 1->#c} {1->#a. 2->#b. 1->#c} as: NewDictionary "! Item was added: + ----- Method: WeakRegistry class>>migrateOldRegistries (in category 'migrating registry') ----- + migrateOldRegistries + Smalltalk at: #WeakFinalizationRegistry ifAbsent: [ ^ self "already done" ]. + + Smalltalk recreateSpecialObjectsArray. + WeakArray restartFinalizationProcess. + + Smalltalk garbageCollect; garbageCollect. + + "leave no chance to interrupt migration" + Compiler evaluate: ' + [ | old new oldClass newClass | + old := OrderedCollection new. + new := OrderedCollection new. + WeakRegistry allInstancesDo: [:registry | | newr | + old add: registry. + newr := WeakFinalizationRegistry basicNew initialize. + registry migrateTo: newr. + new add: newr ]. + old asArray elementsForwardIdentityTo: new asArray. + + oldClass := WeakRegistry. + newClass := WeakFinalizationRegistry. + + Smalltalk forgetClass: newClass logged: false. + newClass superclass removeSubclass: newClass. + newClass setName: #WeakRegistry. + oldClass becomeForward: newClass. + ] forkAt: Processor highestPriority. + '. + !

1 0

The Inbox: Environments-fbs.5.mcz
by commits＠source.squeak.org 03 Aug '12

03 Aug '12

A new version of Environments was added to project The Inbox: http://source.squeak.org/inbox/Environments-fbs.5.mcz ==================== Summary ==================== Name: Environments-fbs.5 Author: fbs Time: 3 August 2012, 9:11:57.622 pm UUID: 07a930ba-2277-4253-8810-25012ba8e67f Ancestors: Environments-cmm.4 Colin Putney will point out that Environments should actually provide a higher-level API than Dictionary. This is a compatibility call. =============== Diff against Environments-cmm.4 =============== Item was added: + ----- Method: Environment>>removeKey:ifAbsent: (in category 'accessing') ----- + removeKey: key ifAbsent: aBlock + self flag: #review. + ^ contents removeKey: key ifAbsent: aBlock!

1 0

Pristine recent 4.4 image?
by Frank Shearar 03 Aug '12

03 Aug '12

This is a bit of a strange request, but anyway. Is there a blessed trunk image lying around somewhere more recent than #11925? I ask, because if I take that image (the latest one in http://ftp.squeak.org/trunk/) and try update it, I get an "Error: Unmatched string quote" while processing update-eem.210.mcm. I vaguely recall this happened around the last GetText changes? At any rate, if someone has a blessed, more recent, image lying around I'd be grateful. (The idea is to take such a thing, write a script to update from trunk, and then run the tests. That tells us that Trunk's working.) frank

3 4

First green ball
by Chris Cunnington 03 Aug '12

03 Aug '12

/var/lib/jenkins drwxr-xr-x 2 jenkins jenkins 4096 Aug 1 10:51 updates drwxr-xr-x 2 jenkins jenkins 4096 Feb 29 09:51 userContent drwxr-xr-x 5 jenkins jenkins 4096 Jul 20 12:49 users drwxr-xr-x 9 jenkins jenkins 4096 Feb 29 09:50 war drwxr-xr-x 3 teamjenkins teamjenkins 4096 Jul 31 13:04 workspace -rw-r--r-- 1 jenkins jenkins 0 Aug 1 15:01 Workspace clean-up.log One of these things is not like the others. One of these things doesn't belong. drwxr-xr-x 2 jenkins jenkins 4096 Aug 1 10:51 updates drwxr-xr-x 2 jenkins jenkins 4096 Feb 29 09:51 userContent drwxr-xr-x 5 jenkins jenkins 4096 Jul 20 12:49 users drwxr-xr-x 9 jenkins jenkins 4096 Feb 29 09:50 war drwxr-xr-x 3 jenkins jenkins 4096 Jul 31 13:04 workspace -rw-r--r-- 1 jenkins jenkins 0 Aug 1 15:01 Workspace clean-up.log Try it now. Chris

4 10

Smalltalks 2012 invitation and registration
by Andres Valloud 03 Aug '12

03 Aug '12

Hello! You're invited to come over to the wonderful Argentine patagonia to participate in Smalltalks 2012. This year we will host the conference at a new venue for us: Puerto Madryn <http://en.wikipedia.org/wiki/Puerto_Madryn>. We're very pleased to see different sections of the Argentine Smalltalk community represented every year. Go here and register <http://www.fast.org.ar/>. See you in Puerto Madryn!

1 0

Jump to page: