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