--- a/SVN__CommitTask.st Wed Mar 14 18:46:28 2012 +0100
+++ b/SVN__CommitTask.st Wed Mar 14 18:47:12 2012 +0100
@@ -134,23 +134,30 @@
!
doCommit
- |containers commitInfo msg|
+ |containers commitInfo commitLabel msg |
msg := ((message ? '<no commit message>') asStringCollection
reject: [:line|line size >= 2 and:[line first == $# and:[line second == $#]]])
asString.
- self do:[
- ActivityNotification notify:'Commiting ' , (self package ? '').
- containers := paths notNil ifTrue:[
- paths
+ self do:[
+ paths notNil ifTrue:[
+ paths size > 3 ifTrue:[
+ commitLabel := ((paths upTo: 3) asStringWith:', ') , (' and %1 others' bindWith: paths size - 3).
+ ] ifFalse:[
+ commitLabel := paths asStringWith:', '
+ ].
+ containers := paths
] ifFalse:[
+ commitLabel := (self package ? '').
self isSelectiveFileoutTask ifTrue:[
self containersToFileOut
] ifFalse:[
#()
]
].
+ ActivityNotification notify:'Commiting ' , commitLabel.
+
(paths notNil and:[paths isEmpty]) ifFalse:[
self
synchronized:[
@@ -166,7 +173,7 @@
execute
].
"Do this only iff this is a package commit"
- package notNil ifTrue:[
+ self isPackageCommit ifTrue:[
self doCompileSvnRevisionNrMethod:true.
self doCompileSvnRepositoryUrlStringMethod.
ActivityNotification notify:'Shrinking changes'.
@@ -184,6 +191,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: / 10-02-2012 / 15:28:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 14-03-2012 / 17:42:25 / jv"
!
doPrepareWorkingCopy
@@ -227,9 +235,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
+ ^ 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"
! !
!CommitTask class methodsFor:'documentation'!