--- a/common/SCMAbstractCommitTask.st Thu Nov 15 10:26:04 2012 +0000
+++ b/common/SCMAbstractCommitTask.st Thu Nov 15 10:26:08 2012 +0000
@@ -116,7 +116,7 @@
!
doCommit
- |containers commitInfo commitLabel msg |
+ |containers commitLabel msg |
msg := ((message ? '<no commit message>') asStringCollection
reject: [:line|line size >= 2 and:[line first == $# and:[line second == $#]]])
@@ -132,7 +132,7 @@
containers := paths
] ifTrue:[
paths size > 2 ifTrue:[
- commitLabel := self package ? ''.
+ commitLabel := self package name ? ''.
] ifFalse:[
commitLabel := paths asStringWith:', '
].
@@ -147,39 +147,35 @@
]
].
ActivityNotification notify:'Commiting ' , commitLabel.
-
- (paths notNil and:[paths isEmpty]) ifFalse:[
- self
- synchronized:[
- commitInfo := (CommitCommand new)
- workingCopy:self workingCopy;
- message: msg;
- paths:containers;
- execute.
- "Update the working copy. We need svn info
- to report commited revision"
- (UpdateCommand new)
- workingCopy:self workingCopy;
- execute
- ].
- "Do this only iff this is a package commit"
- self isPackageCommit ifTrue:[
- ActivityNotification notify:'Shrinking changes'.
- (ChangeSet current)
- condenseChangesForPackage2:self package;
- condenseChangesForExtensionsInPackage:self package;
- flushChangedClassesCache;
- yourself.
- ].
- ]
+ self doCommit: msg files: containers.
+ ActivityNotification notify:'Shrinking changes'.
+ self doShrinkChanges.
].
self package commited.
- ^ commitInfo
"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: / 06-10-2012 / 23:32:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 15-11-2012 / 09:44:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+doCommit: msg files: containers
+ "Actually commit the changes, To be overridden by subclasses"
+
+ containers isEmptyOrNil ifTrue: [ ^ self ].
+
+"/ self synchronized:[
+ self package workingCopy commit: msg files: containers.
+ self package repository push.
+
+ "Update the working copy. We need svn info
+ to report commited revision"
+"/ (UpdateCommand new)
+"/ workingCopy:self workingCopy;
+"/ execute
+"/ ].
+
+ "Created: / 15-11-2012 / 09:39:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
doPrepareWorkingCopy
@@ -234,6 +230,20 @@
"Created: / 11-04-2008 / 09:19:27 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 17-08-2009 / 18:28:34 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Created: / 13-02-2012 / 16:36:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+doShrinkChanges
+
+ "Do this only iff this is a package commit"
+ self isPackageCommit ifTrue:[
+ (ChangeSet current)
+ condenseChangesForPackage2:self package name;
+ condenseChangesForExtensionsInPackage:self package name;
+ flushChangedClassesCache;
+ yourself.
+ ].
+
+ "Created: / 15-11-2012 / 09:41:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!SCMAbstractCommitTask methodsFor:'testing'!
@@ -262,5 +272,5 @@
!
version_SVN
- ^ '$Id:: $'
+ ^ '§Id:: §'
! !