author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Fri, 16 Mar 2012 12:21:49 +0100 | |
changeset 1067 | fd43642bb21f |
parent 1066 | e05c09a0df44 |
child 1069 | 6c7aa539a81f |
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:[ |
79 |
| changedClasses changedMethods | |
|
80 |
changedClasses := OrderedSet new. |
|
81 |
changedMethods := OrderedSet new. |
|
82 |
(ChangeSet current changesForPackage: package) do: |
|
83 |
[:chg| | chgCls | |
|
84 |
chg isClassChange ifTrue: |
|
85 |
[(chgCls := chg changeClass theNonMetaclass) package == package |
|
86 |
ifTrue: |
|
87 |
[(classes isNil or:[classes includes: chgCls]) ifTrue: |
|
88 |
[changedClasses add: chgCls]] |
|
89 |
ifFalse: |
|
90 |
[chg isMethodDefinitionChange ifTrue: |
|
91 |
[changedMethods add: chg changeMethod]]]]. |
|
92 |
message := String streamContents: |
|
93 |
[:s| |
|
94 |
s cr. |
|
95 |
changedClasses isEmpty ifFalse: |
|
96 |
[s nextPutLine:'## Changed classes:'. |
|
97 |
changedClasses do: |
|
98 |
[:cls|s nextPutAll:'## ';nextPutAll: cls name; cr]]. |
|
99 |
changedMethods isEmpty ifFalse: |
|
100 |
[s nextPutLine:'## Changed methods:'. |
|
101 |
changedMethods do: |
|
102 |
[:m| |
|
103 |
s nextPutAll:'## '; nextPutAll: m mclass name; |
|
104 |
nextPutAll:' >> #'; nextPutAll: m selector; cr]]. |
|
105 |
s nextPutLine:'##'. |
|
106 |
s nextPutLine:'## Lines starting with ## will be removed'. |
|
107 |
]]. |
|
108 |
^message. |
|
49 | 109 |
|
675 | 110 |
"Modified: / 01-08-2010 / 13:02:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
49 | 111 |
! |
112 |
||
113 |
message:aString |
|
114 |
message := aString. |
|
1005
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
115 |
! |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
116 |
|
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
117 |
paths |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
118 |
^ paths |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
119 |
! |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
120 |
|
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
121 |
paths:aCollection |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
122 |
paths := aCollection. |
49 | 123 |
! ! |
124 |
||
125 |
!CommitTask methodsFor:'executing'! |
|
126 |
||
127 |
do |
|
128 |
self |
|
675 | 129 |
doPrepareWorkingCopy; |
130 |
doCommit |
|
49 | 131 |
|
132 |
"Created: / 23-03-2009 / 11:15:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
133 |
"Modified: / 17-06-2009 / 10:16:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
134 |
! |
|
135 |
||
136 |
doCommit |
|
1066 | 137 |
|containers commitInfo commitLabel msg | |
675 | 138 |
|
139 |
msg := ((message ? '<no commit message>') asStringCollection |
|
140 |
reject: [:line|line size >= 2 and:[line first == $# and:[line second == $#]]]) |
|
141 |
asString. |
|
49 | 142 |
|
1066 | 143 |
self do:[ |
1067 | 144 |
self isPackageCommit ifFalse:[ |
1066 | 145 |
paths size > 3 ifTrue:[ |
146 |
commitLabel := ((paths upTo: 3) asStringWith:', ') , (' and %1 others' bindWith: paths size - 3). |
|
147 |
] ifFalse:[ |
|
148 |
commitLabel := paths asStringWith:', ' |
|
149 |
]. |
|
150 |
containers := paths |
|
1067 | 151 |
] ifTrue:[ |
1066 | 152 |
commitLabel := (self package ? ''). |
1005
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
153 |
self isSelectiveFileoutTask ifTrue:[ |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
154 |
self containersToFileOut |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
155 |
] ifFalse:[ |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
156 |
#() |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
157 |
] |
daa3cfe06560
Improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
887
diff
changeset
|
158 |
]. |
1066 | 159 |
ActivityNotification notify:'Commiting ' , commitLabel. |
160 |
||
1037 | 161 |
(paths notNil and:[paths isEmpty]) ifFalse:[ |
162 |
self |
|
163 |
synchronized:[ |
|
164 |
commitInfo := (CommitCommand new) |
|
165 |
workingCopy:self workingCopy; |
|
166 |
message: msg; |
|
167 |
paths:containers; |
|
168 |
execute. |
|
169 |
"Update the working copy. We need svn info |
|
170 |
to report commited revision" |
|
171 |
(UpdateCommand new) |
|
172 |
workingCopy:self workingCopy; |
|
173 |
execute |
|
174 |
]. |
|
175 |
"Do this only iff this is a package commit" |
|
1066 | 176 |
self isPackageCommit ifTrue:[ |
1037 | 177 |
self doCompileSvnRevisionNrMethod:true. |
178 |
self doCompileSvnRepositoryUrlStringMethod. |
|
179 |
ActivityNotification notify:'Shrinking changes'. |
|
180 |
(ChangeSet current) |
|
181 |
condenseChangesForPackage2:self package; |
|
182 |
condenseChangesForExtensionsInPackage:self package; |
|
183 |
flushChangedClassesCache; |
|
184 |
yourself. |
|
185 |
]. |
|
186 |
] |
|
675 | 187 |
]. |
49 | 188 |
self workingCopy commited. |
189 |
^ commitInfo |
|
190 |
||
191 |
"Created: / 11-04-2008 / 09:20:01 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
192 |
"Modified: / 19-08-2009 / 12:27:44 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1066 | 193 |
"Modified: / 14-03-2012 / 17:42:25 / jv" |
1067 | 194 |
"Modified: / 16-03-2012 / 11:21:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
49 | 195 |
! |
196 |
||
675 | 197 |
doPrepareWorkingCopy |
1019
57e0efa7b31c
improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1005
diff
changeset
|
198 |
|
1039 | 199 |
self isPackageCommit ifTrue:[ |
1019
57e0efa7b31c
improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1005
diff
changeset
|
200 |
self do:[ |
57e0efa7b31c
improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1005
diff
changeset
|
201 |
self workingCopy ensureIsValid. |
57e0efa7b31c
improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1005
diff
changeset
|
202 |
self doFileOutAll |
57e0efa7b31c
improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1005
diff
changeset
|
203 |
] |
57e0efa7b31c
improvements for CommitDialog2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1005
diff
changeset
|
204 |
]. |
49 | 205 |
|
206 |
"Created: / 11-04-2008 / 09:19:27 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
207 |
"Modified: / 17-08-2009 / 18:28:34 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1039 | 208 |
"Modified: / 13-02-2012 / 16:38:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
209 |
! |
|
210 |
||
211 |
doSanityChecks |
|
212 |
"Perform some sanity checks on the package |
|
213 |
(or individual classes and/or methods). Returns |
|
214 |
a collection (possibly empty) of found issues." |
|
215 |
||
1042
e1e57dbcd43e
changed: #doSanityChecks
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1039
diff
changeset
|
216 |
self isPackageCommit ifFalse:[ ^ nil ]. |
e1e57dbcd43e
changed: #doSanityChecks
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1039
diff
changeset
|
217 |
OperatingSystem getLoginName ~= 'jv' ifTrue:[^nil]. |
1039 | 218 |
|
219 |
^ProjectChecker new |
|
220 |
package: self package; |
|
221 |
classes: classes; |
|
222 |
methods: extensionMethods; |
|
223 |
check; |
|
224 |
problems |
|
225 |
||
226 |
"Created: / 11-04-2008 / 09:19:27 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
227 |
"Modified: / 17-08-2009 / 18:28:34 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
228 |
"Created: / 13-02-2012 / 16:36:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
229 |
! ! |
|
230 |
||
231 |
!CommitTask methodsFor:'testing'! |
|
232 |
||
233 |
isPackageCommit |
|
234 |
"Returns true iff this task is for a package |
|
235 |
(or part of it). False if this is ad-hoc commit task - |
|
236 |
for example ad-hoc commit from a file browser" |
|
237 |
||
1066 | 238 |
^ self package notNil and:[paths isEmptyOrNil] |
1039 | 239 |
|
240 |
"Modified (comment): / 13-02-2012 / 16:38:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1066 | 241 |
"Modified: / 14-03-2012 / 17:27:17 / jv" |
49 | 242 |
! ! |
243 |
||
244 |
!CommitTask class methodsFor:'documentation'! |
|
245 |
||
246 |
version |
|
887
712c4ef37cb7
checkin to get version methods correct
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
675
diff
changeset
|
247 |
^ '$Header$' |
198 | 248 |
! |
249 |
||
250 |
version_SVN |
|
887
712c4ef37cb7
checkin to get version methods correct
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
675
diff
changeset
|
251 |
^ '§Id: SVN__CommitTask.st 371 2011-09-28 18:47:07Z vranyj1 §' |
49 | 252 |
! ! |