|
2408
|
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:#ChangeSetDiffSet
|
|
|
30 |
instanceVariableNames:'name versionALabel versionBLabel versionBaseLabel diffs'
|
|
|
31 |
classVariableNames:''
|
|
|
32 |
poolDictionaries:''
|
|
|
33 |
category:'System-Changes-Diff'
|
|
|
34 |
!
|
|
|
35 |
|
|
|
36 |
!ChangeSetDiffSet 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 |
!ChangeSetDiffSet class methodsFor:'instance creation'!
|
|
|
69 |
|
|
|
70 |
new
|
|
|
71 |
^ self basicNew initialize.
|
|
|
72 |
! !
|
|
|
73 |
|
|
2879
|
74 |
!ChangeSetDiffSet class methodsFor:'others'!
|
|
|
75 |
|
|
|
76 |
version_CVS
|
|
3462
|
77 |
^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffSet.st,v 1.7 2014-02-05 17:52:25 cg Exp $'
|
|
2879
|
78 |
! !
|
|
|
79 |
|
|
2408
|
80 |
!ChangeSetDiffSet methodsFor:'accessing'!
|
|
|
81 |
|
|
3462
|
82 |
depth
|
|
|
83 |
| depth |
|
|
|
84 |
depth := 0.
|
|
|
85 |
diffs do:[:diff|
|
|
|
86 |
depth := depth max: diff depth
|
|
|
87 |
].
|
|
|
88 |
^depth + 1
|
|
|
89 |
|
|
|
90 |
"Created: / 15-01-2013 / 11:27:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
91 |
!
|
|
|
92 |
|
|
2408
|
93 |
diffs
|
|
|
94 |
^ diffs
|
|
|
95 |
!
|
|
|
96 |
|
|
|
97 |
flattened
|
|
|
98 |
|
|
|
99 |
| flattened s |
|
|
|
100 |
flattened := self copy.
|
|
|
101 |
s := (OrderedCollection new: diffs size) writeStream.
|
|
|
102 |
self flattenOn: s.
|
|
|
103 |
flattened setDiffs: s contents.
|
|
|
104 |
^flattened
|
|
|
105 |
|
|
|
106 |
"Created: / 05-12-2009 / 11:09:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
107 |
!
|
|
|
108 |
|
|
|
109 |
merged
|
|
|
110 |
|
|
|
111 |
^diffs allSatisfy:[:e|e merged]
|
|
|
112 |
|
|
|
113 |
"Created: / 24-11-2009 / 10:04:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
114 |
!
|
|
|
115 |
|
|
|
116 |
name
|
|
2427
|
117 |
|
|
|
118 |
^ '%1 (%2)' bindWith: (name ? '<unnamed>') with: diffs size
|
|
2408
|
119 |
|
|
|
120 |
"Modified: / 26-11-2009 / 16:26:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2427
|
121 |
"Modified: / 07-07-2011 / 14:15:12 / jv"
|
|
2408
|
122 |
!
|
|
|
123 |
|
|
|
124 |
name:aString
|
|
|
125 |
name := aString.
|
|
|
126 |
!
|
|
|
127 |
|
|
3462
|
128 |
nextEntryAfter: entry suchThat: predicate
|
|
|
129 |
| found |
|
|
|
130 |
|
|
|
131 |
entry isNil ifTrue:[
|
|
|
132 |
self do:[:each|(predicate value: each) ifTrue:[^each]].
|
|
|
133 |
^nil
|
|
|
134 |
].
|
|
|
135 |
|
|
|
136 |
found := false.
|
|
|
137 |
self do:[:each|
|
|
|
138 |
each == entry ifTrue:[
|
|
|
139 |
found := true
|
|
|
140 |
] ifFalse:[
|
|
|
141 |
(found and:[predicate value: each]) ifTrue:[ ^ each ]
|
|
|
142 |
].
|
|
|
143 |
].
|
|
|
144 |
^nil
|
|
|
145 |
|
|
|
146 |
"Created: / 17-01-2013 / 13:00:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
147 |
"Modified: / 17-01-2013 / 16:55:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
148 |
!
|
|
|
149 |
|
|
|
150 |
nextEntryBefore: entry suchThat: predicate
|
|
|
151 |
| last |
|
|
|
152 |
|
|
|
153 |
entry isNil ifTrue:[
|
|
|
154 |
^nil
|
|
|
155 |
].
|
|
|
156 |
|
|
|
157 |
self do:[:each|
|
|
|
158 |
each == entry ifTrue:[ ^ last ].
|
|
|
159 |
(predicate value: each) ifTrue:[last := each].
|
|
|
160 |
].
|
|
|
161 |
^nil
|
|
|
162 |
|
|
|
163 |
"Created: / 17-01-2013 / 16:57:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
164 |
!
|
|
|
165 |
|
|
2408
|
166 |
resolution
|
|
2627
|
167 |
| changeset |
|
|
2408
|
168 |
|
|
|
169 |
changeset := ChangeSet new.
|
|
2627
|
170 |
self do:[:diff|
|
|
|
171 |
diff versionMerged notNil ifTrue:[
|
|
|
172 |
changeset add: diff versionMerged
|
|
|
173 |
]
|
|
|
174 |
].
|
|
2408
|
175 |
^changeset
|
|
|
176 |
|
|
|
177 |
"Created: / 26-11-2009 / 08:44:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2627
|
178 |
"Modified: / 29-11-2011 / 11:25:02 / cg"
|
|
2408
|
179 |
!
|
|
|
180 |
|
|
|
181 |
versionALabel
|
|
2628
|
182 |
^ versionALabel ifNil:[parent ifNotNil:[parent versionALabel]]
|
|
2408
|
183 |
|
|
|
184 |
"Modified: / 21-11-2009 / 07:50:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2628
|
185 |
"Modified: / 29-11-2011 / 11:26:15 / cg"
|
|
2408
|
186 |
!
|
|
|
187 |
|
|
|
188 |
versionALabel:aString
|
|
|
189 |
versionALabel := aString.
|
|
|
190 |
!
|
|
|
191 |
|
|
|
192 |
versionBLabel
|
|
2628
|
193 |
^ versionBLabel ifNil:[parent ifNotNil:[parent versionBLabel]]
|
|
2408
|
194 |
|
|
|
195 |
"Modified: / 21-11-2009 / 07:51:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2628
|
196 |
"Modified: / 29-11-2011 / 11:26:19 / cg"
|
|
2408
|
197 |
!
|
|
|
198 |
|
|
|
199 |
versionBLabel:aString
|
|
|
200 |
versionBLabel := aString.
|
|
|
201 |
!
|
|
|
202 |
|
|
|
203 |
versionBaseLabel
|
|
2628
|
204 |
^ versionBaseLabel ifNil:[parent ifNotNil:[parent versionBaseLabel]]
|
|
2408
|
205 |
|
|
|
206 |
"Created: / 23-11-2009 / 22:54:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
207 |
"Modified: / 24-11-2009 / 09:21:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2628
|
208 |
"Modified (format): / 29-11-2011 / 11:26:37 / cg"
|
|
2408
|
209 |
!
|
|
|
210 |
|
|
|
211 |
versionBaseLabel:aString
|
|
|
212 |
versionBaseLabel := aString.
|
|
|
213 |
! !
|
|
|
214 |
|
|
|
215 |
!ChangeSetDiffSet methodsFor:'adding & removing'!
|
|
|
216 |
|
|
|
217 |
add: anObject
|
|
|
218 |
|
|
|
219 |
anObject parent: self.
|
|
|
220 |
^diffs add: anObject
|
|
|
221 |
|
|
|
222 |
"Created: / 09-11-2009 / 12:36:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
223 |
"Modified: / 10-11-2009 / 11:26:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
224 |
!
|
|
|
225 |
|
|
|
226 |
addAll: aCollection
|
|
|
227 |
|
|
|
228 |
aCollection do:[:e|self add:e]
|
|
|
229 |
|
|
|
230 |
"Created: / 10-11-2009 / 11:27:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
231 |
! !
|
|
|
232 |
|
|
|
233 |
!ChangeSetDiffSet methodsFor:'enumerating'!
|
|
|
234 |
|
|
|
235 |
collect: aBlock
|
|
|
236 |
|
|
|
237 |
^diffs collect: aBlock
|
|
|
238 |
|
|
|
239 |
"Created: / 10-11-2009 / 11:26:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
240 |
!
|
|
|
241 |
|
|
|
242 |
do: aBlock
|
|
|
243 |
|
|
|
244 |
^diffs do: [:each|each do:aBlock]
|
|
|
245 |
|
|
|
246 |
"Created: / 10-11-2009 / 11:26:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
247 |
"Modified: / 25-11-2009 / 10:30:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
248 |
! !
|
|
|
249 |
|
|
|
250 |
!ChangeSetDiffSet methodsFor:'initialization'!
|
|
|
251 |
|
|
|
252 |
initialize
|
|
|
253 |
"Invoked when a new instance is created."
|
|
|
254 |
|
|
|
255 |
"/ please change as required (and remove this comment)
|
|
|
256 |
"/ name := nil.
|
|
|
257 |
"/ versionALabel := nil.
|
|
|
258 |
"/ versionBLabel := nil.
|
|
|
259 |
diffs := OrderedCollection new:4.
|
|
|
260 |
|
|
|
261 |
"/ super initialize. -- commented since inherited method does nothing
|
|
|
262 |
|
|
|
263 |
"Modified: / 10-11-2009 / 11:25:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
264 |
!
|
|
|
265 |
|
|
|
266 |
setDiffs: aCollection
|
|
|
267 |
|
|
|
268 |
diffs := aCollection
|
|
|
269 |
|
|
|
270 |
"Created: / 05-12-2009 / 11:09:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
271 |
! !
|
|
|
272 |
|
|
|
273 |
!ChangeSetDiffSet methodsFor:'private'!
|
|
|
274 |
|
|
|
275 |
flattenOn: stream
|
|
|
276 |
|
|
|
277 |
diffs do:[:diff|diff flattenOn: stream]
|
|
|
278 |
|
|
|
279 |
"Created: / 05-12-2009 / 11:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
3462
|
280 |
!
|
|
|
281 |
|
|
|
282 |
sort:sortBlock
|
|
|
283 |
"superclass ChangeSetDiffComponent says that I am responsible to implement this method"
|
|
|
284 |
|
|
|
285 |
diffs sort: sortBlock.
|
|
|
286 |
diffs do:[:e|e sort: sortBlock].
|
|
|
287 |
|
|
|
288 |
"Modified: / 17-01-2013 / 14:18:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2408
|
289 |
! !
|
|
|
290 |
|
|
|
291 |
!ChangeSetDiffSet methodsFor:'testing'!
|
|
|
292 |
|
|
3462
|
293 |
isConflict
|
|
|
294 |
"Return true, if there is a conflict."
|
|
|
295 |
|
|
|
296 |
^ self diffs anySatisfy:[:e|e isConflict].
|
|
|
297 |
|
|
|
298 |
"Created: / 01-08-2012 / 17:10:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
299 |
!
|
|
|
300 |
|
|
2408
|
301 |
isDiffSet
|
|
|
302 |
^ true
|
|
|
303 |
!
|
|
|
304 |
|
|
|
305 |
isEmpty
|
|
|
306 |
|
|
|
307 |
^diffs isEmpty or:[diffs allSatisfy: [:diff|diff isEmpty]]
|
|
|
308 |
|
|
|
309 |
"Created: / 25-11-2009 / 20:37:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
310 |
"Modified: / 09-12-2009 / 17:43:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2879
|
311 |
!
|
|
|
312 |
|
|
3462
|
313 |
isForCopyrightMethod
|
|
|
314 |
"Returns true, if this is an entry for #copyright method"
|
|
|
315 |
|
|
|
316 |
^diffs allSatisfy:[:each|each isForCopyrightMethod]
|
|
|
317 |
|
|
|
318 |
"Created: / 01-08-2012 / 16:38:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
319 |
!
|
|
|
320 |
|
|
2879
|
321 |
isForVersionMethod
|
|
|
322 |
"Returns true, if this is an entry for version method"
|
|
|
323 |
|
|
|
324 |
^diffs allSatisfy:[:each|each isForVersionMethod]
|
|
|
325 |
|
|
|
326 |
"Created: / 18-04-2012 / 19:05:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
327 |
!
|
|
|
328 |
|
|
|
329 |
isMerged
|
|
|
330 |
"raise an error: must be redefined in concrete subclass(es)"
|
|
|
331 |
|
|
|
332 |
^ self diffs allSatisfy:[:e|e isMerged].
|
|
|
333 |
|
|
|
334 |
"Created: / 19-03-2012 / 15:15:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
2408
|
335 |
! !
|
|
|
336 |
|
|
|
337 |
!ChangeSetDiffSet class methodsFor:'documentation'!
|
|
|
338 |
|
|
2628
|
339 |
version
|
|
3462
|
340 |
^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffSet.st,v 1.7 2014-02-05 17:52:25 cg Exp $'
|
|
2628
|
341 |
!
|
|
|
342 |
|
|
2879
|
343 |
version_SVN
|
|
3462
|
344 |
^ '$Id: ChangeSetDiffSet.st,v 1.7 2014-02-05 17:52:25 cg Exp $'
|
|
2408
|
345 |
! !
|
|
3398
|
346 |
|