equal
deleted
inserted
replaced
491 |
491 |
492 "Modified: / 25-07-2012 / 18:38:40 / cg" |
492 "Modified: / 25-07-2012 / 18:38:40 / cg" |
493 ! |
493 ! |
494 |
494 |
495 checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages |
495 checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages |
496 |mgr classesToCheckIn methodsToCheckIn |
496 |mgr classesToCheckIn methodsToCheckIn methodsInPrjDef |
497 methodsInOtherPackages looseMethods otherPackages |
497 methodsInOtherPackages looseMethods otherPackages |
498 msg classesInChangeSet newClasses checkinInfo originalCheckinInfo classesToTag| |
498 msg classesInChangeSet newClasses checkinInfo originalCheckinInfo classesToTag| |
499 |
499 |
500 mgr := self sourceCodeManagerFor: packageToCheckIn. |
500 mgr := self sourceCodeManagerFor: packageToCheckIn. |
501 |
501 |
565 ^ self. |
565 ^ self. |
566 ]. |
566 ]. |
567 |
567 |
568 checkinInfo validateConsistency ifTrue:[ |
568 checkinInfo validateConsistency ifTrue:[ |
569 self validateConsistencyOfPackage:packageToCheckIn doClasses:doClasses doExtensions:doExtensions. |
569 self validateConsistencyOfPackage:packageToCheckIn doClasses:doClasses doExtensions:doExtensions. |
570 "/ could have changed/recompiled methods |
570 "/ could have changed/recompiled methods... |
571 methodsToCheckIn := packageToCheckIn asPackageId projectDefinitionClass extensionMethods |
571 "/ mhmh - should we checkin what is specified in the prj-def, |
|
572 "/ or what is actually present in the image (in case user did not repair)??? |
|
573 |
|
574 methodsInPrjDef := packageToCheckIn asPackageId projectDefinitionClass extensionMethods. |
|
575 methodsInPrjDef := methodsInPrjDef reject:[:m | m isNil]. |
|
576 methodsInPrjDef asSet ~= methodsToCheckIn asSet ifTrue:[ |
|
577 (Dialog |
|
578 confirm:('Set of methods in image is different from what is specified in the project definition.\Check in image methods (%1) or definition methods (%2)?' |
|
579 bindWith: methodsToCheckIn size |
|
580 with: methodsInPrjDef size) |
|
581 yesLabel:'Image Methods' |
|
582 noLabel:'Definition Methods' |
|
583 ) ifFalse:[ |
|
584 methodsToCheckIn := methodsInPrjDef. |
|
585 ]. |
|
586 ]. |
572 ]. |
587 ]. |
573 |
588 |
574 (self |
589 (self |
575 checkinExtensionMethods:methodsToCheckIn |
590 checkinExtensionMethods:methodsToCheckIn |
576 forPackage:packageToCheckIn |
591 forPackage:packageToCheckIn |
731 ! ! |
746 ! ! |
732 |
747 |
733 !SourceCodeManagerUtilitiesForContainerBasedManagers class methodsFor:'documentation'! |
748 !SourceCodeManagerUtilitiesForContainerBasedManagers class methodsFor:'documentation'! |
734 |
749 |
735 version |
750 version |
736 ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.8 2013-03-31 00:27:16 cg Exp $' |
751 ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.9 2013-04-02 20:48:44 cg Exp $' |
737 ! |
752 ! |
738 |
753 |
739 version_CVS |
754 version_CVS |
740 ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.8 2013-03-31 00:27:16 cg Exp $' |
755 ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.9 2013-04-02 20:48:44 cg Exp $' |
741 ! ! |
756 ! ! |
742 |
757 |