changed:
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sat, 17 Mar 2012 20:59:42 +0100
changeset 1069 6c7aa539a81f
parent 1068 13cab5330dde
child 1070 83db0ef5f4dd
changed: #doCommit #isPackageCommit
SVN__CommitTask.st
--- a/SVN__CommitTask.st	Fri Mar 16 21:24:02 2012 +0100
+++ b/SVN__CommitTask.st	Sat Mar 17 20:59:42 2012 +0100
@@ -142,18 +142,22 @@
 
     self do:[                             
         self isPackageCommit ifFalse:[
-            paths size > 3 ifTrue:[
-                commitLabel := ((paths upTo: 3) asStringWith:', ') , (' and %1 others' bindWith: paths size - 3).
+            paths size > 2 ifTrue:[
+                commitLabel := ((paths upTo: 2) asStringWith:', ') , (' and %1 others' bindWith: paths size - 3).
             ] ifFalse:[
                 commitLabel := paths asStringWith:', '
             ].
             containers := paths
         ] ifTrue:[
-            commitLabel := (self package ? '').
+            paths size > 2 ifTrue:[
+                commitLabel := self package ? ''.
+            ] ifFalse:[
+                commitLabel := paths asStringWith:', '
+            ].
             self isSelectiveFileoutTask ifTrue:[
-                self containersToFileOut
+                containers := self containersToFileOut
             ] ifFalse:[ 
-                #() 
+                containers := #() 
             ]
         ].
         ActivityNotification notify:'Commiting ' , commitLabel.
@@ -191,7 +195,7 @@
     "Created: / 11-04-2008 / 09:20:01 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 19-08-2009 / 12:27:44 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 14-03-2012 / 17:42:25 / jv"
-    "Modified: / 16-03-2012 / 11:21:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 17-03-2012 / 19:59:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doPrepareWorkingCopy
@@ -235,10 +239,10 @@
      (or part of it). False if this is ad-hoc commit task -
     for example ad-hoc commit from a file browser"
 
-    ^ self package notNil and:[paths isEmptyOrNil]
+    ^ self package notNil" and:[paths isEmptyOrNil]"
 
-    "Modified (comment): / 13-02-2012 / 16:38:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 14-03-2012 / 17:27:17 / jv"
+    "Modified: / 17-03-2012 / 19:49:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CommitTask class methodsFor:'documentation'!