diff -r b28f9faf66fc -r b31b6b0af883 common/SCMCommonSourceCodeManagerUtilities.st --- a/common/SCMCommonSourceCodeManagerUtilities.st Tue Dec 05 20:20:18 2017 +0100 +++ b/common/SCMCommonSourceCodeManagerUtilities.st Tue Dec 05 20:20:46 2017 +0100 @@ -62,33 +62,38 @@ "Created: / 25-12-2011 / 23:45:55 / Jan Vrany " ! -checkinClasses:classes withInfo:aLogInfoOrNil withCheck:doCheckClass usingManager:aManagerOrNil +checkinClasses:classes withInfo:aLogInfoOrNil withCheck:doCheckClass usingManager:aManagerOrNil onBranch:branchNameOrNil | classesPerPackage | + branchNameOrNil notNil ifTrue:[self error:'branches not yet supported']. + classesPerPackage := Dictionary new. - classes do: [:class| - (classesPerPackage at: class theNonMetaclass package ifAbsentPut:[Set new]) - add: class theNonMetaclass]. - classesPerPackage keysAndValuesDo: - [:packageId :classes| | package | + classes do:[:class| + (classesPerPackage at:(class theNonMetaclass package) ifAbsentPut:[Set new]) + add:(class theNonMetaclass) + ]. + classesPerPackage keysAndValuesDo:[:packageId :classes| + | package | + package := manager packageRegistryClass packageNamed: packageId. manager commitDialogClass new - task: (package commitTask - classes: classes; - message: aLogInfoOrNil; - extensionMethods: #() - yourself); - open]. + task: (package commitTask + classes: classes; + message: aLogInfoOrNil; + extensionMethods: #() + yourself); + open + ]. ^ true - "Modified: / 06-05-2011 / 10:32:55 / cg" - "Created: / 25-12-2011 / 23:46:10 / Jan Vrany " - "Modified: / 14-11-2012 / 00:00:21 / Jan Vrany " + "Created: / 05-12-2017 / 20:17:09 / cg" ! -checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages +checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages onBranch:branchNameOrNil + | package task | - | package task | + branchNameOrNil notNil ifTrue:[self error:'branches not yet supported']. + package := manager packageRegistryClass packageNamed: packageToCheckIn. package isNil ifTrue:[ Dialog warn: (resources string: 'No repository for package %1' with: packageToCheckIn). @@ -103,8 +108,7 @@ task: task; open - "Created: / 13-10-2011 / 11:16:52 / Jan Vrany " - "Modified: / 14-11-2012 / 22:29:53 / Jan Vrany " + "Created: / 05-12-2017 / 20:03:14 / cg" ! compareProject:aProject withRepositoryVersionFrom:aDateOrNilForNewest extensionsOnly:extensionsOnly