|
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 |
|
|
|
68 |
!ChangeSetDiffEntry class methodsFor:'instance creation'!
|
|
|
69 |
|
|
|
70 |
versionA:versionA
|
|
|
71 |
|
|
|
72 |
^self new
|
|
2877
|
73 |
"/ versionB: versionA asAntiChange
|
|
|
74 |
versionA: versionA.
|
|
2409
|
75 |
|
|
2877
|
76 |
"Modified (comment): / 20-03-2012 / 21:42:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2409
|
77 |
!
|
|
|
78 |
|
|
|
79 |
versionA:versionA versionB:versionB
|
|
|
80 |
|
|
|
81 |
^self new
|
|
|
82 |
versionA: versionA;
|
|
|
83 |
versionB: versionB.
|
|
|
84 |
!
|
|
|
85 |
|
|
|
86 |
versionB:versionB
|
|
|
87 |
|
|
|
88 |
^self new
|
|
2877
|
89 |
"/ versionA: versionB asAntiChange;
|
|
2409
|
90 |
versionB: versionB.
|
|
|
91 |
|
|
2877
|
92 |
"Modified: / 20-03-2012 / 21:42:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2409
|
93 |
! !
|
|
|
94 |
|
|
|
95 |
!ChangeSetDiffEntry class methodsFor:'image specs'!
|
|
|
96 |
|
|
|
97 |
iconMinus
|
|
2492
|
98 |
^ ToolbarIconLibrary iconMinus12x12
|
|
2409
|
99 |
|
|
2492
|
100 |
"Modified: / 31-08-2011 / 10:51:21 / cg"
|
|
2409
|
101 |
!
|
|
|
102 |
|
|
|
103 |
iconPlus
|
|
2492
|
104 |
^ ToolbarIconLibrary iconPlus12x12
|
|
2409
|
105 |
|
|
2492
|
106 |
"Modified: / 31-08-2011 / 10:51:34 / cg"
|
|
2409
|
107 |
! !
|
|
|
108 |
|
|
2877
|
109 |
!ChangeSetDiffEntry class methodsFor:'others'!
|
|
|
110 |
|
|
|
111 |
version_CVS
|
|
3468
|
112 |
^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffEntry.st,v 1.5 2014-02-05 17:52:37 cg Exp $'
|
|
2877
|
113 |
! !
|
|
|
114 |
|
|
2409
|
115 |
!ChangeSetDiffEntry methodsFor:'accessing'!
|
|
|
116 |
|
|
2631
|
117 |
changeClass
|
|
|
118 |
|
|
|
119 |
^(versionA ? versionB) changeClass
|
|
|
120 |
|
|
|
121 |
"Created: / 30-11-2011 / 11:35:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
122 |
!
|
|
|
123 |
|
|
|
124 |
changeSelector
|
|
|
125 |
|
|
|
126 |
| chg |
|
|
|
127 |
|
|
|
128 |
(chg := versionA ? versionB) isMethodChange ifTrue:[
|
|
|
129 |
^chg changeSelector
|
|
|
130 |
] ifFalse:[
|
|
|
131 |
^nil
|
|
|
132 |
]
|
|
|
133 |
|
|
|
134 |
"Created: / 30-11-2011 / 11:40:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
135 |
!
|
|
|
136 |
|
|
2409
|
137 |
className
|
|
|
138 |
|
|
|
139 |
^(versionA ? versionB) className
|
|
|
140 |
|
|
|
141 |
"Created: / 01-11-2009 / 16:48:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
142 |
!
|
|
|
143 |
|
|
2877
|
144 |
mergeInfo
|
|
|
145 |
(mergeInfo isNil and:[Tools::TextMergeInfo notNil]) ifTrue:[
|
|
|
146 |
mergeInfo := Tools::TextMergeInfo new.
|
|
|
147 |
mergeInfo text1: self versionBaseText text2: self versionAText text3: self versionBText.
|
|
|
148 |
].
|
|
|
149 |
^mergeInfo
|
|
2409
|
150 |
|
|
2877
|
151 |
"Created: / 19-03-2012 / 14:57:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
152 |
!
|
|
|
153 |
|
|
|
154 |
mergeInfo:aTextMergeInfo
|
|
|
155 |
mergeInfo := aTextMergeInfo.
|
|
|
156 |
|
|
|
157 |
"Created: / 19-03-2012 / 14:57:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2409
|
158 |
!
|
|
|
159 |
|
|
|
160 |
mergedUsingVersionA
|
|
|
161 |
|
|
|
162 |
versionMerged ifNil:[^false].
|
|
|
163 |
versionA ifNil:[^false].
|
|
|
164 |
|
|
|
165 |
^versionA sameAs: versionMerged
|
|
|
166 |
|
|
|
167 |
"Created: / 24-11-2009 / 08:16:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
168 |
!
|
|
|
169 |
|
|
|
170 |
mergedUsingVersionB
|
|
|
171 |
|
|
|
172 |
versionMerged ifNil:[^false].
|
|
|
173 |
versionB ifNil:[^false].
|
|
|
174 |
|
|
|
175 |
^versionB sameAs: versionMerged
|
|
|
176 |
|
|
|
177 |
"Created: / 24-11-2009 / 08:16:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
178 |
!
|
|
|
179 |
|
|
|
180 |
mergedUsingVersionBase
|
|
|
181 |
|
|
|
182 |
versionMerged ifNil:[^false].
|
|
|
183 |
versionBase ifNil:[^false].
|
|
|
184 |
|
|
|
185 |
^versionBase sameAs: versionMerged
|
|
|
186 |
|
|
|
187 |
"Created: / 24-11-2009 / 08:16:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
188 |
!
|
|
|
189 |
|
|
|
190 |
name
|
|
|
191 |
|
|
|
192 |
^self versionAorB displayString
|
|
|
193 |
|
|
|
194 |
"Created: / 24-11-2009 / 09:56:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
195 |
!
|
|
|
196 |
|
|
|
197 |
nonMetaClassName
|
|
|
198 |
|
|
|
199 |
^(versionA ? versionB) nonMetaClassName
|
|
|
200 |
|
|
|
201 |
"Created: / 21-11-2009 / 07:42:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
202 |
!
|
|
|
203 |
|
|
|
204 |
versionA
|
|
|
205 |
^ versionA
|
|
|
206 |
!
|
|
|
207 |
|
|
|
208 |
versionA:something
|
|
|
209 |
versionA := something.
|
|
|
210 |
!
|
|
|
211 |
|
|
|
212 |
versionALabel
|
|
|
213 |
^ parent versionALabel
|
|
|
214 |
|
|
|
215 |
"Created: / 09-11-2009 / 12:38:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
216 |
!
|
|
|
217 |
|
|
|
218 |
versionAText
|
|
2877
|
219 |
^versionA notNil ifTrue:[
|
|
|
220 |
versionA source
|
|
|
221 |
] ifFalse:[
|
|
|
222 |
nil
|
|
|
223 |
].
|
|
2409
|
224 |
|
|
|
225 |
"Created: / 06-07-2011 / 12:29:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
226 |
!
|
|
|
227 |
|
|
|
228 |
versionAorB
|
|
|
229 |
|
|
2877
|
230 |
^versionA ? versionB
|
|
2409
|
231 |
|
|
|
232 |
"Created: / 02-11-2009 / 18:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
233 |
!
|
|
|
234 |
|
|
|
235 |
versionB
|
|
|
236 |
^ versionB
|
|
|
237 |
!
|
|
|
238 |
|
|
|
239 |
versionB:something
|
|
2877
|
240 |
|
|
2409
|
241 |
versionB := something.
|
|
2877
|
242 |
|
|
|
243 |
"Modified: / 20-03-2012 / 22:08:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2409
|
244 |
!
|
|
|
245 |
|
|
|
246 |
versionBLabel
|
|
|
247 |
^ parent versionBLabel
|
|
|
248 |
|
|
|
249 |
"Created: / 09-11-2009 / 12:38:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
250 |
!
|
|
|
251 |
|
|
|
252 |
versionBText
|
|
2877
|
253 |
^versionB notNil ifTrue:[
|
|
|
254 |
versionB source
|
|
|
255 |
] ifFalse:[
|
|
|
256 |
nil
|
|
|
257 |
].
|
|
2409
|
258 |
|
|
|
259 |
"Created: / 06-07-2011 / 12:29:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
260 |
!
|
|
|
261 |
|
|
|
262 |
versionBase
|
|
|
263 |
^ versionBase
|
|
|
264 |
!
|
|
|
265 |
|
|
|
266 |
versionBase:something
|
|
|
267 |
versionBase := something.
|
|
|
268 |
!
|
|
|
269 |
|
|
2877
|
270 |
versionBaseText
|
|
|
271 |
^versionBase notNil ifTrue:[
|
|
|
272 |
versionBase source
|
|
|
273 |
] ifFalse:[
|
|
|
274 |
nil
|
|
|
275 |
].
|
|
2409
|
276 |
|
|
2877
|
277 |
"Created: / 16-03-2012 / 15:20:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2409
|
278 |
!
|
|
|
279 |
|
|
|
280 |
versionMerged
|
|
2877
|
281 |
"Returns a change representing a merge"
|
|
|
282 |
|
|
|
283 |
| merged |
|
|
|
284 |
merged := versionMerged.
|
|
|
285 |
(merged isNil and:[mergeInfo notNil]) ifTrue:[
|
|
|
286 |
merged := (versionA ? versionB ? versionBase) copy.
|
|
|
287 |
merged source: mergeInfo text.
|
|
|
288 |
merged isClassDefinitionChange ifTrue:[
|
|
|
289 |
merged setupFromSource.
|
|
|
290 |
]
|
|
|
291 |
|
|
|
292 |
].
|
|
|
293 |
^merged
|
|
|
294 |
|
|
|
295 |
"Modified: / 21-03-2012 / 00:59:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2409
|
296 |
!
|
|
|
297 |
|
|
|
298 |
versionMerged:aChange
|
|
|
299 |
versionMerged := aChange.
|
|
|
300 |
self changed:#resolution with: aChange
|
|
|
301 |
|
|
|
302 |
"Modified: / 24-11-2009 / 12:58:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
303 |
!
|
|
|
304 |
|
|
|
305 |
versionMergedLabel
|
|
|
306 |
|
|
|
307 |
(versionMerged isNil)
|
|
|
308 |
ifTrue:[^'<unresolved>' asText colorizeAllWith: Color red].
|
|
|
309 |
(versionMerged sameAs: versionA)
|
|
|
310 |
ifTrue:[^self versionALabel].
|
|
|
311 |
(versionMerged sameAs: versionB)
|
|
|
312 |
ifTrue:[^self versionBLabel].
|
|
|
313 |
(versionMerged sameAs: versionBase)
|
|
|
314 |
ifTrue:[^self versionBaseLabel].
|
|
|
315 |
^'manual merge'
|
|
|
316 |
! !
|
|
|
317 |
|
|
|
318 |
!ChangeSetDiffEntry methodsFor:'enumerating'!
|
|
|
319 |
|
|
|
320 |
do: aBlock
|
|
|
321 |
|
|
|
322 |
aBlock value: self
|
|
|
323 |
|
|
|
324 |
"Created: / 25-11-2009 / 10:22:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
325 |
! !
|
|
|
326 |
|
|
|
327 |
!ChangeSetDiffEntry methodsFor:'merging'!
|
|
|
328 |
|
|
|
329 |
automerge
|
|
|
330 |
|
|
2877
|
331 |
"Automerge version methods"
|
|
|
332 |
versionB ifNil:[^self].
|
|
|
333 |
versionB isMethodCodeChange ifTrue:[
|
|
|
334 |
(AbstractSourceCodeManager isVersionMethodSelector: versionB selector) ifTrue:[
|
|
|
335 |
versionMerged := versionB copy.
|
|
|
336 |
self mergeInfo mergeUsingB: (versionB source)
|
|
|
337 |
]
|
|
|
338 |
].
|
|
2409
|
339 |
|
|
|
340 |
"Created: / 02-11-2009 / 18:51:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2877
|
341 |
"Modified: / 09-04-2012 / 16:37:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
342 |
"Modified (comment): / 09-04-2012 / 18:01:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2409
|
343 |
! !
|
|
|
344 |
|
|
3468
|
345 |
!ChangeSetDiffEntry methodsFor:'private'!
|
|
|
346 |
|
|
|
347 |
sort:sortBlock
|
|
|
348 |
"superclass ChangeSetDiffComponent says that I am responsible to implement this method"
|
|
|
349 |
|
|
|
350 |
"Ignored"
|
|
|
351 |
|
|
|
352 |
"Modified: / 17-01-2013 / 13:57:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
353 |
! !
|
|
|
354 |
|
|
2409
|
355 |
!ChangeSetDiffEntry methodsFor:'testing'!
|
|
|
356 |
|
|
3468
|
357 |
isConflict
|
|
|
358 |
"Return true, if there is a conflict. For simple two-way diff,
|
|
|
359 |
conflict is when there are both versionA and versionB and they
|
|
|
360 |
differ. For three-way diff/merge, conflict is iff the entry is not
|
|
|
361 |
yet merged"
|
|
|
362 |
|
|
|
363 |
^versionBase isNil ifTrue:[
|
|
|
364 |
"/two-way diff
|
|
|
365 |
versionA notNil and:[versionB notNil and:[(versionA sameAs: versionB) not]]
|
|
|
366 |
] ifFalse:[
|
|
|
367 |
self isMerged not
|
|
|
368 |
].
|
|
|
369 |
|
|
|
370 |
"Created: / 01-08-2012 / 17:10:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
371 |
!
|
|
|
372 |
|
|
2409
|
373 |
isDiffItem
|
|
|
374 |
^ true
|
|
2877
|
375 |
!
|
|
|
376 |
|
|
3468
|
377 |
isForCopyrightMethod
|
|
|
378 |
"Returns true, if this is an entry for version method"
|
|
|
379 |
|
|
|
380 |
| version |
|
|
|
381 |
|
|
|
382 |
version := versionA ? versionB.
|
|
|
383 |
^version isMethodCodeChange
|
|
|
384 |
and:[version isForMeta and: [version selector == #copyright]]
|
|
|
385 |
|
|
|
386 |
"Created: / 01-08-2012 / 16:39:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
387 |
!
|
|
|
388 |
|
|
2877
|
389 |
isForVersionMethod
|
|
|
390 |
"Returns true, if this is an entry for version method"
|
|
|
391 |
|
|
|
392 |
| version |
|
|
|
393 |
|
|
|
394 |
version := versionA ? versionB.
|
|
|
395 |
^version isMethodCodeChange
|
|
3468
|
396 |
and:[(AbstractSourceCodeManager isVersionMethodSelector: version selector) or:[AbstractSourceCodeManager isExtensionsVersionMethodSelector: version selector]]
|
|
2877
|
397 |
|
|
|
398 |
"Created: / 18-04-2012 / 18:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
3468
|
399 |
"Modified: / 15-07-2013 / 13:17:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2877
|
400 |
!
|
|
|
401 |
|
|
|
402 |
isMerged
|
|
|
403 |
| mi |
|
|
|
404 |
|
|
|
405 |
versionMerged notNil ifTrue:[ ^ true ].
|
|
|
406 |
|
|
|
407 |
^(mi := self mergeInfo) notNil ifTrue:[
|
|
|
408 |
mi isMerged
|
|
|
409 |
] ifFalse:[
|
|
|
410 |
false
|
|
|
411 |
]
|
|
|
412 |
|
|
|
413 |
"Created: / 19-03-2012 / 15:12:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2409
|
414 |
! !
|
|
|
415 |
|
|
|
416 |
!ChangeSetDiffEntry class methodsFor:'documentation'!
|
|
|
417 |
|
|
2877
|
418 |
version_SVN
|
|
3468
|
419 |
^ '$Id: ChangeSetDiffEntry.st,v 1.5 2014-02-05 17:52:37 cg Exp $'
|
|
2409
|
420 |
! !
|
|
3468
|
421 |
|