Fix in ChangeSet>>#forPackage:ignoreAutoloaded: - ignore non-Smalltalk classes and methods.
ChangeSet cannot handle them (yet?)
--- a/ChangeSet.st Thu Jul 31 10:49:55 2014 +0200
+++ b/ChangeSet.st Thu Jul 31 10:53:23 2014 +0200
@@ -394,21 +394,23 @@
"Modified: / 17-09-2011 / 10:26:03 / cg"
!
-forPackage: package
-
- ^self forPackage: package ignoreAutoloaded: false.
+forPackage: pkg
+
+ ^self forPackage: pkg ignoreAutoloaded: false.
"Created: / 20-05-2008 / 17:56:18 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 12-08-2009 / 14:23:15 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
-forPackage: package ignoreAutoloaded: ignoreAutoloaded
+forPackage: pkg ignoreAutoloaded: ignoreAutoloaded
"build a changeSet for a given package"
|changeSet packageClasses packageExtensions|
- packageClasses := ProjectDefinition searchForClassesWithProject: package.
- packageExtensions := ProjectDefinition searchForExtensionsWithProject: package.
+ packageClasses := ProjectDefinition searchForClassesWithProject: pkg.
+ packageClasses := packageClasses select:[:each | each programmingLanguage isSmalltalk ].
+ packageExtensions := ProjectDefinition searchForExtensionsWithProject: pkg.
+ packageExtensions := packageExtensions select:[:each | each programmingLanguage isSmalltalk ].
changeSet := self forExistingMethods: packageExtensions.
packageClasses do:[:cls|
(ignoreAutoloaded not and:[cls isLoaded not]) ifTrue:[cls autoload].
@@ -416,11 +418,11 @@
changeSet addAll: (self forExistingClass:cls withExtensions:false)
]
].
- changeSet name: 'Package ' , package.
+ changeSet name: 'Package ' , pkg.
^changeSet
"Created: / 12-08-2009 / 14:22:44 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 16-03-2012 / 15:37:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 31-07-2014 / 09:51:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
fromDiffSet:aDiffSet
@@ -3981,7 +3983,7 @@
!
version_SVN
- ^ '$Id: ChangeSet.st,v 1.246 2014-07-16 12:35:18 cg Exp $'
+ ^ '$Id: ChangeSet.st,v 1.247 2014-07-31 08:53:23 vrany Exp $'
! !
!ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'instance creation'!
@@ -4660,11 +4662,11 @@
!ChangeSet class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.246 2014-07-16 12:35:18 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.247 2014-07-31 08:53:23 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.246 2014-07-16 12:35:18 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.247 2014-07-31 08:53:23 vrany Exp $'
!
version_HG
@@ -4673,6 +4675,6 @@
!
version_SVN
- ^ '$Id: ChangeSet.st,v 1.246 2014-07-16 12:35:18 cg Exp $'
+ ^ '$Id: ChangeSet.st,v 1.247 2014-07-31 08:53:23 vrany Exp $'
! !