diff --git a/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/instance/basicStoreVersion..st b/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/instance/basicStoreVersion..st index abc2435a..4cad4b09 100644 --- a/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/instance/basicStoreVersion..st +++ b/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/instance/basicStoreVersion..st @@ -32,5 +32,5 @@ basicStoreVersion: aVersion do: [ :each | | b | (b := MCWorkingCopy hasPackageNamed: each package name) == false - ifFalse: - [ b versionInfo: (self versionInfoFromVersionNamed: each package name) ] ] \ No newline at end of file + ifFalse: [ b + versionInfo: (self versionInfoFromVersionNamed: each package name) ] ] \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/instance/versionInfoFromVersionNamed..st b/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/instance/versionInfoFromVersionNamed..st index 35db3609..73813e49 100644 --- a/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/instance/versionInfoFromVersionNamed..st +++ b/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/instance/versionInfoFromVersionNamed..st @@ -1,11 +1,17 @@ accessing versionInfoFromVersionNamed: aString "Ok this code hides some of the conflict/version upgrade resolution inside the repository. This is plain bad design from Monticello/Metacello." + + "Beware: the default implementation by Monticello is really bad and may answer a wrong version; revert + to the FileTree behavior and expect a package name, not a version." | versions | - versions := self readableFileNames select: [ :each | each name beginsWith: aString ]. + versions := self readableFileNames + select: [ :each | each packageDirectory = (aString , self packageExtension) ]. versions isEmpty ifTrue: [ ^ nil ]. versions := versions - asSortedCollection: [ :a :b | (a name copyAfterLast: $.) asNumber <= (b name copyAfterLast: $.) asNumber ]. + asSortedCollection: [ :a :b | + (a name copyAfterLast: $.) asNumber + <= (b name copyAfterLast: $.) asNumber ]. ^ versions last info \ No newline at end of file diff --git a/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/methodProperties.json b/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/methodProperties.json index 1f8fc071..e0e22f8e 100644 --- a/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/methodProperties.json +++ b/repository/MonticelloFileTree-Git.package/MCFileTreeGitRepository.class/methodProperties.json @@ -27,7 +27,7 @@ "instance" : { "allFileNames" : "ThierryGoubier 4/30/2016 11:46:50", "allVersionNames" : "ThierryGoubier 4/30/2016 11:46:50", - "basicStoreVersion:" : "ThierryGoubier 8/26/2016 15:54", + "basicStoreVersion:" : "ThierryGoubier 8/26/2016 17:13", "branch" : "ThierryGoubier 4/30/2016 11:46:50", "branch:" : "ThierryGoubier 4/30/2016 11:46:50", "cacheAllFileNames" : "ThierryGoubier 4/30/2016 11:46:50", @@ -76,7 +76,7 @@ "versionFromPackageName:commit:" : "ThierryGoubier 4/30/2016 11:46:50", "versionFromRepositoryFromFileNamed:" : "ThierryGoubier 4/30/2016 11:46:50", "versionInfoFromFileNamed:" : "ThierryGoubier 4/30/2016 11:46:50", - "versionInfoFromVersionNamed:" : "ThierryGoubier 4/30/2016 11:46:50", + "versionInfoFromVersionNamed:" : "ThierryGoubier 8/26/2016 17:20", "versionNameFromFileName:" : "ThierryGoubier 4/30/2016 11:46:50", "writeGitFileTreeProperties:" : "ThierryGoubier 4/30/2016 11:46:50", "writeRepositoryProperties" : "ThierryGoubier 4/30/2016 11:46:50" } } diff --git a/repository/MonticelloFileTree-Git.package/monticello.meta/version b/repository/MonticelloFileTree-Git.package/monticello.meta/version index 20bded5f..02d8e6b5 100644 --- a/repository/MonticelloFileTree-Git.package/monticello.meta/version +++ b/repository/MonticelloFileTree-Git.package/monticello.meta/version @@ -1,4 +1,9 @@ -(name 'MonticelloFileTree-Git-ThierryGoubier.146' message 'Add string type check to version save: ensure version info message is a String instance.' id '38351af1-e1af-4f66-a077-a5313683d881' date '26 August 2016' time '3:59:20.626875 pm' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.145' message 'Replace the FileTree Json Parser by the in-image STON parser' id 'b4c07c9b-7f31-494c-97cf-f57d4ed1c824' date '3 June 2016' time '2:06:16.493042 pm' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.144' message 'Commented' id '294e6381-97b0-410c-9d53-08511e5bb1fe' date '1 May 2016' time '11:02:37.450455 am' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.143' message 'Better setting definition +(name 'MonticelloFileTree-Git-ThierryGoubier.149' message 'final fix' id 'd4d4407a-ea12-4ca3-a865-e2388c78f462' date '26 August 2016' time '5:21:09.530021 pm' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.148' message 'fix follow-up: do not use the version number we have in the image. +' id 'c3ab78bc-a827-5a48-ad00-d61aeba24539' date '26 August 2016' time '4:48:27 pm' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.147' message 'basicSaveVersion bug: +' id '5ed62545-a456-572b-86cd-cdbd154ae72f' date '26 August 2016' time '4:41:28 pm' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.146' message 'Add string type check to version save: ensure version info message is a String instance. +' id '5ead0dcb-0838-5a4f-8c0e-af2329e64190' date '26 August 2016' time '3:59:21 pm' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.145' message 'Replace the FileTree Json Parser by the in-image STON parser +' id 'cd5db903-3c71-571a-a3d2-3cf7a5e8a7af' date '3 June 2016' time '2:06:17 pm' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.144' message 'Commented +' id 'c98063f6-b50b-5d43-9d1d-ac28746292e1' date '1 May 2016' time '11:02:38 am' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.143' message 'Better setting definition ' id 'aa52cc78-fd8b-50a4-85dd-d863bb21fd77' date '1 May 2016' time '10:53:22 am' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.142' message 'OSProcess / OSSubprocess accepted as targets ' id '74c2a475-fa37-5492-a748-bd48ce068c0c' date '30 April 2016' time '11:46:50 am' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.141' message 'Error for the -- argument ' id '214a1b8f-119b-5c50-85b3-cb1f1ffa7732' date '28 April 2016' time '7:58:12 pm' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.140' message 'Added caching-aware code for #versionFromPackageName:commit: @@ -141,4 +146,4 @@ ' id '1d04a512-633a-5bc7-9205-7951f969ba10' date '17 November 2015' time '6:42:16 am' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.101' message 'Make default git command Windows-aware ' id '560dd0f7-81db-5910-a46e-3d7710a7a231' date '30 September 2015' time '10:30:49 am' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.100' message 'Correct ProcessWrapper calling code ' id '8c9272f5-0eb7-5482-a5c5-8bc23f44985e' date '30 September 2015' time '8:46:15 am' author 'ThierryGoubier' ancestors ((name 'MonticelloFileTree-Git-ThierryGoubier.97' message 'Lazy version info improvement -' id 'b551ea20-0597-5ec3-9afc-3126a50e9028' date '23 August 2015' time '5:03:26 pm' author 'ThierryGoubier' ancestors ((id 'd6e59cf0-141b-5325-bad3-ed8f2a1f0dec')) stepChildren ())) stepChildren ())) stepChildren ())(id '1061a6c8-6ced-576e-b19c-124f409daf93')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(id 'd5f8d52b-0078-5dda-acdb-2f4b905a4526')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +' id 'b551ea20-0597-5ec3-9afc-3126a50e9028' date '23 August 2015' time '5:03:26 pm' author 'ThierryGoubier' ancestors ((id 'd6e59cf0-141b-5325-bad3-ed8f2a1f0dec')) stepChildren ())) stepChildren ())) stepChildren ())(id '1061a6c8-6ced-576e-b19c-124f409daf93')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(id 'd5f8d52b-0078-5dda-acdb-2f4b905a4526')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file