author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Thu, 28 Mar 2013 12:22:48 +0000 | |
branch | jv |
changeset 3158 | f8c56a311307 |
parent 3128 | 87750af738dc |
parent 2877 | 623b67ae9447 |
child 3349 | cf76b0a531ae |
permissions | -rw-r--r-- |
2409 | 1 |
" |
2 |
Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, |
|
3 |
Czech Technical University in Prague |
|
4 |
Copyright (c) 2009-2010 eXept Software AG |
|
5 |
||
6 |
Permission is hereby granted, free of charge, to any person |
|
7 |
obtaining a copy of this software and associated documentation |
|
8 |
files (the 'Software'), to deal in the Software without |
|
9 |
restriction, including without limitation the rights to use, |
|
10 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
11 |
copies of the Software, and to permit persons to whom the |
|
12 |
Software is furnished to do so, subject to the following |
|
13 |
conditions: |
|
14 |
||
15 |
The above copyright notice and this permission notice shall be |
|
16 |
included in all copies or substantial portions of the Software. |
|
17 |
||
18 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
19 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
20 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
21 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
22 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
23 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
24 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
25 |
OTHER DEALINGS IN THE SOFTWARE. |
|
26 |
" |
|
27 |
"{ Package: 'stx:libbasic3' }" |
|
28 |
||
29 |
ChangeSetDiffComponent subclass:#ChangeSetDiffEntry |
|
2877 | 30 |
instanceVariableNames:'versionBase versionA versionB versionMerged mergeInfo' |
2409 | 31 |
classVariableNames:'' |
32 |
poolDictionaries:'' |
|
33 |
category:'System-Changes-Diff' |
|
34 |
! |
|
35 |
||
36 |
!ChangeSetDiffEntry class methodsFor:'documentation'! |
|
37 |
||
38 |
copyright |
|
39 |
" |
|
40 |
Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, |
|
41 |
Czech Technical University in Prague |
|
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 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
68 |
|
2409 | 69 |
!ChangeSetDiffEntry class methodsFor:'instance creation'! |
70 |
||
71 |
versionA:versionA |
|
72 |
||
73 |
^self new |
|
2877 | 74 |
"/ versionB: versionA asAntiChange |
75 |
versionA: versionA. |
|
2409 | 76 |
|
2877 | 77 |
"Modified (comment): / 20-03-2012 / 21:42:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2409 | 78 |
! |
79 |
||
80 |
versionA:versionA versionB:versionB |
|
81 |
||
82 |
^self new |
|
83 |
versionA: versionA; |
|
84 |
versionB: versionB. |
|
85 |
! |
|
86 |
||
87 |
versionB:versionB |
|
88 |
||
89 |
^self new |
|
2877 | 90 |
"/ versionA: versionB asAntiChange; |
2409 | 91 |
versionB: versionB. |
92 |
||
2877 | 93 |
"Modified: / 20-03-2012 / 21:42:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2409 | 94 |
! ! |
95 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
96 |
|
2409 | 97 |
!ChangeSetDiffEntry class methodsFor:'image specs'! |
98 |
||
99 |
iconMinus |
|
2492 | 100 |
^ ToolbarIconLibrary iconMinus12x12 |
2409 | 101 |
|
2492 | 102 |
"Modified: / 31-08-2011 / 10:51:21 / cg" |
2409 | 103 |
! |
104 |
||
105 |
iconPlus |
|
2492 | 106 |
^ ToolbarIconLibrary iconPlus12x12 |
2409 | 107 |
|
2492 | 108 |
"Modified: / 31-08-2011 / 10:51:34 / cg" |
2409 | 109 |
! ! |
110 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
111 |
|
2877 | 112 |
!ChangeSetDiffEntry class methodsFor:'others'! |
113 |
||
114 |
version_CVS |
|
115 |
^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffEntry.st,v 1.4 2012-07-31 12:34:18 vrany Exp $' |
|
116 |
! ! |
|
117 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
118 |
|
2409 | 119 |
!ChangeSetDiffEntry methodsFor:'accessing'! |
120 |
||
2631 | 121 |
changeClass |
122 |
||
123 |
^(versionA ? versionB) changeClass |
|
124 |
||
125 |
"Created: / 30-11-2011 / 11:35:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
126 |
! |
|
127 |
||
128 |
changeSelector |
|
129 |
||
130 |
| chg | |
|
131 |
||
132 |
(chg := versionA ? versionB) isMethodChange ifTrue:[ |
|
133 |
^chg changeSelector |
|
134 |
] ifFalse:[ |
|
135 |
^nil |
|
136 |
] |
|
137 |
||
138 |
"Created: / 30-11-2011 / 11:40:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
139 |
! |
|
140 |
||
2409 | 141 |
className |
142 |
||
143 |
^(versionA ? versionB) className |
|
144 |
||
145 |
"Created: / 01-11-2009 / 16:48:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
146 |
! |
|
147 |
||
2877 | 148 |
mergeInfo |
149 |
(mergeInfo isNil and:[Tools::TextMergeInfo notNil]) ifTrue:[ |
|
150 |
mergeInfo := Tools::TextMergeInfo new. |
|
151 |
mergeInfo text1: self versionBaseText text2: self versionAText text3: self versionBText. |
|
152 |
]. |
|
153 |
^mergeInfo |
|
2409 | 154 |
|
2877 | 155 |
"Created: / 19-03-2012 / 14:57:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
156 |
! |
|
157 |
||
158 |
mergeInfo:aTextMergeInfo |
|
159 |
mergeInfo := aTextMergeInfo. |
|
160 |
||
161 |
"Created: / 19-03-2012 / 14:57:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2409 | 162 |
! |
163 |
||
164 |
mergedUsingVersionA |
|
165 |
||
166 |
versionMerged ifNil:[^false]. |
|
167 |
versionA ifNil:[^false]. |
|
168 |
||
169 |
^versionA sameAs: versionMerged |
|
170 |
||
171 |
"Created: / 24-11-2009 / 08:16:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
172 |
! |
|
173 |
||
174 |
mergedUsingVersionB |
|
175 |
||
176 |
versionMerged ifNil:[^false]. |
|
177 |
versionB ifNil:[^false]. |
|
178 |
||
179 |
^versionB sameAs: versionMerged |
|
180 |
||
181 |
"Created: / 24-11-2009 / 08:16:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
182 |
! |
|
183 |
||
184 |
mergedUsingVersionBase |
|
185 |
||
186 |
versionMerged ifNil:[^false]. |
|
187 |
versionBase ifNil:[^false]. |
|
188 |
||
189 |
^versionBase sameAs: versionMerged |
|
190 |
||
191 |
"Created: / 24-11-2009 / 08:16:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
192 |
! |
|
193 |
||
194 |
name |
|
195 |
||
196 |
^self versionAorB displayString |
|
197 |
||
198 |
"Created: / 24-11-2009 / 09:56:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
199 |
! |
|
200 |
||
201 |
nonMetaClassName |
|
202 |
||
203 |
^(versionA ? versionB) nonMetaClassName |
|
204 |
||
205 |
"Created: / 21-11-2009 / 07:42:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
206 |
! |
|
207 |
||
208 |
versionA |
|
209 |
^ versionA |
|
210 |
! |
|
211 |
||
212 |
versionA:something |
|
213 |
versionA := something. |
|
214 |
! |
|
215 |
||
216 |
versionALabel |
|
217 |
^ parent versionALabel |
|
218 |
||
219 |
"Created: / 09-11-2009 / 12:38:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
220 |
! |
|
221 |
||
222 |
versionAText |
|
2877 | 223 |
^versionA notNil ifTrue:[ |
224 |
versionA source |
|
225 |
] ifFalse:[ |
|
226 |
nil |
|
227 |
]. |
|
2409 | 228 |
|
229 |
"Created: / 06-07-2011 / 12:29:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
230 |
! |
|
231 |
||
232 |
versionAorB |
|
233 |
||
2877 | 234 |
^versionA ? versionB |
2409 | 235 |
|
236 |
"Created: / 02-11-2009 / 18:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
237 |
! |
|
238 |
||
239 |
versionB |
|
240 |
^ versionB |
|
241 |
! |
|
242 |
||
243 |
versionB:something |
|
2877 | 244 |
|
2409 | 245 |
versionB := something. |
2877 | 246 |
|
247 |
"Modified: / 20-03-2012 / 22:08:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2409 | 248 |
! |
249 |
||
250 |
versionBLabel |
|
251 |
^ parent versionBLabel |
|
252 |
||
253 |
"Created: / 09-11-2009 / 12:38:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
254 |
! |
|
255 |
||
256 |
versionBText |
|
2877 | 257 |
^versionB notNil ifTrue:[ |
258 |
versionB source |
|
259 |
] ifFalse:[ |
|
260 |
nil |
|
261 |
]. |
|
2409 | 262 |
|
263 |
"Created: / 06-07-2011 / 12:29:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
264 |
! |
|
265 |
||
266 |
versionBase |
|
267 |
^ versionBase |
|
268 |
! |
|
269 |
||
270 |
versionBase:something |
|
271 |
versionBase := something. |
|
272 |
! |
|
273 |
||
2877 | 274 |
versionBaseText |
275 |
^versionBase notNil ifTrue:[ |
|
276 |
versionBase source |
|
277 |
] ifFalse:[ |
|
278 |
nil |
|
279 |
]. |
|
2409 | 280 |
|
2877 | 281 |
"Created: / 16-03-2012 / 15:20:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2409 | 282 |
! |
283 |
||
284 |
versionMerged |
|
2877 | 285 |
"Returns a change representing a merge" |
286 |
||
287 |
| merged | |
|
288 |
merged := versionMerged. |
|
289 |
(merged isNil and:[mergeInfo notNil]) ifTrue:[ |
|
290 |
merged := (versionA ? versionB ? versionBase) copy. |
|
291 |
merged source: mergeInfo text. |
|
292 |
merged isClassDefinitionChange ifTrue:[ |
|
293 |
merged setupFromSource. |
|
294 |
] |
|
295 |
||
296 |
]. |
|
297 |
^merged |
|
298 |
||
299 |
"Modified: / 21-03-2012 / 00:59:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2409 | 300 |
! |
301 |
||
302 |
versionMerged:aChange |
|
303 |
versionMerged := aChange. |
|
304 |
self changed:#resolution with: aChange |
|
305 |
||
306 |
"Modified: / 24-11-2009 / 12:58:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
307 |
! |
|
308 |
||
309 |
versionMergedLabel |
|
310 |
||
311 |
(versionMerged isNil) |
|
312 |
ifTrue:[^'<unresolved>' asText colorizeAllWith: Color red]. |
|
313 |
(versionMerged sameAs: versionA) |
|
314 |
ifTrue:[^self versionALabel]. |
|
315 |
(versionMerged sameAs: versionB) |
|
316 |
ifTrue:[^self versionBLabel]. |
|
317 |
(versionMerged sameAs: versionBase) |
|
318 |
ifTrue:[^self versionBaseLabel]. |
|
319 |
^'manual merge' |
|
320 |
! ! |
|
321 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
322 |
|
2409 | 323 |
!ChangeSetDiffEntry methodsFor:'enumerating'! |
324 |
||
325 |
do: aBlock |
|
326 |
||
327 |
aBlock value: self |
|
328 |
||
329 |
"Created: / 25-11-2009 / 10:22:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
330 |
! ! |
|
331 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
332 |
|
2409 | 333 |
!ChangeSetDiffEntry methodsFor:'merging'! |
334 |
||
335 |
automerge |
|
336 |
||
2877 | 337 |
"Automerge version methods" |
338 |
versionB ifNil:[^self]. |
|
339 |
versionB isMethodCodeChange ifTrue:[ |
|
340 |
(AbstractSourceCodeManager isVersionMethodSelector: versionB selector) ifTrue:[ |
|
341 |
versionMerged := versionB copy. |
|
342 |
self mergeInfo mergeUsingB: (versionB source) |
|
343 |
] |
|
344 |
]. |
|
2409 | 345 |
|
346 |
"Created: / 02-11-2009 / 18:51:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2877 | 347 |
"Modified: / 09-04-2012 / 16:37:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
348 |
"Modified (comment): / 09-04-2012 / 18:01:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2409 | 349 |
! ! |
350 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
351 |
|
3099
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
352 |
!ChangeSetDiffEntry methodsFor:'private'! |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
353 |
|
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
354 |
sort:sortBlock |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
355 |
"superclass ChangeSetDiffComponent says that I am responsible to implement this method" |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
356 |
|
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
357 |
"Ignored" |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
358 |
|
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
359 |
"Modified: / 17-01-2013 / 13:57:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
360 |
! ! |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
361 |
|
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
362 |
|
2409 | 363 |
!ChangeSetDiffEntry methodsFor:'testing'! |
364 |
||
3074
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
365 |
isConflict |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
366 |
"Return true, if there is a conflict. For simple two-way diff, |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
367 |
conflict is when there are both versionA and versionB and they |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
368 |
differ. For three-way diff/merge, conflict is iff the entry is not |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
369 |
yet merged" |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
370 |
|
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
371 |
^versionBase isNil ifTrue:[ |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
372 |
"/two-way diff |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
373 |
versionA notNil and:[versionB notNil and:[(versionA sameAs: versionB) not]] |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
374 |
] ifFalse:[ |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
375 |
self isMerged not |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
376 |
]. |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
377 |
|
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
378 |
"Created: / 01-08-2012 / 17:10:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
379 |
! |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
380 |
|
2409 | 381 |
isDiffItem |
382 |
^ true |
|
2877 | 383 |
! |
384 |
||
3074
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
385 |
isForCopyrightMethod |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
386 |
"Returns true, if this is an entry for version method" |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
387 |
|
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
388 |
| version | |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
389 |
|
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
390 |
version := versionA ? versionB. |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
391 |
^version isMethodCodeChange |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
392 |
and:[version isForMeta and: [version selector == #copyright]] |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
393 |
|
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
394 |
"Created: / 01-08-2012 / 16:39:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
395 |
! |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
396 |
|
2877 | 397 |
isForVersionMethod |
398 |
"Returns true, if this is an entry for version method" |
|
399 |
||
400 |
| version | |
|
401 |
||
402 |
version := versionA ? versionB. |
|
403 |
^version isMethodCodeChange |
|
3074
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
404 |
and:[(AbstractSourceCodeManager isVersionMethodSelector: version selector) or:[AbstractSourceCodeManager isVersionMethodForExtensionsSelector: version selector]] |
2877 | 405 |
|
406 |
"Created: / 18-04-2012 / 18:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
407 |
! |
|
408 |
||
409 |
isMerged |
|
410 |
| mi | |
|
411 |
||
412 |
versionMerged notNil ifTrue:[ ^ true ]. |
|
413 |
||
414 |
^(mi := self mergeInfo) notNil ifTrue:[ |
|
415 |
mi isMerged |
|
416 |
] ifFalse:[ |
|
417 |
false |
|
418 |
] |
|
419 |
||
420 |
"Created: / 19-03-2012 / 15:12:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2409 | 421 |
! ! |
422 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
423 |
|
2409 | 424 |
!ChangeSetDiffEntry class methodsFor:'documentation'! |
425 |
||
3069 | 426 |
version |
3121
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
427 |
^ '$Header: ChangeSetDiffEntry.st 1986 2013-01-17 17:02:15Z vranyj1 $' |
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
428 |
! |
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
429 |
|
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
430 |
version_HG |
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
431 |
|
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
432 |
^ '$Changeset: <not expanded> $' |
3012 | 433 |
! |
434 |
||
2877 | 435 |
version_SVN |
436 |
^ '§Id: ChangeSetDiffEntry.st 1927 2012-06-22 09:52:57Z vranyj1 §' |
|
2409 | 437 |
! ! |
3121
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
438 |