class: SourceCodeManagerUtilitiesForContainerBasedManagers
changed:
#checkinBuildSupportFilesForPackage:
#checkinPackage:classes:extensions:buildSupport:askForMethodsInOtherPackages:
--- a/SourceCodeManagerUtilitiesForContainerBasedManagers.st Wed Mar 27 12:59:56 2013 +0100
+++ b/SourceCodeManagerUtilitiesForContainerBasedManagers.st Wed Mar 27 13:00:15 2013 +0100
@@ -42,7 +42,8 @@
mgr := self sourceCodeManagerFor: packageID.
defClass := ProjectDefinition definitionClassForPackage: packageID.
- defClass validateDescription.
+ "/ already done elsewhere now
+ "/ defClass validateDescription.
anyFailure := false.
@@ -503,7 +504,9 @@
looseMethods := IdentitySet new.
"/ classes ...
- classes do:[:aClass | |owner classPackage|
+ classes do:[:aClass |
+ |owner classPackage|
+
(owner := aClass owningClass) notNil ifTrue:[
classPackage := aClass topOwningClass package
] ifFalse:[
@@ -556,7 +559,8 @@
with:packageToCheckIn allBold
with:classesInChangeSet size)
initialAnswer:nil
- withQuickOption:(classesToCheckIn size > 0).
+ withQuickOption:(classesToCheckIn size > 0)
+ withValidateConsistencyOption:true.
checkinInfo isNil ifTrue:[
^ self.
].
@@ -594,12 +598,17 @@
with:packageToCheckIn allBold
with:classesInChangeSet size)
initialAnswer:nil
- withQuickOption:(classesToCheckIn size > 0).
+ withQuickOption:(classesToCheckIn size > 0)
+ withValidateConsistencyOption:true.
checkinInfo isNil ifTrue:[
^ self.
].
].
+ checkinInfo validateConsistency ifTrue:[
+ self validateConsistencyOfPackage:packageToCheckIn.
+ ].
+
checkinInfo quickCheckIn ifTrue:[
(checkinInfo isStable or:[checkinInfo tagIt]) ifTrue:[
classesToTag := classesToCheckIn.
@@ -710,10 +719,10 @@
!SourceCodeManagerUtilitiesForContainerBasedManagers class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.4 2013-03-22 13:30:43 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.5 2013-03-27 12:00:15 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.4 2013-03-22 13:30:43 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.5 2013-03-27 12:00:15 cg Exp $'
! !