--- a/.hgtags Fri Aug 09 12:54:44 2013 +0100
+++ b/.hgtags Tue Aug 20 00:07:29 2013 +0100
@@ -43,8 +43,6 @@
c8a7c7f580a85f476ea085979d2dd842e78938d5 expecco_1_7_1rc2
c8a7c7f580a85f476ea085979d2dd842e78938d5 expecco_1_7_1rc3
c8a7c7f580a85f476ea085979d2dd842e78938d5 expecco_1_7_1rc4
-c930d3e0c8d46c73568f7ebfbaf535d148145d95 expecco_2_5_1
-c930d3e0c8d46c73568f7ebfbaf535d148145d95 stable
cc7dd729c2a63686729c206a8f1a31f6e21d8aab expeccoNET_1_5_1rc1
cd22e54333338ca2523c75c747377620600753f4 expecco_1_8_0rc1
cdbd6a3ada7b4d839bc9443cdd0d4807b6618492 expecco_1_7_0rc8
@@ -57,3 +55,5 @@
f5a8ddd00d66842de1b66d65cd2ffde97bc31090 rel2_10_8_5
f8314a9474cf3bd4d5d84837c82c442f9e6f1e48 stable_expecco_sel
f832f7ec6ccffb81a23a346e4df659417fde1264 expecco_1_5_0
+fa6da9d435d53bbe1998e08177cb5dcdd02e109c expecco_2_5_1
+fa6da9d435d53bbe1998e08177cb5dcdd02e109c stable
--- a/CVSSourceCodeManager.st Fri Aug 09 12:54:44 2013 +0100
+++ b/CVSSourceCodeManager.st Tue Aug 20 00:07:29 2013 +0100
@@ -2717,7 +2717,7 @@
|cacheDir cacheSubDir cachedSourceFilename cachedFile cmd fullName revisionArg stream
checkoutName checkoutNameLocal fullTempName fullCachedName tempdir cmdOut
- classFileName cvsRoot tempFile revMsg cacheIt|
+ classFileName cvsRoot revMsg cacheIt|
cacheIt := cacheItArg.
@@ -2818,10 +2818,9 @@
self activityNotification:'Checking out source ' , checkoutName , revMsg.
OperatingSystem isUNIXlike ifTrue:[
"/ can redirect output
- cmdOut := Filename newTemporary.
- cmdOut exists ifTrue:[
- cmdOut remove.
- ].
+ cmdOut := FileStream newTemporary
+ close;
+ fileName.
cmd := 'checkout' , revisionArg , ' ', checkoutName , ' > ' , '"' , cmdOut name, '"' .
] ifFalse:[
cmd := 'checkout' , revisionArg , ' ', checkoutName.
@@ -2830,7 +2829,7 @@
(self
executeCVSCommand:cmd
module:moduleDir
- inDirectory:tempdir name
+ inDirectory:tempdir
) ifFalse:[
('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
@@ -2880,19 +2879,18 @@
] ifFalse:[
self activityNotification:'Not cached - please check your settings.'.
].
- OperatingSystem isUNIXlike ifFalse:[
+
+ OperatingSystem isUNIXlike ifTrue:[
+ stream := fullTempName readStream.
+ ] ifFalse:[
"/ cannot remove files which are still open ...
"/ sigh - need a delete-on-close flag in FileStream.
"/
- tempFile := Filename newTemporary.
- fullTempName copyTo:tempFile.
- stream := tempFile readStream.
- stream notNil ifTrue:[
- stream removeOnClose:true.
- ].
- ] ifTrue:[
- stream := fullTempName readStream.
- ]
+ stream := FileStream newTemporary.
+ fullTempName copyToStream:stream.
+ stream removeOnClose:true.
+ stream reset.
+ ].
].
self releaseAndRemove:tempdir module:moduleDir outputTo:nil.
] ensure:[
@@ -5315,11 +5313,11 @@
!CVSSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.475 2013-08-07 08:30:41 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.476 2013-08-08 11:26:40 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.475 2013-08-07 08:30:41 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.476 2013-08-08 11:26:40 cg Exp $'
!
version_HG
--- a/ChangeSet.st Fri Aug 09 12:54:44 2013 +0100
+++ b/ChangeSet.st Tue Aug 20 00:07:29 2013 +0100
@@ -658,7 +658,6 @@
"Created: / 27.10.1997 / 13:52:54 / cg"
! !
-
!ChangeSet class methodsFor:'Compatibility-VW'!
component: component definition: anObject change: changeSymbol
@@ -735,7 +734,7 @@
[aStream atEnd] whileFalse:[
aStream skipSeparators.
lineNumber := aStream lineNumber.
- pos := aStream position1Based.
+ pos := aStream position + 1.
ProgressNotification notify: nil progress:(100 / size) * pos.
@@ -1237,7 +1236,6 @@
"Created: / 05-12-2009 / 12:32:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet methodsFor:'misc'!
addPatch:nameOfPatch
@@ -1246,7 +1244,6 @@
^ self
! !
-
!ChangeSet methodsFor:'private-accessing'!
addChange:aChange
@@ -1528,46 +1525,49 @@
"Created: / 25-10-2006 / 18:06:55 / cg"
!
-selectClassesForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:aCollectionOfClasses
- "Return the set of classes from a given collection, for which I have changes."
-
+selectClassesForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:aCollectionOfClasses
+ "return the set of classes from a given collection, for which I have changes."
+
|selected alreadyProcessed classes prev|
- classes := (aCollectionOfClasses collect:[:eachClass | eachClass theNonMetaclass]) asArray.
-
- selected := Set new.
- alreadyProcessed := Set new.
+ classes := (aCollectionOfClasses
+ collect:[:eachClass | eachClass theNonMetaclass]) as:IdentitySet.
+
+ selected := IdentitySet new.
+ alreadyProcessed := IdentitySet new.
self do:[:eachChange |
|changeClassName changeClass isIn|
changeClass := eachChange changeClass.
- (changeClass notNil and:[ changeClass ~~ prev ]) ifTrue:[
+ (changeClass notNil and:[changeClass ~~ prev]) ifTrue:[
changeClass := changeClass theNonMetaclass.
(alreadyProcessed includes:changeClass) ifFalse:[
(classes includes:changeClass) ifTrue:[
- selected add: changeClass
+ selected add:changeClass
].
+
"/ Care for private classes. If one of its owningClass
"/ is in the given collection, add **that owningClass** into
- "/ result too!!
+ "/ result too!!!!
+
changeClass isPrivate ifTrue:[
- | owner |
+ |owner|
owner := changeClass owningClass.
- [ owner notNil ] whileTrue:[
+ [owner notNil] whileTrue:[
(classes includes:owner) ifTrue:[
- selected add: owner.
- owner := nil. "/ To terminate the loop
+ selected add:owner.
+ owner := nil.
] ifFalse:[
owner := owner owningClass.
- ]
- ]
+ ].
+ ].
].
- alreadyProcessed add: changeClass
+ alreadyProcessed add: changeClass.
].
prev := changeClass.
- ]
+ ].
].
^ selected.
@@ -2664,7 +2664,7 @@
].
inputStream skipSeparators.
lineNumber := inputStream lineNumber.
- position := inputStream position1Based.
+ position := inputStream position + 1.
methodSource := chunk := inputStream nextChunk.
changes := OrderedCollection new.
@@ -2698,7 +2698,7 @@
inputStream skipSeparators.
lineNumber := inputStream lineNumber.
- position := inputStream position1Based.
+ position := inputStream position + 1.
methodSource := chunk := inputStream nextChunk.
].
^ true
@@ -3849,7 +3849,7 @@
!
version_SVN
- ^ '$Id: ChangeSet.st,v 1.232 2013-07-30 19:42:56 cg Exp $'
+ ^ '$Id: ChangeSet.st,v 1.234 2013-08-10 12:29:04 stefan Exp $'
! !
!ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'instance creation'!
@@ -4443,7 +4443,7 @@
inputStream skipSeparators.
lineNumber := inputStream lineNumber.
- position := inputStream position1Based.
+ position := inputStream position + 1.
methodSource := inputStream nextChunk.
@@ -4514,11 +4514,11 @@
!ChangeSet class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.232 2013-07-30 19:42:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.234 2013-08-10 12:29:04 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.232 2013-07-30 19:42:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.234 2013-08-10 12:29:04 stefan Exp $'
!
version_HG
@@ -4527,6 +4527,6 @@
!
version_SVN
- ^ '$Id: ChangeSet.st,v 1.232 2013-07-30 19:42:56 cg Exp $'
+ ^ '$Id: ChangeSet.st,v 1.234 2013-08-10 12:29:04 stefan Exp $'
! !
--- a/ClassDefinitionChange.st Fri Aug 09 12:54:44 2013 +0100
+++ b/ClassDefinitionChange.st Tue Aug 20 00:07:29 2013 +0100
@@ -628,8 +628,8 @@
cls notNil ifTrue:[
cls isBehavior ifTrue:[
cls package ~= pkg ifTrue:[
-Transcript showCR:('Autoloaded class: %1 not installed (package would change from %2 to %3)'
- bindWith:clsName with:cls package with:pkg).
+Transcript showCR:('Autoloaded class: %1 (%4) not installed (package would change from %2 to %3)'
+ bindWith:clsName with:cls package with:pkg with:aFilenameString).
]
].
].
@@ -716,11 +716,11 @@
!ClassDefinitionChange class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.84 2013-05-15 15:58:10 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.85 2013-08-15 14:08:03 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.84 2013-05-15 15:58:10 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.85 2013-08-15 14:08:03 stefan Exp $'
!
version_HG
@@ -729,6 +729,6 @@
!
version_SVN
- ^ '$Id: ClassDefinitionChange.st,v 1.84 2013-05-15 15:58:10 cg Exp $'
+ ^ '$Id: ClassDefinitionChange.st,v 1.85 2013-08-15 14:08:03 stefan Exp $'
! !
--- a/SourceCodeCache.st Fri Aug 09 12:54:44 2013 +0100
+++ b/SourceCodeCache.st Tue Aug 20 00:07:29 2013 +0100
@@ -105,7 +105,7 @@
cache nextPutAll: (stream next: 4096)
].
].
- stream position0Based: 0.
+ stream position: 0.
].
^stream
@@ -141,11 +141,11 @@
!SourceCodeCache class methodsFor:'documentation'!
version
- ^ '$Header: SourceCodeCache.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeCache.st,v 1.3 2013-08-10 11:25:09 stefan Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeCache.st,v 1.2 2011/12/01 10:52:43 vrany Exp §'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeCache.st,v 1.3 2013-08-10 11:25:09 stefan Exp $'
!
version_HG