author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Mon, 19 Mar 2012 15:30:00 +0000 | |
branch | jv |
changeset 3030 | f89aa3cfedde |
parent 3029 | c7be0be50898 |
child 3033 | 8964521a2c1b |
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 |
|
3030 | 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 |
|
73 |
versionA: versionA; |
|
74 |
versionB: versionA asAntiChange |
|
75 |
||
76 |
"Modified: / 24-11-2009 / 12:30:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
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 |
|
89 |
versionA: versionB asAntiChange; |
|
90 |
versionB: versionB. |
|
91 |
||
92 |
"Modified: / 24-11-2009 / 12:30:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
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 |
||
109 |
!ChangeSetDiffEntry methodsFor:'accessing'! |
|
110 |
||
2631 | 111 |
changeClass |
112 |
||
113 |
^(versionA ? versionB) changeClass |
|
114 |
||
115 |
"Created: / 30-11-2011 / 11:35:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
116 |
! |
|
117 |
||
118 |
changeSelector |
|
119 |
||
120 |
| chg | |
|
121 |
||
122 |
(chg := versionA ? versionB) isMethodChange ifTrue:[ |
|
123 |
^chg changeSelector |
|
124 |
] ifFalse:[ |
|
125 |
^nil |
|
126 |
] |
|
127 |
||
128 |
"Created: / 30-11-2011 / 11:40:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
129 |
! |
|
130 |
||
2409 | 131 |
className |
132 |
||
133 |
^(versionA ? versionB) className |
|
134 |
||
135 |
"Created: / 01-11-2009 / 16:48:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
136 |
! |
|
137 |
||
3030 | 138 |
mergeInfo |
139 |
(mergeInfo isNil and:[versionBase notNil and:[Tools::TextMergeInfo notNil]]) ifTrue:[ |
|
140 |
mergeInfo := Tools::TextMergeInfo new. |
|
141 |
mergeInfo text1: self versionBaseText text2: self versionAText text3: self versionBText. |
|
142 |
]. |
|
143 |
^mergeInfo |
|
144 |
||
145 |
"Created: / 19-03-2012 / 14:57:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
146 |
! |
|
147 |
||
148 |
mergeInfo:aTextMergeInfo |
|
149 |
mergeInfo := aTextMergeInfo. |
|
150 |
||
151 |
"Created: / 19-03-2012 / 14:57:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
152 |
! |
|
153 |
||
2409 | 154 |
merged |
155 |
^ versionMerged notNil |
|
156 |
||
157 |
"Modified: / 24-11-2009 / 12:55:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
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 |
|
219 |
^ versionA source |
|
220 |
||
221 |
"Created: / 06-07-2011 / 12:29:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
222 |
! |
|
223 |
||
224 |
versionAorB |
|
225 |
||
226 |
^versionA isClassRemoveChangeOrMethodRemoveChange |
|
227 |
ifFalse:[versionA] |
|
228 |
ifTrue:[versionB] |
|
229 |
||
230 |
"Created: / 02-11-2009 / 18:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
231 |
! |
|
232 |
||
233 |
versionB |
|
234 |
^ versionB |
|
235 |
! |
|
236 |
||
237 |
versionB:something |
|
238 |
versionB := something. |
|
239 |
! |
|
240 |
||
241 |
versionBLabel |
|
242 |
^ parent versionBLabel |
|
243 |
||
244 |
"Created: / 09-11-2009 / 12:38:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
245 |
! |
|
246 |
||
247 |
versionBText |
|
248 |
^ versionB source |
|
249 |
||
250 |
"Created: / 06-07-2011 / 12:29:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
251 |
! |
|
252 |
||
253 |
versionBase |
|
254 |
^ versionBase |
|
255 |
! |
|
256 |
||
257 |
versionBase:something |
|
258 |
versionBase := something. |
|
259 |
! |
|
260 |
||
261 |
versionBaseLabel |
|
262 |
^ parent versionBaseLabel |
|
263 |
||
264 |
"Created: / 23-11-2009 / 22:55:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
265 |
! |
|
266 |
||
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
267 |
versionBaseText |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
268 |
^versionBase notNil ifTrue:[ |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
269 |
versionBase source |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
270 |
] ifFalse:[ |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
271 |
nil |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
272 |
] |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
273 |
|
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
274 |
"Created: / 16-03-2012 / 15:20:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
275 |
! |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
276 |
|
2409 | 277 |
versionMerged |
278 |
^ versionMerged |
|
279 |
! |
|
280 |
||
281 |
versionMerged:aChange |
|
282 |
versionMerged := aChange. |
|
283 |
self changed:#resolution with: aChange |
|
284 |
||
285 |
"Modified: / 24-11-2009 / 12:58:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
286 |
! |
|
287 |
||
288 |
versionMergedLabel |
|
289 |
||
290 |
(versionMerged isNil) |
|
291 |
ifTrue:[^'<unresolved>' asText colorizeAllWith: Color red]. |
|
292 |
(versionMerged sameAs: versionA) |
|
293 |
ifTrue:[^self versionALabel]. |
|
294 |
(versionMerged sameAs: versionB) |
|
295 |
ifTrue:[^self versionBLabel]. |
|
296 |
(versionMerged sameAs: versionBase) |
|
297 |
ifTrue:[^self versionBaseLabel]. |
|
298 |
^'manual merge' |
|
299 |
! ! |
|
300 |
||
301 |
!ChangeSetDiffEntry methodsFor:'enumerating'! |
|
302 |
||
303 |
do: aBlock |
|
304 |
||
305 |
aBlock value: self |
|
306 |
||
307 |
"Created: / 25-11-2009 / 10:22:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
308 |
! ! |
|
309 |
||
310 |
!ChangeSetDiffEntry methodsFor:'merging'! |
|
311 |
||
312 |
automerge |
|
313 |
||
314 |
"Try to automatically merge differences. The merge is based |
|
315 |
on versionBase. If any of versions is same as versionBase, |
|
316 |
the other is used as merge result" |
|
317 |
||
3030 | 318 |
^self. |
319 |
||
2409 | 320 |
versionBase ifNil:[^self]. |
321 |
||
322 |
(versionA sameAs: versionBase) ifTrue:[versionMerged := versionB copy]. |
|
323 |
(versionB sameAs: versionBase) ifTrue:[versionMerged := versionA copy]. |
|
324 |
||
325 |
"Created: / 02-11-2009 / 18:51:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3030 | 326 |
"Modified: / 19-03-2012 / 15:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2409 | 327 |
! ! |
328 |
||
329 |
!ChangeSetDiffEntry methodsFor:'testing'! |
|
330 |
||
331 |
isDiffItem |
|
332 |
^ true |
|
3030 | 333 |
! |
334 |
||
335 |
isMerged |
|
336 |
| mi | |
|
337 |
||
338 |
^(mi := self mergeInfo) notNil ifTrue:[ |
|
339 |
mi isMerged |
|
340 |
] ifFalse:[ |
|
341 |
false |
|
342 |
] |
|
343 |
||
344 |
"Created: / 19-03-2012 / 15:12:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2409 | 345 |
! ! |
346 |
||
347 |
!ChangeSetDiffEntry class methodsFor:'documentation'! |
|
348 |
||
349 |
version_CVS |
|
3011
1997ff6e7e55
trunk branched into /branches/jv
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2631
diff
changeset
|
350 |
^ '§Header: /cvs/stx/stx/libbasic3/ChangeSetDiffEntry.st,v 1.3 2011/11/30 18:52:51 vrany Exp §' |
3012 | 351 |
! |
352 |
||
353 |
version_SVN |
|
3030 | 354 |
^ '$Id: ChangeSetDiffEntry.st 1896 2012-03-19 15:30:00Z vranyj1 $' |
3012 | 355 |
! ! |