author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Thu, 26 Jul 2012 12:11:37 +0200 | |
changeset 1115 | 9e43cb31c027 |
parent 1104 | c1c3fed1110f |
permissions | -rw-r--r-- |
675 | 1 |
" |
2 |
Copyright (c) 2007-2010 Jan Vrany |
|
3 |
Copyright (c) 2009-2010 eXept Software AG |
|
4 |
||
5 |
Permission is hereby granted, free of charge, to any person |
|
6 |
obtaining a copy of this software and associated documentation |
|
7 |
files (the 'Software'), to deal in the Software without |
|
8 |
restriction, including without limitation the rights to use, |
|
9 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
10 |
copies of the Software, and to permit persons to whom the |
|
11 |
Software is furnished to do so, subject to the following |
|
12 |
conditions: |
|
13 |
||
14 |
The above copyright notice and this permission notice shall be |
|
15 |
included in all copies or substantial portions of the Software. |
|
16 |
||
17 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
18 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
19 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
20 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
21 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
22 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
23 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
24 |
OTHER DEALINGS IN THE SOFTWARE. |
|
25 |
" |
|
383 | 26 |
"{ Package: 'stx:libsvn' }" |
49 | 27 |
|
28 |
"{ NameSpace: SVN }" |
|
29 |
||
492 | 30 |
FileoutLikeTask subclass:#CommitTask |
1005
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
31 |
instanceVariableNames:'message paths' |
49 | 32 |
classVariableNames:'' |
33 |
poolDictionaries:'' |
|
34 |
category:'SVN-Tasks' |
|
35 |
! |
|
36 |
||
675 | 37 |
!CommitTask class methodsFor:'documentation'! |
38 |
||
39 |
copyright |
|
40 |
" |
|
41 |
Copyright (c) 2007-2010 Jan Vrany |
|
42 |
Copyright (c) 2009-2010 eXept Software AG |
|
43 |
||
44 |
Permission is hereby granted, free of charge, to any person |
|
45 |
obtaining a copy of this software and associated documentation |
|
46 |
files (the 'Software'), to deal in the Software without |
|
47 |
restriction, including without limitation the rights to use, |
|
48 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
49 |
copies of the Software, and to permit persons to whom the |
|
50 |
Software is furnished to do so, subject to the following |
|
51 |
conditions: |
|
52 |
||
53 |
The above copyright notice and this permission notice shall be |
|
54 |
included in all copies or substantial portions of the Software. |
|
55 |
||
56 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
57 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
58 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
59 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
60 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
61 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
62 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
63 |
OTHER DEALINGS IN THE SOFTWARE. |
|
64 |
||
65 |
" |
|
66 |
! ! |
|
67 |
||
68 |
!CommitTask class methodsFor:'others'! |
|
69 |
||
70 |
version_CVS |
|
887
712c4ef37cb7
checkin to get version methods correct
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
675
diff
changeset
|
71 |
^ '$Header$' |
675 | 72 |
! ! |
49 | 73 |
|
74 |
!CommitTask methodsFor:'accessing'! |
|
75 |
||
675 | 76 |
message |
492 | 77 |
|
675 | 78 |
message ifNil:[ |
1089 | 79 |
message := String streamContents: [:s| |
80 |
| classes methods msg | |
|
81 |
classes := self classesToFileOut. |
|
82 |
methods := self extensionMethodsToFileOut. |
|
83 |
classes do:[:cls| |
|
84 |
msg := SVNSourceCodeManager utilities goodInitialLogMessageForCheckinClassOfClass:cls. |
|
85 |
msg notEmptyOrNil ifTrue: [ |
|
86 |
s nextPutLine: ' - ', cls name. |
|
87 |
msg asStringCollection do:[:line| |
|
88 |
s nextPutAll:' '; nextPutLine: line. |
|
89 |
] |
|
90 |
]. |
|
91 |
]. |
|
92 |
methods notEmptyOrNil ifTrue:[ |
|
93 |
s nextPutLine: ' - extensions'. |
|
94 |
s nextPutLine: ' ...'. |
|
95 |
]. |
|
96 |
] |
|
97 |
]. |
|
675 | 98 |
^message. |
49 | 99 |
|
1089 | 100 |
"Modified: / 03-04-2012 / 18:15:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
49 | 101 |
! |
102 |
||
103 |
message:aString |
|
104 |
message := aString. |
|
1005
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
105 |
! |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
106 |
|
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
107 |
paths |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
108 |
^ paths |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
109 |
! |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
110 |
|
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
111 |
paths:aCollection |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
112 |
paths := aCollection. |
49 | 113 |
! ! |
114 |
||
115 |
!CommitTask methodsFor:'executing'! |
|
116 |
||
117 |
do |
|
118 |
self |
|
675 | 119 |
doPrepareWorkingCopy; |
120 |
doCommit |
|
49 | 121 |
|
122 |
"Created: / 23-03-2009 / 11:15:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
123 |
"Modified: / 17-06-2009 / 10:16:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
124 |
! |
|
125 |
||
126 |
doCommit |
|
1066 | 127 |
|containers commitInfo commitLabel msg | |
675 | 128 |
|
129 |
msg := ((message ? '<no commit message>') asStringCollection |
|
130 |
reject: [:line|line size >= 2 and:[line first == $# and:[line second == $#]]]) |
|
131 |
asString. |
|
49 | 132 |
|
1066 | 133 |
self do:[ |
1067 | 134 |
self isPackageCommit ifFalse:[ |
1069 | 135 |
paths size > 2 ifTrue:[ |
136 |
commitLabel := ((paths upTo: 2) asStringWith:', ') , (' and %1 others' bindWith: paths size - 3). |
|
1066 | 137 |
] ifFalse:[ |
138 |
commitLabel := paths asStringWith:', ' |
|
139 |
]. |
|
140 |
containers := paths |
|
1067 | 141 |
] ifTrue:[ |
1069 | 142 |
paths size > 2 ifTrue:[ |
143 |
commitLabel := self package ? ''. |
|
144 |
] ifFalse:[ |
|
145 |
commitLabel := paths asStringWith:', ' |
|
146 |
]. |
|
1092 | 147 |
paths isEmptyOrNil ifTrue:[ |
148 |
self isSelectiveFileoutTask ifTrue:[ |
|
149 |
containers := self containersToFileOut |
|
150 |
] ifFalse:[ |
|
151 |
containers := #() |
|
152 |
] |
|
153 |
] ifFalse:[ |
|
154 |
containers := paths |
|
1005
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
155 |
] |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
156 |
]. |
1066 | 157 |
ActivityNotification notify:'Commiting ' , commitLabel. |
158 |
||
1037 | 159 |
(paths notNil and:[paths isEmpty]) ifFalse:[ |
160 |
self |
|
161 |
synchronized:[ |
|
162 |
commitInfo := (CommitCommand new) |
|
163 |
workingCopy:self workingCopy; |
|
164 |
message: msg; |
|
165 |
paths:containers; |
|
166 |
execute. |
|
167 |
"Update the working copy. We need svn info |
|
168 |
to report commited revision" |
|
169 |
(UpdateCommand new) |
|
170 |
workingCopy:self workingCopy; |
|
171 |
execute |
|
172 |
]. |
|
173 |
"Do this only iff this is a package commit" |
|
1066 | 174 |
self isPackageCommit ifTrue:[ |
1037 | 175 |
self doCompileSvnRevisionNrMethod:true. |
176 |
self doCompileSvnRepositoryUrlStringMethod. |
|
177 |
ActivityNotification notify:'Shrinking changes'. |
|
178 |
(ChangeSet current) |
|
179 |
condenseChangesForPackage2:self package; |
|
180 |
condenseChangesForExtensionsInPackage:self package; |
|
181 |
flushChangedClassesCache; |
|
182 |
yourself. |
|
183 |
]. |
|
184 |
] |
|
675 | 185 |
]. |
49 | 186 |
self workingCopy commited. |
187 |
^ commitInfo |
|
188 |
||
189 |
"Created: / 11-04-2008 / 09:20:01 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
190 |
"Modified: / 19-08-2009 / 12:27:44 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1066 | 191 |
"Modified: / 14-03-2012 / 17:42:25 / jv" |
1092 | 192 |
"Modified: / 04-04-2012 / 17:39:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
49 | 193 |
! |
194 |
||
675 | 195 |
doPrepareWorkingCopy |
1019
57e0efa7b31c
improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1005
diff
changeset
|
196 |
|
1039 | 197 |
self isPackageCommit ifTrue:[ |
1019
57e0efa7b31c
improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1005
diff
changeset
|
198 |
self do:[ |
57e0efa7b31c
improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1005
diff
changeset
|
199 |
self workingCopy ensureIsValid. |
57e0efa7b31c
improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1005
diff
changeset
|
200 |
self doFileOutAll |
57e0efa7b31c
improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1005
diff
changeset
|
201 |
] |
57e0efa7b31c
improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1005
diff
changeset
|
202 |
]. |
49 | 203 |
|
204 |
"Created: / 11-04-2008 / 09:19:27 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
205 |
"Modified: / 17-08-2009 / 18:28:34 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1039 | 206 |
"Modified: / 13-02-2012 / 16:38:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
207 |
! |
|
208 |
||
1104 | 209 |
doPrepareWorkingCopy1 |
210 |
||
211 |
self isPackageCommit ifTrue:[ |
|
212 |
self do:[ |
|
213 |
self doUpdateCode. |
|
214 |
] |
|
215 |
]. |
|
216 |
||
217 |
"Created: / 10-05-2012 / 17:08:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
218 |
! |
|
219 |
||
220 |
doPrepareWorkingCopy2 |
|
221 |
||
222 |
self isPackageCommit ifTrue:[ |
|
223 |
self do:[ |
|
224 |
self workingCopy ensureIsValid. |
|
225 |
self doFileOut |
|
226 |
] |
|
227 |
]. |
|
228 |
||
229 |
"Created: / 10-05-2012 / 17:08:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
230 |
! |
|
231 |
||
1039 | 232 |
doSanityChecks |
233 |
"Perform some sanity checks on the package |
|
1115
9e43cb31c027
Changes required by ProjectChecker(Browser) refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1104
diff
changeset
|
234 |
(or individual classes and/or methods). |
9e43cb31c027
Changes required by ProjectChecker(Browser) refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1104
diff
changeset
|
235 |
Return a project checker. Use #problems to get the |
9e43cb31c027
Changes required by ProjectChecker(Browser) refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1104
diff
changeset
|
236 |
list of problems" |
1039 | 237 |
|
1042
e1e57dbcd43e
changed: #doSanityChecks
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1039
diff
changeset
|
238 |
self isPackageCommit ifFalse:[ ^ nil ]. |
1089 | 239 |
(ConfigurableFeatures includesFeature:#ProjectChecker) ifFalse:[ ^ nil ]. |
1039 | 240 |
|
241 |
^ProjectChecker new |
|
242 |
package: self package; |
|
243 |
classes: classes; |
|
1095
ad868d3af03d
changed: #doSanityChecks
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1092
diff
changeset
|
244 |
methods: (extensionMethods = #() ifTrue:[nil] ifFalse:[extensionMethods]); |
1039 | 245 |
check; |
1115
9e43cb31c027
Changes required by ProjectChecker(Browser) refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1104
diff
changeset
|
246 |
yourself |
1039 | 247 |
|
248 |
"Created: / 11-04-2008 / 09:19:27 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
249 |
"Modified: / 17-08-2009 / 18:28:34 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
250 |
"Created: / 13-02-2012 / 16:36:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
251 |
! ! |
|
252 |
||
253 |
!CommitTask methodsFor:'testing'! |
|
254 |
||
255 |
isPackageCommit |
|
256 |
"Returns true iff this task is for a package |
|
257 |
(or part of it). False if this is ad-hoc commit task - |
|
258 |
for example ad-hoc commit from a file browser" |
|
259 |
||
1069 | 260 |
^ self package notNil" and:[paths isEmptyOrNil]" |
1039 | 261 |
|
1066 | 262 |
"Modified: / 14-03-2012 / 17:27:17 / jv" |
1069 | 263 |
"Modified: / 17-03-2012 / 19:49:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
49 | 264 |
! ! |
265 |
||
266 |
!CommitTask class methodsFor:'documentation'! |
|
267 |
||
268 |
version |
|
887
712c4ef37cb7
checkin to get version methods correct
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
675
diff
changeset
|
269 |
^ '$Header$' |
198 | 270 |
! |
271 |
||
272 |
version_SVN |
|
887
712c4ef37cb7
checkin to get version methods correct
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
675
diff
changeset
|
273 |
^ '§Id: SVN__CommitTask.st 371 2011-09-28 18:47:07Z vranyj1 §' |
49 | 274 |
! ! |