diff --git a/.filetree b/.filetree deleted file mode 100644 index c6704e51..00000000 --- a/.filetree +++ /dev/null @@ -1,2 +0,0 @@ -{"packageExtension" : ".package", -"propertyFileExtension" : ".json" } \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 0b3496fd..c49f5bf8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,5 @@ os: # Select compatible Smalltalk image(s) smalltalk: - - Pharo-6.0 \ No newline at end of file + - Pharo-6.1 + - Pharo64-6.1 diff --git a/repository/BaselineOfFileTree.package/.filetree b/repository/BaselineOfFileTree.package/.filetree index 8998102c..57a67973 100644 --- a/repository/BaselineOfFileTree.package/.filetree +++ b/repository/BaselineOfFileTree.package/.filetree @@ -1,4 +1,5 @@ { - "noMethodMetaData" : true, "separateMethodMetaAndSource" : false, - "useCypressPropertiesFile" : true } + "noMethodMetaData" : true, + "useCypressPropertiesFile" : true +} \ No newline at end of file diff --git a/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/instance/baseline..st b/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/instance/baseline..st index 2003b623..d29a830e 100644 --- a/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/instance/baseline..st +++ b/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/instance/baseline..st @@ -4,10 +4,10 @@ baseline: spec spec for: #common do: [ spec - configuration: 'OSSubprocess' + configuration: 'OSProcess' with: [ spec versionString: #stable; - repository: 'github://marianopeck/OSSubprocess/repository' ]; + repository: 'http://www.squeaksource.com/MetacelloRepository' ]; yourself. spec configuration: 'ProcessWrapper' @@ -32,17 +32,17 @@ baseline: spec for: #Unix do: [ spec package: 'MonticelloFileTree-Git' - with: [ spec requires: #('MonticelloFileTree-Core' ) ] ]. + with: [ spec requires: #('MonticelloFileTree-Core') ] ]. spec - for: #MacOSSubprocess + for: #MacOSProcess do: [ spec package: 'MonticelloFileTree-Git' - with: [ spec requires: #('MonticelloFileTree-Core' 'OSSubprocess') ] ]. + with: [ spec requires: #('MonticelloFileTree-Core' 'OSProcess') ] ]. spec - for: #UnixOSSubprocess + for: #UnixOSProcess do: [ spec package: 'MonticelloFileTree-Git' - with: [ spec requires: #('MonticelloFileTree-Core' 'OSSubprocess') ] ]. + with: [ spec requires: #('MonticelloFileTree-Core' 'OSProcess') ] ]. spec for: #Windows do: [ spec diff --git a/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/instance/customProjectAttributes.st b/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/instance/customProjectAttributes.st index 830d67f5..c69b3ffb 100644 --- a/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/instance/customProjectAttributes.st +++ b/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/instance/customProjectAttributes.st @@ -1,16 +1,16 @@ accessing customProjectAttributes Smalltalk os isMacOS - ifTrue: [ (Smalltalk at: #PipeableOSProcess ifAbsent: [ ]) - ifNil: [ (Smalltalk at: #OSSUnixSubprocess ifAbsent: [ ]) - ifNil: [ ^ #(#MacOSSubprocess) ] - ifNotNil: [ ^ #(#MacOS) ] ] - ifNotNil: [ ^ #(#MacOS) ] ]. + ifTrue: [ (Smalltalk hasClassNamed: #PipeableOSProcess) + ifFalse: [ (Smalltalk hasClassNamed: #OSSUnixSubprocess) + ifFalse: [ ^ #(#MacOSProcess) ] + ifTrue: [ ^ #(#MacOS) ] ] + ifTrue: [ ^ #(#MacOS) ] ]. Smalltalk os isUnix - ifTrue: [ ^ (Smalltalk at: #PipeableOSProcess ifAbsent: [ ]) - ifNil: [ (Smalltalk at: #OSSUnixSubprocess ifAbsent: [ ]) - ifNil: [ ^ #(#UnixOSSubprocess) ] - ifNotNil: [ ^ #(#Unix) ] ] - ifNotNil: [ ^ #(#Unix) ] ]. + ifTrue: [ (Smalltalk hasClassNamed: #PipeableOSProcess) + ifFalse: [ (Smalltalk hasClassNamed: #OSSUnixSubprocess) + ifFalse: [ ^ #(#UnixOSProcess) ] + ifTrue: [ ^ #(#Unix) ] ] + ifTrue: [ ^ #(#Unix) ] ]. Smalltalk os isWindows ifTrue: [ ^ #(#Windows) ] \ No newline at end of file diff --git a/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/methodProperties.json b/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/methodProperties.json index 12833d52..899a9791 100644 --- a/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/methodProperties.json +++ b/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/methodProperties.json @@ -1,6 +1,7 @@ { - "class" : { - }, "instance" : { - "baseline:" : "ThierryGoubier 4/30/2016 16:03", - "customProjectAttributes" : "ThierryGoubier 4/30/2016 16:02" } } + "baseline:" : "ThierryGoubier 3/8/2018 22:55", + "customProjectAttributes" : "ThierryGoubier 3/8/2018 22:54" + }, + "class" : { } +} \ No newline at end of file diff --git a/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/properties.json b/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/properties.json index 0151e54a..b4cc02d4 100644 --- a/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/properties.json +++ b/repository/BaselineOfFileTree.package/BaselineOfFileTree.class/properties.json @@ -1,14 +1,11 @@ { - "category" : "BaselineOfFileTree", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "", - "instvars" : [ - ], - "name" : "BaselineOfFileTree", - "pools" : [ - ], "super" : "BaselineOf", - "type" : "normal" } + "category" : "BaselineOfFileTree", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "BaselineOfFileTree", + "type" : "normal" +} \ No newline at end of file diff --git a/repository/BaselineOfFileTree.package/monticello.meta/version b/repository/BaselineOfFileTree.package/monticello.meta/version index 23a7623e..a30e6bdd 100644 --- a/repository/BaselineOfFileTree.package/monticello.meta/version +++ b/repository/BaselineOfFileTree.package/monticello.meta/version @@ -1,32 +1,2 @@ -(name 'BaselineOfFileTree-ThierryGoubier.32' message '#Unix, #MacOS !' id 'ff6fcae4-dce4-452c-9905-56da70d23abe' date '30 April 2016' time '4:03:40.734218 pm' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.31' message 'Check for OSSubprocess as well. -' id '17accafe-b515-508c-b488-6af5104cd30f' date '30 April 2016' time '3:59:20 pm' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.30' message 'Target both OSProcess and OSSubprocess ? -' id '4416e1d2-e43c-59e3-b9c5-a58ab958e8c4' date '30 April 2016' time '12:00:13 pm' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.29' message 'updating the issue_171 branch with current pharo5.0_dev -' id '6eab405a-8020-5ee1-84fb-3e30789fce7a' date '29 March 2016' time '10:52:56 pm' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-MarianoMartinezPeck.26' message 'Fix issue #175 for branch issue_171 -' id 'a9aaf494-26c9-5c62-9fa5-f9670bb99297' date '6 February 2016' time '9:55:10 am' author 'MarianoMartinezPeck' ancestors ((name 'BaselineOfFileTree-MarianoMartinezPeck.25' message 'Fix issue #175 for branch issue_171 -' id '66373e5b-f482-5868-813a-2d02ab411f8b' date '6 February 2016' time '9:51:12 am' author 'MarianoMartinezPeck' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.22' message 'Forgot to update the requires! -' id '0cfdc14c-d709-5603-a7b2-c37423182a2d' date '14 January 2016' time '10:25:39 pm' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.21' message 'Replace OSProcess by OSSubprocess -' id '8abebac6-afa8-5f07-8929-c59bb8b88de8' date '14 January 2016' time '9:58:25 pm' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.19' message 'Reactivate GitFileTree tests -' id '40621310-ff38-5ecf-8759-e713bea8374a' date '23 July 2015' time '4:06:59 pm' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.18' message 'Remove the git tests for now -' id '80b5f97d-c674-525a-9b97-e9a3d2198572' date '23 July 2015' time '10:26:18 am' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.17' message 'Activated Git Tests in the travis CI -' id 'ad10178e-3197-5bcd-b6d4-903eb8dbe314' date '23 July 2015' time '9:42:49 am' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.16' message 'Wrong Repository for OSProcess -' id '888fb307-4ff0-51b7-b951-06e11128f873' date '6 March 2015' time '9:47:37 am' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.15' message 'Switch to the OSProcess configuration in MetaRepoForPharo30 -' id 'eac20fe8-4aa9-5ab4-b0a3-4527ee3b05ea' date '6 March 2015' time '7:22 am' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.14' message 'Added support for loading ProcessWrapper (Windows Support) -' id 'e85ac281-20e9-5b65-91cf-a9c5720c4163' date '2 March 2015' time '7:24:56 pm' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-DaleHenrichs.13' message 'bump baseline monticello version -' id '3aa08233-a131-5c97-ba2a-d9304c19ca02' date '1 September 2013' time '10:21:10 pm' author 'DaleHenrichs' ancestors ((name 'BaselineOfFileTree-DaleHenrichs.12' message 'have to remove MonticelloFileTree-GitTests from Tests ... create separate Git Tests group -' id '42e9ad70-c7b6-5f7d-b48c-d90e0a0db082' date '1 September 2013' time '9:00:20 am' author 'DaleHenrichs' ancestors ((name 'BaselineOfFileTree-DaleHenrichs.11' message 'remove Git load/testing for pharo3.0, per Thierry''s comment[1] -' id '2c7be37b-ff03-537a-b89a-3c505d29df2e' date '1 September 2013' time '8:48:26 am' author 'DaleHenrichs' ancestors ((name 'BaselineOfFileTree-DaleHenrichs.10' message 'cherry-pick: fd9d9be3be16c5ea001c41d6ad93fa49de055dc3 (gitrepo work from Thierry) -' id '5579aadb-16eb-5458-962c-d887f5cd0363' date '28 June 2013' time '1:42:37 pm' author 'DaleHenrichs' ancestors ((name 'BaselineOfFileTree-DaleHenrichs.9' message 'create Git group for MonticelloFileTree-Git package -' id '15e20e3f-1f81-56b2-96b2-c816299b6642' date '15 June 2013' time '6:06:05 pm' author 'DaleHenrichs' ancestors ((name 'BaselineOfFileTree-DaleHenrichs.8' message 'add MonticelloFileTree-Git to baseline -' id '92698551-d187-5bf9-a3fc-deffe6788e0e' date '3 June 2013' time '2:46:21 pm' author 'DaleHenrichs' ancestors ((name 'BaselineOfFileTree-DaleHenrichs.7' message 'Merge branch ''master'' into pharo2.0: all tests green in Pharo-2.0a-20305 -' id '830a45dc-ffc4-5ab1-9d2e-c0b87ff60459' date '24 September 2012' time '5:14:05 pm' author 'DaleHenrichs' ancestors ((name 'BaselineOfFileTree-DaleHenrichs.5' message 'Issue #52: update baseline for pharo-2.0 -' id 'bab12d8f-8e2e-5361-bc3b-1e00a85ffbe7' date '10 August 2012' time '10:26:57 pm' author 'DaleHenrichs' ancestors ((name 'BaselineOfFileTree-DaleHenrichs.4' message 'Issue #52: fix the baseline -' id 'a9c223a6-447a-59bd-814a-bbd5dc4e4c5d' date '10 August 2012' time '7:03:57 pm' author 'DaleHenrichs' ancestors ((name 'BaselineOfFileTree-DaleHenrichs.3' message 'Issue #52: add new packages to baseline -' id '7592aa14-1183-5c48-a3e9-f9b2e54d30f3' date '10 August 2012' time '5:13:02 pm' author 'DaleHenrichs' ancestors ((name 'BaselineOfFileTree-DaleHenrichs.2' message 'Merge branch ''issue_38'' into pharo1.3: Issue #38 fix (cherry picked from commit 4065e9230164df95dd013cfaa2f58e89803ab391) -' id '0777e8f9-d874-5f1f-bc68-c74bacc2fa1a' date '5 July 2012' time '11:24:40 am' author 'DaleHenrichs' ancestors ((name 'BaselineOfFileTree-DaleHenrichs.1' message '[travis-ci and BaselineOf] cherry pick line of commits from: 7ca09f5ac0d182d4b940403936fb11303a544db1 to 6e01c7dd719e9e742c2730e05bb89b995d36a0d0 -' id '5b3ff9c7-b547-5367-82ab-d012de13a941' date '11 June 2012' time '2:58:16 pm' author 'DaleHenrichs' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfFileTree-DaleHenrichs.6' message 'Merge branch ''issue_52'' into pharo1.4: Issue #52 -' id '82a62164-f27e-5fff-9934-ce5e16ac1a16' date '10 August 2012' time '10:34:37 pm' author 'DaleHenrichs' ancestors ((id '0777e8f9-d874-5f1f-bc68-c74bacc2fa1a')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfFileTree-ThierryGoubier.28' message 'Revert to Mariano changes -' id '20c442c5-bd0b-5a8b-9df5-394152d17cbd' date '27 March 2016' time '6:50:12 pm' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.27' message 'Merge Otto Behrens improvements on the Pharo5.0_dev branch -' id '6897578a-5a26-52b0-9121-ca6aa92c62e2' date '27 March 2016' time '6:47:07 pm' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-MarianoMartinezPeck.24' message 'Fix to issue #175. This one should work -' id 'b2eed698-eab4-510e-9d00-cb3e45f680e8' date '5 February 2016' time '10:51:38 am' author 'MarianoMartinezPeck' ancestors ((name 'BaselineOfFileTree-MarianoMartinezPeck.23' message 'Trying to fix issue #175 but not luck -' id '64f2a773-f8b8-5b6b-aabd-eeeb16a62ad4' date '31 January 2016' time '10:02:56 pm' author 'MarianoMartinezPeck' ancestors ((id '40621310-ff38-5ecf-8759-e713bea8374a')) stepChildren ())) stepChildren ())(name 'BaselineOfFileTree-ThierryGoubier.20' message 'This is maintained for Pharo 4 -' id '51bc40d6-854c-5060-ab9a-0d5b3f168259' date '17 November 2015' time '6:58:54 am' author 'ThierryGoubier' ancestors ((id '40621310-ff38-5ecf-8759-e713bea8374a')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'BaselineOfFileTree-ThierryGoubier.1520015085' message 'Update the baseline' id '95957f79-4f23-0d00-88b7-a36c0faff969' date '8 March 2018' time '10:55:45.03195 pm' author 'ThierryGoubier' ancestors ((name 'BaselineOfFileTree-ThierryGoubier.1520015084' message 'Revert a change in accessing repository properties. +' id '57efc516-a8a9-554f-8627-9b0b12407b2b' date '2 March 2018' time '7:24:44 pm' author 'ThierryGoubier' ancestors () stepChildren ())) stepChildren ()) \ No newline at end of file diff --git a/repository/BaselineOfFileTree.package/properties.json b/repository/BaselineOfFileTree.package/properties.json index f037444a..6f31cf5a 100644 --- a/repository/BaselineOfFileTree.package/properties.json +++ b/repository/BaselineOfFileTree.package/properties.json @@ -1,2 +1 @@ -{ - } +{ } \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/Array.extension/instance/writeCypressJsonOn.forHtml.indent..st b/repository/MonticelloFileTree-Core.package/Array.extension/instance/writeCypressJsonOn.forHtml.indent..st deleted file mode 100644 index a7b4805c..00000000 --- a/repository/MonticelloFileTree-Core.package/Array.extension/instance/writeCypressJsonOn.forHtml.indent..st +++ /dev/null @@ -1,22 +0,0 @@ -*monticellofiletree-core -writeCypressJsonOn: aStream forHtml: forHtml indent: startIndent - "by default ignore ... is used for Dictionary and Array, i.e., container objects and String which actually encodes itself differently for HTML" - - | indent | - aStream - nextPutAll: '['; - lf. - indent := startIndent + 1. - 1 to: self size do: [ :index | - | item | - item := self at: index. - aStream tab: indent. - item writeCypressJsonOn: aStream forHtml: forHtml indent: indent. - index < self size - ifTrue: [ - aStream - nextPutAll: ','; - lf ] ]. - self size = 0 - ifTrue: [ aStream tab: indent ]. - aStream nextPutAll: ' ]' \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/Array.extension/methodProperties.json b/repository/MonticelloFileTree-Core.package/Array.extension/methodProperties.json deleted file mode 100644 index ede78ac3..00000000 --- a/repository/MonticelloFileTree-Core.package/Array.extension/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "writeCypressJsonOn:forHtml:indent:" : "dkh 4/6/2012 15:56:14" } } diff --git a/repository/MonticelloFileTree-Core.package/Array.extension/properties.json b/repository/MonticelloFileTree-Core.package/Array.extension/properties.json deleted file mode 100644 index 1070c08e..00000000 --- a/repository/MonticelloFileTree-Core.package/Array.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "Array" } diff --git a/repository/MonticelloFileTree-Core.package/Boolean.extension/instance/writeCypressJsonOn.forHtml.indent..st b/repository/MonticelloFileTree-Core.package/Boolean.extension/instance/writeCypressJsonOn.forHtml.indent..st deleted file mode 100644 index d13058f8..00000000 --- a/repository/MonticelloFileTree-Core.package/Boolean.extension/instance/writeCypressJsonOn.forHtml.indent..st +++ /dev/null @@ -1,5 +0,0 @@ -*monticellofiletree-core -writeCypressJsonOn: aStream forHtml: forHtml indent: startIndent - "by default ignore ... is used for Dictionary and Array, i.e., container objects and String which actually encodes itself differently for HTML" - - aStream nextPutAll: self printString \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/Boolean.extension/methodProperties.json b/repository/MonticelloFileTree-Core.package/Boolean.extension/methodProperties.json deleted file mode 100644 index ede78ac3..00000000 --- a/repository/MonticelloFileTree-Core.package/Boolean.extension/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "writeCypressJsonOn:forHtml:indent:" : "dkh 4/6/2012 15:56:14" } } diff --git a/repository/MonticelloFileTree-Core.package/Boolean.extension/properties.json b/repository/MonticelloFileTree-Core.package/Boolean.extension/properties.json deleted file mode 100644 index c15542b7..00000000 --- a/repository/MonticelloFileTree-Core.package/Boolean.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "Boolean" } diff --git a/repository/MonticelloFileTree-Core.package/Dictionary.extension/instance/writeCypressJsonForHtmlOn..st b/repository/MonticelloFileTree-Core.package/Dictionary.extension/instance/writeCypressJsonForHtmlOn..st deleted file mode 100644 index 496ba69e..00000000 --- a/repository/MonticelloFileTree-Core.package/Dictionary.extension/instance/writeCypressJsonForHtmlOn..st +++ /dev/null @@ -1,3 +0,0 @@ -*monticellofiletree-core -writeCypressJsonForHtmlOn: aStream - self writeCypressJsonOn: aStream forHtml: true indent: 0 \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/Dictionary.extension/instance/writeCypressJsonOn..st b/repository/MonticelloFileTree-Core.package/Dictionary.extension/instance/writeCypressJsonOn..st deleted file mode 100644 index 47040a03..00000000 --- a/repository/MonticelloFileTree-Core.package/Dictionary.extension/instance/writeCypressJsonOn..st +++ /dev/null @@ -1,4 +0,0 @@ -*monticellofiletree-core -writeCypressJsonOn: aStream - self writeCypressJsonOn: aStream forHtml: false indent: 0. - aStream lf \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/Dictionary.extension/instance/writeCypressJsonOn.forHtml.indent..st b/repository/MonticelloFileTree-Core.package/Dictionary.extension/instance/writeCypressJsonOn.forHtml.indent..st deleted file mode 100644 index 8b0f2763..00000000 --- a/repository/MonticelloFileTree-Core.package/Dictionary.extension/instance/writeCypressJsonOn.forHtml.indent..st +++ /dev/null @@ -1,27 +0,0 @@ -*monticellofiletree-core -writeCypressJsonOn: aStream forHtml: forHtml indent: startIndent - "by default ignore ... is used for Dictionary and Array, i.e., container objects and String which actually encodes itself differently for HTML" - - | indent keys | - indent := startIndent. - aStream - nextPutAll: '{'; - lf. - indent := indent + 1. - keys := self keys sort: [ :a :b | a <= b ]. - 1 to: keys size do: [ :index | - | key value | - key := keys at: index. - value := self at: key. - aStream tab: indent. - key writeCypressJsonOn: aStream forHtml: forHtml indent: indent. - aStream nextPutAll: ' : '. - value writeCypressJsonOn: aStream forHtml: forHtml indent: indent. - index < self size - ifTrue: [ - aStream - nextPutAll: ','; - lf ] ]. - self size = 0 - ifTrue: [ aStream tab: indent ]. - aStream nextPutAll: ' }' \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/Dictionary.extension/methodProperties.json b/repository/MonticelloFileTree-Core.package/Dictionary.extension/methodProperties.json deleted file mode 100644 index c09078f1..00000000 --- a/repository/MonticelloFileTree-Core.package/Dictionary.extension/methodProperties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "writeCypressJsonForHtmlOn:" : "dkh 4/6/2012 15:56:14", - "writeCypressJsonOn:" : "dkh 4/6/2012 15:56:14", - "writeCypressJsonOn:forHtml:indent:" : "dkh 4/6/2012 15:56:14" } } diff --git a/repository/MonticelloFileTree-Core.package/Dictionary.extension/properties.json b/repository/MonticelloFileTree-Core.package/Dictionary.extension/properties.json deleted file mode 100644 index cb1bf501..00000000 --- a/repository/MonticelloFileTree-Core.package/Dictionary.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "Dictionary" } diff --git a/repository/MonticelloFileTree-Core.package/MCFileRepositoryInspector.extension/instance/refresh.st b/repository/MonticelloFileTree-Core.package/MCFileRepositoryInspector.extension/instance/refresh.st deleted file mode 100644 index 640eb038..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileRepositoryInspector.extension/instance/refresh.st +++ /dev/null @@ -1,20 +0,0 @@ -*monticellofiletree-core -refresh - loadedPackages := Set new. - versions := repository retrieveVersionsWithPackageNames: Set new. - newer := Set new. - loaded := Set new. - MCWorkingCopy allManagers - do: [ :workingCopy | | versionsForPackage | - workingCopy ancestors do: [ :ancestor | loaded add: ancestor name ]. - versionsForPackage := versions select: [ :v | v first = workingCopy package name ]. - versionsForPackage - do: [ :aVersionArray | - workingCopy ancestors - do: [ :ancestor | - (ancestor versionNumber < aVersionArray third - or: [ ancestor versionNumber = aVersionArray third and: [ ancestor author ~= aVersionArray second ] ]) - ifTrue: [ newer add: ancestor name ] ] ] ]. - self - packageListUpdate; - changed: #versionList \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileRepositoryInspector.extension/methodProperties.json b/repository/MonticelloFileTree-Core.package/MCFileRepositoryInspector.extension/methodProperties.json deleted file mode 100644 index 23f3c0d9..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileRepositoryInspector.extension/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "refresh" : "NicolaiHess 3/9/2016 09:25" } } diff --git a/repository/MonticelloFileTree-Core.package/MCFileRepositoryInspector.extension/properties.json b/repository/MonticelloFileTree-Core.package/MCFileRepositoryInspector.extension/properties.json deleted file mode 100644 index d59833ff..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileRepositoryInspector.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "MCFileRepositoryInspector" } diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeAbstractReader.class/instance/packageProperties.st b/repository/MonticelloFileTree-Core.package/MCFileTreeAbstractReader.class/instance/packageProperties.st index 89c9cba8..a5593d06 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeAbstractReader.class/instance/packageProperties.st +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeAbstractReader.class/instance/packageProperties.st @@ -9,7 +9,7 @@ packageProperties readStreamDo: [ :fileStream | | jsonObject structureVersion | [ - (jsonObject := MCFileTreeJsonParser parseStream: fileStream) isFloat + (jsonObject := STON fromStream: fileStream) isFloat ifTrue: [ " 0.0 - original structure diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeAbstractReader.class/methodProperties.json b/repository/MonticelloFileTree-Core.package/MCFileTreeAbstractReader.class/methodProperties.json index 3ffacf66..9655c6d8 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeAbstractReader.class/methodProperties.json +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeAbstractReader.class/methodProperties.json @@ -15,6 +15,6 @@ "monticelloMetaDirName" : "dkh 4/4/2012 17:43", "noMethodMetaData" : "dkh 3/1/2012 10:11", "packageDirectory:" : "dkh 8/10/2012 05:46", - "packageProperties" : "dkh 3/1/2012 11:56", + "packageProperties" : "OffrayLuna 5/27/2016 10:06", "parseMember:" : "dkh 8/10/2012 07:43", "separateMethodMetaAndSource" : "dkh 3/1/2012 10:10" } } diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/README.md b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/README.md deleted file mode 100644 index 54bbeeff..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/README.md +++ /dev/null @@ -1 +0,0 @@ -JSON parser \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/class/new.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/class/new.st deleted file mode 100644 index f3bdc1bd..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/class/new.st +++ /dev/null @@ -1,3 +0,0 @@ -instance creation -new - self error: 'Instantiate the parser with a stream.' \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/class/on..st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/class/on..st deleted file mode 100644 index b670df39..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/class/on..st +++ /dev/null @@ -1,3 +0,0 @@ -instance creation -on: aStream - ^ self basicNew initializeOn: aStream \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/class/parse..st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/class/parse..st deleted file mode 100644 index d32506bd..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/class/parse..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -parse: aString - ^ self parseStream: aString readStream \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/class/parseStream..st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/class/parseStream..st deleted file mode 100644 index 36bd4436..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/class/parseStream..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -parseStream: aStream - ^ (self on: aStream) parse \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/addProperty.to..st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/addProperty.to..st deleted file mode 100644 index 71a50279..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/addProperty.to..st +++ /dev/null @@ -1,7 +0,0 @@ -adding -addProperty: anAssociation to: anObject - "Add the property anAssociation described with key and value to anObject. Subclasses might want to refine this implementation." - - ^ anObject - add: anAssociation; - yourself \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/addValue.to..st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/addValue.to..st deleted file mode 100644 index 8ea58976..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/addValue.to..st +++ /dev/null @@ -1,5 +0,0 @@ -adding -addValue: anObject to: aCollection - "Add anObject to aCollection. Subclasses might want to refine this implementation." - - ^ aCollection copyWith: anObject \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createArray.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createArray.st deleted file mode 100644 index c3174778..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createArray.st +++ /dev/null @@ -1,5 +0,0 @@ -creating -createArray - "Create an empty collection. Subclasses might want to refine this implementation." - - ^ Array new \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createFalse.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createFalse.st deleted file mode 100644 index b919103d..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createFalse.st +++ /dev/null @@ -1,5 +0,0 @@ -creating -createFalse - "Create the false literal. Subclasses might want to refine this implementation." - - ^ false \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createNull.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createNull.st deleted file mode 100644 index 163631c1..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createNull.st +++ /dev/null @@ -1,5 +0,0 @@ -creating -createNull - "Create the null literal. Subclasses might want to refine this implementation." - - ^ nil \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createNumber..st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createNumber..st deleted file mode 100644 index 20222e35..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createNumber..st +++ /dev/null @@ -1,5 +0,0 @@ -creating -createNumber: aString - "Create a number literal. Subclasses might want to refine this implementation." - - ^ aString asNumber \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createObject.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createObject.st deleted file mode 100644 index ef0a86a5..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createObject.st +++ /dev/null @@ -1,5 +0,0 @@ -creating -createObject - "Create an empty object. Subclasses might want to refine this implementation." - - ^ Dictionary new \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createProperty.with..st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createProperty.with..st deleted file mode 100644 index 58f60c1f..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createProperty.with..st +++ /dev/null @@ -1,5 +0,0 @@ -creating -createProperty: aKey with: aValue - "Create an empty attribute value pair. Subclasses might want to refine this implementation." - - ^ aKey -> aValue \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createString..st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createString..st deleted file mode 100644 index 58139070..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createString..st +++ /dev/null @@ -1,5 +0,0 @@ -creating -createString: aString - "Create a string literal. Subclasses might want to refine this implementation." - - ^ aString \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createTrue.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createTrue.st deleted file mode 100644 index 67247cda..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/createTrue.st +++ /dev/null @@ -1,5 +0,0 @@ -creating -createTrue - "Create the true literal. Subclasses might want to refine this implementation." - - ^ true \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/expect..st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/expect..st deleted file mode 100644 index eddc337f..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/expect..st +++ /dev/null @@ -1,5 +0,0 @@ -private -expect: aString - "Expects aString and consume input, throw an error otherwise." - - ^ (self match: aString) ifFalse: [ self error: aString , ' expected' ] \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/initializeOn..st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/initializeOn..st deleted file mode 100644 index 022d2e63..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/initializeOn..st +++ /dev/null @@ -1,4 +0,0 @@ -initialization -initializeOn: aStream - self initialize. - stream := aStream \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/match..st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/match..st deleted file mode 100644 index 786f49b5..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/match..st +++ /dev/null @@ -1,12 +0,0 @@ -private -match: aString - "Tries to match aString, consume input and answer true if successful." - - | position | - position := stream position. - aString do: [ :each | - (stream atEnd or: [ stream next ~= each ]) ifTrue: [ - stream position: position. - ^ false ] ]. - self whitespace. - ^ true \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parse.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parse.st deleted file mode 100644 index 4b789927..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parse.st +++ /dev/null @@ -1,7 +0,0 @@ -parsing -parse - | result | - result := self whitespace; parseValue. - stream atEnd - ifFalse: [ self error: 'end of input expected' ]. - ^ result \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseArray.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseArray.st deleted file mode 100644 index 8358d3b8..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseArray.st +++ /dev/null @@ -1,15 +0,0 @@ -parsing -parseArray - | result | - self expect: '['. - result := self createArray. - (self match: ']') - ifTrue: [ ^ result ]. - [ stream atEnd ] whileFalse: [ - result := self - addValue: self parseValue - to: result. - (self match: ']') - ifTrue: [ ^ result ]. - self expect: ',' ]. - self error: 'end of array expected' \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseCharacter.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseCharacter.st deleted file mode 100644 index b7834503..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseCharacter.st +++ /dev/null @@ -1,26 +0,0 @@ -parsing-internal -parseCharacter - | char | - (char := stream next) = $\ - ifFalse: [ ^ char ]. - (char := stream next) = $" - ifTrue: [ ^ char ]. - char = $' - ifTrue: [ ^ char ]. - char = $\ - ifTrue: [ ^ char ]. - char = $/ - ifTrue: [ ^ char ]. - char = $b - ifTrue: [ ^ Character backspace ]. - char = $f - ifTrue: [ ^ Character newPage ]. - char = $n - ifTrue: [ ^ Character lf ]. - char = $r - ifTrue: [ ^ Character cr ]. - char = $t - ifTrue: [ ^ Character tab ]. - char = $u - ifTrue: [ ^ self parseCharacterHex ]. - self error: 'invalid escape character \' , (String with: char) \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseCharacterHex.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseCharacterHex.st deleted file mode 100644 index c13d8034..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseCharacterHex.st +++ /dev/null @@ -1,6 +0,0 @@ -parsing-internal -parseCharacterHex - | value | - value := self parseCharacterHexDigit. - 3 timesRepeat: [ value := (value << 4) + self parseCharacterHexDigit ]. - ^ Character codePoint: value \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseCharacterHexDigit.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseCharacterHexDigit.st deleted file mode 100644 index 9d6ce1bc..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseCharacterHexDigit.st +++ /dev/null @@ -1,13 +0,0 @@ -parsing-internal -parseCharacterHexDigit - | digit | - stream atEnd - ifFalse: [ - digit := stream next charCode. - (digit between: 48 and: 57) - ifTrue: [ ^ digit - 48 ]. "$0" "$9" - (digit between: 65 and: 70) - ifTrue: [ ^ digit - 55 ]. "$A" "$F" - (digit between: 97 and: 102) - ifTrue: [ ^ digit - 87 ] "$a" "$f" ]. - self error: 'hex-digit expected' \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseNumber.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseNumber.st deleted file mode 100644 index 654c0847..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseNumber.st +++ /dev/null @@ -1,14 +0,0 @@ -parsing-internal -parseNumber - | negated number | - negated := stream peek = $-. - negated ifTrue: [ stream next ]. - number := self parseNumberInteger. - (stream peek = $.) ifTrue: [ - stream next. - number := number + self parseNumberFraction ]. - (stream peek = $e or: [ stream peek = $E ]) ifTrue: [ - stream next. - number := number * self parseNumberExponent ]. - negated ifTrue: [ number := number negated ]. - ^ self whitespace; createNumber: number \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseNumberExponent.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseNumberExponent.st deleted file mode 100644 index 6cf9d1f5..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseNumberExponent.st +++ /dev/null @@ -1,11 +0,0 @@ -parsing-internal -parseNumberExponent - | number negated | - number := 0. - negated := stream peek = $-. - (negated or: [ stream peek = $+ ]) - ifTrue: [ stream next ]. - [ stream atEnd not and: [ stream peek isDigit ] ] whileTrue: [ number := 10 * number + (stream next charCode - 48) ]. - negated - ifTrue: [ number := number negated ]. - ^ 10 raisedTo: number \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseNumberFraction.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseNumberFraction.st deleted file mode 100644 index 5b734a11..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseNumberFraction.st +++ /dev/null @@ -1,10 +0,0 @@ -parsing-internal -parseNumberFraction - | number power | - number := 0. - power := 1.0. - [ stream atEnd not and: [ stream peek isDigit ] ] - whileTrue: [ - number := 10 * number + (stream next charCode - 48). - power := power * 10.0 ]. - ^ number / power \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseNumberInteger.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseNumberInteger.st deleted file mode 100644 index 73ad6afa..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseNumberInteger.st +++ /dev/null @@ -1,6 +0,0 @@ -parsing-internal -parseNumberInteger - | number | - number := 0. - [ stream atEnd not and: [ stream peek isDigit ] ] whileTrue: [ number := 10 * number + (stream next charCode - 48) ]. - ^ number \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseObject.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseObject.st deleted file mode 100644 index a51a75bf..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseObject.st +++ /dev/null @@ -1,15 +0,0 @@ -parsing -parseObject - | result | - self expect: '{'. - result := self createObject. - (self match: '}') - ifTrue: [ ^ result ]. - [ stream atEnd ] whileFalse: [ - result := self - addProperty: self parseProperty - to: result. - (self match: '}') - ifTrue: [ ^ result ]. - self expect: ',' ]. - self error: 'end of object expected' \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseProperty.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseProperty.st deleted file mode 100644 index d31aa179..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseProperty.st +++ /dev/null @@ -1,7 +0,0 @@ -parsing-internal -parseProperty - | name value | - name := self parseString. - self expect: ':'. - value := self parseValue. - ^ self createProperty: name with: value. \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseString.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseString.st deleted file mode 100644 index 03c79f67..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseString.st +++ /dev/null @@ -1,8 +0,0 @@ -parsing-internal -parseString - | result | - self expect: '"'. - result := WriteStream on: String new. - [ stream atEnd or: [ stream peek = $" ] ] - whileFalse: [ result nextPut: self parseCharacter ]. - ^ self expect: '"'; createString: result contents \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseValue.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseValue.st deleted file mode 100644 index ac64aef9..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/parseValue.st +++ /dev/null @@ -1,20 +0,0 @@ -parsing -parseValue - | char | - stream atEnd ifFalse: [ - char := stream peek. - char = ${ - ifTrue: [ ^ self parseObject ]. - char = $[ - ifTrue: [ ^ self parseArray ]. - char = $" - ifTrue: [ ^ self parseString ]. - (char = $- or: [ char between: $0 and: $9 ]) - ifTrue: [ ^ self parseNumber ]. - (self match: 'true') - ifTrue: [ ^ self createTrue ]. - (self match: 'false') - ifTrue: [ ^ self createFalse ]. - (self match: 'null') - ifTrue: [ ^ self createNull ] ]. - self error: 'invalid input' \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/whitespace.st b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/whitespace.st deleted file mode 100644 index 03e9cdcc..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/instance/whitespace.st +++ /dev/null @@ -1,6 +0,0 @@ -private -whitespace - "Strip whitespaces from the input stream." - - [ stream atEnd not and: [ stream peek isSeparator ] ] - whileTrue: [ stream next ] \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/methodProperties.json b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/methodProperties.json deleted file mode 100644 index c1a6fb90..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/methodProperties.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "class" : { - "new" : "dkh 2/16/2012 14:39:25", - "on:" : "dkh 2/16/2012 14:39:25", - "parse:" : "dkh 2/16/2012 14:39:25", - "parseStream:" : "dkh 2/16/2012 14:39:25" }, - "instance" : { - "addProperty:to:" : "dkh 2/16/2012 14:39:25", - "addValue:to:" : "dkh 2/16/2012 14:39:25", - "createArray" : "dkh 2/16/2012 14:39:25", - "createFalse" : "dkh 2/16/2012 14:39:25", - "createNull" : "dkh 2/16/2012 14:39:25", - "createNumber:" : "dkh 2/16/2012 14:39:25", - "createObject" : "dkh 2/16/2012 14:39:25", - "createProperty:with:" : "dkh 2/16/2012 14:39:25", - "createString:" : "dkh 2/16/2012 14:39:25", - "createTrue" : "dkh 2/16/2012 14:39:25", - "expect:" : "dkh 2/16/2012 14:39:25", - "initializeOn:" : "dkh 2/16/2012 14:39:25", - "match:" : "dkh 2/16/2012 14:39:25", - "parse" : "dkh 2/16/2012 14:39:25", - "parseArray" : "dkh 2/16/2012 14:39:25", - "parseCharacter" : "DEMAREYChristophe 7/10/2015 18:06:15", - "parseCharacterHex" : "dkh 2/16/2012 14:39:25", - "parseCharacterHexDigit" : "dkh 4/6/2012 15:56:14", - "parseNumber" : "dkh 2/16/2012 14:39:25", - "parseNumberExponent" : "dkh 4/6/2012 15:56:14", - "parseNumberFraction" : "dkh 4/6/2012 15:56:14", - "parseNumberInteger" : "dkh 4/6/2012 15:56:14", - "parseObject" : "dkh 2/16/2012 14:39:25", - "parseProperty" : "dkh 2/16/2012 14:39:25", - "parseString" : "dkh 2/16/2012 14:39:25", - "parseValue" : "dkh 2/16/2012 14:39:25", - "whitespace" : "dkh 2/16/2012 14:39:25" } } diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/properties.json b/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/properties.json deleted file mode 100644 index 3ed47e8b..00000000 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "MonticelloFileTree-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "TorstenBergmann 2/20/2014 15:59", - "instvars" : [ - "stream" ], - "name" : "MCFileTreeJsonParser", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/instance/basicStoreVersion..st b/repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/instance/basicStoreVersion..st index 84b047a1..3d344314 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/instance/basicStoreVersion..st +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/instance/basicStoreVersion..st @@ -2,8 +2,6 @@ storing basicStoreVersion: aVersion self readonly ifTrue: [ - ^ self - error: - 'The filetree repository: ' , self description printString + ^ self error: 'The filetree repository: ' , self description printString , ' was created read only.' ]. MCFileTreeWriter fileOut: aVersion on: self \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/instance/repositoryProperties.st b/repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/instance/repositoryProperties.st index 95f7270a..c2c1cd49 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/instance/repositoryProperties.st +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/instance/repositoryProperties.st @@ -19,5 +19,5 @@ repositoryProperties self writeRepositoryProperties ] ifNotNil: [ :configEntry | configEntry - readStreamDo: [ :fileStream | repositoryProperties := MCFileTreeJsonParser parseStream: fileStream ] ] ]. + readStreamDo: [ :fileStream | repositoryProperties := STON fromStream: fileStream ] ] ]. ^ repositoryProperties \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/methodProperties.json b/repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/methodProperties.json index bba98545..d8cdcb56 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/methodProperties.json +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/methodProperties.json @@ -15,7 +15,7 @@ "allFileNames" : "dkh 07/08/2013 10:59:46", "allFileNamesForVersionNamed:" : "dkh 07/08/2013 10:59:46", "asRepositorySpecFor:" : "dkh 2/16/2012 14:49:00", - "basicStoreVersion:" : "dkh 4/5/2012 10:33", + "basicStoreVersion:" : "PavelKrivanek 3/10/2017 09:51", "cachedFileNames" : "dkh 2/16/2012 14:49:00", "canReadFileNamed:" : "dkh 2/29/2012 10:15", "defaultRepositoryProperties" : "dkh 07/10/2013 11:43:55", @@ -35,7 +35,7 @@ "readStreamForFileNamed:do:" : "dkh 2/16/2012 14:49:00", "readonly" : "dkh 2/16/2012 14:49:00", "readonly:" : "dkh 2/16/2012 14:49:00", - "repositoryProperties" : "dkh 8/10/2012 07:54", + "repositoryProperties" : "OffrayLuna 5/27/2016 10:06", "versionFrom:" : "ChristopheDemarey 7/3/2015 16:15", "versionFromFileNamed:" : "dkh 07/08/2013 10:59:46", "versionInfoForPackageDirectory:" : "dkh 8/10/2012 07:56", diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addClassAndMethodDefinitionsFromEntry..st b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addClassAndMethodDefinitionsFromEntry..st index b0f2f5d9..edb4b8e7 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addClassAndMethodDefinitionsFromEntry..st +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addClassAndMethodDefinitionsFromEntry..st @@ -3,7 +3,7 @@ addClassAndMethodDefinitionsFromEntry: classEntry | classDirectory classPropertiesDict classComment entries methodPropertiesDict | classDirectory := self fileUtils directoryFromEntry: classEntry. ((entries := classDirectory entries) detect: [:entry | self isPropertyFile: entry] ifNone: [ ]) - ifNotNil: [ :propertyEntry | propertyEntry readStreamDo: [ :fileStream | classPropertiesDict := MCFileTreeJsonParser parseStream: fileStream ] ]. + ifNotNil: [ :propertyEntry | propertyEntry readStreamDo: [ :fileStream | classPropertiesDict := STON fromStream: fileStream ] ]. (entries detect: [ :entry | entry name = 'README.md' ] ifNone: [ ]) ifNotNil: [ :commentEntry | commentEntry readStreamDo: [ :fileStream | classComment := fileStream contents ] ]. methodPropertiesDict := Dictionary new. @@ -12,7 +12,7 @@ addClassAndMethodDefinitionsFromEntry: classEntry propertyEntry readStreamDo: [ :fileStream | "Issue 33: https://github.com/dalehenrich/filetree/issues/33" - methodPropertiesDict := MCFileTreeJsonParser parseStream: fileStream ] ]. + methodPropertiesDict := STON fromStream: fileStream ] ]. self addClassDefinitionFrom: classPropertiesDict comment: classComment withSqueakLineEndings. self addMethodDefinitionsForClass: (classPropertiesDict at: 'name') diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addExtensionClassAndMethodDefinitionsFromEntry..st b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addExtensionClassAndMethodDefinitionsFromEntry..st index 1564f02e..61ed0b9e 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addExtensionClassAndMethodDefinitionsFromEntry..st +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addExtensionClassAndMethodDefinitionsFromEntry..st @@ -8,15 +8,14 @@ addExtensionClassAndMethodDefinitionsFromEntry: classEntry ifNotNil: [ :propertyEntry | propertyEntry readStreamDo: [ :fileStream | - classPropertiesDict := MCFileTreeJsonParser - parseStream: fileStream ] ]. + classPropertiesDict := STON fromStream: fileStream ] ]. methodPropertiesDict := Dictionary new. (entries detect: [ :entry | self isMethodPropertyFile: entry ] ifNone: [ ]) ifNotNil: [ :propertyEntry | propertyEntry readStreamDo: [ :fileStream | "Issue 33: https://github.com/dalehenrich/filetree/issues/33" - methodPropertiesDict := MCFileTreeJsonParser parseStream: fileStream ] ]. + methodPropertiesDict := STON fromStream: fileStream ] ]. self addMethodDefinitionsForClass: (classPropertiesDict at: 'name') methodProperties: methodPropertiesDict diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addTraitAndMethodDefinitionsFromEntry..st b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addTraitAndMethodDefinitionsFromEntry..st index 0882d26f..8b048030 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addTraitAndMethodDefinitionsFromEntry..st +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/instance/addTraitAndMethodDefinitionsFromEntry..st @@ -3,7 +3,7 @@ addTraitAndMethodDefinitionsFromEntry: classEntry | classDirectory classPropertiesDict classComment entries methodPropertiesDict | classDirectory := self fileUtils directoryFromEntry: classEntry. ((entries := classDirectory entries) detect: [:entry | self isPropertyFile: entry] ifNone: [ ]) - ifNotNil: [ :propertyEntry | propertyEntry readStreamDo: [ :fileStream | classPropertiesDict := MCFileTreeJsonParser parseStream: fileStream ] ]. + ifNotNil: [ :propertyEntry | propertyEntry readStreamDo: [ :fileStream | classPropertiesDict := STON fromStream: fileStream ] ]. (entries detect: [ :entry | entry name = 'README.md' ] ifNone: [ ]) ifNotNil: [ :commentEntry | commentEntry readStreamDo: [ :fileStream | classComment := fileStream contents ] ] ifNil: [ classComment := '' ]. @@ -13,7 +13,7 @@ addTraitAndMethodDefinitionsFromEntry: classEntry propertyEntry readStreamDo: [ :fileStream | "Issue 33: https://github.com/dalehenrich/filetree/issues/33" - methodPropertiesDict := MCFileTreeJsonParser parseStream: fileStream ] ]. + methodPropertiesDict := STON fromStream: fileStream ] ]. self addTraitDefinitionFrom: classPropertiesDict comment: classComment withSqueakLineEndings. self addMethodDefinitionsForClass: (classPropertiesDict at: 'name') diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/methodProperties.json b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/methodProperties.json index ce587a85..9c81d376 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/methodProperties.json +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/methodProperties.json @@ -4,12 +4,12 @@ "monticelloMetaDirName" : "dkh 4/4/2012 17:44" }, "instance" : { "addClassAndMethodDefinitionsFromDirectory:" : "topa 7/22/2013 01:41", - "addClassAndMethodDefinitionsFromEntry:" : "dkh 8/10/2012 13:48", + "addClassAndMethodDefinitionsFromEntry:" : "OffrayLuna 5/27/2016 09:54", "addClassDefinitionFrom:comment:" : "DEMAREYChristophe 7/10/2015 18:06:15", - "addExtensionClassAndMethodDefinitionsFromEntry:" : "DEMAREYChristophe 7/10/2015 18:06:15", + "addExtensionClassAndMethodDefinitionsFromEntry:" : "OffrayLuna 5/27/2016 09:55", "addMethodDefinitionsForClass:methodProperties:in:" : "DEMAREYChristophe 7/10/2015 18:06:15", "addMethodDefinitionsForClass:methodProperties:in:extensionMethod:" : "DEMAREYChristophe 7/10/2015 18:06:15", - "addTraitAndMethodDefinitionsFromEntry:" : "topa 7/22/2013 14:41", + "addTraitAndMethodDefinitionsFromEntry:" : "OffrayLuna 5/27/2016 09:56", "addTraitDefinitionFrom:comment:" : "topa 7/22/2013 15:15", "basicVersion" : "dkh 6/27/2012 20:19", "isMethodPropertyFile:" : "dkh 6/16/2013 12:47:20", diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/fileNameMapFor..st b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/fileNameMapFor..st index 45699d8e..ec2972cf 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/fileNameMapFor..st +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/fileNameMapFor..st @@ -40,7 +40,7 @@ fileNameMapFor: aMethodDefinitionCollection put: (self fileNameForSelector: def selector) ] ifFalse: [ "tack on postfix to guarantee file names are uniique on case insensitive file systems" - sortedCol := col sorted: [ :a :b | a name <= b name ]. + sortedCol := col sorted: [ :a :b | a asString <= b asString ]. (1 to: sortedCol size) do: [ :index | | def filename | def := sortedCol at: index. diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeClassDefinition..st b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeClassDefinition..st index 9a493f3e..23a6ae60 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeClassDefinition..st +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeClassDefinition..st @@ -21,4 +21,4 @@ writeClassDefinition: definition properties at: 'classinstvars' put: definition classInstVarNames asArray. properties at: 'type' put: definition type asString. properties at: 'commentStamp' put: definition commentStamp. - properties writeCypressJsonOn: fileStream \ No newline at end of file + STON put: properties asJsonOnStreamPretty: fileStream \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeExtensionClassDefinition..st b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeExtensionClassDefinition..st index b27cb835..e3b910f9 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeExtensionClassDefinition..st +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeExtensionClassDefinition..st @@ -3,4 +3,4 @@ writeExtensionClassDefinition: definition | properties | properties := Dictionary new. properties at: 'name' put: definition className. - properties writeCypressJsonOn: fileStream \ No newline at end of file + STON put: properties asJsonOnStreamPretty: fileStream \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeMethodProperties..st b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeMethodProperties..st index c67479ac..00f67a99 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeMethodProperties..st +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeMethodProperties..st @@ -11,4 +11,4 @@ writeMethodProperties: classMethodDefinitions (methodDefinition classIsMeta ifTrue: [ classMethodsMap ] ifFalse: [ instanceMethodMap ]) at: methodDefinition selector asString put: methodDefinition timeStamp ]. - properties writeCypressJsonOn: fileStream \ No newline at end of file + STON put: properties asJsonOnStreamPretty: fileStream \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writePropertiesFile.st b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writePropertiesFile.st index 7c9c01c6..7b4448f3 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writePropertiesFile.st +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writePropertiesFile.st @@ -9,9 +9,9 @@ writePropertiesFile writeInDirectoryName: '.' fileName: '' extension: '.filetree' - visit: [ properties writeCypressJsonOn: fileStream ]. + visit: [ STON put: properties asJsonOnStreamPretty: fileStream ]. self writeInDirectoryName: '.' fileName: 'properties' extension: self propertyFileExtension - visit: [ Dictionary new writeCypressJsonOn: fileStream ] \ No newline at end of file + visit: [ STON put: (Dictionary new) asJsonOnStreamPretty: fileStream ] \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeTraitDefinition..st b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeTraitDefinition..st index 37250945..e62059bc 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeTraitDefinition..st +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeTraitDefinition..st @@ -15,4 +15,4 @@ writeTraitDefinition: definition ifTrue: [ properties at: 'classtraitcomposition' put: compositionString ] . properties at: 'category' put: definition category. properties at: 'commentStamp' put: definition commentStamp. - properties writeCypressJsonOn: fileStream \ No newline at end of file + STON put: properties asJsonOnStreamPretty: fileStream \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/methodProperties.json b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/methodProperties.json index 04cf75ac..b80d8e71 100644 --- a/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/methodProperties.json +++ b/repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/methodProperties.json @@ -7,19 +7,19 @@ "specials" : "dkh 4/4/2012 11:27" }, "instance" : { "fileNameForSelector:" : "DEMAREYChristophe 7/10/2015 18:06:15", - "fileNameMapFor:" : "ChristopheDemarey 8/28/2013 13:50", + "fileNameMapFor:" : "PavelKrivanek 3/13/2017 13:06", "propertyFileExtension" : "dkh 07/07/2013 22:15", "setFileStream:" : "dkh 4/4/2012 14:01", "writeClassComment:" : "dkh 03/22/2013 11:30", - "writeClassDefinition:" : "dkh 03/22/2013 13:51", + "writeClassDefinition:" : "OffrayLuna 5/27/2016 10:09", "writeClassDefinition:to:" : "dkh 07/07/2013 22:13", "writeDefinitions:" : "08/08/2013 16:08", - "writeExtensionClassDefinition:" : "dkh 4/4/2012 17:52", + "writeExtensionClassDefinition:" : "OffrayLuna 5/27/2016 10:10", "writeExtensionClassDefinition:to:" : "dkh 07/07/2013 22:14", "writeMethodDefinition:" : "dkh 03/22/2013 11:30", "writeMethodDefinition:to:" : "dkh 07/18/2013 17:01", "writeMethodDefinition:to:filename:" : "dkh 07/18/2013 16:34", - "writeMethodProperties:" : "dkh 6/12/2012 17:33:23", - "writePropertiesFile" : "dkh 07/07/2013 22:14", - "writeTraitDefinition:" : "topa 7/22/2013 14:54", + "writeMethodProperties:" : "OffrayLuna 5/27/2016 10:10", + "writePropertiesFile" : "OffrayLuna 5/27/2016 10:14", + "writeTraitDefinition:" : "OffrayLuna 5/27/2016 10:15", "writeTraitDefinition:to:" : "topa 7/22/2013 14:47" } } diff --git a/repository/MonticelloFileTree-Core.package/Number.extension/instance/writeCypressJsonOn.forHtml.indent..st b/repository/MonticelloFileTree-Core.package/Number.extension/instance/writeCypressJsonOn.forHtml.indent..st deleted file mode 100644 index d13058f8..00000000 --- a/repository/MonticelloFileTree-Core.package/Number.extension/instance/writeCypressJsonOn.forHtml.indent..st +++ /dev/null @@ -1,5 +0,0 @@ -*monticellofiletree-core -writeCypressJsonOn: aStream forHtml: forHtml indent: startIndent - "by default ignore ... is used for Dictionary and Array, i.e., container objects and String which actually encodes itself differently for HTML" - - aStream nextPutAll: self printString \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/Number.extension/methodProperties.json b/repository/MonticelloFileTree-Core.package/Number.extension/methodProperties.json deleted file mode 100644 index ede78ac3..00000000 --- a/repository/MonticelloFileTree-Core.package/Number.extension/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "writeCypressJsonOn:forHtml:indent:" : "dkh 4/6/2012 15:56:14" } } diff --git a/repository/MonticelloFileTree-Core.package/Number.extension/properties.json b/repository/MonticelloFileTree-Core.package/Number.extension/properties.json deleted file mode 100644 index 1d2c94d4..00000000 --- a/repository/MonticelloFileTree-Core.package/Number.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "Number" } diff --git a/repository/MonticelloFileTree-Core.package/Object.extension/instance/writeCypressJsonForHtmlOn.indent..st b/repository/MonticelloFileTree-Core.package/Object.extension/instance/writeCypressJsonForHtmlOn.indent..st deleted file mode 100644 index 3e46d113..00000000 --- a/repository/MonticelloFileTree-Core.package/Object.extension/instance/writeCypressJsonForHtmlOn.indent..st +++ /dev/null @@ -1,3 +0,0 @@ -*monticellofiletree-core -writeCypressJsonForHtmlOn: aStream indent: startIndent - self writeCypressJsonOn: aStream forHtml: true indent: startIndent \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/Object.extension/instance/writeCypressJsonOn.forHtml.indent..st b/repository/MonticelloFileTree-Core.package/Object.extension/instance/writeCypressJsonOn.forHtml.indent..st deleted file mode 100644 index bdb602aa..00000000 --- a/repository/MonticelloFileTree-Core.package/Object.extension/instance/writeCypressJsonOn.forHtml.indent..st +++ /dev/null @@ -1,5 +0,0 @@ -*monticellofiletree-core -writeCypressJsonOn: aStream forHtml: forHtml indent: startIndent - "by default ignore ... is used for Dictionary and Array, i.e., container objects and String which actually encodes itself differently for HTML" - - ^ SubclassResponsibility signalFor: thisContext sender selector \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/Object.extension/instance/writeCypressJsonOn.indent..st b/repository/MonticelloFileTree-Core.package/Object.extension/instance/writeCypressJsonOn.indent..st deleted file mode 100644 index 7a7ae78d..00000000 --- a/repository/MonticelloFileTree-Core.package/Object.extension/instance/writeCypressJsonOn.indent..st +++ /dev/null @@ -1,3 +0,0 @@ -*monticellofiletree-core -writeCypressJsonOn: aStream indent: startIndent - self writeCypressJsonOn: aStream forHtml: false indent: startIndent \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/Object.extension/methodProperties.json b/repository/MonticelloFileTree-Core.package/Object.extension/methodProperties.json deleted file mode 100644 index 621cd85a..00000000 --- a/repository/MonticelloFileTree-Core.package/Object.extension/methodProperties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "writeCypressJsonForHtmlOn:indent:" : "dkh 4/6/2012 15:56:14", - "writeCypressJsonOn:forHtml:indent:" : "ChristopheDemarey 9/8/2013 18:34", - "writeCypressJsonOn:indent:" : "dkh 4/6/2012 15:56:14" } } diff --git a/repository/MonticelloFileTree-Core.package/Object.extension/properties.json b/repository/MonticelloFileTree-Core.package/Object.extension/properties.json deleted file mode 100644 index 3d3b9ec4..00000000 --- a/repository/MonticelloFileTree-Core.package/Object.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "Object" } diff --git a/repository/MonticelloFileTree-Core.package/String.extension/instance/cypressEscape.st b/repository/MonticelloFileTree-Core.package/String.extension/instance/cypressEscape.st deleted file mode 100644 index 18c759c6..00000000 --- a/repository/MonticelloFileTree-Core.package/String.extension/instance/cypressEscape.st +++ /dev/null @@ -1,3 +0,0 @@ -*monticellofiletree-core -cypressEscape - ^ self urlEncoded \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/String.extension/instance/cypressEscapeCharacter.on..st b/repository/MonticelloFileTree-Core.package/String.extension/instance/cypressEscapeCharacter.on..st deleted file mode 100644 index 7fb4b5cb..00000000 --- a/repository/MonticelloFileTree-Core.package/String.extension/instance/cypressEscapeCharacter.on..st +++ /dev/null @@ -1,10 +0,0 @@ -*monticellofiletree-core -cypressEscapeCharacter: aCharacter on: aStream - - ^ ('\"''' includes: aCharacter) - ifTrue: [ - aStream - nextPut: $\; - nextPut: aCharacter ] - ifFalse: [ - aStream nextPut: aCharacter ] \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/String.extension/instance/cypressEscapeCharactersOn..st b/repository/MonticelloFileTree-Core.package/String.extension/instance/cypressEscapeCharactersOn..st deleted file mode 100644 index 6f0cdece..00000000 --- a/repository/MonticelloFileTree-Core.package/String.extension/instance/cypressEscapeCharactersOn..st +++ /dev/null @@ -1,3 +0,0 @@ -*monticellofiletree-core -cypressEscapeCharactersOn: aStream - self do: [ :c | self cypressEscapeCharacter: c on: aStream ] \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/String.extension/instance/cypressUnescape.st b/repository/MonticelloFileTree-Core.package/String.extension/instance/cypressUnescape.st deleted file mode 100644 index b7d75003..00000000 --- a/repository/MonticelloFileTree-Core.package/String.extension/instance/cypressUnescape.st +++ /dev/null @@ -1,3 +0,0 @@ -*monticellofiletree-core -cypressUnescape - ^ self urlDecoded \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/String.extension/instance/writeCypressJsonOn.forHtml.indent..st b/repository/MonticelloFileTree-Core.package/String.extension/instance/writeCypressJsonOn.forHtml.indent..st deleted file mode 100644 index 310b6c36..00000000 --- a/repository/MonticelloFileTree-Core.package/String.extension/instance/writeCypressJsonOn.forHtml.indent..st +++ /dev/null @@ -1,9 +0,0 @@ -*monticellofiletree-core -writeCypressJsonOn: aStream forHtml: forHtml indent: startIndent - "by default ignore ... is used for Dictionary and Array, i.e., container objects and String which actually encodes itself differently for HTML" - - aStream nextPutAll: '"'. - forHtml - ifTrue: [ aStream nextPutAll: self cypressEscape ] - ifFalse: [ self cypressEscapeCharactersOn: aStream ]. - aStream nextPutAll: '"' \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/String.extension/methodProperties.json b/repository/MonticelloFileTree-Core.package/String.extension/methodProperties.json deleted file mode 100644 index 6d9184a2..00000000 --- a/repository/MonticelloFileTree-Core.package/String.extension/methodProperties.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "cypressEscape" : "SvenVanCaekenberghe 10/27/2013 11:46", - "cypressEscapeCharacter:on:" : "DEMAREYChristophe 7/10/2015 18:06:15", - "cypressEscapeCharactersOn:" : "DEMAREYChristophe 7/10/2015 18:06:15", - "cypressUnescape" : "SvenVanCaekenberghe 10/27/2013 12:18", - "writeCypressJsonOn:forHtml:indent:" : "DEMAREYChristophe 7/10/2015 18:06:15" } } diff --git a/repository/MonticelloFileTree-Core.package/String.extension/properties.json b/repository/MonticelloFileTree-Core.package/String.extension/properties.json deleted file mode 100644 index c2138507..00000000 --- a/repository/MonticelloFileTree-Core.package/String.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "String" } diff --git a/repository/MonticelloFileTree-Core.package/UndefinedObject.extension/instance/writeCypressJsonOn.forHtml.indent..st b/repository/MonticelloFileTree-Core.package/UndefinedObject.extension/instance/writeCypressJsonOn.forHtml.indent..st deleted file mode 100644 index b5e8ab39..00000000 --- a/repository/MonticelloFileTree-Core.package/UndefinedObject.extension/instance/writeCypressJsonOn.forHtml.indent..st +++ /dev/null @@ -1,5 +0,0 @@ -*monticellofiletree-core -writeCypressJsonOn: aStream forHtml: forHtml indent: startIndent - "by default ignore ... is used for Dictionary and Array, i.e., container objects and String which actually encodes itself differently for HTML" - - aStream nextPutAll: 'null'. \ No newline at end of file diff --git a/repository/MonticelloFileTree-Core.package/UndefinedObject.extension/methodProperties.json b/repository/MonticelloFileTree-Core.package/UndefinedObject.extension/methodProperties.json deleted file mode 100644 index de8d202e..00000000 --- a/repository/MonticelloFileTree-Core.package/UndefinedObject.extension/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "writeCypressJsonOn:forHtml:indent:" : "topa 7/22/2013 01:03" } } diff --git a/repository/MonticelloFileTree-Core.package/UndefinedObject.extension/properties.json b/repository/MonticelloFileTree-Core.package/UndefinedObject.extension/properties.json deleted file mode 100644 index 508a24a8..00000000 --- a/repository/MonticelloFileTree-Core.package/UndefinedObject.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "UndefinedObject" } diff --git a/repository/MonticelloFileTree-Core.package/monticello.meta/version b/repository/MonticelloFileTree-Core.package/monticello.meta/version index 5a6e08b1..b75e7eb0 100644 --- a/repository/MonticelloFileTree-Core.package/monticello.meta/version +++ b/repository/MonticelloFileTree-Core.package/monticello.meta/version @@ -1 +1 @@ -(name 'MonticelloFileTree-Core-NicoPasserini.142' message 'Merge changes from Pharo 6.0' id 'da55e700-4fa7-4579-af84-b32b1230b13d' date '20 May 2016' time '2:47:46.992015 pm' author 'NicoPasserini' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.141' message '17504 TextLink + subclasses lacks implementation of #= and #hash https://pharo.fogbugz.com/f/cases/17504 17796 Debugger step over basicNew of proxies is not working https://pharo.fogbugz.com/f/cases/17796 17769 The debugger should trigger an event before executing a debugging action https://pharo.fogbugz.com/f/cases/17769 17655 Changes in package loading behavior https://pharo.fogbugz.com/f/cases/17655' id '66a552d1-d9c5-47c3-8277-e790900c132a' date '11 March 2016' time '1:57:25.009987 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.140' message '16972 Access to variable catch too much announcements https://pharo.fogbugz.com/f/cases/16972 17787 QualityAssistant v2.5.0 https://pharo.fogbugz.com/f/cases/17787 17781 you can not use printIt Pharo Tutorials https://pharo.fogbugz.com/f/cases/17781 17784 move asMCMethodDefinition and related messages to Monticello package https://pharo.fogbugz.com/f/cases/17784' id '54c3bbf2-aa6d-46a0-8e3f-a59e2b45c7ec' date '10 March 2016' time '2:23:52.724436 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.138' message '17711 Reset Registry of MetacelloProjectRegistration to remove Obsolete configuration instances https://pharo.fogbugz.com/f/cases/17711 17712 clean old startup mechanism - part 1 https://pharo.fogbugz.com/f/cases/17712 17655 Changes in package loading behavior https://pharo.fogbugz.com/f/cases/17655' id '928a7cc5-a0ec-4499-8fd8-fad02612437e' date '26 February 2016' time '3:20:14.825981 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-GuillermoPolito.137' message '- Fixing monticello underlining/bold - some aesthetic fixes, variable renames done during debugging' id 'b60573da-2ef0-4046-8d59-eb50184cea24' date '26 February 2016' time '12:15:17.118847 pm' author 'GuillermoPolito' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.136' message '17125 Metadata-less compatibility with FileTree https://pharo.fogbugz.com/f/cases/17125 17363 (LayoutFrame fractions: (0 @ 0 corner: 1 @ 1)) = LayoutFrame identity should be true and it is not. https://pharo.fogbugz.com/f/cases/17363 17380 OrderedDictionary and OrderedDictionaryTest refactoring https://pharo.fogbugz.com/f/cases/17380' id '08bf97d3-c7dd-484a-bbf9-1ad55b27c7db' date '14 January 2016' time '2:24:32.894571 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-ThierryGoubier.135' message 'Retrying that fix!' id '5e377933-4a7e-4e3d-88c6-81349155e60e' date '13 January 2016' time '6:46:49.958507 am' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.134' message '17212 DNU on MCFileRepository class>>#basicFromUrl: https://pharo.fogbugz.com/f/cases/17212 17213 DNU when trying to retrieve version info from filetree repository https://pharo.fogbugz.com/f/cases/17213' id 'a8c1c174-43c3-4718-aed4-f4fe0224bc69' date '9 December 2015' time '4:00:03.253249 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-EstebanLorenzano.133' message 'empty log message' id '15b96dc9-d7bf-40af-9a07-8535a5adad3f' date '9 December 2015' time '2:06:07.391613 pm' author 'EstebanLorenzano' ancestors ((name 'MonticelloFileTree-Core-EstebanLorenzano.131' message 'empty log message' id 'b4cfb232-827b-4e3b-85a3-ec2633004e22' date '9 December 2015' time '1:58:26.925421 pm' author 'EstebanLorenzano' ancestors ((name 'MonticelloFileTree-Core-ChristopheDemarey.130' message 'Temporary variables not read AND written Checks that all temporary variables are both read and written. MCFileTreeStCypressReader>>#validateExtensionMethodCategory:for:selector:' id 'bfd96e56-d9c8-4c62-851b-c3c6cfe8cda8' date '7 August 2015' time '3:34:30.253351 pm' author 'ChristopheDemarey' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'MonticelloFileTree-Core-NicolaiHess.139' message 'new slice' id '8c5a63a1-14bd-f24f-a94d-2cad93139cdf' date '9 March 2016' time '9:25:48.280745 am' author 'NicolaiHess' ancestors ((id '928a7cc5-a0ec-4499-8fd8-fad02612437e')) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'MonticelloFileTree-Core-TheIntegrator.151' message '19834 Error in horizontal scrollbar https://pharo.fogbugz.com/f/cases/19834 19831 catalog refresh retrieves an empty collection https://pharo.fogbugz.com/f/cases/19831 19823 exported source of the package MonticelloFileTree-Core in pharo-core repository contains strange extension https://pharo.fogbugz.com/f/cases/19823' id '5b137999-0e07-0d00-b6af-74ee0e78f644' date '14 March 2017' time '9:46:23.024138 am' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-PavelKrivanek.150' message 'make the two packages dirty by simple formating change and solution of a the deprecated #name usage. (https://github.com/npasserini/iceberg/issues/294#issuecomment-286076547)' id '3e67f851-fd06-0d00-8994-49120b6654c0' date '13 March 2017' time '1:09:28.965107 pm' author 'PavelKrivanek' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.149' message '19786 MonticelloFileTree-Core package exported to Git contains a strange extension https://pharo.fogbugz.com/f/cases/19786 19825 circular dependency between Renraku and Refactoring-Critics https://pharo.fogbugz.com/f/cases/19825 19824 fix #scrollBarDownButtonBoundsFor: calculation https://pharo.fogbugz.com/f/cases/19824 19819 Epicea browser doesnt refresh when tests produce code changes https://pharo.fogbugz.com/f/cases/19819' id '5b7175d9-c206-0d00-b580-292408a2138c' date '10 March 2017' time '3:23:59.013311 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-PavelKrivanek.148' message 'small formating changes to make the two packages dirty' id 'c13e7735-be06-0d00-a4c4-262207c9f342' date '10 March 2017' time '9:51:47.798808 am' author 'PavelKrivanek' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.147' message '18554 Update SystemCommandLineHandler dependencies https://pharo.fogbugz.com/f/cases/18554 18553 AST based execution counter https://pharo.fogbugz.com/f/cases/18553 18552 Move menu item morph creation to RubSegment https://pharo.fogbugz.com/f/cases/18552 7241 Object>>#name should best be removed https://pharo.fogbugz.com/f/cases/7241' id '00369088-dcd5-43f2-b877-60c0c8dd0f17' date '21 June 2016' time '5:39:09.703246 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-GuillermoPolito.146' message 'Removed expected failure that does not fail anymore' id '6beeedbf-09d4-47cb-8547-ddbcb46e8bc7' date '21 June 2016' time '11:48:31.5822 am' author 'GuillermoPolito' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.145' message '18350 Lost changes should be shown on startup by Epicea https://pharo.fogbugz.com/f/cases/18350 17822 Use STON for JSON parsing in MC FileTree https://pharo.fogbugz.com/f/cases/17822 18357 Update Rubric to 2.19.4 https://pharo.fogbugz.com/f/cases/18357' id 'cc01359e-c1b6-4431-89c2-a43499d3f121' date '31 May 2016' time '1:51:28.516426 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-OffrayLuna.144' message 'Using STON instead of JSON parser. See: https://pharo.fogbugz.com/f/cases/17822/ Thansk to Miguel Campusano :-).' id '8a9658f2-5193-4921-a5ea-a48b9dc6ead3' date '27 May 2016' time '10:22:55.104032 am' author 'OffrayLuna' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.143' message '18337 Spelling mistakes in Pharo (forward port issue 18324 to Pharo 6.0) https://pharo.fogbugz.com/f/cases/18337 18335 MonticelloFileTree-Core extends class MCFileRepositoryInspector https://pharo.fogbugz.com/f/cases/18335 18336 StartupPreferences extends packages outside minimal Pharo https://pharo.fogbugz.com/f/cases/18336 18326 add some more keymapping definitions in PharoShortcuts https://pharo.fogbugz.com/f/cases/18326' id 'decd9ef1-883d-4f42-8f20-ecda0ac27351' date '27 May 2016' time '2:22:55.915864 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-PavelKrivanek.142' message 'remove package extension' id 'c2709c1a-b5a8-4234-aa1c-f0b6a02a71d5' date '26 May 2016' time '4:58:47.43598 pm' author 'PavelKrivanek' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.141' message '17504 TextLink + subclasses lacks implementation of #= and #hash https://pharo.fogbugz.com/f/cases/17504 17796 Debugger step over basicNew of proxies is not working https://pharo.fogbugz.com/f/cases/17796 17769 The debugger should trigger an event before executing a debugging action https://pharo.fogbugz.com/f/cases/17769 17655 Changes in package loading behavior https://pharo.fogbugz.com/f/cases/17655' id '66a552d1-d9c5-47c3-8277-e790900c132a' date '11 March 2016' time '1:57:25.009987 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.140' message '16972 Access to variable catch too much announcements https://pharo.fogbugz.com/f/cases/16972 17787 QualityAssistant v2.5.0 https://pharo.fogbugz.com/f/cases/17787 17781 you can not use printIt Pharo Tutorials https://pharo.fogbugz.com/f/cases/17781 17784 move asMCMethodDefinition and related messages to Monticello package https://pharo.fogbugz.com/f/cases/17784' id '54c3bbf2-aa6d-46a0-8e3f-a59e2b45c7ec' date '10 March 2016' time '2:23:52.724436 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.138' message '17711 Reset Registry of MetacelloProjectRegistration to remove Obsolete configuration instances https://pharo.fogbugz.com/f/cases/17711 17712 clean old startup mechanism - part 1 https://pharo.fogbugz.com/f/cases/17712 17655 Changes in package loading behavior https://pharo.fogbugz.com/f/cases/17655' id '928a7cc5-a0ec-4499-8fd8-fad02612437e' date '26 February 2016' time '3:20:14.825981 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-GuillermoPolito.137' message '- Fixing monticello underlining/bold - some aesthetic fixes, variable renames done during debugging' id 'b60573da-2ef0-4046-8d59-eb50184cea24' date '26 February 2016' time '12:15:17.118847 pm' author 'GuillermoPolito' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.136' message '17125 Metadata-less compatibility with FileTree https://pharo.fogbugz.com/f/cases/17125 17363 (LayoutFrame fractions: (0 @ 0 corner: 1 @ 1)) = LayoutFrame identity should be true and it is not. https://pharo.fogbugz.com/f/cases/17363 17380 OrderedDictionary and OrderedDictionaryTest refactoring https://pharo.fogbugz.com/f/cases/17380' id '08bf97d3-c7dd-484a-bbf9-1ad55b27c7db' date '14 January 2016' time '2:24:32.894571 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-ThierryGoubier.135' message 'Retrying that fix!' id '5e377933-4a7e-4e3d-88c6-81349155e60e' date '13 January 2016' time '6:46:49.958507 am' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Core-TheIntegrator.134' message '17212 DNU on MCFileRepository class>>#basicFromUrl: https://pharo.fogbugz.com/f/cases/17212 17213 DNU when trying to retrieve version info from filetree repository https://pharo.fogbugz.com/f/cases/17213' id 'a8c1c174-43c3-4718-aed4-f4fe0224bc69' date '9 December 2015' time '4:00:03.253249 pm' author 'TheIntegrator' ancestors ((name 'MonticelloFileTree-Core-EstebanLorenzano.133' message 'empty log message' id '15b96dc9-d7bf-40af-9a07-8535a5adad3f' date '9 December 2015' time '2:06:07.391613 pm' author 'EstebanLorenzano' ancestors ((name 'MonticelloFileTree-Core-EstebanLorenzano.131' message 'empty log message' id 'b4cfb232-827b-4e3b-85a3-ec2633004e22' date '9 December 2015' time '1:58:26.925421 pm' author 'EstebanLorenzano' ancestors ((name 'MonticelloFileTree-Core-ChristopheDemarey.130' message 'Temporary variables not read AND written Checks that all temporary variables are both read and written. MCFileTreeStCypressReader>>#validateExtensionMethodCategory:for:selector:' id 'bfd96e56-d9c8-4c62-851b-c3c6cfe8cda8' date '7 August 2015' time '3:34:30.253351 pm' author 'ChristopheDemarey' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'MonticelloFileTree-Core-NicolaiHess.139' message 'new slice' id '8c5a63a1-14bd-f24f-a94d-2cad93139cdf' date '9 March 2016' time '9:25:48.280745 am' author 'NicolaiHess' ancestors ((id '928a7cc5-a0ec-4499-8fd8-fad02612437e')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'MonticelloFileTree-Core-GuillermoPolito.142' message 'Merge for latest pharo6' id 'f67a09fc-a6bb-4362-b348-1aea5e986ea4' date '27 May 2016' time '10:49:04.71983 am' author 'GuillermoPolito' ancestors ((id '66a552d1-d9c5-47c3-8277-e790900c132a')(name 'MonticelloFileTree-Core-GuillermoPolito.138' message 'New slice removing Object>>name for latest Pharo 5' id '1602af22-8343-4400-9a33-06de575e63bb' date '19 February 2016' time '3:26:50.936638 pm' author 'GuillermoPolito' ancestors ((id '08bf97d3-c7dd-484a-bbf9-1ad55b27c7db')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/README.md b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/README.md new file mode 100644 index 00000000..eb0456dc --- /dev/null +++ b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/README.md @@ -0,0 +1,3 @@ +I represent an object entry in git store, along the format provided by git ls-tree. + +I can be used to query a store files and directories instead of querying the working tree \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/class/from..st b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/class/from..st new file mode 100644 index 00000000..5b63e3c4 --- /dev/null +++ b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/class/from..st @@ -0,0 +1,5 @@ +instance creation +from: aLineAsString + "Extracted from a line provided by git ls-tree" + + ^ self new from: aLineAsString \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/class/fromAll..st b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/class/fromAll..st new file mode 100644 index 00000000..c6145791 --- /dev/null +++ b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/class/fromAll..st @@ -0,0 +1,5 @@ +instance creation +fromAll: aString + "Extracted from a string containing the lines of git ls-tree" + + ^ aString lines collect: [ :aLine | self from: aLine ] \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/file.st b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/file.st new file mode 100644 index 00000000..979743c6 --- /dev/null +++ b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/file.st @@ -0,0 +1,3 @@ +accessing +file + ^ file \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/from..st b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/from..st new file mode 100644 index 00000000..1dcb0b20 --- /dev/null +++ b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/from..st @@ -0,0 +1,12 @@ +initialize-release +from: aLineAsString + " SP SP TAB " + + (Character tab split: aLineAsString) + in: [ :anArray | + (Character space split: anArray first) + in: [ :anInsideArray | + mode := anInsideArray first. + type := anInsideArray second. + object := anInsideArray third ]. + file := anArray second ] \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/isDirectory.st b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/isDirectory.st new file mode 100644 index 00000000..dbdb8454 --- /dev/null +++ b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/isDirectory.st @@ -0,0 +1,3 @@ +testing +isDirectory + ^ type = 'tree' \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/mode.st b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/mode.st new file mode 100644 index 00000000..cd01c4ae --- /dev/null +++ b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/mode.st @@ -0,0 +1,3 @@ +accessing +mode + ^ mode \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/name.st b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/name.st new file mode 100644 index 00000000..213a4d48 --- /dev/null +++ b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/name.st @@ -0,0 +1,3 @@ +accessing +name + ^ file \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/object.st b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/object.st new file mode 100644 index 00000000..ab44a2bb --- /dev/null +++ b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/object.st @@ -0,0 +1,3 @@ +accessing +object + ^ object \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/type.st b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/type.st new file mode 100644 index 00000000..7487493d --- /dev/null +++ b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/instance/type.st @@ -0,0 +1,3 @@ +accessing +type + ^ type \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/methodProperties.json b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/methodProperties.json new file mode 100644 index 00000000..eeded45b --- /dev/null +++ b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/methodProperties.json @@ -0,0 +1,15 @@ +{ + "instance" : { + "type" : "ThierryGoubier 3/2/2018 09:51", + "isDirectory" : "ThierryGoubier 3/2/2018 10:22", + "mode" : "ThierryGoubier 3/2/2018 09:51", + "object" : "ThierryGoubier 3/2/2018 09:51", + "name" : "ThierryGoubier 3/2/2018 10:17", + "file" : "ThierryGoubier 3/2/2018 09:51", + "from:" : "ThierryGoubier 3/2/2018 09:57" + }, + "class" : { + "fromAll:" : "ThierryGoubier 3/2/2018 10:13", + "from:" : "ThierryGoubier 3/2/2018 09:57" + } +} \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/MCFileTreeGitWriter.class/properties.json b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/properties.json similarity index 56% rename from repository/MonticelloFileTree-Git.package/MCFileTreeGitWriter.class/properties.json rename to repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/properties.json index 625c72b9..8758db35 100644 --- a/repository/MonticelloFileTree-Git.package/MCFileTreeGitWriter.class/properties.json +++ b/repository/MonticelloFileTree-Git.package/GitFileTreeObjectEntry.class/properties.json @@ -1,11 +1,16 @@ { "commentStamp" : "", - "super" : "MCFileTreeWriter", + "super" : "Object", "category" : "MonticelloFileTree-Git", "classinstvars" : [ ], "pools" : [ ], "classvars" : [ ], - "instvars" : [ ], - "name" : "MCFileTreeGitWriter", + "instvars" : [ + "mode", + "type", + "object", + "file" + ], + "name" : "GitFileTreeObjectEntry", "type" : "normal" } \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/GitFileTreePackageEntry.class/methodProperties.json b/repository/MonticelloFileTree-Git.package/GitFileTreePackageEntry.class/methodProperties.json index 7a9a51de..a482dd54 100644 --- a/repository/MonticelloFileTree-Git.package/GitFileTreePackageEntry.class/methodProperties.json +++ b/repository/MonticelloFileTree-Git.package/GitFileTreePackageEntry.class/methodProperties.json @@ -13,7 +13,7 @@ "info" : "ThierryGoubier 4/30/2016 11:46:50", "repository:" : "ThierryGoubier 4/30/2016 11:46:50", "info:" : "ThierryGoubier 4/30/2016 11:46:50", - "author:" : "ThierryGoubier 4/30/2016 11:46:50", + "author:" : "ThierryGoubier 5/7/2018 19:01", "packageDirectory:" : "ThierryGoubier 4/30/2016 11:46:50", "setMCVersionInfoWithNumber:" : "ThierryGoubier 4/30/2016 11:46:50", "summary" : "ThierryGoubier 4/30/2016 11:46:50", diff --git a/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/README.md b/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/README.md index b19b2bd2..5b96c90d 100644 --- a/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/README.md +++ b/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/README.md @@ -30,3 +30,26 @@ MCRepository basicFromUrl: 'gitfiletree://github.com/dalehenrich/filetree:pharo5 gitfiletree core documentation : gitfiletree maps MC commands onto git commands via OSProcess, and MC metadata out of git commit data. That's all there is to it. A bit of git knowledge can help, but no git command line work is necessary. The inner workings are a bit more complex than that of course, but not by much. + +gitfiletree new attempt : + +When reading, gitfiletree does not use the working tree. When writing with fast-import, gitfiletree does not use the working tree either. Using bare git repositories could then work nicely, wthout any possible mess of a working tree. It would work, except for the fact that the working tree is necessary for some commands (merge, pull). However, gitfiletree would get the benefit of never using the working tree (and hence have issues with file names and the like) + +- Clone: +git clone --bare +git clone --mirror +- Change branch +git symbolic-ref HEAD refs/heads/pharo6 +- Ok on bare: +git log +git branch -> git update-ref refs/heads/new_branch refs/heads/master +git need to pull +- Not Ok on bare +git pull -> replaced by git fetch plus a git merge ? +git push -> has to be explicit? git push origin "works very nicely" +git rev-parse --show-toplevel -> doesn't work, not needed. +git versions for package -> need object navigation +- Object navigation +git cat-file -p -> various objects starting with a commit (can do git cat-file -p ) +git ls-tree : -> show all entries. can recurse (-r) +git rev-parse --is-inside-work-tree -> answers false (not in a work tree) diff --git a/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/class/initialize.st b/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/class/initialize.st new file mode 100644 index 00000000..816bc2b9 --- /dev/null +++ b/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/class/initialize.st @@ -0,0 +1,5 @@ +class initialization +initialize +