Squeak-dev February 2019

squeak-dev@lists.squeakfoundation.org

37 participants
92 discussions

The Inbox: Monticello-cmm.66240.mcz
by commits＠source.squeak.org 19 Feb '19

19 Feb '19

Chris Muller uploaded a new version of Monticello to project The Inbox: http://source.squeak.org/inbox/Monticello-cmm.66240.mcz ==================== Summary ==================== Name: Monticello-cmm.66240 Author: cmm Time: 16 February 2019, 4:49:51.685281 pm UUID: 435c7c35-3b22-4f66-b733-070ccd48a980 Ancestors: Monticello-eem.684 Monticello only requires monotonicity and uniqueness for its version numbers, not consecutiveness. When saving a new package, generate a unique, 6-digit versionNumber. Beginning approximately 2020-11-25T10:40:00+00:00, a 7th digit will appear -- no more than a local phone number -- which will be good until year 2038. =============== Diff against Monticello-eem.684 =============== Item was added: + ----- Method: MCAncestry>>hasAncestorNamed: (in category 'ancestry') ----- + hasAncestorNamed: aString + self allAncestorsDo: + [ : each | aString asMCVersionName = each name ifTrue: [ ^ true ] ]. + ^ false! Item was added: + ----- Method: MCVersionName class>>newVersionNameFor: (in category 'utilities') ----- + newVersionNameFor: branchName + ^ branchName, '-' , Utilities authorInitials , '.' , self newVersionNumberString! Item was added: + ----- Method: MCVersionName class>>newVersionNumberString (in category 'utilities') ----- + newVersionNumberString + "Answer a unique version number for use in generating the versionNumber portion of my name." + ^ self versionNumberFor: DateAndTime now! Item was added: + ----- Method: MCVersionName class>>versionNumberFor: (in category 'private') ----- + versionNumberFor: aDateAndTime + "Answer a unique version number for use in generating the versionNumber portion of my name." + | epoch | + epoch := '2019-01-01T00:00:00+00:00' asDateAndTime. + ^ (aDateAndTime - epoch) days * 24 * 60! Item was changed: MCPackageManager subclass: #MCWorkingCopy + instanceVariableNames: 'versionInfo ancestry repositoryGroup requiredPackages environment' - instanceVariableNames: 'versionInfo ancestry counter repositoryGroup requiredPackages environment' classVariableNames: '' poolDictionaries: '' category: 'Monticello-Versioning'! Item was changed: ----- Method: MCWorkingCopy>>nextVersionName (in category 'private') ----- nextVersionName | branch oldName | ancestry ancestors isEmpty ifTrue: + [ branch := package name ] - [ counter ifNil: [ counter := 0 ]. - branch := package name ] ifFalse: [ oldName := ancestry ancestors first versionName. + branch := oldName packageAndBranchName ]. + ^ MCVersionName newVersionNameFor: branch! - branch := oldName packageAndBranchName. - counter ifNil: - [ counter := (ancestry ancestors detectMax: - [ : eachVersionInfo | eachVersionInfo versionNumber ]) - ifNil: [ 0 ] - ifNotNil: - [ : highestNumbered | highestNumbered versionNumber ] ] ]. - counter := counter + 1. - ^ branch , '-' , Utilities authorInitials , '.' , counter asString! Item was changed: ----- Method: MCWorkingCopy>>uniqueVersionName (in category 'private') ----- uniqueVersionName |versionName| - counter := nil. [versionName := self nextVersionName. + (self repositoryGroup includesVersionNamed: versionName) or: [ ancestry hasAncestorNamed: versionName ]] whileTrue. - self repositoryGroup includesVersionNamed: versionName] whileTrue. ^ versionName!

9 20

MC true ancestors false positive?
by Nicolas Cellier 19 Feb '19

19 Feb '19

Still cleaning the inbox... I see this: *Name: Monticello-bf.540Author: bfTime: 3 May 2013, 12:06:01.01 pmUUID: 759525eb-5ca8-4ab2-9e4a-bddc7d0680dcAncestors: Monticello-bf.532, Monticello-fbs.539This is my allow-partial-commits mod, improved to always diff to the target repository, and merged with the latest fbs.359 trunk version.* It is not signalled as false ancestor, so it means that this ancestor is in history, or another package in history has same UUID (unlikely!). But in trunk there is a different package: *Name: Monticello-bf.540Author: bfTime: 4 May 2013, 8:13:11.165 pmUUID: b8904753-a5e5-4061-a912-49480229e91aAncestors: Monticello-fbs.539Add MCReorganizationPreloader which can resolve moves between arbitrary packages.* Do we really have two different Monticello-bf.540 in ancestors or what? Is there a morphic tool to visualize the ancestry graph?

5 7

The Trunk: EToys-tpr.340.mcz
by commits＠source.squeak.org 19 Feb '19

19 Feb '19

tim Rowledge uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-tpr.340.mcz ==================== Summary ==================== Name: EToys-tpr.340 Author: tpr Time: 18 February 2019, 7:30:07.021016 pm UUID: d1ed1a6e-a62f-4178-bcd6-0fb6684301e8 Ancestors: EToys-kfr.339 Part of deprecating HTTPClient for 6.0 Stop using it =============== Diff against EToys-kfr.339 =============== Item was changed: ----- Method: ServerDirectory class>>parseEToyUserListFrom: (in category '*eToys-school support') ----- parseEToyUserListFrom: urlString | url userString userList | urlString ifNil:[^nil]. url := urlString asUrl. userString := ["Note: We need to prevent going through the plugin API when retrieving a local (file) URL, since the plugin API (correctly) rejects file:// downloads." Cursor wait showWhile:[ (url hasRemoteContents) ifTrue:[ "Go through the browser (if present)" + (HTTPSocket httpGet: url asString) contents. - (HTTPClient httpGet: url asString) contents. ] ifFalse:[ "Go grab it directly" url retrieveContents contents. ]. ]. ] on: Error do:[nil]. userString ifNil:[^nil]. userList := userString lines collect: [:each| each withBlanksTrimmed]. userList := userList reject:[:any| any isEmpty]. (userList first = '##user list##') ifFalse:[^nil]. userList := userList copyFrom: 2 to: userList size. ^userList!

1 0

The Trunk: Network-tpr.229.mcz
by commits＠source.squeak.org 19 Feb '19

19 Feb '19

tim Rowledge uploaded a new version of Network to project The Trunk: http://source.squeak.org/trunk/Network-tpr.229.mcz ==================== Summary ==================== Name: Network-tpr.229 Author: tpr Time: 18 February 2019, 7:29:14.360439 pm UUID: 9e7bdfe3-6f36-403b-900e-cd3331bc598c Ancestors: Network-pre.228 Part of deprecating HTTPClient for 6.0 Stop using it, deprecate URI classes as well =============== Diff against Network-pre.228 =============== Item was changed: ----- Method: HTTPServerDirectory>>entries (in category 'file directory') ----- entries + | answer ftpEntries | + answer := HTTPSocket httpGetDocument: self dirListUrl. + answer isString + ifTrue: [^self error: 'Listing failed: ' , answer] + ifFalse: [answer := answer content]. + answer first == $< + ifTrue: [self error: 'Listing failed: ' , answer]. + ftpEntries := answer findTokens: String crlf. + ^ ftpEntries + collect:[:ftpEntry | self class parseFTPEntry: ftpEntry] + thenSelect: [:entry | entry notNil]! - ^HTTPClient getDirectoryListing: self dirListUrl! Item was removed: - URI subclass: #HierarchicalURI - instanceVariableNames: 'authority query' - classVariableNames: '' - poolDictionaries: '' - category: 'Network-URI'! Item was removed: - ----- Method: HierarchicalURI>>absoluteFromString:scheme: (in category 'private') ----- - absoluteFromString: aString scheme: schemeName - | remainder | - super absoluteFromString: aString scheme: schemeName. - - "We now have the interesting part in schemeSpecficPart and can parse it further" - - "This check is somewhat redundant, just in case somebody calls this directly." - remainder := schemeSpecificPart. - (remainder isEmpty - or: [remainder first ~~ $/]) - ifTrue: [(IllegalURIException new uriString: remainder) signal: 'Invalid absolute URI']. - - (aString beginsWith: '//') - ifTrue: [remainder := self extractAuthority: (remainder copyFrom: 3 to: remainder size)]. - - self extractSchemeSpecificPartAndFragment: remainder! Item was removed: - ----- Method: HierarchicalURI>>absolutePath (in category 'accessing') ----- - absolutePath - ^self schemeSpecificPart isEmpty - ifTrue: ['/'] - ifFalse: [self schemeSpecificPart]! Item was removed: - ----- Method: HierarchicalURI>>allButScheme (in category 'printing') ----- - allButScheme - "Answer the entire url except its scheme" - - ^String streamContents:[:s| - authority ifNotNil:[self authority printOn: s]. - s nextPutAll: super allButScheme. - query ifNotNil:[s nextPutAll: query]. - ].! Item was removed: - ----- Method: HierarchicalURI>>assureExistance (in category 'directory operations') ----- - assureExistance - ! Item was removed: - ----- Method: HierarchicalURI>>authority (in category 'accessing') ----- - authority - ^authority! Item was removed: - ----- Method: HierarchicalURI>>baseName (in category 'accessing') ----- - baseName - "returns the last component stripped of its extension" - - | baseName i | - baseName := self pathComponents last. - i := baseName findLast: [:c | c = $.]. - ^i = 0 - ifTrue: [baseName] - ifFalse: [baseName copyFrom: 1 to: i-1]. - ! Item was removed: - ----- Method: HierarchicalURI>>buildAbsolutePath: (in category 'private') ----- - buildAbsolutePath: pathComponents - ^String streamContents: [:stream | - stream nextPut: $/. - pathComponents - do: [:pathPart | stream nextPutAll: pathPart] - separatedBy: [stream nextPut: $/]]! Item was removed: - ----- Method: HierarchicalURI>>extension (in category 'accessing') ----- - extension - "This method assumes a $. as extension delimiter" - - | i leafName | - leafName := self pathComponents last. - i := leafName findLast: [:c | c = $.]. - ^i = 0 - ifTrue: [''] - ifFalse: [leafName copyFrom: i + 1 to: leafName size]. - ! Item was removed: - ----- Method: HierarchicalURI>>extractAuthority: (in category 'private') ----- - extractAuthority: aString - | endAuthorityIndex authorityString | - endAuthorityIndex := (aString indexOf: $/ ) - 1. - endAuthorityIndex < 0 - ifTrue: [endAuthorityIndex := aString size]. - authorityString := aString copyFrom: 1 to: endAuthorityIndex. - authority := URIAuthority fromString: authorityString. - ^aString copyFrom: endAuthorityIndex+1 to: aString size! Item was removed: - ----- Method: HierarchicalURI>>extractQuery: (in category 'private') ----- - extractQuery: remainder - | queryIndex | - queryIndex := remainder indexOf: $?. - queryIndex > 0 - ifFalse: [^remainder]. - query := remainder copyFrom: queryIndex to: remainder size. - ^remainder copyFrom: 1 to: queryIndex-1! Item was removed: - ----- Method: HierarchicalURI>>extractSchemeSpecificPartAndFragment: (in category 'private') ----- - extractSchemeSpecificPartAndFragment: remainder - super extractSchemeSpecificPartAndFragment: remainder. - schemeSpecificPart := self extractQuery: schemeSpecificPart! Item was removed: - ----- Method: HierarchicalURI>>host (in category 'accessing') ----- - host - ^self authority host! Item was removed: - ----- Method: HierarchicalURI>>path (in category 'accessing') ----- - path - " ^self schemeSpecificPart isEmpty - ifTrue: ['/'] - ifFalse: [self schemeSpecificPart]" - ^self schemeSpecificPart! Item was removed: - ----- Method: HierarchicalURI>>pathComponents (in category 'accessing') ----- - pathComponents - ^self path findTokens: $/! Item was removed: - ----- Method: HierarchicalURI>>port (in category 'accessing') ----- - port - ^self authority port! Item was removed: - ----- Method: HierarchicalURI>>printSchemeSpecificPartOn: (in category 'printing') ----- - printSchemeSpecificPartOn: stream - self isAbsolute - ifTrue: [stream nextPutAll: '//']. - authority - ifNotNil: [self authority printOn: stream]. - super printSchemeSpecificPartOn: stream. - query - ifNotNil: [stream nextPutAll: query]! Item was removed: - ----- Method: HierarchicalURI>>query (in category 'accessing') ----- - query - ^query! Item was removed: - ----- Method: HierarchicalURI>>relativeFromString: (in category 'private') ----- - relativeFromString: aString - | remainder authorityEnd | - remainder := (aString beginsWith: '//') - ifTrue: [ - authorityEnd := aString indexOf: $/ startingAt: 3. - authorityEnd = 0 - ifTrue: [authorityEnd := aString size+1]. - self extractAuthority: (aString copyFrom: 3 to: authorityEnd-1)] - ifFalse: [aString]. - self extractSchemeSpecificPartAndFragment: remainder! Item was removed: - ----- Method: HierarchicalURI>>removeComponentDotDotPairs: (in category 'private') ----- - removeComponentDotDotPairs: pathComponents - | dotDotIndex | - dotDotIndex := pathComponents indexOf: '..'. - [dotDotIndex > 1] - whileTrue: [ - pathComponents - removeAt: dotDotIndex; - removeAt: dotDotIndex-1. - dotDotIndex := pathComponents indexOf: '..']! Item was removed: - ----- Method: HierarchicalURI>>resolveRelativeURI: (in category 'accessing') ----- - resolveRelativeURI: aURI - | relativeURI newAuthority newPath pathComponents newURI relComps | - relativeURI := aURI asURI. - - relativeURI isAbsolute - ifTrue: [^relativeURI]. - - relativeURI authority - ifNil: [ - newAuthority := self authority. - (relativeURI path beginsWith: '/') - ifTrue: [newPath := relativeURI path] - ifFalse: [ - pathComponents := (self path copyUpToLast: $/) findTokens: $/. - relComps := relativeURI pathComponents. - relComps removeAllSuchThat: [:each | each = '.']. - pathComponents addAll: relComps. - pathComponents removeAllSuchThat: [:each | each = '.']. - self removeComponentDotDotPairs: pathComponents. - newPath := self buildAbsolutePath: pathComponents. - ((relComps isEmpty - or: [relativeURI path last == $/ - or: [(relativeURI path endsWith: '/..') - or: [relativeURI path = '..' - or: [relativeURI path endsWith: '/.' ]]]]) - and: [newPath size > 1]) - ifTrue: [newPath := newPath , '/']]] - ifNotNil: [ - newAuthority := relativeURI authority. - newPath := relativeURI path]. - - newURI := String streamContents: [:stream | - stream nextPutAll: self scheme. - stream nextPut: $: . - newAuthority notNil - ifTrue: [ - stream nextPutAll: '//'. - newAuthority printOn: stream]. - newPath notNil - ifTrue: [stream nextPutAll: newPath]. - relativeURI query notNil - ifTrue: [stream nextPutAll: relativeURI query]. - relativeURI fragment notNil - ifTrue: [ - stream nextPut: $# . - stream nextPutAll: relativeURI fragment]]. - ^newURI asURI! Item was removed: - ----- Method: HierarchicalURI>>userInfo (in category 'accessing') ----- - userInfo - ^self authority userInfo! Item was removed: - URI subclass: #OpaqueURI - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Network-URI'! Item was removed: - ----- Method: OpaqueURI>>isOpaque (in category 'testing') ----- - isOpaque - ^true! Item was changed: ----- Method: PRServerDirectory>>getLines (in category 'private') ----- getLines "private - answer a collection of lines with the server response" | url lines string | url := self urlFromServer: self server directories: {'programmatic'} , self directories. url := url , self slash. + string := Cursor read + showWhile: [(HTTPSocket httpGetDocument: url) contents]. - "" - string := Cursor read showWhile: [ - (HTTPClient httpGetDocument: url) contents]. (string beginsWith: '--OK--') ifFalse: [^ nil]. - "" lines := OrderedCollection new. (string allButFirst: 6) linesDo: [:line | lines add: line squeakToIso]. + - "" ^ lines! Item was changed: ----- Method: PRServerDirectory>>writeProject:inFileNamed:fromDirectory: (in category 'squeaklets') ----- writeProject: aProject inFileNamed: fileNameString fromDirectory: localDirectory "write aProject (a file version can be found in the file named fileNameString in localDirectory)" | url arguments string | url := self urlFromServer: self server directories: {'programmatic'. 'uploadproject'}. arguments := self getPostArgsFromProject: aProject fileNamed: fileNameString fromDirectory: localDirectory. + - "" string := Cursor read showWhile: [ + (HTTPSocket httpPostDocument: url args: arguments) contents]. - (HTTPClient httpPostDocument: url args: arguments) contents - "(HTTPSocket httpGetDocument: url args: arguments) contents."]. (string beginsWith: '--OK--') ifTrue: [^ true]. + + self inform: ('Server responded: {1}' translated format: {string}). - "" - self - inform: ('Server responded: {1}' translated format: {string}). ^ false! Item was changed: ----- Method: ProtocolClient class>>openOnHostNamed:port: (in category 'instance creation') ----- openOnHostNamed: hostName port: portNumber | serverIP | serverIP := NetNameResolver addressForName: hostName timeout: 20. + serverIP ifNil:[ ^ nil]. + ^ (self openOnHost: serverIP port: portNumber) hostName: hostName; yourself ! Item was changed: ----- Method: ServerDirectory>>openFTPClient (in category 'dis/connect') ----- openFTPClient | loginSuccessful | client ifNotNil: [client isConnected ifTrue: [^client] ifFalse: [client := nil]]. client := FTPClient openOnHostNamed: server. + client ifNil: [^nil]. loginSuccessful := false. [loginSuccessful] whileFalse: [ [loginSuccessful := true. client loginUser: self user password: self password] on: LoginFailedException do: [:ex | | what | passwordHolder := nil. what := UIManager default chooseFrom: #('enter password' 'give up') title: 'Would you like to try another password?'. what = 1 ifFalse: [ ^nil]. loginSuccessful := false]]. client changeDirectoryTo: directory. ^client! Item was removed: - Object subclass: #URI - instanceVariableNames: 'fragment scheme schemeSpecificPart' - classVariableNames: 'ClientClasses' - poolDictionaries: '' - category: 'Network-URI'! - - !URI commentStamp: 'mir 2/20/2002 15:17' prior: 0! - A Uniform Resource Identifier (URI) is a compact string of characters for identifying an abstract or physical resource. - This implementation is based on http://www.ietf.org/rfc/rfc2396.txt. - - ! Item was removed: - ----- Method: URI class>>absoluteFromString:scheme: (in category 'instance creation') ----- - absoluteFromString: aString scheme: scheme - | remainder | - remainder := aString copyFrom: scheme size+2 to: aString size. - remainder isEmpty - ifTrue: [(IllegalURIException new uriString: aString) signal: 'Invalid absolute URI']. - ^(remainder first = $/ - ifTrue: [HierarchicalURI] - ifFalse: [OpaqueURI]) new absoluteFromString: remainder scheme: scheme! Item was removed: - ----- Method: URI class>>extractSchemeFrom: (in category 'instance creation') ----- - extractSchemeFrom: aString - | colonIndex slashIndex | - colonIndex := aString indexOf: $: . - ^colonIndex > 0 - ifTrue: [ - slashIndex := aString indexOf: $/ . - (slashIndex = 0 - or: [colonIndex < slashIndex]) - ifTrue: [aString copyFrom: 1 to: colonIndex-1] - ifFalse: [nil]] - ifFalse: [nil]! Item was removed: - ----- Method: URI class>>fromString: (in category 'instance creation') ----- - fromString: aString - | parseString scheme | - parseString := aString withBlanksTrimmed. - scheme := self extractSchemeFrom: parseString. - ^scheme - ifNil: [HierarchicalURI new relativeFromString: aString] - ifNotNil: [self absoluteFromString: aString scheme: scheme] - ! Item was removed: - ----- Method: URI class>>initialize (in category 'class initialization') ----- - initialize - "URI initialize" - - ClientClasses := Dictionary new. - ClientClasses - at: 'http' put: #HTTPClient; - at: 'ftp' put: #FTPClient; - at: 'file' put: #FileDirectory - ! Item was removed: - ----- Method: URI>>= (in category 'testing') ----- - = otherURI - ^ self class = otherURI class - and: [self asString = otherURI asString]! Item was removed: - ----- Method: URI>>absoluteFromString:scheme: (in category 'private') ----- - absoluteFromString: remainder scheme: schemeName - scheme := schemeName. - self extractSchemeSpecificPartAndFragment: remainder! Item was removed: - ----- Method: URI>>allButScheme (in category 'printing') ----- - allButScheme - "Answer the entire url except its scheme" - - ^String streamContents:[:s| - s nextPutAll: schemeSpecificPart. - fragment ifNotNil: [ - s nextPut: $# . - s nextPutAll: self fragment] - ].! Item was removed: - ----- Method: URI>>asText (in category 'converting') ----- - asText - ^self asString asText! Item was removed: - ----- Method: URI>>asURI (in category 'converting') ----- - asURI - ^self! Item was removed: - ----- Method: URI>>asUrl (in category 'converting') ----- - asUrl - - ^self asString asUrl! Item was removed: - ----- Method: URI>>clientClass (in category 'private') ----- - clientClass - ^Smalltalk at: (ClientClasses at: self scheme ifAbsent: [ClientClasses at: 'file'])! Item was removed: - ----- Method: URI>>contentStream (in category 'retrieval') ----- - contentStream - ^self clientClass contentStreamForURI: self! Item was removed: - ----- Method: URI>>downloadUrl (in category 'converting') ----- - downloadUrl - self halt! Item was removed: - ----- Method: URI>>extractSchemeSpecificPartAndFragment: (in category 'private') ----- - extractSchemeSpecificPartAndFragment: remainder - | fragmentIndex | - fragmentIndex := remainder indexOf: $# . - fragmentIndex > 0 - ifTrue: [ - schemeSpecificPart := remainder copyFrom: 1 to: fragmentIndex-1. - fragment := remainder copyFrom: fragmentIndex+1 to: remainder size] - ifFalse: [schemeSpecificPart := remainder]! Item was removed: - ----- Method: URI>>fragment (in category 'accessing') ----- - fragment - ^fragment! Item was removed: - ----- Method: URI>>hasRemoteContents (in category 'testing') ----- - hasRemoteContents - self halt! Item was removed: - ----- Method: URI>>hash (in category 'testing') ----- - hash - ^ self asString hash! Item was removed: - ----- Method: URI>>isAbsolute (in category 'testing') ----- - isAbsolute - ^self scheme notNil! Item was removed: - ----- Method: URI>>isOpaque (in category 'testing') ----- - isOpaque - ^false! Item was removed: - ----- Method: URI>>isRelative (in category 'testing') ----- - isRelative - ^self isAbsolute not! Item was removed: - ----- Method: URI>>printOn: (in category 'printing') ----- - printOn: stream - self isAbsolute - ifTrue: [ - stream nextPutAll: self scheme. - stream nextPut: $: ]. - self printSchemeSpecificPartOn: stream. - fragment - ifNotNil: [ - stream nextPut: $# . - stream nextPutAll: self fragment] - ! Item was removed: - ----- Method: URI>>printSchemeSpecificPartOn: (in category 'printing') ----- - printSchemeSpecificPartOn: stream - stream nextPutAll: self schemeSpecificPart! Item was removed: - ----- Method: URI>>resolveRelativeURI: (in category 'accessing') ----- - resolveRelativeURI: relativeURI - self shouldNotImplement! Item was removed: - ----- Method: URI>>retrieveContentStream (in category 'retrieval') ----- - retrieveContentStream - ^self retrieveMIMEDocument contentStream! Item was removed: - ----- Method: URI>>retrieveContents (in category 'retrieval') ----- - retrieveContents - ^self retrieveMIMEDocument contents! Item was removed: - ----- Method: URI>>retrieveMIMEDocument (in category 'retrieval') ----- - retrieveMIMEDocument - ^self clientClass retrieveMIMEDocument: self! Item was removed: - ----- Method: URI>>scheme (in category 'accessing') ----- - scheme - ^scheme! Item was removed: - ----- Method: URI>>schemeSpecificPart (in category 'private') ----- - schemeSpecificPart - ^schemeSpecificPart!

1 0

The Trunk: System-tpr.1055.mcz
by commits＠source.squeak.org 19 Feb '19

19 Feb '19

tim Rowledge uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-tpr.1055.mcz ==================== Summary ==================== Name: System-tpr.1055 Author: tpr Time: 18 February 2019, 7:27:45.328716 pm UUID: e5a22b14-e481-4ca2-bb73-06c231538511 Ancestors: System-tonyg.1054 Part of deprecating HTTPClient for 6.0 Stop using it and deprecate the actual class =============== Diff against System-tonyg.1054 =============== Item was removed: - ----- Method: AutoStart class>>checkForPluginUpdate (in category 'updating') ----- - checkForPluginUpdate - | pluginVersion updateURL | - HTTPClient isRunningInBrowser - ifFalse: [^false]. - pluginVersion := Smalltalk namedArguments - at: (Smalltalk platformName copyWithout: Character space) asUppercase - ifAbsent: [^false]. - updateURL := Smalltalk namedArguments - at: 'UPDATE_URL' - ifAbsent: [^false]. - ^SystemVersion check: pluginVersion andRequestPluginUpdate: updateURL! Item was changed: ----- Method: AutoStart class>>processUpdates (in category 'updating') ----- processUpdates "Process update files from a well-known update server. This method is called at system startup time, Only if the preference #updateFromServerAtStartup is true is the actual update processing undertaken automatically" | choice | (MCMcmUpdater updateFromServerAtStartup) ifTrue: [choice := UIManager default chooseFrom: #('Yes, Update' 'No, Not now' 'Don''t ask again') title: 'Shall I look for new code\updates on the server?' withCRs. choice = 1 ifTrue: [ MCMcmUpdater updateFromServer]. choice = 3 ifTrue: [ MCMcmUpdater updateFromServerAtStartup: false. + self inform: 'Remember to save your image to make this setting permant']]! - self inform: 'Remember to save your image to make this setting permant.']]. - ^false! Item was changed: ----- Method: AutoStart class>>startUp: (in category 'initialization') ----- startUp: resuming "The image is either being newly started (resuming is true), or it's just been snapshotted. If this has just been a snapshot, skip all the startup stuff." | startupParameters launchers | self active ifTrue: [^self]. self active: true. resuming ifFalse: [^self]. - HTTPClient determineIfRunningInBrowser. startupParameters := Smalltalk namedArguments. - (startupParameters includesKey: 'apiSupported' asUppercase ) - ifTrue: [ - HTTPClient browserSupportsAPI: ((startupParameters at: 'apiSupported' asUppercase) asUppercase = 'TRUE'). - HTTPClient isRunningInBrowser - ifFalse: [HTTPClient isRunningInBrowser: true]]. Project current world ifNotNil: [:w | w install. w firstHand position: 100 @ 100 ]. + self processUpdates. + - "Some images might not have the UpdateStream package." - ((self respondsTo: #checkForUpdates) and: [self checkForUpdates]) ifTrue: [^self]. - self checkForPluginUpdate. launchers := self installedLaunchers collect: [:launcher | launcher new]. launchers do: [:launcher | launcher parameters: startupParameters]. launchers do: [:launcher | Project current addDeferredUIMessage: [launcher startUp]]! Item was removed: - Object subclass: #HTTPClient - instanceVariableNames: '' - classVariableNames: 'BrowserSupportsAPI RunningInBrowser' - poolDictionaries: '' - category: 'System-Support'! Item was removed: - ----- Method: HTTPClient class>>browserSupportsAPI (in category 'class initialization') ----- - browserSupportsAPI - ^BrowserSupportsAPI == true! Item was removed: - ----- Method: HTTPClient class>>browserSupportsAPI: (in category 'class initialization') ----- - browserSupportsAPI: aBoolean - BrowserSupportsAPI := aBoolean! Item was removed: - ----- Method: HTTPClient class>>composeMailTo:subject:body: (in category 'utilities') ----- - composeMailTo: address subject: subject body: body - "HTTPClient composeMailTo: 'michael.rueger(a)squeakland.org' subject: 'test subject' body: 'message' " - | mailTo | - mailTo := WriteStream on: String new. - mailTo nextPutAll: 'mailto:'. - mailTo - nextPutAll: address; - nextPut: $?. - subject isEmptyOrNil - ifFalse: [mailTo nextPutAll: 'subject='; nextPutAll: subject; nextPut: $&]. - body isEmptyOrNil - ifFalse: [mailTo nextPutAll: 'body='; nextPutAll: body]. - - self httpGet: mailTo contents! Item was removed: - ----- Method: HTTPClient class>>determineIfRunningInBrowser (in category 'class initialization') ----- - determineIfRunningInBrowser - "HTTPClient determineIfRunningInBrowser" - - RunningInBrowser := StandardFileStream isRunningAsBrowserPlugin - ! Item was removed: - ----- Method: HTTPClient class>>exampleMailTo (in category 'examples') ----- - exampleMailTo - "HTTPClient exampleMailTo" - - HTTPClient mailTo: 'm.rueger(a)acm.org' message: 'A test message from within Squeak' - ! Item was removed: - ----- Method: HTTPClient class>>examplePostArgs (in category 'examples') ----- - examplePostArgs - "HTTPClient examplePostArgs" - - | args result | - args := Dictionary new - at: 'arg1' put: #('val1'); - at: 'arg2' put: #('val2'); - yourself. - result := HTTPClient httpPostDocument: 'http://www.squeaklet.com/cgi-bin/thrd.pl [^]' args: args. - Transcript show: result content; cr; cr. - - ! Item was removed: - ----- Method: HTTPClient class>>examplePostMultipart (in category 'examples') ----- - examplePostMultipart - "HTTPClient examplePostMultipart" - - | args result | - args := Dictionary new - at: 'arg1' put: #('val1'); - at: 'arg2' put: #('val2'); - yourself. - result := HTTPClient httpPostMultipart: 'http://www.squeaklet.com/cgi-bin/thrd.pl' args: args. - Transcript show: result content; cr; cr. - - ! Item was removed: - ----- Method: HTTPClient class>>getDirectoryListing: (in category 'utilities') ----- - getDirectoryListing: dirListURL - "HTTPClient getDirectoryListing: 'http://www.squeakalpha.org/uploads' " - | answer ftpEntries | - " answer := self - httpPostDocument: dirListURL - args: Dictionary new." - "Workaround for Mac IE problem" - answer := self httpGetDocument: dirListURL. - answer isString - ifTrue: [^self error: 'Listing failed: ' , answer] - ifFalse: [answer := answer content]. - answer first == $< - ifTrue: [self error: 'Listing failed: ' , answer]. - ftpEntries := answer findTokens: String crlf. - ^ ftpEntries - collect:[:ftpEntry | ServerDirectory parseFTPEntry: ftpEntry] - thenSelect: [:entry | entry notNil]! Item was removed: - ----- Method: HTTPClient class>>httpGet: (in category 'post/get') ----- - httpGet: url - | document | - document := self httpGetDocument: url. - ^(document isString) - ifTrue: [ - "strings indicate errors" - document] - ifFalse: [(RWBinaryOrTextStream with: document content) reset]! Item was removed: - ----- Method: HTTPClient class>>httpGetDocument: (in category 'post/get') ----- - httpGetDocument: url - | stream content | - ^self shouldUsePluginAPI - ifTrue: [ - stream := FileStream requestURLStream: url ifError: [self error: 'Error in get from ' , url printString]. - stream ifNil: [^'']. - stream position: 0. - content := stream upToEnd. - stream close. - MIMEDocument content: content] - ifFalse: [HTTPSocket httpGetDocument: url]! Item was removed: - ----- Method: HTTPClient class>>httpPostDocument:args: (in category 'post/get') ----- - httpPostDocument: url args: argsDict - ^self httpPostDocument: url target: nil args: argsDict! Item was removed: - ----- Method: HTTPClient class>>httpPostDocument:target:args: (in category 'post/get') ----- - httpPostDocument: url target: target args: argsDict - | argString stream content | - ^self shouldUsePluginAPI - ifTrue: [ - argString := argsDict - ifNotNil: [argString := HTTPSocket argString: argsDict] - ifNil: ['']. - stream := FileStream post: argString , ' ' target: target url: url , argString ifError: [self error: 'Error in post to ' , url printString]. - stream position: 0. - content := stream upToEnd. - stream close. - MIMEDocument content: content] - ifFalse: [HTTPSocket httpPostDocument: url args: argsDict]! Item was removed: - ----- Method: HTTPClient class>>httpPostMultipart:args: (in category 'post/get') ----- - httpPostMultipart: url args: argsDict - " do multipart/form-data encoding rather than x-www-urlencoded " - - ^self shouldUsePluginAPI - ifTrue: [self pluginHttpPostMultipart: url args: argsDict] - ifFalse: [HTTPSocket httpPostMultipart: url args: argsDict accept: nil request: '']! Item was removed: - ----- Method: HTTPClient class>>isRunningInBrowser (in category 'testing') ----- - isRunningInBrowser - - RunningInBrowser isNil - ifTrue: [self determineIfRunningInBrowser]. - ^RunningInBrowser! Item was removed: - ----- Method: HTTPClient class>>isRunningInBrowser: (in category 'testing') ----- - isRunningInBrowser: aBoolean - "Override the automatic process. - This should be used with caution. - One way to determine it without using the primitive is to check for parameters typically only encountered when running as a plugin." - - RunningInBrowser := aBoolean! Item was removed: - ----- Method: HTTPClient class>>mailTo:message: (in category 'utilities') ----- - mailTo: address message: aString - HTTPClient shouldUsePluginAPI - ifFalse: [^self error: 'You need to run inside a web browser.']. - FileStream post: aString url: 'mailto:' , address ifError: [self error: 'Can not send mail']! Item was removed: - ----- Method: HTTPClient class>>pluginHttpPostMultipart:args: (in category 'private') ----- - pluginHttpPostMultipart: url args: argsDict - | mimeBorder argsStream crLf resultStream result | - " do multipart/form-data encoding rather than x-www-urlencoded " - - crLf := String crlf. - mimeBorder := '----squeak-', Time millisecondClockValue printString, '-stuff-----'. - "encode the arguments dictionary" - argsStream := WriteStream on: String new. - argsDict associationsDo: [:assoc | - assoc value do: [ :value | | fieldValue | - "print the boundary" - argsStream nextPutAll: '--', mimeBorder, crLf. - " check if it's a non-text field " - argsStream nextPutAll: 'Content-disposition: form-data; name="', assoc key, '"'. - (value isKindOf: MIMEDocument) - ifFalse: [fieldValue := value] - ifTrue: [argsStream nextPutAll: ' filename="', value url pathForFile, '"', crLf, 'Content-Type: ', value contentType. - fieldValue := (value content - ifNil: [(FileStream fileNamed: value url pathForFile) contentsOfEntireFile] - ifNotNil: [value content]) asString]. - " Transcript show: 'field=', key, '; value=', fieldValue; cr. " - argsStream nextPutAll: crLf, crLf, fieldValue, crLf. - ]]. - argsStream nextPutAll: '--', mimeBorder, '--'. - resultStream := FileStream - post: - ('ACCEPT: text/html', crLf, - 'User-Agent: Squeak 3.1', crLf, - 'Content-type: multipart/form-data; boundary=', mimeBorder, crLf, - 'Content-length: ', argsStream contents size printString, crLf, crLf, - argsStream contents) - url: url ifError: [^'Error in post ' url asString]. - "get the header of the reply" - result := resultStream - ifNil: [''] - ifNotNil: [resultStream upToEnd]. - ^MIMEDocument content: result! Item was removed: - ----- Method: HTTPClient class>>requestURL:target: (in category 'post/get') ----- - requestURL: url target: target - ^self shouldUsePluginAPI - ifTrue: [FileStream requestURL: url target: target] - ifFalse: [self error: 'Requesting a new URL target is not supported.']! Item was removed: - ----- Method: HTTPClient class>>shouldUsePluginAPI (in category 'testing') ----- - shouldUsePluginAPI - "HTTPClient shouldUsePluginAPI" - - self isRunningInBrowser - ifFalse: [^false]. - self browserSupportsAPI - ifFalse: [^false]. - "The Mac plugin calls do not work in full screen mode" - ^((Smalltalk platformName = 'Mac OS') - and: [DisplayScreen displayIsFullScreen]) not! Item was removed: - ----- Method: HTTPClient class>>uploadFileNamed:to:user:passwd: (in category 'utilities') ----- - uploadFileNamed: aFilename to: baseUrl user: user passwd: passwd - - | fileContents remoteFilename | - remoteFilename := (baseUrl endsWith: '/') - ifTrue: [baseUrl , '/' , aFilename] - ifFalse: [baseUrl , aFilename]. - fileContents := (StandardFileStream readOnlyFileNamed: aFilename) contentsOfEntireFile. - HTTPSocket httpPut: fileContents to: remoteFilename user: user passwd: passwd! Item was changed: ----- Method: HTTPLoader class>>httpRequestClass (in category 'accessing') ----- httpRequestClass + ^HTTPDownloadRequest! - ^HTTPClient shouldUsePluginAPI - ifTrue: [PluginHTTPDownloadRequest] - ifFalse: [HTTPDownloadRequest]! Item was changed: ----- Method: Project>>tellAFriend: (in category 'SuperSwiki') ----- + tellAFriend: emailAddressOrNil + " + Project current tellAFrien + " - tellAFriend: emailAddressOrNil | urlForLoading | + (urlForLoading := self urlForLoading) + ifNil: [urlForLoading := self url + "fallback for dtp servers"]. + urlForLoading isEmptyOrNil + ifTrue: [^ self inform: 'Since this project has not been saved yet, + I cannot tell someone where it is.' translated]. + FancyMailComposition new + celeste: nil + to: (emailAddressOrNil + ifNil: ['RECIPIENT.GOESHERE']) + subject: 'New/Updated Squeak project' + initialText: 'This is a link to the Squeak project ' , self name , ': ' , String crlf + theLinkToInclude: urlForLoading; + open! - " - Project current tellAFriend - " - - (urlForLoading := self urlForLoading) ifNil: [ - urlForLoading := self url "fallback for dtp servers" - ]. - urlForLoading isEmptyOrNil ifTrue: [ - ^self inform: 'Since this project has not been saved yet, - I cannot tell someone where it is.' translated - ]. - HTTPClient tellAFriend: emailAddressOrNil url: urlForLoading name: self name! Item was changed: ----- Method: ProjectLauncher>>initialize (in category 'initialization') ----- initialize super initialize. + showSplash := true! - showSplash := true. - HTTPClient isRunningInBrowser - ifTrue: [whichFlaps := 'etoy']! Item was changed: ----- Method: ProjectLauncher>>startUpAfterLogin (in category 'running') ----- startUpAfterLogin | scriptName loader isUrl | self setupFlaps. + Preferences readDocumentAtStartup + ifTrue: [scriptName := Smalltalk documentPath + ifNil: ['']. - Preferences readDocumentAtStartup ifTrue: [ - HTTPClient isRunningInBrowser ifTrue:[ - self setupFromParameters. - scriptName := self parameterAt: 'src'. - CodeLoader defaultBaseURL: (self parameterAt: 'Base'). - ] ifFalse:[ - scriptName := (Smalltalk documentPath) ifNil:['']. scriptName := scriptName convertFromSystemString. + scriptName isEmpty + ifFalse: ["figure out if script name is a URL by itself" + isUrl := (scriptName asLowercase beginsWith: 'http://') + or: [(scriptName asLowercase beginsWith: 'file://') + or: [scriptName asLowercase beginsWith: 'ftp://']]. + isUrl + ifFalse: [| encodedPath pathTokens | + "Allow for ../dir/scriptName arguments" + pathTokens := scriptName splitBy: FileDirectory slash. + pathTokens := pathTokens + collect: [:s | s encodeForHTTP]. + encodedPath := pathTokens + reduce: [:acc :each | acc , FileDirectory slash , each]. + scriptName := (FileDirectory default uri resolveRelativeURI: encodedPath) asString]]] + ifFalse: [scriptName := '']. - scriptName isEmpty ifFalse:[ - "figure out if script name is a URL by itself" - isUrl := (scriptName asLowercase beginsWith:'http://') or:[ - (scriptName asLowercase beginsWith:'file://') or:[ - (scriptName asLowercase beginsWith:'ftp://')]]. - isUrl ifFalse:[ | encodedPath pathTokens | - "Allow for ../dir/scriptName arguments" - pathTokens := scriptName splitBy: FileDirectory slash. - pathTokens := pathTokens collect: [:s | s encodeForHTTP]. - encodedPath := pathTokens reduce: [:acc :each | acc , FileDirectory slash , each]. - scriptName := (FileDirectory default uri - resolveRelativeURI: encodedPath) asString]]. - ]. ] - ifFalse: [ scriptName := '' ]. - scriptName isEmptyOrNil + ifTrue: [^ Preferences eToyFriendly + ifTrue: [self currentWorld addGlobalFlaps]]. - ifTrue:[^Preferences eToyFriendly ifTrue: [self currentWorld addGlobalFlaps]]. loader := CodeLoader new. + loader + loadSourceFiles: (Array with: scriptName). + (scriptName asLowercase endsWith: '.pr') + ifTrue: [self installProjectFrom: loader] + ifFalse: [loader installSourceFiles]! - loader loadSourceFiles: (Array with: scriptName). - (scriptName asLowercase endsWith: '.pr') - ifTrue:[self installProjectFrom: loader] - ifFalse:[loader installSourceFiles]. - ! Item was changed: ----- Method: ResourceCollector>>writeResourceForm:fromLocator: (in category 'resource writing') ----- writeResourceForm: aForm fromLocator: aLocator "The given form has been externalized before. If it was reasonably compressed, use the bits of the original data - this allows us to recycle GIF, JPEG, PNG etc. data without using the internal compression (which is in most cases inferior). If necessary the data will be retrieved from its URL location. This retrieval is done only if the resouce comes from either * the local disk (in which case the file has never been published) * the browser cache (in which case we don't cache the resource locally) In any other case we will *not* attempt to retrieve it, because doing so can cause the system to connect to the network which is probably not what we want. It should be a rare case anyways; could only happen if one clears the squeak cache selectively." | fName fStream url data | "Try to be smart about the name of the file" fName := (aLocator urlString includes: $:) ifTrue: [ url := aLocator urlString asUrl. url path last] ifFalse: [aLocator urlString]. fName isEmptyOrNil ifFalse:[fName := fName asFileName]. (fName isEmptyOrNil or:[localDirectory isAFileNamed: fName]) ifTrue:[ "bad luck -- duplicate name" fName := localDirectory nextNameFor:'resource' extension: (FileDirectory extensionFor: aLocator urlString)]. "Let's see if we have cached it locally" ResourceManager lookupCachedResource: self baseUrl , aLocator urlString ifPresentDo:[:stream | data := stream upToEnd]. "Check if the cache entry is without qualifying baseUrl. Workaround for older versions." data ifNil:[ ResourceManager lookupCachedResource: aLocator urlString ifPresentDo:[:stream | data := stream upToEnd]]. data ifNil:[ "We don't have it cached locally. Retrieve it from its original location." + (url notNil and: [url hasRemoteContents]) - ((url notNil and: [url hasRemoteContents]) and:[HTTPClient isRunningInBrowser not]) ifTrue:[^nil]. "see note above" (Url schemeNameForString: aLocator urlString) ifNil: [^nil]. data := HTTPLoader default retrieveContentsFor: aLocator urlString. data ifNil:[^nil]. data := data content. ]. "data size > aForm bits byteSize ifTrue:[^nil]." fStream := localDirectory newFileNamed: fName. fStream binary. fStream nextPutAll: data. fStream close. ^{fName. data size}! Item was changed: ----- Method: ResourceManager class>>cacheResource:stream: (in category 'resource caching') ----- cacheResource: urlString stream: aStream | fd localName file buf | + - HTTPClient shouldUsePluginAPI ifTrue:[^self]. "use browser cache" (self resourceCache at: urlString ifAbsent:[#()]) size > 0 ifTrue:[^self]. "don't waste space" fd := Project squeakletDirectory. localName := fd nextNameFor: 'resource' extension:'cache'. file := fd forceNewFileNamed: localName. buf := ByteArray new: 10000. aStream binary. file binary. [aStream atEnd] whileFalse:[ buf := aStream next: buf size into: buf. file nextPutAll: buf. ]. file close. "update cache" file := [fd oldFileNamed: self resourceCacheName] on: FileDoesNotExistException do:[:ex| fd forceNewFileNamed: self resourceCacheName]. file setToEnd. file nextPutAll: urlString; cr. file nextPutAll: localName; cr. file close. self addCacheLocation: localName for: urlString. aStream position: 0. ! Item was removed: - ----- Method: SystemVersion class>>check:andRequestPluginUpdate: (in category 'updating') ----- - check: pluginVersion andRequestPluginUpdate: updateURL - "SystemVersion check: 'zzz' andRequestPluginUpdate: 'http://www.squeakland.org/installers/update.html' " - - "We don't have a decent versioning scheme yet, so we are basically checking for a nil VM version on the mac." - (self pluginVersion: pluginVersion newerThan: self currentPluginVersion) - ifFalse: [^true]. - (self confirm: 'There is a newer plugin version available. Do you want to install it now?') - ifFalse: [^false]. - HTTPClient - requestURL: updateURL , (Smalltalk platformName copyWithout: Character space) asLowercase , '.html' - target: '_top'. - ^false!

1 0

Squeak and Tonel
by Torsten Bergmann 18 Feb '19

18 Feb '19

Hi, as some of you might already know "Tonel" is a file-per-class format for monticello repositories [1]. In Pharo land many projects are already converted to it - as regular "file tree" solution faces issues with git handling due to very long file names / deep file hierarchy (often leading to trouble on Windows). Dales's Rowan (a new project/package manager for Smalltalk) supports FileTree and also Tonel repositories [2]. There is also a tool to convert from STORE (VisualWorks Source-Code Versioning System) to Tonel format [3]. So I wonder about adoption of Tonel in Squeak land. Any status/comments? Thx T. [1] https://github.com/pharo-vcs/tonel [2] https://github.com/GemTalk/Rowan [3] https://pharoweekly.wordpress.com/2019/01/20/ann-sett-store-export-to-tonel…

12 30

Re: [squeak-dev] VMMaker in Pharo [Was: Squeak and Tonel]
by Eliot Miranda 18 Feb '19

18 Feb '19

Doru, On Sun, Feb 17, 2019 at 10:33 PM Tudor Girba <tudor(a)tudorgirba.com> wrote: > Hi Eliot, > > You raise a few technical concerns related to VMMaker that seem > addressable: > > 1. Rendering technology: Both in Pharo and in GT, there exist in-image > canvases, Athens and Sparta respectively, that are backend independent. > This allows us to have image-based drawing logic, like BitBlt or even > better, the drawing capabilities that Juan Vuletich built in Morphic 3, > transparently. In fact, we even started to look at the code from Morphic 3 > and we think it’s not much effort to make it work behind Sparta. This would > provide a complete solution that would not rely on any external libraries. > > 2. Git history. We used to have the author and timestamp in the metadata > of Tonel but because it generated unwanted conflicts it was decided to > remove it. I think this is a good decision and one based on the experience > of using it. But, why do you think the algorithm of retrieving Git could > not be made to work in Squeak? Is there a specific technical reason, or is > it more that you do not see the effort being spent in this direction? I am > asking to understand what could a possible solution be. > > > But, let’s take a step back. George and Andrei did move the VMMaker code, > including all its history, into Git using (and enhancing) > https://github.com/peteruhnak/git-migration. > > The code is here: > https://github.com/feenkcom/opensmalltalk-vm/tree/pullrequest5/vmmaker > > Our goal was to make the code loadable and runnable in Pharo through Git. > We have a reproducible process to produce this history, and this means that > we can also synchronize all changes from the Monticello VMMaker repository > and produce a history-preserving Git repository. > > The current code comes with a BaselineOfVMMaker that loads in Pharo, and > the code generation seems to work to a good extent without much effort. > There is still work that needs to be done especially on the simulation > part, but we think most of it can be addressed through a Pharo-specific > package that provides compatibility logic. > > I see two benefits for doing this: > 1. It allows people in Pharo to play with the VM within the Pharo context > and consequently contribute. > 2. It allows us to build an environment dedicated for VM development > without affecting the current contribution process. We can judge later > whether this is useful. > All this is great work. But I cannot use it until I can also function in Squeak. I know you want me to move to Pharo, but I am not convinced that it is a safe place for me to land. I have voiced my concerns before (stability, moving away from support I need (e.g. Pharo dropping read./write file streams is the latest example). Let me simply restate that "t6he devil you know is better than the devil you don't", and that I know I am productive with VMMaker in Squeak, but I *do not* know that I can be productive in Pharo (in fact, I have lots of experience of the contrary). So I will not move to Pharo any time soon and so, until there is a solution to git/tonel/squeak integration I cannot join the unified repository, must as I would like to. I'm sorry for the frustration this causes other. I am radical in some things, but deeply conservative in others. And my ability to be productive is obviously foundational. > Cheers, > Doru > > > > On Feb 17, 2019, at 9:27 PM, Eliot Miranda <eliot.miranda(a)gmail.com> > wrote: > > > > Hi All, Hi Torsten, Hi Jakob, > > > > On Thu, Feb 14, 2019 at 6:17 AM Torsten Bergmann <astares(a)gmx.de> wrote: > > Hi, > > > > as some of you might already know "Tonel" is a file-per-class format for > monticello repositories [1]. > > > > In Pharo land many projects are already converted to it - as regular > "file tree" solution faces issues > > with git handling due to very long file names / deep file hierarchy > (often leading to trouble on Windows). > > > > Dales's Rowan (a new project/package manager for Smalltalk) supports > FileTree and also Tonel > > repositories [2]. There is also a tool to convert from STORE > (VisualWorks Source-Code Versioning System) > > to Tonel format [3]. > > > > So I wonder about adoption of Tonel in Squeak land. > > > > Any status/comments? > > > > Last year I was given contract employment by Tudor Girba's feenk which > in part was to involve me porting VMMaker.oscog to Pharo in order to reap > the productivity benefits of the Glamorous Toolkit when applied to > VMMaker. The major direction was to unify the opensmalltalk-vm repository > with a Toned-Format repository holding the Smalltalk code. > > > > This project, though no fault of feenk's did not go well. A big part of > it was my own emotional attachment to Squeak, my "muscle memory" with > Squeak and my long experience with Smalltalk-80 derived meta programming > which I make extensive use of in VMMaker.oscog. But a key issue was that I > was not prepared to *move* VMMaker.oscog to Pharo; for me it is key that it > can live in both places. In particular I will not risk VMMaker.oscog being > stranded on Pharo as it moves away from the "image-based rendering model". > This is not because I don't believe in pixel-independent rendering models, > but because productivity in VMMaker depends much more than on GToolkit > inspection on the key architectural feature of being completely, safely > simulateable (not a real English word; but meaning capable of being > simulated). As Pharo moves towards external libraries to implement its UI > so the degree to which VMMaker is simulated is reduced. Thus crashes in > external code cannot be handled with the same power as with errors > presented within the Smalltalk environment itself, and this (as harsh > experience over thirty five years has taught me) is far more important for > overall productivity than having powerful tailorable inspectors. > > > > I therefore wanted a Tonel that could both function for Squeak's > Monticello and for Pharo's Iceberg. I had modified the Tonel serialization > a little to provide well-formatted support for method timestamps, which are > still a key and extremely useful part of Squeak Monticello's "blame" > equivalent. Until git author attribution can be imported into Squeak's > Monticello (something I don't see happening) I wanted merely to be able to > have a variant of Tonel, enabled for example by a class variable, and hence > /not/ present in Pharo, that would allow VMMaker.oscog to use Tonel but > still be functional inside Squeak. I asked Esteban and was met by a flat > no. Not "OK, but this is an option only you will use", but a flat "not > under any circumstance". > > > > So here I am joining in this thread reluctantly. I'm extremely > frustrated by the state of Tonel in Squeak and between the two dialects. > Clément had moved his Scorch optimizer to Tonel/git and I tried to use > Metacello and Jakob's Tonel code to at least allow me to load that code and > try and push forward on Sista/Scorch. The port *does not work*. Metacello > fails to load Scorch. Neither Jakob nor Fabio, after putting in some > effort, were able to fix the problem, and it is well beyond me. So I have > accepted the fact that I will have to use the Monticello repository for > Scorch/Sista. > > > > I had deep concerns that the pursuit of git integration would end up > splitting the Pharo and Squeak communities and indeed this is now in > progress. I am utterly unmotivated by the lack of cooperation, the sheer > arrogance and bullying of those that say "you will move to git/tonel or > else", and considering leaving VMMaker altogether. The only things that > are keeping me interested are Ron Teitelbaum's Terf and me pursuing a PhD > on register allocation in the context of Sista/Scorch with Robert > Hirshfeld's group at HPI. > > > > Here's the kind of crap people like Ducasse throw at me: > > > > "Eliot > > > > At the end of the day I will probably ask the two phds that should work > on language design to use truffle or pypy > > because let us face it we cannot work with the Pharo VM. Else we will > simply have to fork it (because we do not want to have > > to jump over cuis, newspeak, squeak code constraints and I do not what) > and it will be another drama is in the pico world > > of the “open” smalltalk VM. " > > > > I am so over this crap. > > _,,,^..^,,,_ > > best, Eliot > > -- > www.feenk.com > > “Software has no shape. Actually, it has no one shape. It has many." > > -- _,,,^..^,,,_ best, Eliot

1 0

Re: [squeak-dev] [Vm-dev] VMMaker in Pharo [Was: Squeak and Tonel]
by Nicolas Cellier 18 Feb '19

18 Feb '19

Hi Tudor, Retrieving author and timestamp from git history is doable. The question is whether it will be still possible to contribute thru MC or not. If it is metadataless MC, there's no point, it's unusable. I think that the minimal metadata we have to maintain is the last MC ancestor. This can be done by convention thru a .last_mc_ancestor file. Of course, there will be conflicts, but easy to (automatically) solve. That could also lie in commit message, but is somehow a bit more fragile... it would mean scanning thru ancestry for getting such information. By symmetry, merged agit sha should be in mc commit, either a specific file in mcz, or commit message. Also note that vmmaker history as proposed in opensmalltalk pr was broken (no respect of branch topology). Maybe retry with Squot? https://github.com/hpi-swa/Squot There is still a problem of synching commits of other packages (cog, various plugins ...), and if nobody is working on it, we are condemned to a mediocre solution. IMO, a broken history has not much interest. The question is whether it is possible to come to acceptable compromise? Le lun. 18 févr. 2019 à 07:33, Tudor Girba <tudor(a)tudorgirba.com> a écrit : > > Hi Eliot, > > You raise a few technical concerns related to VMMaker that seem > addressable: > > 1. Rendering technology: Both in Pharo and in GT, there exist in-image > canvases, Athens and Sparta respectively, that are backend independent. > This allows us to have image-based drawing logic, like BitBlt or even > better, the drawing capabilities that Juan Vuletich built in Morphic 3, > transparently. In fact, we even started to look at the code from Morphic 3 > and we think it’s not much effort to make it work behind Sparta. This would > provide a complete solution that would not rely on any external libraries. > > 2. Git history. We used to have the author and timestamp in the metadata > of Tonel but because it generated unwanted conflicts it was decided to > remove it. I think this is a good decision and one based on the experience > of using it. But, why do you think the algorithm of retrieving Git could > not be made to work in Squeak? Is there a specific technical reason, or is > it more that you do not see the effort being spent in this direction? I am > asking to understand what could a possible solution be. > > > But, let’s take a step back. George and Andrei did move the VMMaker code, > including all its history, into Git using (and enhancing) > https://github.com/peteruhnak/git-migration. > > The code is here: > https://github.com/feenkcom/opensmalltalk-vm/tree/pullrequest5/vmmaker > > Our goal was to make the code loadable and runnable in Pharo through Git. > We have a reproducible process to produce this history, and this means that > we can also synchronize all changes from the Monticello VMMaker repository > and produce a history-preserving Git repository. > > The current code comes with a BaselineOfVMMaker that loads in Pharo, and > the code generation seems to work to a good extent without much effort. > There is still work that needs to be done especially on the simulation > part, but we think most of it can be addressed through a Pharo-specific > package that provides compatibility logic. > > I see two benefits for doing this: > 1. It allows people in Pharo to play with the VM within the Pharo context > and consequently contribute. > 2. It allows us to build an environment dedicated for VM development > without affecting the current contribution process. We can judge later > whether this is useful. > > Cheers, > Doru > > > > On Feb 17, 2019, at 9:27 PM, Eliot Miranda <eliot.miranda(a)gmail.com> > wrote: > > > > Hi All, Hi Torsten, Hi Jakob, > > > > On Thu, Feb 14, 2019 at 6:17 AM Torsten Bergmann <astares(a)gmx.de> wrote: > > Hi, > > > > as some of you might already know "Tonel" is a file-per-class format for > monticello repositories [1]. > > > > In Pharo land many projects are already converted to it - as regular > "file tree" solution faces issues > > with git handling due to very long file names / deep file hierarchy > (often leading to trouble on Windows). > > > > Dales's Rowan (a new project/package manager for Smalltalk) supports > FileTree and also Tonel > > repositories [2]. There is also a tool to convert from STORE > (VisualWorks Source-Code Versioning System) > > to Tonel format [3]. > > > > So I wonder about adoption of Tonel in Squeak land. > > > > Any status/comments? > > > > Last year I was given contract employment by Tudor Girba's feenk which > in part was to involve me porting VMMaker.oscog to Pharo in order to reap > the productivity benefits of the Glamorous Toolkit when applied to > VMMaker. The major direction was to unify the opensmalltalk-vm repository > with a Toned-Format repository holding the Smalltalk code. > > > > This project, though no fault of feenk's did not go well. A big part of > it was my own emotional attachment to Squeak, my "muscle memory" with > Squeak and my long experience with Smalltalk-80 derived meta programming > which I make extensive use of in VMMaker.oscog. But a key issue was that I > was not prepared to *move* VMMaker.oscog to Pharo; for me it is key that it > can live in both places. In particular I will not risk VMMaker.oscog being > stranded on Pharo as it moves away from the "image-based rendering model". > This is not because I don't believe in pixel-independent rendering models, > but because productivity in VMMaker depends much more than on GToolkit > inspection on the key architectural feature of being completely, safely > simulateable (not a real English word; but meaning capable of being > simulated). As Pharo moves towards external libraries to implement its UI > so the degree to which VMMaker is simulated is reduced. Thus crashes in > external code cannot be handled with the same power as with errors > presented within the Smalltalk environment itself, and this (as harsh > experience over thirty five years has taught me) is far more important for > overall productivity than having powerful tailorable inspectors. > > > > I therefore wanted a Tonel that could both function for Squeak's > Monticello and for Pharo's Iceberg. I had modified the Tonel serialization > a little to provide well-formatted support for method timestamps, which are > still a key and extremely useful part of Squeak Monticello's "blame" > equivalent. Until git author attribution can be imported into Squeak's > Monticello (something I don't see happening) I wanted merely to be able to > have a variant of Tonel, enabled for example by a class variable, and hence > /not/ present in Pharo, that would allow VMMaker.oscog to use Tonel but > still be functional inside Squeak. I asked Esteban and was met by a flat > no. Not "OK, but this is an option only you will use", but a flat "not > under any circumstance". > > > > So here I am joining in this thread reluctantly. I'm extremely > frustrated by the state of Tonel in Squeak and between the two dialects. > Clément had moved his Scorch optimizer to Tonel/git and I tried to use > Metacello and Jakob's Tonel code to at least allow me to load that code and > try and push forward on Sista/Scorch. The port *does not work*. Metacello > fails to load Scorch. Neither Jakob nor Fabio, after putting in some > effort, were able to fix the problem, and it is well beyond me. So I have > accepted the fact that I will have to use the Monticello repository for > Scorch/Sista. > > > > I had deep concerns that the pursuit of git integration would end up > splitting the Pharo and Squeak communities and indeed this is now in > progress. I am utterly unmotivated by the lack of cooperation, the sheer > arrogance and bullying of those that say "you will move to git/tonel or > else", and considering leaving VMMaker altogether. The only things that > are keeping me interested are Ron Teitelbaum's Terf and me pursuing a PhD > on register allocation in the context of Sista/Scorch with Robert > Hirshfeld's group at HPI. > > > > Here's the kind of crap people like Ducasse throw at me: > > > > "Eliot > > > > At the end of the day I will probably ask the two phds that should work > on language design to use truffle or pypy > > because let us face it we cannot work with the Pharo VM. Else we will > simply have to fork it (because we do not want to have > > to jump over cuis, newspeak, squeak code constraints and I do not what) > and it will be another drama is in the pico world > > of the “open” smalltalk VM. " > > > > I am so over this crap. > > _,,,^..^,,,_ > > best, Eliot > > -- > www.feenk.com > > “Software has no shape. Actually, it has no one shape. It has many." > >

2 1

Squeak and Tonel
by Hilaire 18 Feb '19

18 Feb '19

Yes, please cool down, this is a pathetic spectacle. What is needed in our community is cooperation, and we can extend it to humanity if we want to overcome the greatest difficulties ahead of us... We have the right to not agree, but we have the moral obligation to respect each other and keep the discussion gentle. Hilaire Le 18/02/2019 à 06:37, Tudor Girba a écrit : > Gentlemen, > > I am really sad to read through this animosity. Please, let’s go back to technical discussions. > > Tudor -- Dr. Geo http://drgeo.eu

1 0

The Inbox: Environments-cmm.74.mcz
by commits＠source.squeak.org 18 Feb '19

18 Feb '19

Chris Muller uploaded a new version of Environments to project The Inbox: http://source.squeak.org/inbox/Environments-cmm.74.mcz ==================== Summary ==================== Name: Environments-cmm.74 Author: cmm Time: 15 February 2019, 6:04:29.038747 pm UUID: 6caf9737-93e0-4117-9ee0-336dd2991002 Ancestors: Environments-pre.73 Keep and access Classes and Traits by their #name's logical value instead of the physical identity of the String object. =============== Diff against Environments-pre.73 =============== Item was removed: - (PackageInfo named: 'Environments') preamble: '"Fix ''Instances'' entry for Smalltalk Environment." - | dict | - dict := (Environment classPool at: ''Instances''). - dict keys - do: [ : eachName | (eachName isSymbol not ) ifTrue: [ dict at: eachName asSymbol put: (dict removeKey: eachName) ] ]. - - "Let Environment names be, consistently, Symbols." - Environment allInstances do: - [ : each | - each info - instVarNamed: ''name'' - put: (each name asSymbol) ]'! Item was changed: ----- Method: Environment>>allClassesAndTraitsDo: (in category 'classes and traits') ----- allClassesAndTraitsDo: aBlock declarations keysAndValuesDo: [:key :value | + ((value isBehavior) and: [key = value name]) ifTrue: - ((value isBehavior) and: [key == value name]) ifTrue: [aBlock value: value]]! Item was changed: ----- Method: Environment>>classOrTraitNamed: (in category 'classes and traits') ----- classOrTraitNamed: aString "aString is either a class or trait name or a class or trait name followed by ' class' or 'classTrait' respectively. Answer the class or metaclass it names." | meta baseName | (aString endsWith: ' class') ifTrue: [meta := true. baseName := aString copyFrom: 1 to: aString size - 6] ifFalse: [ (aString endsWith: ' classTrait') ifTrue: [ meta := true. baseName := aString copyFrom: 1 to: aString size - 11] ifFalse: [ meta := false. baseName := aString]]. + ^declarations at: baseName ifPresent: - ^declarations at: baseName asSymbol ifPresent: [ :global | global isBehavior ifTrue: [ meta ifFalse: [ global ] ifTrue: [ global classSide ]]]! Item was changed: ----- Method: Environment>>hasClassNamed: (in category 'classes and traits') ----- hasClassNamed: aString + ^ declarations includesKey: aString! - Symbol hasInterned: aString ifTrue: - [:symbol | - ^ (declarations at: symbol ifAbsent: [nil]) - isKindOf: Class]. - ^ false.! Item was changed: ----- Method: Environment>>initialize (in category 'initialize-release') ----- initialize + declarations := Dictionary new. + bindings := Dictionary new. - declarations := IdentityDictionary new. - bindings := IdentityDictionary new. undeclared := WeakIdentityDictionary new. policies := Array new. observers := IdentitySet new.! Item was changed: ----- Method: Environment>>removeClassNamed: (in category 'classes and traits') ----- removeClassNamed: aString declarations + at: aString - at: aString asSymbol ifPresent: [:class | class removeFromSystem] ifAbsent: [Transcript cr; show: 'Removal of class named ', aString, ' ignored because ', aString, ' does not exist.']! Item was added: + (PackageInfo named: 'Environments') postscript: '"Fix ''Instances'' entry for Smalltalk Environment." + | dict | + dict := (Environment classPool at: ''Instances''). + Environment classPool at: ''Instances'' put: (dict := dict as: Dictionary). + dict keys + do: [ : eachName | (eachName isSymbol not ) ifTrue: [ dict at: eachName asSymbol put: (dict removeKey: eachName) ] ]. + + "Let Environment names be, consistently, Symbols." + Environment allInstances do: + [ : each | + each info + instVarNamed: ''name'' + put: (each name asSymbol). + #(''declarations'' ''bindings'') do: [ : eachIdDictVar | (each instVarNamed: eachIdDictVar put: ((each instVarNamed: eachIdDictVar) as: Dictionary)) ] ]'!

3 2

← Newer
1
2
3
4
5
6
7
8
9
10
Older →