--- a/AbstractSourceCodeManager.st Thu Sep 27 10:24:03 2012 +0100
+++ b/AbstractSourceCodeManager.st Thu Sep 27 20:37:25 2012 +0100
@@ -1141,8 +1141,8 @@
!
pathInRepositoryFrom:containerPath forPackage:packageID
- "this tries to extract the path within a repository, given some path
- as present in an RCS Header string.
+ "this tries to extract the path within a repository,
+ given some path as present in an RCS Header string.
Typically, this ought to be that string directly;
however, if the repository directory is accessed via a symbolic link during
ci/co, some systems extract different strings with co.
@@ -1200,6 +1200,7 @@
"Created: / 25-11-1995 / 18:42:20 / cg"
"Modified: / 21-06-2006 / 12:06:14 / cg"
+ "Modified (comment): / 24-09-2012 / 11:10:50 / cg"
!
postCheckInClass:aClass
@@ -3774,15 +3775,15 @@
!AbstractSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Id: AbstractSourceCodeManager.st 1969 2012-09-27 09:24:03Z vranyj1 $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.299 2012/09/26 18:29:58 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.296 2012/07/27 10:37:04 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.299 2012/09/26 18:29:58 cg Exp §'
!
version_SVN
- ^ '$Id: AbstractSourceCodeManager.st 1969 2012-09-27 09:24:03Z vranyj1 $'
+ ^ '$Id: AbstractSourceCodeManager.st 1971 2012-09-27 19:37:25Z vranyj1 $'
! !
AbstractSourceCodeManager initialize!
--- a/CVSSourceCodeManager.st Thu Sep 27 10:24:03 2012 +0100
+++ b/CVSSourceCodeManager.st Thu Sep 27 20:37:25 2012 +0100
@@ -378,7 +378,7 @@
cvsTmpDirectory
"return the name of the tmp repository.
That's the directory, where temporary files are created for checkin/checkout.
- If nil, the systems default tempDirectory is used."
+ If nil, the system's default tempDirectory is used."
^ (CVSTempDir ? Filename tempDirectory pathName)
@@ -386,17 +386,17 @@
CVSTempDir := nil
"
- "Modified (comment): / 14-01-2012 / 20:54:06 / cg"
+ "Modified (comment): / 24-09-2012 / 11:09:38 / cg"
!
cvsTmpDirectory:aPathNameString
"set the name of the tmp repository.
That's the directory, where temporary files are created for checkin/checkout.
- If nil, the systems default tempDirectory is used."
+ If nil, the system's default tempDirectory is used."
CVSTempDir := aPathNameString
- "Modified (comment): / 14-01-2012 / 20:54:11 / cg"
+ "Modified (comment): / 24-09-2012 / 11:09:34 / cg"
!
knownModules
@@ -2039,7 +2039,7 @@
^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMsg force:force.
].
].
- (Dialog confirm:('There seems to be no source container for "%1"\(Either the source container was removed, or your per-module repository setting is wrong).\\Proceed?' bindWith:cls name allBold) withCRs)
+ (Dialog confirm:('There seems to be no source container for "%1"\(Either the source container was removed,\or your per-module repository setting is wrong,\or the CVS server is unreachable).\\Proceed?' bindWith:cls name allBold) withCRs)
ifFalse:[
tempdir recursiveRemove.
^ false
@@ -2575,7 +2575,7 @@
"Created: / 11-09-1996 / 16:16:11 / cg"
"Modified: / 26-02-1998 / 17:34:16 / stefan"
- "Modified: / 05-08-2012 / 19:27:04 / cg"
+ "Modified: / 11-09-2012 / 18:43:38 / cg"
!
checkoutModule:aModule directory:aPackage andDo:aBlock
@@ -5076,15 +5076,15 @@
!CVSSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.437 2012/08/06 05:58:37 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.439 2012/09/26 16:33:08 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.437 2012/08/06 05:58:37 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.439 2012/09/26 16:33:08 cg Exp §'
!
version_SVN
- ^ '$Id: CVSSourceCodeManager.st 1957 2012-09-05 11:45:38Z vranyj1 $'
+ ^ '$Id: CVSSourceCodeManager.st 1971 2012-09-27 19:37:25Z vranyj1 $'
! !
CVSSourceCodeManager initialize!
--- a/ChangeSet.st Thu Sep 27 10:24:03 2012 +0100
+++ b/ChangeSet.st Thu Sep 27 20:37:25 2012 +0100
@@ -553,7 +553,6 @@
"Created: / 27.10.1997 / 13:52:54 / cg"
! !
-
!ChangeSet class methodsFor:'Compatibility-VW'!
component: component definition: anObject change: changeSymbol
@@ -708,12 +707,6 @@
"Modified: / 31-07-2012 / 15:37:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-!ChangeSet class methodsFor:'others'!
-
-version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.197 2012/08/13 14:22:06 stefan Exp §'
-! !
-
!ChangeSet class methodsFor:'queries'!
current
@@ -1111,7 +1104,6 @@
"Created: / 05-12-2009 / 12:32:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet methodsFor:'misc'!
addPatch:nameOfPatch
@@ -1120,7 +1112,6 @@
^ self
! !
-
!ChangeSet methodsFor:'private-accessing'!
addChange:aChange
@@ -1395,7 +1386,10 @@
"Created: / 25-10-2006 / 18:06:55 / cg"
!
-selectForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:aCollectionOfClasses
+selectClassesForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:aCollectionOfClasses
+ "return the set of classes from a given collection, for which I have changes.
+ Returns a collection of classes"
+
|selected alreadyProcessed classes prev|
classes := aCollectionOfClasses collect:[:eachClass | eachClass theNonMetaclass] as:Array.
@@ -1425,6 +1419,37 @@
].
^ selected.
+ "Created: / 04-09-2012 / 14:01:37 / cg"
+!
+
+selectForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:aCollectionOfClasses
+ "select changes for one of a given class.
+ Returns a collection of changes"
+
+ |selected classes |
+
+ classes := aCollectionOfClasses collect:[:eachClass | eachClass theNonMetaclass] as:Array.
+
+ selected := ChangeSet new.
+
+ self do:[:eachChange |
+ |changeClassName changeClass isIn|
+
+ changeClass := eachChange changeClass.
+ (changeClass notNil) ifTrue:[
+ changeClass := changeClass theNonMetaclass.
+ ((classes includes:changeClass)
+ or: [
+ changeClass isPrivate
+ and: [ (classes includes:changeClass owningClass) ]
+ ]
+ ) ifTrue:[
+ selected add: eachChange
+ ].
+ ]
+ ].
+ ^ selected.
+
"Created: / 08-09-2011 / 04:38:32 / cg"
! !
@@ -3461,7 +3486,7 @@
!
version_SVN
- ^ '$Id:: ChangeSet.st 1959 2012-09-05 15:46:10Z vranyj1 $'
+ ^ '$Id:: ChangeSet.st 1971 2012-09-27 19:37:25Z vranyj1 $'
! !
!ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'instance creation'!
@@ -3850,6 +3875,22 @@
!ChangeSet::DiffSet methodsFor:'queries'!
+changedClasses
+ |allChangedClasses|
+
+ allChangedClasses := Set new.
+ allChangedClasses addAll:(onlyInArg changedClasses).
+ allChangedClasses addAll:(onlyInReceiver changedClasses).
+ changed do:[:eachChangePair |
+ allChangedClasses add:(eachChangePair first changeClass).
+ allChangedClasses add:(eachChangePair second changeClass).
+ ].
+ allChangedClasses remove:nil ifAbsent:[].
+ ^ allChangedClasses
+
+ "Created: / 26-09-2012 / 15:39:18 / cg"
+!
+
isEmpty
^ changed isEmpty
and:[ onlyInReceiver isEmpty
@@ -4118,9 +4159,13 @@
!ChangeSet class methodsFor:'documentation'!
version
- ^ '$Id: ChangeSet.st 1959 2012-09-05 15:46:10Z vranyj1 $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.200 2012/09/26 16:34:02 cg Exp $'
+!
+
+version_CVS
+ ^ '§Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.200 2012/09/26 16:34:02 cg Exp §'
!
version_SVN
- ^ '$Id: ChangeSet.st 1959 2012-09-05 15:46:10Z vranyj1 $'
+ ^ '$Id: ChangeSet.st 1971 2012-09-27 19:37:25Z vranyj1 $'
! !
--- a/GitSourceCodeManager.st Thu Sep 27 10:24:03 2012 +0100
+++ b/GitSourceCodeManager.st Thu Sep 27 20:37:25 2012 +0100
@@ -222,7 +222,7 @@
gitTmpDirectory
"return the name of the tmp repository.
That's the directory, where temporary files are created for checkin/checkout.
- If nil, the systems default tempDirectory is used."
+ If nil, the system's default tempDirectory is used."
^ (GitTempDir ? Filename tempDirectory pathName)
@@ -236,7 +236,7 @@
gitTmpDirectory:aPathNameString
"set the name of the tmp repository.
That's the directory, where temporary files are created for checkin/checkout.
- If nil, the systems default tempDirectory is used."
+ If nil, the system's default tempDirectory is used."
GitTempDir := aPathNameString
@@ -652,15 +652,15 @@
!GitSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/GitSourceCodeManager.st,v 1.6 2012/07/25 23:31:16 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/GitSourceCodeManager.st,v 1.7 2012/09/26 16:32:44 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic3/GitSourceCodeManager.st,v 1.6 2012/07/25 23:31:16 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic3/GitSourceCodeManager.st,v 1.7 2012/09/26 16:32:44 cg Exp §'
!
version_SVN
- ^ '$Id:: GitSourceCodeManager.st 1940 2012-07-26 15:09:40Z vranyj1 $'
+ ^ '$Id:: GitSourceCodeManager.st 1971 2012-09-27 19:37:25Z vranyj1 $'
! !
GitSourceCodeManager initialize!
--- a/MercurialSourceCodeManager.st Thu Sep 27 10:24:03 2012 +0100
+++ b/MercurialSourceCodeManager.st Thu Sep 27 20:37:25 2012 +0100
@@ -178,7 +178,7 @@
hgTmpDirectory
"return the name of the tmp repository.
That's the directory, where temporary files are created for checkin/checkout.
- If nil, the systems default tempDirectory is used."
+ If nil, the system's default tempDirectory is used."
^ (HGTempDir ? Filename tempDirectory pathName)
@@ -192,7 +192,7 @@
hgTmpDirectory:aPathNameString
"set the name of the tmp repository.
That's the directory, where temporary files are created for checkin/checkout.
- If nil, the systems default tempDirectory is used."
+ If nil, the system's default tempDirectory is used."
HGTempDir := aPathNameString
@@ -417,15 +417,15 @@
!MercurialSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/MercurialSourceCodeManager.st,v 1.5 2012/03/20 18:06:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/MercurialSourceCodeManager.st,v 1.6 2012/09/26 16:32:23 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic3/MercurialSourceCodeManager.st,v 1.5 2012/03/20 18:06:01 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic3/MercurialSourceCodeManager.st,v 1.6 2012/09/26 16:32:23 cg Exp §'
!
version_SVN
- ^ '$Id: MercurialSourceCodeManager.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+ ^ '$Id: MercurialSourceCodeManager.st 1971 2012-09-27 19:37:25Z vranyj1 $'
! !
MercurialSourceCodeManager initialize!
--- a/PerforceSourceCodeManager.st Thu Sep 27 10:24:03 2012 +0100
+++ b/PerforceSourceCodeManager.st Thu Sep 27 20:37:25 2012 +0100
@@ -1363,7 +1363,7 @@
perforceTmpDirectory
"return the name of the tmp repository.
That's the directory, where temporary files are created for checkin/checkout.
- If nil, the systems default tempDirectory is used."
+ If nil, the system's default tempDirectory is used."
^ (PerforceTempDir ? Filename tempDirectory pathName)
@@ -1371,7 +1371,7 @@
PerforceTempDir := nil
"
- "Modified (comment): / 14-01-2012 / 20:54:29 / cg"
+ "Modified (comment): / 24-09-2012 / 11:09:26 / cg"
!
removeWorkSpaceForSettings:settingsString
@@ -1881,7 +1881,7 @@
Timestamp now printOn:s format:'%h-%m-%s.%i'.
versionInfo time:s contents.
PerforceVersionInfo fromRCSString:versionInfo getVersionString.
- PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.27 2012/07/24 07:42:22 cg Exp $'
+ PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.28 2012/09/26 16:32:02 cg Exp $'
"
"Modified: / 01-06-2012 / 13:32:40 / cg"
@@ -1982,13 +1982,13 @@
!PerforceSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.27 2012/07/24 07:42:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.28 2012/09/26 16:32:02 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.27 2012/07/24 07:42:22 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.28 2012/09/26 16:32:02 cg Exp §'
!
version_SVN
- ^ '$Id: PerforceSourceCodeManager.st 1937 2012-07-25 08:46:08Z vranyj1 $'
+ ^ '$Id: PerforceSourceCodeManager.st 1971 2012-09-27 19:37:25Z vranyj1 $'
! !
--- a/ProjectChecker.st Thu Sep 27 10:24:03 2012 +0100
+++ b/ProjectChecker.st Thu Sep 27 20:37:25 2012 +0100
@@ -93,6 +93,12 @@
"Created: / 11-01-2012 / 16:46:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!ProjectChecker class methodsFor:'others'!
+
+version_CVS
+ ^ '§Header: /cvs/stx/stx/libbasic3/ProjectChecker.st,v 1.8 2012/09/18 00:10:30 vrany Exp §'
+! !
+
!ProjectChecker methodsFor:'accessing'!
classes: aCollection
@@ -557,13 +563,9 @@
!ProjectChecker class methodsFor:'documentation'!
version
- ^ '$Id: ProjectChecker.st 1967 2012-09-18 00:10:00Z vranyj1 $'
-!
-
-version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic3/ProjectChecker.st,v 1.8 2012-09-18 01:10:30 +0100 vrany Exp §'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ProjectChecker.st,v 1.8 2012/09/18 00:10:30 vrany Exp $'
!
version_SVN
- ^ '$Id:: ProjectChecker.st 1967 2012-09-18 00:10:00Z vranyj1 $'
+ ^ '$Id: ProjectChecker.st 1971 2012-09-27 19:37:25Z vranyj1 $'
! !
--- a/ProjectProblem.st Thu Sep 27 10:24:03 2012 +0100
+++ b/ProjectProblem.st Thu Sep 27 20:37:25 2012 +0100
@@ -1190,9 +1190,9 @@
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/ProjectProblem.st,v 1.5 2012/09/13 17:30:14 vrany Exp $'
+ ^ '§Header: /cvs/stx/stx/libbasic3/ProjectProblem.st,v 1.5 2012/09/13 17:30:14 vrany Exp §'
!
version_SVN
- ^ '§Id: ProjectProblem.st 1962 2012-09-10 10:34:08Z vranyj1 §'
+ ^ '$Id: ProjectProblem.st 1971 2012-09-27 19:37:25Z vranyj1 $'
! !
--- a/SourceCodeManagerUtilities.st Thu Sep 27 10:24:03 2012 +0100
+++ b/SourceCodeManagerUtilities.st Thu Sep 27 20:37:25 2012 +0100
@@ -3699,32 +3699,32 @@
"/ a helper function
printSelectors :=
- [:what :selectors |
- initialLogStream
- nextPutAll:(what,':').
- selectors size < 5 ifTrue:[
- selectors size == 1 ifTrue:[
- initialLogStream
- print: ' #';
- print: (selectors first);
- cr.
- ] ifFalse:[
- initialLogStream cr.
- selectors asSortedCollection do:[:sel | initialLogStream tab; nextPutAll:'#'; nextPutLine:sel].
- ]
- ] ifFalse:[
- initialLogStream
- print: (selectors size);
- print: ' methods';
- cr.
- ].
- ].
+ [:what :selectors |
+ initialLogStream
+ nextPutAll:(what,':').
+ selectors size < 5 ifTrue:[
+ selectors size == 1 ifTrue:[
+ initialLogStream
+ print: ' #';
+ print: (selectors first);
+ cr.
+ ] ifFalse:[
+ initialLogStream cr.
+ selectors asSortedCollection do:[:sel | initialLogStream tab; nextPutAll:'#'; nextPutLine:sel].
+ ]
+ ] ifFalse:[
+ initialLogStream
+ print: (selectors size);
+ print: ' methods';
+ cr.
+ ].
+ ].
classChanges := ChangeSet current select:[:aChange | aChange isClassChange].
changesForThisClass := classChanges
- select:[:aChange | aChange className = aClass theNonMetaclass name
- or:[aChange className = aClass theMetaclass name] ].
+ select:[:aChange | aChange className = aClass theNonMetaclass name
+ or:[aChange className = aClass theMetaclass name] ].
definitionChangesForThisClass := changesForThisClass select:[:aChange | aChange isMethodChange not].
categoryChanges := changesForThisClass select:[:aChange | aChange isMethodCategoryChange].
@@ -3732,93 +3732,93 @@
allMethodChangesForThisClass := changesForThisClass select:[:aChange | aChange isMethodCodeChange].
selectorsInChangeSet := allMethodChangesForThisClass collect:[:aChange | aChange changeSelector] as:Set.
methodChangesForThisClass := selectorsInChangeSet collect:[:eachSelector |
- allMethodChangesForThisClass detectLast:[:change | change changeSelector = eachSelector]] as:OrderedCollection.
+ allMethodChangesForThisClass detectLast:[:change | change changeSelector = eachSelector]] as:OrderedCollection.
modifiedMethodsForThisClass := methodChangesForThisClass
- select:[:aChange | aChange previousVersion notNil].
+ select:[:aChange | aChange previousVersion notNil].
modifiedSelectors := modifiedMethodsForThisClass collect:[:aChange | aChange changeSelector] as:Set.
newMethodsForThisClass := allMethodChangesForThisClass
- select:[:aChange | aChange previousVersion isNil].
+ select:[:aChange | aChange previousVersion isNil].
newSelectors := newMethodsForThisClass collect:[:aChange | aChange changeSelector] as:Set.
removedMethodsForThisClass := allMethodChangesForThisClass
- select:[:aChange | aChange isMethodRemoveChange].
+ select:[:aChange | aChange isMethodRemoveChange].
removedSelectors := removedMethodsForThisClass collect:[:aChange | aChange changeSelector] as:Set.
initialLogStream := '' writeStream.
"/ definition?
"/ suppress definition-message if initial checkin
(aClass package isNil or:[aClass revision isNil]) ifFalse:[
- definitionChangesForThisClass notEmpty ifTrue:[
- initialLogStream
- print:'class definition'; cr.
- ].
+ definitionChangesForThisClass notEmpty ifTrue:[
+ initialLogStream
+ print:'class definition'; cr.
+ ].
].
"/ added selectors?
newSelectors notEmpty ifTrue:[
- printSelectors value:'added' value:newSelectors.
+ printSelectors value:'added' value:newSelectors.
].
modifiedSelectors removeAllFoundIn:newSelectors.
categoryChangeSelectors removeAllFoundIn:newSelectors.
"/ removed selectors?
removedSelectors notEmpty ifTrue:[
- printSelectors value:'removed' value:removedSelectors.
+ printSelectors value:'removed' value:removedSelectors.
].
modifiedSelectors removeAllFoundIn:removedSelectors.
categoryChangeSelectors removeAllFoundIn:removedSelectors.
"/ modifications?
modifiedSelectors notEmpty ifTrue:[
- selectorsWithCommentOrFormattingChangeOnly := Set new.
- selectorsWithVariableChangeOnly := Set new.
-
- "/ cehck for format/comment change
- RBParser notNil ifTrue:[
- modifiedSelectors do:[:eachSelector |
- |oldest newest oldMethod newMethod oldTree newTree variableMapping|
-
- (newSelectors includes:eachSelector) ifFalse:[
- oldest := allMethodChangesForThisClass detect:[:change | change changeSelector = eachSelector].
- newest := allMethodChangesForThisClass detectLast:[:change | change changeSelector = eachSelector].
-
- oldest := oldest previousVersion notNil ifTrue:[oldest previousVersion] ifFalse:[oldest].
-
- oldTree := RBParser parseMethod:oldest source onError:[:aString :pos | nil].
- newTree := RBParser parseMethod:newest source onError:[:aString :pos | nil].
- (oldTree notNil and:[newTree notNil]) ifTrue:[
- variableMapping := Dictionary new.
- (oldTree equalTo:newTree withMapping: variableMapping) ifTrue:[
- (variableMapping at:'self' ifAbsent:nil) = 'self' ifTrue:[
- ((variableMapping associations count:[:assoc | assoc key ~= assoc value]) == 0) ifTrue:[
- selectorsWithCommentOrFormattingChangeOnly add:eachSelector.
- ] ifFalse:[
- selectorsWithVariableChangeOnly add:eachSelector.
- ].
- ].
- ].
- ].
- ]
- ].
- ].
-
- modifiedSelectors removeAllFoundIn:selectorsWithCommentOrFormattingChangeOnly.
- modifiedSelectors removeAllFoundIn:selectorsWithVariableChangeOnly.
-
- (selectorsWithCommentOrFormattingChangeOnly notEmpty) ifTrue:[
- printSelectors value:'comment/format in' value:selectorsWithCommentOrFormattingChangeOnly.
- ].
- (selectorsWithVariableChangeOnly notEmpty) ifTrue:[
- printSelectors value:'variable renamed in' value:selectorsWithVariableChangeOnly.
- ].
- (modifiedSelectors notEmpty) ifTrue:[
- printSelectors value:'changed' value:modifiedSelectors.
- ].
+ selectorsWithCommentOrFormattingChangeOnly := Set new.
+ selectorsWithVariableChangeOnly := Set new.
+
+ "/ cehck for format/comment change
+ RBParser notNil ifTrue:[
+ modifiedSelectors do:[:eachSelector |
+ |oldest newest oldMethod newMethod oldTree newTree variableMapping|
+
+ (newSelectors includes:eachSelector) ifFalse:[
+ oldest := allMethodChangesForThisClass detect:[:change | change changeSelector = eachSelector].
+ newest := allMethodChangesForThisClass detectLast:[:change | change changeSelector = eachSelector].
+
+ oldest := oldest previousVersion notNil ifTrue:[oldest previousVersion] ifFalse:[oldest].
+
+ oldTree := RBParser parseMethod:oldest source onError:[:aString :pos | nil].
+ newTree := RBParser parseMethod:newest source onError:[:aString :pos | nil].
+ (oldTree notNil and:[newTree notNil]) ifTrue:[
+ variableMapping := Dictionary new.
+ (oldTree equalTo:newTree withMapping: variableMapping) ifTrue:[
+ (variableMapping at:'self' ifAbsent:nil) = 'self' ifTrue:[
+ ((variableMapping associations count:[:assoc | assoc key ~= assoc value]) == 0) ifTrue:[
+ selectorsWithCommentOrFormattingChangeOnly add:eachSelector.
+ ] ifFalse:[
+ selectorsWithVariableChangeOnly add:eachSelector.
+ ].
+ ].
+ ].
+ ].
+ ]
+ ].
+ ].
+
+ modifiedSelectors removeAllFoundIn:selectorsWithCommentOrFormattingChangeOnly.
+ modifiedSelectors removeAllFoundIn:selectorsWithVariableChangeOnly.
+
+ (selectorsWithCommentOrFormattingChangeOnly notEmpty) ifTrue:[
+ printSelectors value:'comment/format in' value:selectorsWithCommentOrFormattingChangeOnly.
+ ].
+ (selectorsWithVariableChangeOnly notEmpty) ifTrue:[
+ printSelectors value:'variable renamed in' value:selectorsWithVariableChangeOnly.
+ ].
+ (modifiedSelectors notEmpty) ifTrue:[
+ printSelectors value:'changed' value:modifiedSelectors.
+ ].
].
categoryChanges notEmpty ifTrue:[
- printSelectors value:'category of' value:categoryChangeSelectors.
+ printSelectors value:'category of' value:categoryChangeSelectors.
].
^ initialLogStream contents
@@ -3865,13 +3865,13 @@
!SourceCodeManagerUtilities class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.255 2012/08/13 14:22:38 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.256 2012/09/26 16:33:42 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.255 2012/08/13 14:22:38 stefan Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.256 2012/09/26 16:33:42 cg Exp §'
!
version_SVN
- ^ '$Id: SourceCodeManagerUtilities.st 1957 2012-09-05 11:45:38Z vranyj1 $'
+ ^ '$Id: SourceCodeManagerUtilities.st 1971 2012-09-27 19:37:25Z vranyj1 $'
! !
--- a/SourceCodeManagerUtilitiesForContainerBasedManagers.st Thu Sep 27 10:24:03 2012 +0100
+++ b/SourceCodeManagerUtilitiesForContainerBasedManagers.st Thu Sep 27 20:37:25 2012 +0100
@@ -518,7 +518,7 @@
"/ cg: O(n^2) algorithm
"/ classesInChangeSet := classesToCheckIn select:[:cls | cls hasUnsavedChanges].
"/ replaced by: O(n) algorithm
- classesInChangeSet := ChangeSet current selectForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:classesToCheckIn.
+ classesInChangeSet := ChangeSet current selectClassesForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:classesToCheckIn.
"/ individual methods ...
classes do:[:aClass |
@@ -704,20 +704,20 @@
self checkinBuildSupportFilesForPackage:packageToCheckIn
].
- "Modified: / 08-09-2011 / 04:42:38 / cg"
"Created: / 13-10-2011 / 11:15:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 04-09-2012 / 14:05:36 / cg"
! !
!SourceCodeManagerUtilitiesForContainerBasedManagers class methodsFor:'documentation'!
version
- ^ '$Id: SourceCodeManagerUtilitiesForContainerBasedManagers.st 1942 2012-07-27 14:53:23Z vranyj1 $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.2 2012/09/04 12:09:12 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.1 2012/07/25 23:29:44 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.2 2012/09/04 12:09:12 cg Exp §'
!
version_SVN
- ^ '$Id:: SourceCodeManagerUtilitiesForContainerBasedManagers.st 1942 2012-07-27 14:53:23Z vranyj1 $'
+ ^ '$Id:: SourceCodeManagerUtilitiesForContainerBasedManagers.st 1971 2012-09-27 19:37:25Z vranyj1 $'
! !
--- a/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st Thu Sep 27 10:24:03 2012 +0100
+++ b/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st Thu Sep 27 20:37:25 2012 +0100
@@ -46,8 +46,7 @@
repos := (mgr repositoryNameForPackage:packageToCheckIn) ifNil:[mgr repositoryName].
- "/ clear package directory in the repository (so we get rid of removed files)
- pkgDir := packageToCheckIn asPackageId pathRelativeToTopDirectory:repos.
+ pkgDir := packageToCheckIn asPackageId pathRelativeToTopDirectory:(mgr workDirectory).
pkgDir recursiveMakeDirectory.
"/ containerFileName := self nameOfExtensionsContainer.
@@ -61,7 +60,7 @@
"/ cg: O(n^2) algorithm
"/ classesInChangeSet := classesToCheckIn select:[:cls | cls hasUnsavedChanges].
"/ replaced by: O(n) algorithm
- classesInChangeSet := ChangeSet current selectForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:classesToCheckIn.
+ classesInChangeSet := ChangeSet current selectClassesForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:classesToCheckIn.
"/ individual methods ...
Smalltalk allClassesDo:[:aClass |
@@ -208,19 +207,19 @@
mgr commitRepository:repos logMessage:checkinInfo logMessage.
"Created: / 13-10-2011 / 11:15:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 25-07-2012 / 23:15:47 / cg"
+ "Modified: / 24-09-2012 / 11:13:04 / cg"
! !
!SourceCodeManagerUtilitiesForWorkspaceBasedManagers class methodsFor:'documentation'!
version
- ^ '$Id: SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st 1942 2012-07-27 14:53:23Z vranyj1 $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st,v 1.3 2012/09/26 16:17:41 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st,v 1.1 2012/07/25 23:30:21 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st,v 1.3 2012/09/26 16:17:41 cg Exp §'
!
version_SVN
- ^ '$Id:: SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st 1942 2012-07-27 14:53:23Z vranyj1 $'
+ ^ '$Id:: SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st 1971 2012-09-27 19:37:25Z vranyj1 $'
! !
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lccmake.bat Thu Sep 27 20:37:25 2012 +0100
@@ -0,0 +1,8 @@
+@REM -------
+@REM make using lcc compiler
+@REM type lccmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+make.exe -N -f bc.mak USELCC=1 %*
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mingwmake.bat Thu Sep 27 20:37:25 2012 +0100
@@ -0,0 +1,6 @@
+@REM -------
+@REM make using mingw compiler
+@REM type mingwmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+make.exe -N -f bc.mak USEMINGW=1 %1 %2