--- a/SourceCodeManagerUtilities.st Sun Mar 01 02:10:03 2015 +0100
+++ b/SourceCodeManagerUtilities.st Sun Mar 01 14:18:10 2015 +0100
@@ -1367,9 +1367,9 @@
"Modified: / 21-12-2011 / 18:24:47 / cg"
!
-checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClassesHolder usingManager:aManagerOrNil
+checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder usingManager:aManagerOrNil
"check a bunch of classes into the source repository.
- If the argument, aLogInfoOrStringNil isNil, ask interactively for log-message."
+ If the argument, aLogInfoOrStringOrNil isNil, ask interactively for log-message."
|classes allClasses checkinInfoOrString yesOrNoToAll unchangedClasses|
@@ -1386,22 +1386,22 @@
].
classes size == 1 ifTrue:[
- ^ self checkinClass:classes first withInfo:aLogInfoOrStringNil withCheck:doCheckClassesHolder usingManager:aManagerOrNil.
+ ^ self checkinClass:classes first withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder usingManager:aManagerOrNil.
].
"ask once, for all classes"
- aLogInfoOrStringNil isNil ifTrue:[
+ aLogInfoOrStringOrNil isNil ifTrue:[
checkinInfoOrString := self
getCheckinInfoFor:(resources string:'%1 classes to checkin' with:aCollectionOfClasses size)
initialAnswer:nil
withQuickOption:true.
checkinInfoOrString isNil ifTrue:[^ self].
] ifFalse:[
- checkinInfoOrString := aLogInfoOrStringNil.
+ checkinInfoOrString := aLogInfoOrStringOrNil.
].
allClasses := classes.
- checkinInfoOrString quickCheckIn ifTrue:[
+ (checkinInfoOrString isString not and:[checkinInfoOrString quickCheckIn]) ifTrue:[
"/ not only the one's in the changeSet;
"/ also those which have not been checked in before.
classes := classes select:[:each | each hasUnsavedChanges or:[ (each revisionOfManager:aManagerOrNil) isNil ]].
@@ -1438,7 +1438,7 @@
].
].
- (checkinInfoOrString isStable or:[checkinInfoOrString tagIt])
+ (checkinInfoOrString isString not and:[ (checkinInfoOrString isStable or:[checkinInfoOrString tagIt]) ])
ifTrue:[
"/mhmh - but tag should be set on all (even unchanged ones)
"/ the other onces have already been tagged
@@ -4325,10 +4325,10 @@
!SourceCodeManagerUtilities class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.318 2015-02-28 23:41:31 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.319 2015-03-01 13:18:10 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.318 2015-02-28 23:41:31 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.319 2015-03-01 13:18:10 cg Exp $'
! !