SourceCodeManagerUtilities.st
changeset 4276 1725bf9d43b0
parent 4272 d0105e003a5a
child 4281 7b1c0f0170d0
--- a/SourceCodeManagerUtilities.st	Tue Dec 05 19:29:28 2017 +0100
+++ b/SourceCodeManagerUtilities.st	Tue Dec 05 20:32:48 2017 +0100
@@ -369,6 +369,17 @@
     ^self default checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrNil
 !
 
+checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrNil onBranch:branchNameOrNil
+
+    <resource: #obsolete>
+
+    self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'.
+
+    ^self default checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrNil onBranch:branchNameOrNil
+
+    "Created: / 05-12-2017 / 20:15:04 / cg"
+!
+
 checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClasses
 
     <resource: #obsolete>
@@ -378,6 +389,17 @@
     ^self default checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClasses
 !
 
+checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClasses onBranch:branchNameOrNil
+
+    <resource: #obsolete>
+
+    self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'.
+
+    ^self default checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClasses onBranch:branchNameOrNil
+
+    "Created: / 05-12-2017 / 20:15:55 / cg"
+!
+
 checkinExtensionMethods:aCollectionOfMethods forPackage:aPackageID withInfo:aLogInfoOrStringOrNil
 
     <resource: #obsolete>
@@ -387,6 +409,17 @@
     ^self default checkinExtensionMethods:aCollectionOfMethods forPackage:aPackageID withInfo:aLogInfoOrStringOrNil
 !
 
+checkinExtensionMethods:aCollectionOfMethods forPackage:aPackageID withInfo:aLogInfoOrStringOrNil onBranch:branchNameOrNil
+
+    <resource: #obsolete>
+
+    self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'.
+
+    ^self default checkinExtensionMethods:aCollectionOfMethods forPackage:aPackageID withInfo:aLogInfoOrStringOrNil onBranch:branchNameOrNil
+
+    "Created: / 05-12-2017 / 20:13:44 / cg"
+!
+
 checkoutClass:aClass askForMerge:askForMerge
 
     <resource: #obsolete>
@@ -1531,6 +1564,21 @@
      If the argument, aLogInfoOrNil isNil, ask interactively for log-message.
      If doCheckClass is true, the class is checked for send of halts etc."
 
+    ^ self
+        checkinClass:aClass 
+        withInfo:aLogInfoOrNil withCheck:doCheckClassHolder 
+        usingManager:managerOrNil confirmNewContainer:confirmNewContainer 
+        onBranch:nil
+
+    "Created: / 21-12-2011 / 18:19:14 / cg"
+    "Modified: / 05-12-2017 / 20:26:38 / cg"
+!
+
+checkinClass:aClass withInfo:aLogInfoOrNil withCheck:doCheckClassHolder usingManager:managerOrNil confirmNewContainer:confirmNewContainer onBranch:branchNameOrNil
+    "check a class into the source repository.
+     If the argument, aLogInfoOrNil isNil, ask interactively for log-message.
+     If doCheckClass is true, the class is checked for send of halts etc."
+
     |logMessage checkinInfo mgr pri|
 
     aClass isLoaded ifFalse:[
@@ -1604,7 +1652,7 @@
                 checkinState := false.
                 cause := ''.
                 [
-                    checkinState := mgr checkinClass:aClass logMessage:logMessage
+                    checkinState := mgr checkinClass:aClass logMessage:logMessage onBranch:branchNameOrNil
                 ] on:SourceCodeManagerError do:[:ex| 
                     cause := ex description.
                     "/ ex proceed.
@@ -1647,7 +1695,7 @@
     ].
     ^ true
 
-    "Created: / 21-12-2011 / 18:19:14 / cg"
+    "Created: / 05-12-2017 / 20:26:09 / cg"
 !
 
 checkinClasses:aCollectionOfClass
@@ -1661,25 +1709,48 @@
     "check a bunch of classes into the source repository.
      If the argument, aLogInfoOrNil isNil, ask interactively for log-message."
 
+    ^ self checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrNil onBranch:nil
+
+    "Modified: / 05-12-2017 / 20:15:25 / cg"
+!
+
+checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrNil onBranch:branchNameOrNil     
+    "check a bunch of classes into the source repository.
+     If the argument, aLogInfoOrNil isNil, ask interactively for log-message."
+
     |checkClassWhenCheckingInHolder|
 
     checkClassWhenCheckingInHolder := ValueHolder with:(UserPreferences current at:#checkClassesWhenCheckingIn ifAbsent:true).
     checkClassWhenCheckingInHolder 
-        onChangeEvaluate:[ UserPreferences current at:#checkClassesWhenCheckingIn put:checkClassWhenCheckingInHolder value ].
+        onChangeEvaluate:[ 
+            UserPreferences current at:#checkClassesWhenCheckingIn put:checkClassWhenCheckingInHolder value 
+        ].
 
     ^ self
         checkinClasses:aCollectionOfClasses 
         withInfo:aLogInfoOrNil 
         withCheck:checkClassWhenCheckingInHolder
+        onBranch:branchNameOrNil
+
+    "Created: / 05-12-2017 / 20:15:09 / cg"
 !
 
 checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClassesHolder
     "check a bunch of classes into the source repository.
      If the argument, aLogInfoOrStringNil isNil, ask interactively for log-message."
 
-    self checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClassesHolder usingManager:nil
-
-    "Modified: / 21-12-2011 / 18:24:47 / cg"
+    ^ self checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClassesHolder onBranch:nil
+
+    "Modified: / 05-12-2017 / 20:16:18 / cg"
+!
+
+checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClassesHolder onBranch:branchNameOrNil
+    "check a bunch of classes into the source repository.
+     If the argument, aLogInfoOrStringNil isNil, ask interactively for log-message."
+
+    ^ self checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClassesHolder usingManager:nil onBranch:branchNameOrNil
+
+    "Created: / 05-12-2017 / 20:15:59 / cg"
 !
 
 checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder usingManager:aManagerOrNil
@@ -1687,13 +1758,28 @@
      If the argument, aLogInfoOrStringOrNil isNil, ask interactively for log-message."
 
     ^ self
-        checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder 
-        usingManager:aManagerOrNil 
-        confirmNewContainer:confirmNewFiles
+        checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder usingManager:aManagerOrNil
+        onBranch:nil
+
+    "Modified: / 05-12-2017 / 20:17:32 / cg"
 !
 
 checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder 
     usingManager:aManagerOrNil confirmNewContainer:confirmNewContainer
+
+    "check a bunch of classes into the source repository.
+     If the argument, aLogInfoOrStringOrNil isNil, ask interactively for log-message."
+
+    ^ self 
+        checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder 
+        usingManager:aManagerOrNil confirmNewContainer:confirmNewContainer onBranch:nil
+
+    "Created: / 21-12-2011 / 18:24:25 / cg"
+    "Modified (format): / 05-12-2017 / 20:24:09 / cg"
+!
+
+checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder 
+    usingManager:aManagerOrNil confirmNewContainer:confirmNewContainer onBranch:branchNameOrNil
     "check a bunch of classes into the source repository.
      If the argument, aLogInfoOrStringOrNil isNil, ask interactively for log-message."
 
@@ -1790,7 +1876,35 @@
         ].
     ].
 
-    "Created: / 21-12-2011 / 18:24:25 / cg"
+    "Created: / 05-12-2017 / 20:23:37 / cg"
+!
+
+checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder usingManager:aManagerOrNil onBranch:branchNameOrNil
+    "check a bunch of classes into the source repository.
+     If the argument, aLogInfoOrStringOrNil isNil, ask interactively for log-message."
+
+    ^ self
+        checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder 
+        usingManager:aManagerOrNil 
+        confirmNewContainer:confirmNewFiles
+        onBranch:branchNameOrNil
+
+    "Created: / 05-12-2017 / 20:17:16 / cg"
+!
+
+checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages
+    ^ self 
+        checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions 
+        buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages 
+        onBranch:nil
+
+    "Created: / 05-12-2017 / 20:02:49 / cg"
+!
+
+checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages onBranch:branchNameOrNil
+    self subclassResponsibility
+
+    "Created: / 05-12-2017 / 20:02:34 / cg"
 !
 
 checkoutClass:aClass askForMerge:askForMerge