|
3807
|
1 |
"{ Encoding: utf8 }"
|
|
|
2 |
|
|
3676
|
3 |
"
|
|
|
4 |
COPYRIGHT (c) 2019 by eXept Software AG
|
|
|
5 |
All Rights Reserved
|
|
|
6 |
|
|
|
7 |
This software is furnished under a license and may be used
|
|
|
8 |
only in accordance with the terms of that license and with the
|
|
|
9 |
inclusion of the above copyright notice. This software may not
|
|
|
10 |
be provided or otherwise made available to, or used by, any
|
|
|
11 |
other person. No title to or ownership of the software is
|
|
|
12 |
hereby transferred.
|
|
|
13 |
"
|
|
|
14 |
"{ Package: 'stx:libtool2' }"
|
|
|
15 |
|
|
|
16 |
"{ NameSpace: Smalltalk }"
|
|
|
17 |
|
|
|
18 |
ApplicationModel subclass:#FileVersionDiffBrowser
|
|
|
19 |
instanceVariableNames:'diffTextView diffTextLabelA diffTextLabelB versionAHolder
|
|
|
20 |
versionBHolder infoHolder isMultipleVersionBrowser
|
|
|
21 |
versionInfoList versionList versionEntriesList
|
|
|
22 |
selectedVersionHolder symbolicVersionList symbolicVersionNameList
|
|
|
23 |
selectedSymbolicVersionHolder selectedSymbolicVersionIndexHolder
|
|
|
24 |
symbolicToVersionMapping selectedVersionIndexHolder
|
|
|
25 |
isMultipleFilesVersionBrowser fileListHolder
|
|
|
26 |
selectedFileIndexHolder fileHolder diffTextHolder
|
|
|
27 |
versionAIfSingleFileDiff versionBIfSingleFileDiff
|
|
|
28 |
fileIfSingleFileDiff'
|
|
|
29 |
classVariableNames:''
|
|
|
30 |
poolDictionaries:''
|
|
|
31 |
category:'Interface-Tools-File'
|
|
|
32 |
!
|
|
|
33 |
|
|
|
34 |
!FileVersionDiffBrowser class methodsFor:'documentation'!
|
|
|
35 |
|
|
|
36 |
copyright
|
|
|
37 |
"
|
|
|
38 |
COPYRIGHT (c) 2019 by eXept Software AG
|
|
|
39 |
All Rights Reserved
|
|
|
40 |
|
|
|
41 |
This software is furnished under a license and may be used
|
|
|
42 |
only in accordance with the terms of that license and with the
|
|
|
43 |
inclusion of the above copyright notice. This software may not
|
|
|
44 |
be provided or otherwise made available to, or used by, any
|
|
|
45 |
other person. No title to or ownership of the software is
|
|
|
46 |
hereby transferred.
|
|
|
47 |
"
|
|
|
48 |
!
|
|
|
49 |
|
|
|
50 |
documentation
|
|
|
51 |
"
|
|
|
52 |
A quickly hacked up browser to show differences between file versions,
|
|
|
53 |
allowing easy comparison; will also eventually add capabilities
|
|
|
54 |
to checkIn / load files into / from the repository.
|
|
|
55 |
|
|
|
56 |
[usages:]
|
|
|
57 |
FileVersionDiffBrowser openOnAllVersionsOfFile:'Make.proto'.
|
|
|
58 |
FileVersionDiffBrowser openOnAllFilesChangedSince:(Date today - 7 days) in:('../../libbasic' asFilename).
|
|
|
59 |
|
|
|
60 |
[see also:]
|
|
|
61 |
|
|
|
62 |
[instance variables:]
|
|
|
63 |
|
|
|
64 |
[class variables:]
|
|
|
65 |
"
|
|
|
66 |
! !
|
|
|
67 |
|
|
|
68 |
!FileVersionDiffBrowser class methodsFor:'interface specs'!
|
|
|
69 |
|
|
|
70 |
windowSpec
|
|
|
71 |
"This resource specification was automatically generated
|
|
|
72 |
by the UIPainter of ST/X."
|
|
|
73 |
|
|
|
74 |
"Do not manually edit this!! If it is corrupted,
|
|
|
75 |
the UIPainter may not be able to read the specification."
|
|
|
76 |
|
|
|
77 |
"
|
|
|
78 |
UIPainter new openOnClass:FileVersionDiffBrowser andSelector:#windowSpec
|
|
|
79 |
FileVersionDiffBrowser new openInterface:#windowSpec
|
|
|
80 |
FileVersionDiffBrowser open
|
|
|
81 |
"
|
|
|
82 |
|
|
|
83 |
<resource: #canvas>
|
|
|
84 |
|
|
|
85 |
^
|
|
|
86 |
#(FullSpec
|
|
|
87 |
name: windowSpec
|
|
|
88 |
uuid: '34d3baee-a108-11e9-a652-b8f6b1108e05'
|
|
|
89 |
window:
|
|
|
90 |
(WindowSpec
|
|
|
91 |
label: 'Version DiffBrowser'
|
|
|
92 |
name: 'Version DiffBrowser'
|
|
|
93 |
uuid: '90e45e00-7175-11e9-a23a-b8f6b1108e05'
|
|
|
94 |
min: (Point 10 10)
|
|
|
95 |
bounds: (Rectangle 0 0 865 504)
|
|
|
96 |
menu: mainMenu
|
|
|
97 |
)
|
|
|
98 |
component:
|
|
|
99 |
(SpecCollection
|
|
|
100 |
collection: (
|
|
|
101 |
(VariableVerticalPanelSpec
|
|
|
102 |
name: 'VariableVerticalPanel1'
|
|
|
103 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
|
|
|
104 |
uuid: '90e460c6-7175-11e9-a23a-b8f6b1108e05'
|
|
|
105 |
component:
|
|
|
106 |
(SpecCollection
|
|
|
107 |
collection: (
|
|
|
108 |
(ViewSpec
|
|
|
109 |
name: 'DiffOrSingleMethodCodeBox'
|
|
|
110 |
uuid: '90e471a6-7175-11e9-a23a-b8f6b1108e05'
|
|
|
111 |
component:
|
|
|
112 |
(SpecCollection
|
|
|
113 |
collection: (
|
|
|
114 |
(ViewSpec
|
|
|
115 |
name: 'diffTextViewBox'
|
|
|
116 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
|
|
|
117 |
uuid: '90e47264-7175-11e9-a23a-b8f6b1108e05'
|
|
|
118 |
component:
|
|
|
119 |
(SpecCollection
|
|
|
120 |
collection: (
|
|
|
121 |
(LabelSpec
|
|
|
122 |
label: 'A'
|
|
|
123 |
name: 'DiffTextLabelA'
|
|
|
124 |
layout: (LayoutFrame 0 0 0 0 0 0.5 20 0)
|
|
|
125 |
uuid: '90e47318-7175-11e9-a23a-b8f6b1108e05'
|
|
|
126 |
translateLabel: true
|
|
|
127 |
labelChannel: diffTextLabelA
|
|
|
128 |
)
|
|
|
129 |
(LabelSpec
|
|
|
130 |
label: 'B'
|
|
|
131 |
name: 'DiffTextLabelB'
|
|
|
132 |
layout: (LayoutFrame 0 0.5 0 0 0 1 20 0)
|
|
|
133 |
uuid: '90e47412-7175-11e9-a23a-b8f6b1108e05'
|
|
|
134 |
translateLabel: true
|
|
|
135 |
labelChannel: diffTextLabelB
|
|
|
136 |
)
|
|
|
137 |
(ArbitraryComponentSpec
|
|
|
138 |
name: 'diffTextView'
|
|
|
139 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 0 1.0)
|
|
|
140 |
uuid: '90e47502-7175-11e9-a23a-b8f6b1108e05'
|
|
|
141 |
hasBorder: false
|
|
|
142 |
component: diffTextView
|
|
|
143 |
)
|
|
|
144 |
)
|
|
|
145 |
|
|
|
146 |
)
|
|
|
147 |
)
|
|
|
148 |
)
|
|
|
149 |
|
|
|
150 |
)
|
|
|
151 |
)
|
|
|
152 |
)
|
|
|
153 |
|
|
|
154 |
)
|
|
|
155 |
handles: (Any 1.0)
|
|
|
156 |
)
|
|
|
157 |
(LabelSpec
|
|
|
158 |
name: 'InfoLabel'
|
|
|
159 |
layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
|
|
|
160 |
uuid: '90e47868-7175-11e9-a23a-b8f6b1108e05'
|
|
|
161 |
level: -1
|
|
|
162 |
translateLabel: true
|
|
3847
|
163 |
labelChannel: informationHolder
|
|
3676
|
164 |
adjust: left
|
|
|
165 |
)
|
|
|
166 |
)
|
|
|
167 |
|
|
|
168 |
)
|
|
|
169 |
)
|
|
|
170 |
!
|
|
|
171 |
|
|
|
172 |
windowSpecForMultipleFiles
|
|
|
173 |
"This resource specification was automatically generated
|
|
|
174 |
by the UIPainter of ST/X."
|
|
|
175 |
|
|
|
176 |
"Do not manually edit this!! If it is corrupted,
|
|
|
177 |
the UIPainter may not be able to read the specification."
|
|
|
178 |
|
|
|
179 |
"
|
|
|
180 |
UIPainter new openOnClass:FileVersionDiffBrowser andSelector:#windowSpecForMultipleFiles
|
|
|
181 |
FileVersionDiffBrowser new openInterface:#windowSpecForMultipleFiles
|
|
|
182 |
"
|
|
|
183 |
|
|
|
184 |
<resource: #canvas>
|
|
|
185 |
|
|
|
186 |
^
|
|
|
187 |
#(FullSpec
|
|
|
188 |
name: windowSpecForMultipleFiles
|
|
|
189 |
uuid: '3c5c60f4-a108-11e9-a652-b8f6b1108e05'
|
|
|
190 |
window:
|
|
|
191 |
(WindowSpec
|
|
|
192 |
label: 'Version DiffBrowser'
|
|
|
193 |
name: 'Version DiffBrowser'
|
|
|
194 |
uuid: '2b3f2546-d4fd-11e7-af82-c42c033b4871'
|
|
|
195 |
min: (Point 10 10)
|
|
|
196 |
bounds: (Rectangle 0 0 865 504)
|
|
|
197 |
menu: mainMenu
|
|
|
198 |
)
|
|
|
199 |
component:
|
|
|
200 |
(SpecCollection
|
|
|
201 |
collection: (
|
|
|
202 |
(VariableVerticalPanelSpec
|
|
|
203 |
name: 'VariableVerticalPanel1'
|
|
|
204 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
|
|
|
205 |
uuid: '2b3f297e-d4fd-11e7-af82-c42c033b4871'
|
|
|
206 |
component:
|
|
|
207 |
(SpecCollection
|
|
|
208 |
collection: (
|
|
|
209 |
(VariableHorizontalPanelSpec
|
|
|
210 |
name: 'FileAndVersionAndTagPanel'
|
|
|
211 |
uuid: '17c6805c-7184-11e9-a23a-b8f6b1108e05'
|
|
|
212 |
component:
|
|
|
213 |
(SpecCollection
|
|
|
214 |
collection: (
|
|
|
215 |
(SequenceViewSpec
|
|
|
216 |
name: 'List2'
|
|
|
217 |
uuid: '2b3f2d20-d4fd-11e7-af82-c42c033b4871'
|
|
|
218 |
model: selectedFileIndexHolder
|
|
|
219 |
menu: fileListMenu
|
|
|
220 |
hasHorizontalScrollBar: true
|
|
|
221 |
hasVerticalScrollBar: true
|
|
|
222 |
useIndex: true
|
|
|
223 |
sequenceList: fileNameListHolder
|
|
|
224 |
)
|
|
|
225 |
(VariableHorizontalPanelSpec
|
|
|
226 |
name: 'VersionAndTagPanel'
|
|
|
227 |
uuid: '2b3f2c08-d4fd-11e7-af82-c42c033b4871'
|
|
|
228 |
component:
|
|
|
229 |
(SpecCollection
|
|
|
230 |
collection: (
|
|
|
231 |
(SequenceViewSpec
|
|
|
232 |
name: 'VersionList'
|
|
|
233 |
uuid: '2b3f2d20-d4fd-11e7-af82-c42c033b4871'
|
|
|
234 |
model: selectedVersionIndexHolder
|
|
|
235 |
menu: versionsMenu
|
|
|
236 |
hasHorizontalScrollBar: true
|
|
|
237 |
hasVerticalScrollBar: true
|
|
|
238 |
useIndex: true
|
|
|
239 |
sequenceList: versionEntriesList
|
|
|
240 |
)
|
|
|
241 |
(SequenceViewSpec
|
|
|
242 |
name: 'List1'
|
|
|
243 |
uuid: '2b3f3086-d4fd-11e7-af82-c42c033b4871'
|
|
|
244 |
model: selectedSymbolicVersionIndexHolder
|
|
|
245 |
menu: symbolicVersionsMenu
|
|
|
246 |
hasHorizontalScrollBar: true
|
|
|
247 |
hasVerticalScrollBar: true
|
|
|
248 |
useIndex: true
|
|
|
249 |
sequenceList: symbolicVersionNameList
|
|
|
250 |
)
|
|
|
251 |
)
|
|
|
252 |
|
|
|
253 |
)
|
|
|
254 |
handles: (Any 0.5 1.0)
|
|
|
255 |
)
|
|
|
256 |
)
|
|
|
257 |
|
|
|
258 |
)
|
|
|
259 |
handles: (Any 0.5 1.0)
|
|
|
260 |
)
|
|
|
261 |
(ViewSpec
|
|
|
262 |
name: 'DiffBox'
|
|
|
263 |
uuid: '2b3f408a-d4fd-11e7-af82-c42c033b4871'
|
|
|
264 |
component:
|
|
|
265 |
(SpecCollection
|
|
|
266 |
collection: (
|
|
|
267 |
(ViewSpec
|
|
|
268 |
name: 'diffTextViewBox'
|
|
|
269 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
|
|
|
270 |
uuid: '2b3f415c-d4fd-11e7-af82-c42c033b4871'
|
|
|
271 |
component:
|
|
|
272 |
(SpecCollection
|
|
|
273 |
collection: (
|
|
|
274 |
(LabelSpec
|
|
|
275 |
label: 'A'
|
|
|
276 |
name: 'DiffTextLabelA'
|
|
|
277 |
layout: (LayoutFrame 0 0 0 0 0 0.5 20 0)
|
|
|
278 |
uuid: '2b3f426a-d4fd-11e7-af82-c42c033b4871'
|
|
|
279 |
translateLabel: true
|
|
|
280 |
labelChannel: diffTextLabelA
|
|
|
281 |
)
|
|
|
282 |
(LabelSpec
|
|
|
283 |
label: 'B'
|
|
|
284 |
name: 'DiffTextLabelB'
|
|
|
285 |
layout: (LayoutFrame 0 0.5 0 0 0 1 20 0)
|
|
|
286 |
uuid: '2b3f43d2-d4fd-11e7-af82-c42c033b4871'
|
|
|
287 |
translateLabel: true
|
|
|
288 |
labelChannel: diffTextLabelB
|
|
|
289 |
)
|
|
|
290 |
(ArbitraryComponentSpec
|
|
|
291 |
name: 'diffTextView'
|
|
|
292 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 0 1.0)
|
|
|
293 |
uuid: '2b3f4508-d4fd-11e7-af82-c42c033b4871'
|
|
|
294 |
hasBorder: false
|
|
|
295 |
component: diffTextView
|
|
|
296 |
)
|
|
|
297 |
)
|
|
|
298 |
|
|
|
299 |
)
|
|
|
300 |
)
|
|
|
301 |
)
|
|
|
302 |
|
|
|
303 |
)
|
|
|
304 |
)
|
|
|
305 |
)
|
|
|
306 |
|
|
|
307 |
)
|
|
|
308 |
handles: (Any 0.5 1.0)
|
|
|
309 |
)
|
|
|
310 |
(LabelSpec
|
|
|
311 |
name: 'InfoLabel'
|
|
|
312 |
layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
|
|
|
313 |
uuid: '2b3f4a44-d4fd-11e7-af82-c42c033b4871'
|
|
|
314 |
level: -1
|
|
|
315 |
translateLabel: true
|
|
3847
|
316 |
labelChannel: informationHolder
|
|
3676
|
317 |
adjust: left
|
|
|
318 |
)
|
|
|
319 |
)
|
|
|
320 |
|
|
|
321 |
)
|
|
|
322 |
)
|
|
|
323 |
!
|
|
|
324 |
|
|
|
325 |
windowSpecForMultipleVersions
|
|
|
326 |
"This resource specification was automatically generated
|
|
|
327 |
by the UIPainter of ST/X."
|
|
|
328 |
|
|
|
329 |
"Do not manually edit this!! If it is corrupted,
|
|
|
330 |
the UIPainter may not be able to read the specification."
|
|
|
331 |
|
|
|
332 |
"
|
|
|
333 |
UIPainter new openOnClass:FileVersionDiffBrowser andSelector:#windowSpecForMultipleVersions
|
|
|
334 |
FileVersionDiffBrowser new openInterface:#windowSpecForMultipleVersions
|
|
|
335 |
"
|
|
|
336 |
|
|
|
337 |
<resource: #canvas>
|
|
|
338 |
|
|
|
339 |
^
|
|
|
340 |
#(FullSpec
|
|
|
341 |
name: windowSpecForMultipleVersions
|
|
|
342 |
uuid: '441c0448-a108-11e9-a652-b8f6b1108e05'
|
|
|
343 |
window:
|
|
|
344 |
(WindowSpec
|
|
|
345 |
label: 'Version DiffBrowser'
|
|
|
346 |
name: 'Version DiffBrowser'
|
|
|
347 |
uuid: '2b3f2546-d4fd-11e7-af82-c42c033b4871'
|
|
|
348 |
min: (Point 10 10)
|
|
|
349 |
bounds: (Rectangle 0 0 865 504)
|
|
|
350 |
menu: mainMenu
|
|
|
351 |
)
|
|
|
352 |
component:
|
|
|
353 |
(SpecCollection
|
|
|
354 |
collection: (
|
|
|
355 |
(VariableVerticalPanelSpec
|
|
|
356 |
name: 'VariableVerticalPanel1'
|
|
|
357 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
|
|
|
358 |
uuid: '2b3f297e-d4fd-11e7-af82-c42c033b4871'
|
|
|
359 |
component:
|
|
|
360 |
(SpecCollection
|
|
|
361 |
collection: (
|
|
|
362 |
(VariableHorizontalPanelSpec
|
|
|
363 |
name: 'VersionAndTagBox'
|
|
|
364 |
uuid: '2b3f2c08-d4fd-11e7-af82-c42c033b4871'
|
|
|
365 |
component:
|
|
|
366 |
(SpecCollection
|
|
|
367 |
collection: (
|
|
|
368 |
(SequenceViewSpec
|
|
|
369 |
name: 'VersionList'
|
|
|
370 |
uuid: '2b3f2d20-d4fd-11e7-af82-c42c033b4871'
|
|
|
371 |
model: selectedVersionIndexHolder
|
|
|
372 |
menu: versionsMenu
|
|
|
373 |
hasHorizontalScrollBar: true
|
|
|
374 |
hasVerticalScrollBar: true
|
|
|
375 |
useIndex: true
|
|
|
376 |
sequenceList: versionEntriesList
|
|
|
377 |
)
|
|
|
378 |
(SequenceViewSpec
|
|
|
379 |
name: 'List1'
|
|
|
380 |
uuid: '2b3f3086-d4fd-11e7-af82-c42c033b4871'
|
|
|
381 |
model: selectedSymbolicVersionIndexHolder
|
|
|
382 |
menu: symbolicVersionsMenu
|
|
|
383 |
hasHorizontalScrollBar: true
|
|
|
384 |
hasVerticalScrollBar: true
|
|
|
385 |
useIndex: true
|
|
|
386 |
sequenceList: symbolicVersionNameList
|
|
|
387 |
)
|
|
|
388 |
)
|
|
|
389 |
|
|
|
390 |
)
|
|
|
391 |
handles: (Any 0.5 1.0)
|
|
|
392 |
)
|
|
|
393 |
(ViewSpec
|
|
|
394 |
name: 'DiffBox'
|
|
|
395 |
uuid: '2b3f408a-d4fd-11e7-af82-c42c033b4871'
|
|
|
396 |
component:
|
|
|
397 |
(SpecCollection
|
|
|
398 |
collection: (
|
|
|
399 |
(ViewSpec
|
|
|
400 |
name: 'diffTextViewBox'
|
|
|
401 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
|
|
|
402 |
uuid: '2b3f415c-d4fd-11e7-af82-c42c033b4871'
|
|
|
403 |
component:
|
|
|
404 |
(SpecCollection
|
|
|
405 |
collection: (
|
|
|
406 |
(LabelSpec
|
|
|
407 |
label: 'A'
|
|
|
408 |
name: 'DiffTextLabelA'
|
|
|
409 |
layout: (LayoutFrame 0 0 0 0 0 0.5 20 0)
|
|
|
410 |
uuid: '2b3f426a-d4fd-11e7-af82-c42c033b4871'
|
|
|
411 |
translateLabel: true
|
|
|
412 |
labelChannel: diffTextLabelA
|
|
|
413 |
)
|
|
|
414 |
(LabelSpec
|
|
|
415 |
label: 'B'
|
|
|
416 |
name: 'DiffTextLabelB'
|
|
|
417 |
layout: (LayoutFrame 0 0.5 0 0 0 1 20 0)
|
|
|
418 |
uuid: '2b3f43d2-d4fd-11e7-af82-c42c033b4871'
|
|
|
419 |
translateLabel: true
|
|
|
420 |
labelChannel: diffTextLabelB
|
|
|
421 |
)
|
|
|
422 |
(ArbitraryComponentSpec
|
|
|
423 |
name: 'diffTextView'
|
|
|
424 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 0 1.0)
|
|
|
425 |
uuid: '2b3f4508-d4fd-11e7-af82-c42c033b4871'
|
|
|
426 |
hasBorder: false
|
|
|
427 |
component: diffTextView
|
|
|
428 |
)
|
|
|
429 |
)
|
|
|
430 |
|
|
|
431 |
)
|
|
|
432 |
)
|
|
|
433 |
)
|
|
|
434 |
|
|
|
435 |
)
|
|
|
436 |
)
|
|
|
437 |
)
|
|
|
438 |
|
|
|
439 |
)
|
|
|
440 |
handles: (Any 0.5 1.0)
|
|
|
441 |
)
|
|
|
442 |
(LabelSpec
|
|
|
443 |
name: 'InfoLabel'
|
|
|
444 |
layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
|
|
|
445 |
uuid: '2b3f4a44-d4fd-11e7-af82-c42c033b4871'
|
|
|
446 |
level: -1
|
|
|
447 |
translateLabel: true
|
|
3847
|
448 |
labelChannel: informationHolder
|
|
3676
|
449 |
adjust: left
|
|
|
450 |
)
|
|
|
451 |
)
|
|
|
452 |
|
|
|
453 |
)
|
|
|
454 |
)
|
|
|
455 |
! !
|
|
|
456 |
|
|
|
457 |
!FileVersionDiffBrowser class methodsFor:'menu specs'!
|
|
|
458 |
|
|
|
459 |
mainMenu
|
|
|
460 |
"This resource specification was automatically generated
|
|
|
461 |
by the MenuEditor of ST/X."
|
|
|
462 |
|
|
|
463 |
"Do not manually edit this!! If it is corrupted,
|
|
|
464 |
the MenuEditor may not be able to read the specification."
|
|
|
465 |
|
|
|
466 |
|
|
|
467 |
"
|
|
|
468 |
MenuEditor new openOnClass:FileVersionDiffBrowser andSelector:#mainMenu
|
|
|
469 |
(Menu new fromLiteralArrayEncoding:(FileVersionDiffBrowser mainMenu)) startUp
|
|
|
470 |
"
|
|
|
471 |
|
|
|
472 |
<resource: #menu>
|
|
|
473 |
|
|
|
474 |
^
|
|
|
475 |
#(Menu
|
|
|
476 |
(
|
|
|
477 |
(MenuItem
|
|
|
478 |
label: 'File'
|
|
|
479 |
submenu:
|
|
|
480 |
(Menu
|
|
|
481 |
(
|
|
|
482 |
(MenuItem
|
|
|
483 |
label: 'Create PatchFile...'
|
|
|
484 |
itemValue: createPatchFile
|
|
|
485 |
)
|
|
|
486 |
(MenuItem
|
|
|
487 |
label: '-'
|
|
|
488 |
)
|
|
|
489 |
(MenuItem
|
|
|
490 |
label: 'Exit'
|
|
|
491 |
itemValue: closeRequest
|
|
|
492 |
)
|
|
|
493 |
)
|
|
|
494 |
nil
|
|
|
495 |
nil
|
|
|
496 |
)
|
|
|
497 |
)
|
|
|
498 |
(MenuItem
|
|
|
499 |
label: 'View'
|
|
|
500 |
submenuChannel: viewMenu
|
|
|
501 |
)
|
|
|
502 |
(MenuItem
|
|
|
503 |
label: 'MENU_Help'
|
|
|
504 |
startGroup: conditionalRight
|
|
|
505 |
submenu:
|
|
|
506 |
(Menu
|
|
|
507 |
(
|
|
|
508 |
(MenuItem
|
|
|
509 |
label: 'Documentation'
|
|
|
510 |
itemValue: openDocumentation
|
|
|
511 |
)
|
|
|
512 |
(MenuItem
|
|
|
513 |
label: '-'
|
|
|
514 |
)
|
|
|
515 |
(MenuItem
|
|
|
516 |
label: 'About this Application...'
|
|
|
517 |
itemValue: openAboutThisApplication
|
|
|
518 |
)
|
|
|
519 |
)
|
|
|
520 |
nil
|
|
|
521 |
nil
|
|
|
522 |
)
|
|
|
523 |
)
|
|
|
524 |
)
|
|
|
525 |
nil
|
|
|
526 |
nil
|
|
|
527 |
)
|
|
|
528 |
!
|
|
|
529 |
|
|
|
530 |
versionsMenu
|
|
|
531 |
"This resource specification was automatically generated
|
|
|
532 |
by the MenuEditor of ST/X."
|
|
|
533 |
|
|
|
534 |
"Do not manually edit this!! If it is corrupted,
|
|
|
535 |
the MenuEditor may not be able to read the specification."
|
|
|
536 |
|
|
|
537 |
|
|
|
538 |
"
|
|
|
539 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#mainMenu
|
|
|
540 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser mainMenu)) startUp
|
|
|
541 |
"
|
|
|
542 |
|
|
|
543 |
<resource: #menu>
|
|
|
544 |
|
|
|
545 |
^
|
|
|
546 |
#(Menu
|
|
|
547 |
(
|
|
|
548 |
(MenuItem
|
|
|
549 |
label: 'Compare against Previous (Older) Version'
|
|
|
550 |
nameKey: CompareAgainstPreviousVersion
|
|
|
551 |
itemValue: versionMenuCompareAgainstPreviousVersion
|
|
|
552 |
enabled: hasPreviousVersionInVersionList
|
|
|
553 |
)
|
|
|
554 |
(MenuItem
|
|
|
555 |
label: 'Compare against Next (Younger) Version'
|
|
|
556 |
nameKey: CompareAgainstNextVersion
|
|
|
557 |
itemValue: versionMenuCompareAgainstNextVersion
|
|
|
558 |
enabled: hasNextVersionInVersionList
|
|
|
559 |
)
|
|
|
560 |
|
|
|
561 |
)
|
|
|
562 |
nil
|
|
|
563 |
nil
|
|
|
564 |
)
|
|
|
565 |
|
|
|
566 |
"Created: / 05-02-2017 / 11:11:30 / cg"
|
|
|
567 |
"Modified: / 06-02-2017 / 09:27:22 / cg"
|
|
|
568 |
!
|
|
|
569 |
|
|
|
570 |
viewMenu
|
|
|
571 |
"This resource specification was automatically generated
|
|
|
572 |
by the MenuEditor of ST/X."
|
|
|
573 |
|
|
|
574 |
"Do not manually edit this!! If it is corrupted,
|
|
|
575 |
the MenuEditor may not be able to read the specification."
|
|
|
576 |
|
|
|
577 |
|
|
|
578 |
"
|
|
|
579 |
MenuEditor new openOnClass:FileVersionDiffBrowser andSelector:#viewMenu
|
|
|
580 |
(Menu new fromLiteralArrayEncoding:(FileVersionDiffBrowser viewMenu)) startUp
|
|
|
581 |
"
|
|
|
582 |
|
|
|
583 |
<resource: #menu>
|
|
|
584 |
|
|
|
585 |
^
|
|
|
586 |
#(Menu
|
|
|
587 |
(
|
|
|
588 |
(MenuItem
|
|
|
589 |
label: 'Show Log Messages'
|
|
|
590 |
itemValue: showLogMessages
|
|
|
591 |
)
|
|
|
592 |
)
|
|
|
593 |
nil
|
|
|
594 |
nil
|
|
|
595 |
)
|
|
|
596 |
! !
|
|
|
597 |
|
|
|
598 |
!FileVersionDiffBrowser class methodsFor:'startup'!
|
|
|
599 |
|
|
|
600 |
openOnAllFilesChangedSince:aDateOrTimestamp in:aSetOfFilesOrADirectoryFilename
|
|
|
601 |
"create a FileVersionDiffBrowser instance and set the list of files.
|
|
|
602 |
When a file is selected, the version list is extracted,
|
|
|
603 |
and the diff list is generated from the file's current version against
|
|
|
604 |
the selected version in the top selection list"
|
|
|
605 |
|
|
3847
|
606 |
self
|
|
|
607 |
openOnAllFilesMatching:nil
|
|
|
608 |
changedSince:aDateOrTimestamp
|
|
|
609 |
in:aSetOfFilesOrADirectoryFilename
|
|
3676
|
610 |
|
|
|
611 |
"
|
|
|
612 |
FileVersionDiffBrowser
|
|
|
613 |
openOnAllFilesChangedSince:(Date today - 7 days)
|
|
|
614 |
in:('../../libbasic' asFilename files).
|
|
|
615 |
"
|
|
|
616 |
|
|
|
617 |
"Created: / 07-07-2019 / 18:58:01 / Claus Gittinger"
|
|
|
618 |
"Modified: / 08-07-2019 / 01:36:01 / Claus Gittinger"
|
|
|
619 |
!
|
|
|
620 |
|
|
3847
|
621 |
openOnAllFilesMatching:matchPatternOrNil changedSince:aDateOrTimestamp in:aSetOfFilesOrADirectoryFilename
|
|
|
622 |
"create a FileVersionDiffBrowser instance and set the list of files.
|
|
|
623 |
When a file is selected, the version list is extracted,
|
|
|
624 |
and the diff list is generated from the file's current version against
|
|
|
625 |
the selected version in the top selection list"
|
|
|
626 |
|
|
|
627 |
|setOfFiles theBrowser filesMatching filesChangedSince sinceTimestamp|
|
|
|
628 |
|
|
|
629 |
sinceTimestamp := aDateOrTimestamp asTimestamp.
|
|
|
630 |
|
|
|
631 |
setOfFiles := aSetOfFilesOrADirectoryFilename.
|
|
|
632 |
setOfFiles isFilename ifTrue:[
|
|
|
633 |
setOfFiles := setOfFiles directoryContentsAsFilenames.
|
|
|
634 |
].
|
|
|
635 |
(matchPatternOrNil isEmptyOrNil or:[matchPatternOrNil = '*']) ifTrue:[
|
|
|
636 |
filesMatching := setOfFiles
|
|
|
637 |
] ifFalse:[
|
|
|
638 |
filesMatching := setOfFiles select:[:fn | fn baseName matches:matchPatternOrNil].
|
|
|
639 |
].
|
|
|
640 |
filesChangedSince := filesMatching select:[:fn | fn modificationTime > sinceTimestamp].
|
|
|
641 |
filesChangedSince sort:[:a :b | a name < b name].
|
|
|
642 |
|
|
|
643 |
theBrowser := self new.
|
|
|
644 |
theBrowser allButOpenInterface:#windowSpecForMultipleFiles.
|
|
|
645 |
theBrowser beMultipleFilesVersionBrowser.
|
|
|
646 |
theBrowser fileList:filesChangedSince.
|
|
|
647 |
|
|
|
648 |
"/ theBrowser classHolder:(ValueHolder with:aClass).
|
|
|
649 |
"/ theBrowser setupForClass:aClass againstVersion:nil.
|
|
|
650 |
theBrowser window label:(self resources string:'Versions of %1 files' with:filesChangedSince size).
|
|
|
651 |
theBrowser openWindow.
|
|
|
652 |
^ theBrowser.
|
|
|
653 |
|
|
|
654 |
"
|
|
|
655 |
FileVersionDiffBrowser
|
|
|
656 |
openOnAllFilesMatching:'*.st'
|
|
|
657 |
changedSince:(Date today - 7 days)
|
|
|
658 |
in:('../../libbasic' asFilename files).
|
|
|
659 |
"
|
|
|
660 |
|
|
|
661 |
"Created: / 07-07-2019 / 18:58:01 / Claus Gittinger"
|
|
|
662 |
"Modified: / 08-07-2019 / 01:36:01 / Claus Gittinger"
|
|
|
663 |
!
|
|
|
664 |
|
|
|
665 |
openOnAllVersionsOfFile:aFilenameOrString
|
|
3676
|
666 |
"create a VersionDiffBrowser instance and set the file.
|
|
|
667 |
The diff is generated from aFilename's current version against
|
|
|
668 |
the selected version in the top selection list"
|
|
|
669 |
|
|
3847
|
670 |
|theBrowser fileName|
|
|
|
671 |
|
|
|
672 |
fileName := aFilenameOrString asFilename.
|
|
3676
|
673 |
|
|
|
674 |
theBrowser := self new.
|
|
|
675 |
theBrowser allButOpenInterface:#windowSpecForMultipleVersions.
|
|
|
676 |
theBrowser beMultipleVersionBrowser.
|
|
3847
|
677 |
theBrowser fileHolder value:fileName.
|
|
|
678 |
theBrowser setupForAllVersionsOfFile:fileName.
|
|
|
679 |
theBrowser window label:(self resources string:'Versions of %1' with:fileName baseName).
|
|
3676
|
680 |
theBrowser openWindow.
|
|
|
681 |
^ theBrowser.
|
|
|
682 |
|
|
|
683 |
"
|
|
|
684 |
self openOnAllVersionsOfFile:'Make.proto' asFilename
|
|
|
685 |
self openOnAllVersionsOfFile:'../../libbasic/Array.st' asFilename
|
|
|
686 |
"
|
|
|
687 |
|
|
|
688 |
"Created: / 07-07-2019 / 19:26:28 / Claus Gittinger"
|
|
|
689 |
"Modified: / 07-07-2019 / 22:40:38 / Claus Gittinger"
|
|
|
690 |
"Modified (comment): / 08-07-2019 / 01:27:03 / Claus Gittinger"
|
|
|
691 |
!
|
|
|
692 |
|
|
|
693 |
openOnAllVersionsOfFiles:aSetOfFilenames
|
|
|
694 |
"create a VersionDiffBrowser instance and set the list of files.
|
|
|
695 |
When a file is selected, the version list is extracted,
|
|
|
696 |
and the diff set is generated from the file's current version against
|
|
|
697 |
the selected version in the top selection list"
|
|
|
698 |
|
|
|
699 |
|theBrowser|
|
|
|
700 |
|
|
|
701 |
theBrowser := self new.
|
|
|
702 |
theBrowser allButOpenInterface:#windowSpecForMultipleFiles.
|
|
|
703 |
theBrowser beMultipleFilesVersionBrowser.
|
|
|
704 |
theBrowser beMultipleVersionBrowser.
|
|
|
705 |
theBrowser fileList:(aSetOfFilenames collect:#asFilename).
|
|
|
706 |
theBrowser window label:(self resources string:'Versions of %1 files' with:aSetOfFilenames size).
|
|
|
707 |
theBrowser openWindow.
|
|
|
708 |
^ theBrowser.
|
|
|
709 |
|
|
|
710 |
"
|
|
|
711 |
self openOnAllVersionsOfFiles:#('Make.proto' 'Make.spec')
|
|
|
712 |
"
|
|
|
713 |
|
|
|
714 |
"Created: / 07-07-2019 / 19:29:38 / Claus Gittinger"
|
|
|
715 |
"Modified: / 08-07-2019 / 00:30:31 / Claus Gittinger"
|
|
|
716 |
!
|
|
|
717 |
|
|
|
718 |
openOnFile:aFilename againstVersion:aVersionA
|
|
|
719 |
"create a VersionDiffBrowser instance and set the diffs of the
|
|
|
720 |
browser. The diffs are generated from aFilename's current against some version
|
|
|
721 |
via the source code manager."
|
|
|
722 |
|
|
|
723 |
|theBrowser fn|
|
|
|
724 |
|
|
|
725 |
fn := aFilename asFilename.
|
|
|
726 |
theBrowser := self new.
|
|
|
727 |
theBrowser allButOpen.
|
|
|
728 |
theBrowser setupForFile:fn againstVersion:aVersionA.
|
|
|
729 |
theBrowser window label:(self resources string:'Diffs of %1 %2 against current' with:fn baseName with:aVersionA).
|
|
|
730 |
theBrowser openWindow.
|
|
|
731 |
^ theBrowser.
|
|
|
732 |
|
|
|
733 |
"
|
|
|
734 |
self openOnFile:'Make.proto' againstVersion:'1.2'
|
|
|
735 |
self openOnFile:'Make.proto' againstVersion:#newest - against the newest repository version
|
|
|
736 |
"
|
|
|
737 |
|
|
|
738 |
"Created: / 07-07-2019 / 19:31:13 / Claus Gittinger"
|
|
|
739 |
"Modified: / 08-07-2019 / 00:42:22 / Claus Gittinger"
|
|
|
740 |
!
|
|
|
741 |
|
|
|
742 |
openOnFile:file1 andFile:file2
|
|
|
743 |
|fn1 fn2|
|
|
|
744 |
|
|
|
745 |
fn1 := file1 asFilename.
|
|
|
746 |
fn2 := file2 asFilename.
|
|
|
747 |
^ self
|
|
|
748 |
openOnFile:fn1 labelA:fn1 baseName andFile:fn2 labelB:fn2 baseName
|
|
|
749 |
title:(self resources string:'%1 vs. %2'
|
|
|
750 |
with:fn1 baseName with:fn2 baseName)
|
|
|
751 |
ifSame:nil
|
|
|
752 |
|
|
|
753 |
"
|
|
|
754 |
FileVersionDiffBrowser
|
|
|
755 |
openOnFile:'../../libbasic/FloatArray.st'
|
|
|
756 |
andFile:'../../libbasic/DoubleArray.st'
|
|
|
757 |
"
|
|
|
758 |
|
|
|
759 |
"Created: / 08-07-2019 / 00:52:18 / Claus Gittinger"
|
|
|
760 |
!
|
|
|
761 |
|
|
|
762 |
openOnFile:fileA labelA:aLabelA andFile:fileB labelB:aLabelB title:title
|
|
|
763 |
"create a VersionDiffBrowser instance and set the difflist of the
|
|
|
764 |
browser. The diffs are generated from two files."
|
|
|
765 |
|
|
|
766 |
^ self
|
|
|
767 |
openOnFile:fileA labelA:aLabelA
|
|
|
768 |
andFile:fileB labelB:aLabelB
|
|
|
769 |
title:title ifSame:nil
|
|
|
770 |
|
|
|
771 |
"
|
|
|
772 |
self
|
|
|
773 |
openOnFile:'../../libbasic/FloatArray.st' labelA:'FloatArray'
|
|
|
774 |
andFile:'../../libbasic/DoubleArray.st' labelB:'DoubleArray'
|
|
|
775 |
title:'FloatArray vs. DoubleArray'
|
|
|
776 |
"
|
|
|
777 |
|
|
|
778 |
"Created: / 07-07-2019 / 19:32:07 / Claus Gittinger"
|
|
|
779 |
"Modified (comment): / 08-07-2019 / 00:37:50 / Claus Gittinger"
|
|
|
780 |
!
|
|
|
781 |
|
|
|
782 |
openOnFile:fileA labelA:aLabelA andFile:fileB labelB:aLabelB title:title ifSame:sameAction
|
|
|
783 |
"create a VersionDiffBrowser instance and set the class change set of the
|
|
|
784 |
browser. The class diff set is generated from two classes."
|
|
|
785 |
|
|
|
786 |
|theBrowser fn1 fn2|
|
|
|
787 |
|
|
|
788 |
fn1 := fileA asFilename.
|
|
|
789 |
fn2 := fileB asFilename.
|
|
|
790 |
|
|
|
791 |
theBrowser := self new.
|
|
|
792 |
theBrowser allButOpen.
|
|
|
793 |
theBrowser setupForFile:fn1 labelA:aLabelA andFile:fn2 labelB:aLabelB.
|
|
|
794 |
theBrowser window label:title.
|
|
|
795 |
theBrowser openWindow.
|
|
|
796 |
^ theBrowser.
|
|
|
797 |
|
|
|
798 |
"
|
|
|
799 |
FileVersionDiffBrowser
|
|
|
800 |
openOnFile:'../../libbasic/FloatArray.st' labelA:'FloatArray'
|
|
|
801 |
andFile:'../../libbasic/DoubleArray.st' labelB:'DoubleArray'
|
|
|
802 |
title:'Some diffs' ifSame:nil
|
|
|
803 |
"
|
|
|
804 |
|
|
|
805 |
"Created: / 07-07-2019 / 20:05:16 / Claus Gittinger"
|
|
|
806 |
"Modified (comment): / 08-07-2019 / 00:51:29 / Claus Gittinger"
|
|
|
807 |
!
|
|
|
808 |
|
|
|
809 |
openOnFile:aFilename versionA:versionA versionB:versionB
|
|
|
810 |
"create a VersionDiffBrowser instance and set the class change set of the
|
|
|
811 |
browser. The class diff set is generated from two versions of aClass via
|
|
|
812 |
the source code manager."
|
|
|
813 |
|
|
|
814 |
|theBrowser|
|
|
|
815 |
|
|
|
816 |
theBrowser := self new.
|
|
|
817 |
theBrowser allButOpen.
|
|
|
818 |
theBrowser setupForFile:aFilename versionA:versionA versionB:versionB.
|
|
|
819 |
theBrowser window label:(self resources
|
|
|
820 |
string:'%1 Versions %2 vs. %3'
|
|
|
821 |
with:aFilename baseName with:versionA with:versionB).
|
|
|
822 |
theBrowser openWindow.
|
|
|
823 |
^ theBrowser.
|
|
|
824 |
|
|
|
825 |
"
|
|
|
826 |
self openOnFile:'Make.proto' versionA:'1.1' versionB:'1.2'
|
|
|
827 |
"
|
|
|
828 |
|
|
|
829 |
"Created: / 07-07-2019 / 20:06:15 / Claus Gittinger"
|
|
|
830 |
! !
|
|
|
831 |
|
|
|
832 |
!FileVersionDiffBrowser methodsFor:'accessing'!
|
|
|
833 |
|
|
|
834 |
beMultipleFilesVersionBrowser
|
|
|
835 |
isMultipleFilesVersionBrowser := true
|
|
|
836 |
|
|
|
837 |
"Created: / 07-07-2019 / 18:58:49 / Claus Gittinger"
|
|
|
838 |
!
|
|
|
839 |
|
|
|
840 |
beMultipleVersionBrowser
|
|
|
841 |
isMultipleVersionBrowser := true
|
|
|
842 |
!
|
|
|
843 |
|
|
|
844 |
isMultipleFilesVersionBrowser
|
|
|
845 |
^ isMultipleFilesVersionBrowser
|
|
|
846 |
|
|
|
847 |
"Created: / 07-07-2019 / 19:53:15 / Claus Gittinger"
|
|
|
848 |
!
|
|
|
849 |
|
|
|
850 |
isMultipleVersionBrowser
|
|
|
851 |
^ isMultipleVersionBrowser
|
|
|
852 |
|
|
|
853 |
"Modified: / 08-05-2019 / 10:59:40 / Claus Gittinger"
|
|
|
854 |
! !
|
|
|
855 |
|
|
|
856 |
!FileVersionDiffBrowser methodsFor:'aspects'!
|
|
|
857 |
|
|
|
858 |
diffTextHolder
|
|
|
859 |
diffTextHolder isNil ifTrue:[
|
|
|
860 |
diffTextHolder := '' asValue
|
|
|
861 |
].
|
|
|
862 |
^ diffTextHolder
|
|
|
863 |
|
|
|
864 |
"Created: / 07-07-2019 / 20:04:23 / Claus Gittinger"
|
|
|
865 |
!
|
|
|
866 |
|
|
|
867 |
diffTextLabelA
|
|
|
868 |
"aspect for the label for version A"
|
|
|
869 |
|
|
|
870 |
^ diffTextLabelA.
|
|
|
871 |
|
|
|
872 |
"Modified: / 08-05-2019 / 11:03:23 / Claus Gittinger"
|
|
|
873 |
!
|
|
|
874 |
|
|
|
875 |
diffTextLabelB
|
|
|
876 |
"aspect for the label for version B"
|
|
|
877 |
|
|
|
878 |
^ diffTextLabelB.
|
|
|
879 |
|
|
|
880 |
"Modified: / 08-05-2019 / 11:03:32 / Claus Gittinger"
|
|
|
881 |
!
|
|
|
882 |
|
|
|
883 |
diffTextView
|
|
|
884 |
"
|
|
|
885 |
return the component for the diff text view.
|
|
|
886 |
|
|
|
887 |
<return: HVScrollableView>
|
|
|
888 |
"
|
|
|
889 |
|v|
|
|
|
890 |
|
|
|
891 |
diffTextView isNil ifTrue:[
|
|
|
892 |
v := DiffCodeView new.
|
|
|
893 |
v textViewClass:CodeView.
|
|
|
894 |
v initialize.
|
|
|
895 |
diffTextView := HVScrollableView
|
|
|
896 |
forView:v
|
|
|
897 |
miniScrollerH:true miniScrollerV:false.
|
|
|
898 |
diffTextView addNextPreviousButtons.
|
|
|
899 |
].
|
|
|
900 |
^ diffTextView
|
|
|
901 |
|
|
|
902 |
"Modified: / 06-10-2006 / 14:30:42 / cg"
|
|
|
903 |
!
|
|
|
904 |
|
|
|
905 |
fileHolder
|
|
|
906 |
fileHolder isNil ifTrue:[
|
|
|
907 |
fileHolder := nil asValue
|
|
|
908 |
].
|
|
|
909 |
^ fileHolder
|
|
|
910 |
|
|
|
911 |
"Created: / 07-07-2019 / 20:10:47 / Claus Gittinger"
|
|
|
912 |
!
|
|
|
913 |
|
|
|
914 |
fileList:aList
|
|
|
915 |
self fileListHolder contents:aList
|
|
|
916 |
|
|
|
917 |
"Created: / 08-07-2019 / 00:28:32 / Claus Gittinger"
|
|
|
918 |
!
|
|
|
919 |
|
|
|
920 |
fileListHolder
|
|
|
921 |
"aspect for the 'list of files' list.
|
|
|
922 |
<return: List>"
|
|
|
923 |
|
|
|
924 |
fileListHolder isNil ifTrue:[
|
|
|
925 |
fileListHolder := List new
|
|
|
926 |
].
|
|
|
927 |
^ fileListHolder
|
|
|
928 |
|
|
|
929 |
"Created: / 07-07-2019 / 19:46:44 / Claus Gittinger"
|
|
|
930 |
!
|
|
|
931 |
|
|
|
932 |
fileNameListHolder
|
|
|
933 |
"aspect for the 'list of file' list.
|
|
|
934 |
<return: List>"
|
|
|
935 |
|
|
|
936 |
^ BlockValue
|
|
|
937 |
with:[:l | l collect:#baseName]
|
|
|
938 |
argument:(self fileListHolder)
|
|
|
939 |
|
|
|
940 |
"Created: / 07-07-2019 / 19:47:13 / Claus Gittinger"
|
|
|
941 |
!
|
|
|
942 |
|
|
3847
|
943 |
informationHolder
|
|
3676
|
944 |
^ infoHolder.
|
|
|
945 |
|
|
|
946 |
"Modified: / 08-05-2019 / 11:05:10 / Claus Gittinger"
|
|
|
947 |
!
|
|
|
948 |
|
|
|
949 |
selectedFileIndexHolder
|
|
|
950 |
selectedFileIndexHolder isNil ifTrue:[
|
|
|
951 |
selectedFileIndexHolder := nil asValue.
|
|
|
952 |
selectedFileIndexHolder onChangeSend:#selectedFileIndexHolderChanged to:self.
|
|
|
953 |
].
|
|
|
954 |
^ selectedFileIndexHolder
|
|
|
955 |
|
|
|
956 |
"Created: / 07-07-2019 / 19:00:13 / Claus Gittinger"
|
|
|
957 |
!
|
|
|
958 |
|
|
|
959 |
selectedSymbolicVersionHolder
|
|
|
960 |
^ selectedSymbolicVersionHolder
|
|
|
961 |
|
|
|
962 |
"Modified: / 08-05-2019 / 11:08:42 / Claus Gittinger"
|
|
|
963 |
!
|
|
|
964 |
|
|
|
965 |
selectedSymbolicVersionIndexHolder
|
|
|
966 |
^ selectedSymbolicVersionIndexHolder
|
|
|
967 |
|
|
|
968 |
"Created: / 28-05-2019 / 15:32:03 / Claus Gittinger"
|
|
|
969 |
!
|
|
|
970 |
|
|
|
971 |
selectedVersionHolder
|
|
|
972 |
^ selectedVersionHolder
|
|
|
973 |
|
|
|
974 |
"Modified: / 08-05-2019 / 11:09:18 / Claus Gittinger"
|
|
|
975 |
!
|
|
|
976 |
|
|
|
977 |
selectedVersionIndex
|
|
|
978 |
^ selectedVersionIndexHolder value ? 0
|
|
|
979 |
|
|
|
980 |
"Created: / 23-05-2018 / 11:35:50 / Claus Gittinger"
|
|
|
981 |
"Modified: / 08-05-2019 / 11:09:50 / Claus Gittinger"
|
|
|
982 |
!
|
|
|
983 |
|
|
|
984 |
selectedVersionIndexHolder
|
|
|
985 |
^ selectedVersionIndexHolder
|
|
|
986 |
|
|
|
987 |
"Created: / 29-11-2017 / 13:02:49 / cg"
|
|
|
988 |
"Modified: / 08-05-2019 / 11:09:46 / Claus Gittinger"
|
|
|
989 |
!
|
|
|
990 |
|
|
|
991 |
symbolicVersionList
|
|
|
992 |
^ symbolicVersionList
|
|
|
993 |
|
|
|
994 |
"Modified: / 08-05-2019 / 11:10:23 / Claus Gittinger"
|
|
|
995 |
!
|
|
|
996 |
|
|
|
997 |
symbolicVersionNameList
|
|
|
998 |
^ symbolicVersionNameList
|
|
|
999 |
|
|
|
1000 |
"Created: / 28-05-2019 / 15:42:12 / Claus Gittinger"
|
|
|
1001 |
!
|
|
|
1002 |
|
|
|
1003 |
versionEntriesList
|
|
|
1004 |
^ versionEntriesList
|
|
|
1005 |
|
|
|
1006 |
"Created: / 29-11-2017 / 13:06:14 / cg"
|
|
|
1007 |
"Modified: / 08-05-2019 / 11:10:38 / Claus Gittinger"
|
|
|
1008 |
!
|
|
|
1009 |
|
|
|
1010 |
versionList
|
|
|
1011 |
^ versionList
|
|
|
1012 |
|
|
|
1013 |
"Modified: / 08-05-2019 / 11:10:53 / Claus Gittinger"
|
|
|
1014 |
! !
|
|
|
1015 |
|
|
|
1016 |
!FileVersionDiffBrowser methodsFor:'aspects-menu'!
|
|
|
1017 |
|
|
|
1018 |
hasNextVersionInVersionList
|
|
|
1019 |
"versions are sorted youngest first.
|
|
|
1020 |
If the current selected one is the first, there is no next version"
|
|
|
1021 |
|
|
|
1022 |
^ (self selectedVersionIndex) > 1.
|
|
|
1023 |
|
|
|
1024 |
"Modified: / 23-05-2018 / 11:36:33 / Claus Gittinger"
|
|
|
1025 |
!
|
|
|
1026 |
|
|
|
1027 |
hasPreviousVersionInVersionList
|
|
|
1028 |
"versions are sorted youngest first.
|
|
|
1029 |
If the current selected one is the last, there is no previous version"
|
|
|
1030 |
|
|
|
1031 |
^ (self selectedVersionIndex) < versionList value size.
|
|
|
1032 |
|
|
|
1033 |
"Modified: / 23-05-2018 / 11:36:38 / Claus Gittinger"
|
|
|
1034 |
!
|
|
|
1035 |
|
|
|
1036 |
versionsMenu
|
|
|
1037 |
^ [
|
|
|
1038 |
|m item nextVersion prevVersion|
|
|
|
1039 |
|
|
|
1040 |
m := self class versionsMenu.
|
|
|
1041 |
m := m decodeAsLiteralArray.
|
|
|
1042 |
m findGuiResourcesIn:self.
|
|
|
1043 |
|
|
|
1044 |
self hasNextVersionInVersionList ifTrue:[
|
|
|
1045 |
nextVersion := self versionList at:(self selectedVersionIndex - 1).
|
|
|
1046 |
item := m atNameKey:#CompareAgainstNextVersion.
|
|
|
1047 |
item label:(resources string:(item label,' (%1)') with:nextVersion).
|
|
|
1048 |
].
|
|
|
1049 |
self hasPreviousVersionInVersionList ifTrue:[
|
|
|
1050 |
prevVersion := self versionList at:(self selectedVersionIndex + 1).
|
|
|
1051 |
item := m atNameKey:#CompareAgainstPreviousVersion.
|
|
|
1052 |
item label:(resources string:(item label,'(%1)') with:prevVersion).
|
|
|
1053 |
].
|
|
|
1054 |
m
|
|
|
1055 |
]
|
|
|
1056 |
|
|
|
1057 |
"Modified: / 23-05-2018 / 11:36:18 / Claus Gittinger"
|
|
|
1058 |
! !
|
|
|
1059 |
|
|
|
1060 |
!FileVersionDiffBrowser methodsFor:'change & update'!
|
|
|
1061 |
|
|
|
1062 |
selectVersion:version
|
|
|
1063 |
|idx numShownBefore numShownAfter|
|
|
|
1064 |
|
|
|
1065 |
idx := versionList indexOf:version.
|
|
|
1066 |
"/ if not found, get more version infos
|
|
|
1067 |
[idx == 0] whileTrue:[
|
|
|
1068 |
numShownBefore := versionList size.
|
|
|
1069 |
self updateVersionList.
|
|
|
1070 |
numShownAfter := versionList size.
|
|
|
1071 |
idx := versionList indexOf:version.
|
|
|
1072 |
idx == 0 ifTrue:[
|
|
|
1073 |
numShownBefore == numShownAfter ifTrue:[
|
|
|
1074 |
^ self
|
|
|
1075 |
].
|
|
|
1076 |
].
|
|
|
1077 |
].
|
|
|
1078 |
self selectedVersionIndexHolder value:idx.
|
|
|
1079 |
|
|
|
1080 |
"Created: / 28-05-2019 / 14:58:37 / Claus Gittinger"
|
|
|
1081 |
!
|
|
|
1082 |
|
|
|
1083 |
selectedFileIndexHolderChanged
|
|
|
1084 |
|fn|
|
|
|
1085 |
|
|
|
1086 |
fn := self fileListHolder value at:(self selectedFileIndexHolder value).
|
|
|
1087 |
|
|
|
1088 |
self fileHolder value:fn.
|
|
|
1089 |
(self isMultipleVersionBrowser or:[self isMultipleFilesVersionBrowser]) ifTrue:[
|
|
|
1090 |
self withWaitCursorDo:[
|
|
|
1091 |
self updateVersionList.
|
|
|
1092 |
]
|
|
|
1093 |
]
|
|
|
1094 |
|
|
|
1095 |
"Created: / 07-07-2019 / 19:51:17 / Claus Gittinger"
|
|
|
1096 |
"Modified: / 08-07-2019 / 00:30:51 / Claus Gittinger"
|
|
|
1097 |
!
|
|
|
1098 |
|
|
|
1099 |
selectedSymbolicVersionHolderChanged
|
|
|
1100 |
|symbolicTag version|
|
|
|
1101 |
|
|
|
1102 |
symbolicTag := self selectedSymbolicVersionHolder value.
|
|
|
1103 |
version := symbolicToVersionMapping at:symbolicTag ifAbsent:nil.
|
|
|
1104 |
version isNil ifTrue:[
|
|
|
1105 |
symbolicTag = '-' ifFalse:[
|
|
|
1106 |
Dialog warn:'No version has this tag ("%1")' with:symbolicTag.
|
|
|
1107 |
].
|
|
|
1108 |
^ self.
|
|
|
1109 |
].
|
|
|
1110 |
self selectVersion:version
|
|
|
1111 |
|
|
|
1112 |
"Modified: / 28-05-2019 / 14:57:56 / Claus Gittinger"
|
|
|
1113 |
!
|
|
|
1114 |
|
|
|
1115 |
selectedSymbolicVersionIndexHolderChanged
|
|
|
1116 |
self selectedSymbolicVersionHolder value:(symbolicVersionList at:self selectedSymbolicVersionIndexHolder value)
|
|
|
1117 |
|
|
|
1118 |
"Created: / 28-05-2019 / 15:32:47 / Claus Gittinger"
|
|
|
1119 |
!
|
|
|
1120 |
|
|
|
1121 |
selectedVersionHolderChanged
|
|
|
1122 |
|
|
|
1123 |
self withWaitCursorDo:[
|
|
|
1124 |
|idx|
|
|
|
1125 |
|
|
|
1126 |
"/ possibly expand a contracted list
|
|
|
1127 |
selectedVersionHolder value = '...' ifTrue:[
|
|
|
1128 |
idx := self versionList size.
|
|
|
1129 |
self updateVersionList.
|
|
|
1130 |
selectedVersionHolder setValue:(self versionList at:idx).
|
|
|
1131 |
].
|
|
|
1132 |
|
|
|
1133 |
"/ update the view
|
|
|
1134 |
self
|
|
|
1135 |
setupForFile:fileHolder value
|
|
|
1136 |
againstVersion:(selectedVersionHolder value).
|
|
|
1137 |
|
|
|
1138 |
"/ self showVersionInfoIfNothingSelected
|
|
|
1139 |
]
|
|
|
1140 |
|
|
|
1141 |
"Modified: / 06-02-2017 / 02:32:24 / cg"
|
|
|
1142 |
"Modified: / 08-07-2019 / 00:05:30 / Claus Gittinger"
|
|
|
1143 |
!
|
|
|
1144 |
|
|
|
1145 |
selectedVersionIndexHolderChanged
|
|
|
1146 |
self selectedVersionHolder value:(versionList at:self selectedVersionIndexHolder value)
|
|
|
1147 |
|
|
|
1148 |
"Created: / 29-11-2017 / 13:04:12 / cg"
|
|
|
1149 |
!
|
|
|
1150 |
|
|
|
1151 |
showActivity:someMessage
|
|
|
1152 |
"some activityNotification shalt be communicated to the user."
|
|
|
1153 |
|
|
3847
|
1154 |
self information:someMessage.
|
|
3676
|
1155 |
|
|
|
1156 |
"Created: / 28-05-2019 / 15:26:34 / Claus Gittinger"
|
|
|
1157 |
!
|
|
|
1158 |
|
|
|
1159 |
update:something with:parameter from:changedObject
|
|
|
1160 |
(changedObject == fileHolder
|
|
|
1161 |
or:[changedObject == versionAHolder
|
|
|
1162 |
or:[changedObject == versionBHolder]]) ifTrue:[
|
|
|
1163 |
self setupForFile:(fileHolder value) versionA:(versionAHolder value) versionB:(versionBHolder value).
|
|
|
1164 |
^ self
|
|
|
1165 |
].
|
|
|
1166 |
super update:something with:parameter from:changedObject
|
|
|
1167 |
|
|
|
1168 |
"Modified: / 17-07-2012 / 17:48:58 / cg"
|
|
|
1169 |
"Modified: / 08-07-2019 / 00:09:19 / Claus Gittinger"
|
|
|
1170 |
!
|
|
|
1171 |
|
|
|
1172 |
updateLists
|
|
|
1173 |
"walk over the changeSet(s) and setup the 3 lists:
|
|
|
1174 |
onlyInA, changed, onlyInB,
|
|
|
1175 |
Optionally filter extensions, categoryChanges and versionMethods,
|
|
|
1176 |
changes with same semantic (variable renames)
|
|
|
1177 |
and changes which have been explicitly filtered by the user."
|
|
|
1178 |
|
|
|
1179 |
|listOnlyInA listOnlyInB listChanged
|
|
|
1180 |
printStringGenerator "sortBlockForChangeLists" filteredList
|
|
|
1181 |
numIgnoredExtensions numIgnoredVersionMethods
|
|
|
1182 |
info needFilter entryIsForCommentOrFormatOnly
|
|
|
1183 |
isIgnoredChange|
|
|
|
1184 |
|
|
|
1185 |
"/ listOnlyInA := filteredList := self methodsOnlyInA.
|
|
|
1186 |
"/ listOnlyInA removeAll.
|
|
|
1187 |
"/ classChangeSet notNil ifTrue:[
|
|
|
1188 |
"/ "/ classChangeSet methodsOnlyInA sort:sortBlockForChangeLists.
|
|
|
1189 |
"/ filteredList := classChangeSet methodsOnlyInA reject:isIgnoredChange.
|
|
|
1190 |
"/ listOnlyInA addAll: (filteredList collect:printStringGenerator).
|
|
|
1191 |
"/ ].
|
|
|
1192 |
"/ methodsOnlyInAFiltered := filteredList.
|
|
|
1193 |
"/
|
|
|
1194 |
"/ listOnlyInB := filteredList := self methodsOnlyInB.
|
|
|
1195 |
"/ listOnlyInB removeAll.
|
|
|
1196 |
"/ classChangeSet notNil ifTrue:[
|
|
|
1197 |
"/ "/ classChangeSet methodsOnlyInB sort:sortBlockForChangeLists.
|
|
|
1198 |
"/ filteredList := classChangeSet methodsOnlyInB reject:isIgnoredChange.
|
|
|
1199 |
"/ listOnlyInB addAll: (filteredList collect:printStringGenerator).
|
|
|
1200 |
"/ ].
|
|
|
1201 |
"/ methodsOnlyInBFiltered := filteredList.
|
|
|
1202 |
|
|
|
1203 |
"/ entryIsForCommentOrFormatOnly :=
|
|
|
1204 |
"/ [:entry |
|
|
|
1205 |
"/ |commentOnly changeA changeB mthdA mthdB|
|
|
|
1206 |
"/
|
|
|
1207 |
"/ commentOnly := false.
|
|
|
1208 |
"/
|
|
|
1209 |
"/ changeA := entry first.
|
|
|
1210 |
"/ changeB := entry second.
|
|
|
1211 |
"/ changeA isMethodChange ifTrue:[
|
|
|
1212 |
"/ changeA isMethodCodeChange ifTrue:[
|
|
|
1213 |
"/ RBCodeDuplicationRule notNil ifTrue:[
|
|
|
1214 |
"/ mthdA := RBMethod forMethodChange:changeA.
|
|
|
1215 |
"/ mthdB := RBMethod forMethodChange:changeB.
|
|
|
1216 |
"/ commentOnly := RBCodeDuplicationRule hasMethod:mthdA sameSemanticAs:mthdB.
|
|
|
1217 |
"/ ].
|
|
|
1218 |
"/ ] ifFalse:[
|
|
|
1219 |
"/ changeA isMethodCategoryChange ifTrue:[
|
|
|
1220 |
"/ commentOnly := true
|
|
|
1221 |
"/ ] ifFalse:[
|
|
|
1222 |
"/ self breakPoint:#cg
|
|
|
1223 |
"/ ].
|
|
|
1224 |
"/ ].
|
|
|
1225 |
"/ ] ifFalse:[
|
|
|
1226 |
"/ changeA isClassDefinitionChange ifTrue:[
|
|
|
1227 |
"/ changeA source = changeB source ifTrue:[
|
|
|
1228 |
"/ commentOnly := true
|
|
|
1229 |
"/ ] ifFalse:[
|
|
|
1230 |
"/ self breakPoint:#cg
|
|
|
1231 |
"/ ].
|
|
|
1232 |
"/ ] ifFalse:[
|
|
|
1233 |
"/ self breakPoint:#cg
|
|
|
1234 |
"/ ].
|
|
|
1235 |
"/ ].
|
|
|
1236 |
"/ commentOnly
|
|
|
1237 |
"/ ].
|
|
|
1238 |
|
|
|
1239 |
"/ listChanged := filteredList := self methodsChanged.
|
|
|
1240 |
"/ listChanged removeAll.
|
|
|
1241 |
"/ classChangeSet notNil ifTrue:[
|
|
|
1242 |
"/ "/ classChangeSet methodsChanged sort:[:a :b | sortBlockForChangeLists value:a first value:b first].
|
|
|
1243 |
"/ filteredList := classChangeSet methodsChanged reject:[:entry | isIgnoredChange value:entry first].
|
|
|
1244 |
"/
|
|
|
1245 |
"/ (self hideDiffsWithCommentOrFormattingChangeOnly) ifTrue:[
|
|
|
1246 |
"/ filteredList := filteredList reject:entryIsForCommentOrFormatOnly.
|
|
|
1247 |
"/ listChanged addAll: (filteredList collect:[:entry| printStringGenerator value:(entry first)]).
|
|
|
1248 |
"/ ] ifFalse:[
|
|
|
1249 |
"/ filteredList do:[:entry|
|
|
|
1250 |
"/ |string|
|
|
|
1251 |
"/
|
|
|
1252 |
"/ string := printStringGenerator value:(entry first).
|
|
|
1253 |
"/ (entryIsForCommentOrFormatOnly value:entry) ifTrue:[
|
|
|
1254 |
"/ string := string withColor:Color grey.
|
|
|
1255 |
"/ ].
|
|
|
1256 |
"/ listChanged add:string
|
|
|
1257 |
"/ ].
|
|
|
1258 |
"/ ].
|
|
|
1259 |
"/ ].
|
|
|
1260 |
"/ methodsChangedFiltered := filteredList.
|
|
|
1261 |
|
|
|
1262 |
"/ self boxAVisible value:(listOnlyInA notEmpty).
|
|
|
1263 |
"/ self boxBVisible value:(listOnlyInB notEmpty).
|
|
|
1264 |
|
|
|
1265 |
"/ self boxMVisible value:(listChanged isEmpty
|
|
|
1266 |
"/ and: [(listOnlyInA notEmpty
|
|
|
1267 |
"/ or:[listOnlyInB notEmpty])]) not.
|
|
|
1268 |
|
|
|
1269 |
self information:info
|
|
|
1270 |
|
|
|
1271 |
"Modified (comment): / 06-02-2017 / 10:09:11 / cg"
|
|
|
1272 |
"Modified (format): / 16-02-2017 / 11:11:49 / stefan"
|
|
|
1273 |
"Modified: / 07-07-2019 / 19:08:03 / Claus Gittinger"
|
|
|
1274 |
!
|
|
|
1275 |
|
|
|
1276 |
updateVersionList
|
|
|
1277 |
"asks the classes source code manager for a list of revisions;
|
|
|
1278 |
construct versionInfoList (containing the full info), versionList (containing version numbers only)
|
|
|
1279 |
and tagList (containing symbolic names only).
|
|
|
1280 |
This is only used when comparing multiple versions."
|
|
|
1281 |
|
|
|
1282 |
|fn sourceCodeManager numShown newNumShown numOverallRevisions
|
|
|
1283 |
partialLog newestRev revisions revisionEntries symbolicNames
|
|
|
1284 |
stableRevision releasedRevision tagList logMessages|
|
|
|
1285 |
|
|
|
1286 |
fn := fileHolder value.
|
|
|
1287 |
fn isNil ifTrue:[
|
|
|
1288 |
symbolicVersionList contents:#().
|
|
|
1289 |
symbolicVersionNameList contents:#().
|
|
|
1290 |
self versionList contents:#().
|
|
|
1291 |
self versionEntriesList contents:#().
|
|
|
1292 |
^ self
|
|
|
1293 |
].
|
|
|
1294 |
|
|
|
1295 |
sourceCodeManager := CVSSourceCodeManager.
|
|
|
1296 |
|
|
|
1297 |
numShown := versionList size - 1.
|
|
|
1298 |
newNumShown := (numShown + 50) max:30.
|
|
|
1299 |
|
|
3847
|
1300 |
self information:'Getting version log...'.
|
|
3676
|
1301 |
partialLog := sourceCodeManager revisionLogOfFile:fn numberOfRevisions:newNumShown.
|
|
|
1302 |
|
|
|
1303 |
partialLog isNil ifTrue:[
|
|
|
1304 |
self warn:'Could not find/access the container for ',fn name,' in the repository.
|
|
|
1305 |
This could be due to:
|
|
|
1306 |
- invalid/wrong CVS-Root setting
|
|
|
1307 |
- missing CVS access rights
|
|
|
1308 |
(no access / not logged in)
|
|
|
1309 |
- changed CVSRoot after compilation
|
|
|
1310 |
(i.e. wrong CVS-path in classes version method)
|
|
|
1311 |
'.
|
|
|
1312 |
^ nil
|
|
|
1313 |
].
|
|
|
1314 |
|
|
|
1315 |
numOverallRevisions := partialLog at:#numberOfRevisions.
|
|
|
1316 |
newestRev := partialLog at:#newestRevision.
|
|
|
1317 |
revisions := partialLog at:#revisions.
|
|
|
1318 |
|
|
|
1319 |
"/ fetch the symbolic (tag) version list
|
|
|
1320 |
symbolicNames := partialLog at:#symbolicNames ifAbsent:[].
|
|
|
1321 |
symbolicNames notNil ifTrue:[
|
|
|
1322 |
stableRevision := symbolicNames at:'stable' ifAbsent:[].
|
|
|
1323 |
releasedRevision := symbolicNames at:'released' ifAbsent:[].
|
|
|
1324 |
|
|
|
1325 |
tagList := ((symbolicNames associations
|
|
|
1326 |
sort:[:a :b | sourceCodeManager versionString:(a value) isLessThan:(b value)])
|
|
|
1327 |
collect:[:assoc | assoc key]) reverse.
|
|
|
1328 |
"/ tagList := ((symbolicNames associations
|
|
|
1329 |
"/ sort:[:a :b | a key < b key])
|
|
|
1330 |
"/ collect:[:assoc | assoc key]) reverse.
|
|
|
1331 |
|
|
|
1332 |
tagList remove:'stable' ifAbsent:[].
|
|
|
1333 |
stableRevision notNil ifTrue:[
|
|
|
1334 |
tagList notEmpty ifTrue:[tagList addFirst:'-'].
|
|
|
1335 |
tagList addFirst:'stable'.
|
|
|
1336 |
].
|
|
|
1337 |
].
|
|
|
1338 |
logMessages := Dictionary new.
|
|
|
1339 |
|
|
|
1340 |
versionInfoList := revisions.
|
|
|
1341 |
|
|
|
1342 |
"/ items := versionInfoList collect:[:each | |rev date who flag|
|
|
|
1343 |
"/ rev := each at:#revision.
|
|
|
1344 |
"/ logMessages at:rev put:(each at:#logMessage).
|
|
|
1345 |
"/ date := (each at:#date ifAbsent:nil) ? '?'.
|
|
|
1346 |
"/ who := (each at:#author ifAbsent:nil) ? '?'.
|
|
|
1347 |
"/ rev = stableRevision ifTrue:[
|
|
|
1348 |
"/ flag := ' Stable' allBold.
|
|
|
1349 |
"/ ] ifFalse:[rev = releasedRevision ifTrue:[
|
|
|
1350 |
"/ flag := ' Released' allBold.
|
|
|
1351 |
"/ ] ifFalse:[
|
|
|
1352 |
"/ flag := ' '
|
|
|
1353 |
"/ ]].
|
|
|
1354 |
"/ rev allBold , flag, ' [' , date , ' by ' , who , ']'
|
|
|
1355 |
"/ ].
|
|
|
1356 |
"/
|
|
|
1357 |
"/ revisions := revisions collect:[:eachItem | eachItem at:#revision].
|
|
|
1358 |
revisions := OrderedCollection new.
|
|
|
1359 |
revisionEntries := OrderedCollection new.
|
|
|
1360 |
versionInfoList do:[:eachVersionInfo |
|
|
|
1361 |
revisions add:eachVersionInfo revision.
|
|
|
1362 |
revisionEntries add:(
|
|
|
1363 |
(eachVersionInfo revision)
|
|
|
1364 |
, ((' (by %2 at %3)'
|
|
|
1365 |
bindWith:(eachVersionInfo revision)
|
|
|
1366 |
with:(eachVersionInfo user)
|
|
3754
|
1367 |
with:(eachVersionInfo date)) allGray)).
|
|
3676
|
1368 |
].
|
|
|
1369 |
|
|
|
1370 |
revisions size < numOverallRevisions ifTrue:[
|
|
|
1371 |
revisions add:'...'.
|
|
|
1372 |
revisionEntries add:'...'.
|
|
|
1373 |
].
|
|
|
1374 |
|
|
|
1375 |
symbolicToVersionMapping := symbolicNames.
|
|
|
1376 |
|
|
|
1377 |
symbolicVersionList contents:tagList.
|
|
|
1378 |
|
|
|
1379 |
symbolicVersionNameList
|
|
|
1380 |
contents:(
|
|
|
1381 |
tagList
|
|
|
1382 |
collect:[:eachSymbolic |
|
|
|
1383 |
|versionsString|
|
|
|
1384 |
|
|
|
1385 |
eachSymbolic = '-' ifTrue:[
|
|
|
1386 |
eachSymbolic.
|
|
|
1387 |
] ifFalse:[
|
|
|
1388 |
versionsString := symbolicToVersionMapping at:eachSymbolic ifAbsent:'<<none>>'.
|
|
3754
|
1389 |
eachSymbolic,((' (',versionsString,')') allGray)
|
|
3676
|
1390 |
]
|
|
|
1391 |
]).
|
|
|
1392 |
self versionList contents:revisions.
|
|
|
1393 |
self versionEntriesList contents:revisionEntries.
|
|
|
1394 |
infoHolder value:'Done.'.
|
|
|
1395 |
|
|
|
1396 |
"Modified: / 29-11-2017 / 13:06:21 / cg"
|
|
|
1397 |
"Modified: / 07-07-2019 / 23:44:42 / Claus Gittinger"
|
|
|
1398 |
! !
|
|
|
1399 |
|
|
|
1400 |
!FileVersionDiffBrowser methodsFor:'initialization & release'!
|
|
|
1401 |
|
|
|
1402 |
initialize
|
|
|
1403 |
super initialize.
|
|
|
1404 |
|
|
|
1405 |
isMultipleVersionBrowser := false.
|
|
|
1406 |
isMultipleFilesVersionBrowser := false.
|
|
|
1407 |
|
|
|
1408 |
diffTextLabelA := ValueHolder new.
|
|
|
1409 |
diffTextLabelB := ValueHolder new.
|
|
|
1410 |
infoHolder := ValueHolder new.
|
|
|
1411 |
|
|
|
1412 |
selectedSymbolicVersionIndexHolder := nil asValue.
|
|
|
1413 |
selectedSymbolicVersionIndexHolder onChangeSend:#selectedSymbolicVersionIndexHolderChanged to:self.
|
|
|
1414 |
|
|
|
1415 |
selectedSymbolicVersionHolder := nil asValue.
|
|
|
1416 |
selectedSymbolicVersionHolder onChangeSend:#selectedSymbolicVersionHolderChanged to:self.
|
|
|
1417 |
|
|
|
1418 |
selectedVersionIndexHolder := nil asValue.
|
|
|
1419 |
selectedVersionIndexHolder onChangeSend:#selectedVersionIndexHolderChanged to:self.
|
|
|
1420 |
|
|
|
1421 |
selectedVersionHolder := nil asValue.
|
|
|
1422 |
selectedVersionHolder onChangeSend:#selectedVersionHolderChanged to:self.
|
|
|
1423 |
|
|
|
1424 |
symbolicVersionList := List new.
|
|
|
1425 |
symbolicVersionNameList := List new.
|
|
|
1426 |
versionEntriesList := List new.
|
|
|
1427 |
versionList := List new.
|
|
|
1428 |
|
|
|
1429 |
"Created: / 08-05-2019 / 10:59:30 / Claus Gittinger"
|
|
|
1430 |
"Modified: / 08-07-2019 / 00:06:27 / Claus Gittinger"
|
|
|
1431 |
!
|
|
|
1432 |
|
|
|
1433 |
postOpenWith:aBuilder
|
|
|
1434 |
super postOpenWith:aBuilder.
|
|
|
1435 |
|
|
|
1436 |
self isMultipleVersionBrowser ifTrue:[
|
|
|
1437 |
self withWaitCursorDo:[
|
|
|
1438 |
self updateVersionList.
|
|
|
1439 |
]
|
|
|
1440 |
]
|
|
|
1441 |
! !
|
|
|
1442 |
|
|
3807
|
1443 |
!FileVersionDiffBrowser methodsFor:'menu actions'!
|
|
3676
|
1444 |
|
|
|
1445 |
mainMenu
|
|
|
1446 |
"if this application runs as an subapplication,
|
|
|
1447 |
the menu bar should not be used."
|
|
|
1448 |
|
|
|
1449 |
self masterApplication isNil ifTrue:[
|
|
|
1450 |
^ self class mainMenu
|
|
|
1451 |
].
|
|
|
1452 |
^ nil
|
|
|
1453 |
|
|
|
1454 |
"Modified: / 25-07-2006 / 11:13:44 / cg"
|
|
|
1455 |
!
|
|
|
1456 |
|
|
|
1457 |
menuAHolder
|
|
|
1458 |
^ [ self class menuA ]
|
|
|
1459 |
|
|
|
1460 |
"Created: / 05-02-2017 / 10:07:15 / cg"
|
|
|
1461 |
!
|
|
|
1462 |
|
|
|
1463 |
menuBHolder
|
|
|
1464 |
^ [ self class menuB ]
|
|
|
1465 |
|
|
|
1466 |
"Created: / 05-02-2017 / 10:07:22 / cg"
|
|
|
1467 |
!
|
|
|
1468 |
|
|
|
1469 |
menuMHolder
|
|
|
1470 |
^ [ self class menuM ]
|
|
|
1471 |
|
|
|
1472 |
"Created: / 05-02-2017 / 10:07:36 / cg"
|
|
|
1473 |
!
|
|
|
1474 |
|
|
|
1475 |
openDocumentation
|
|
3807
|
1476 |
"Called when <F1> is pressed"
|
|
|
1477 |
|
|
3676
|
1478 |
HTMLDocumentView openFullOnDocumentationFile:'tools/misc/TOP.html#VERSIONDIFF'
|
|
|
1479 |
!
|
|
|
1480 |
|
|
|
1481 |
versionMenuCompareAgainstNextVersion
|
|
|
1482 |
|fn selectedVersion nextVersion|
|
|
|
1483 |
|
|
|
1484 |
selectedVersion := self selectedVersionHolder value.
|
|
|
1485 |
nextVersion := self versionList at:(self selectedVersionIndex - 1).
|
|
|
1486 |
fn := fileHolder value.
|
|
|
1487 |
|
|
3849
|
1488 |
self withWaitCursorDo:[
|
|
|
1489 |
self class openOnFile:fn versionA:selectedVersion versionB:nextVersion
|
|
|
1490 |
]
|
|
3676
|
1491 |
|
|
|
1492 |
"Modified: / 08-07-2019 / 00:09:54 / Claus Gittinger"
|
|
|
1493 |
!
|
|
|
1494 |
|
|
|
1495 |
versionMenuCompareAgainstPreviousVersion
|
|
|
1496 |
|fn selectedVersion prevVersion|
|
|
|
1497 |
|
|
|
1498 |
selectedVersion := self selectedVersionHolder value.
|
|
|
1499 |
selectedVersion isNil ifTrue:[
|
|
|
1500 |
self selectedVersionIndexHolder value:1
|
|
|
1501 |
].
|
|
|
1502 |
prevVersion := self versionList at:(self selectedVersionIndex + 1).
|
|
|
1503 |
fn := fileHolder value.
|
|
|
1504 |
|
|
3849
|
1505 |
self withWaitCursorDo:[
|
|
|
1506 |
self class openOnFile:fn versionA:prevVersion versionB:selectedVersion
|
|
|
1507 |
].
|
|
3676
|
1508 |
|
|
|
1509 |
"Modified: / 08-07-2019 / 00:10:12 / Claus Gittinger"
|
|
|
1510 |
! !
|
|
|
1511 |
|
|
|
1512 |
!FileVersionDiffBrowser methodsFor:'private'!
|
|
|
1513 |
|
|
3686
|
1514 |
acceptInRightView
|
|
|
1515 |
|text|
|
|
3676
|
1516 |
|
|
3686
|
1517 |
text := self diffTextView text2.
|
|
|
1518 |
self halt.
|
|
3676
|
1519 |
|
|
3686
|
1520 |
"Created: / 08-07-2019 / 02:32:30 / Claus Gittinger"
|
|
|
1521 |
!
|
|
3676
|
1522 |
|
|
3686
|
1523 |
addAcceptToTextViewMenus
|
|
|
1524 |
"add to the standard diff text view an accept entry.
|
|
|
1525 |
The acceptAction will store the selected version into the file"
|
|
3676
|
1526 |
|
|
3686
|
1527 |
|rightView|
|
|
3676
|
1528 |
|
|
3686
|
1529 |
self isMultipleVersionBrowser ifFalse:[^ self].
|
|
|
1530 |
|
|
|
1531 |
diffTextView := self diffTextView.
|
|
|
1532 |
rightView := diffTextView rightTextView.
|
|
|
1533 |
|
|
|
1534 |
rightView acceptAction:[:theCode |
|
|
|
1535 |
|version code|
|
|
|
1536 |
|
|
|
1537 |
version := self selectedVersionHolder value.
|
|
|
1538 |
code := self getFile:(self fileHolder value) version:version.
|
|
|
1539 |
self fileHolder value contents:code.
|
|
|
1540 |
].
|
|
|
1541 |
rightView menuHolder:[
|
|
|
1542 |
|m|
|
|
|
1543 |
m := rightView editMenu.
|
|
|
1544 |
m enable:#accept.
|
|
|
1545 |
m
|
|
|
1546 |
].
|
|
|
1547 |
rightView menuMessage:#value.
|
|
|
1548 |
|
|
|
1549 |
"Modified: / 08-07-2019 / 02:45:49 / Claus Gittinger"
|
|
3676
|
1550 |
!
|
|
|
1551 |
|
|
|
1552 |
getFile:fileName version:version
|
|
|
1553 |
|errStream errorMessages inStream contents|
|
|
|
1554 |
|
|
|
1555 |
errStream := '' writeStream.
|
|
|
1556 |
[
|
|
|
1557 |
inStream := PipeStream
|
|
|
1558 |
readingFrom:('cvs update -p -r %1 %2'
|
|
|
1559 |
bindWith:(version ? '')
|
|
|
1560 |
with:fileName baseName)
|
|
|
1561 |
errorDisposition:errStream
|
|
|
1562 |
inDirectory:fileName directory pathName.
|
|
|
1563 |
contents := inStream upToEnd.
|
|
|
1564 |
] ensure:[
|
|
|
1565 |
inStream notNil ifTrue:[
|
|
|
1566 |
inStream close
|
|
|
1567 |
]
|
|
|
1568 |
].
|
|
|
1569 |
contents isEmptyOrNil ifTrue:[
|
|
|
1570 |
errorMessages := errStream contents.
|
|
|
1571 |
errorMessages notEmptyOrNil ifTrue:[
|
|
|
1572 |
self halt.
|
|
|
1573 |
].
|
|
|
1574 |
].
|
|
|
1575 |
^ contents
|
|
|
1576 |
|
|
|
1577 |
"Created: / 07-07-2019 / 22:09:21 / Claus Gittinger"
|
|
|
1578 |
"Modified: / 08-07-2019 / 01:24:35 / Claus Gittinger"
|
|
|
1579 |
!
|
|
|
1580 |
|
|
|
1581 |
resetSelectionHolders
|
|
|
1582 |
"
|
|
|
1583 |
reset all selection holders when a new change set is given.
|
|
|
1584 |
First set the selection to nil.
|
|
|
1585 |
|
|
|
1586 |
<return: self>
|
|
|
1587 |
"
|
|
|
1588 |
|
|
|
1589 |
self diffTextView text1:'' text2:''.
|
|
|
1590 |
|
|
|
1591 |
"Modified (comment): / 08-07-2019 / 00:06:09 / Claus Gittinger"
|
|
|
1592 |
!
|
|
|
1593 |
|
|
|
1594 |
showSingleTextView
|
|
|
1595 |
"
|
|
|
1596 |
if a method is selected which is only in version A or B of the class,
|
|
|
1597 |
then show the text view.
|
|
|
1598 |
Add an accept entry to the popup menu.
|
|
|
1599 |
|
|
|
1600 |
<return: self>
|
|
|
1601 |
"
|
|
|
1602 |
|
|
|
1603 |
(self componentAt:#diffTextViewBox) beInvisible.
|
|
|
1604 |
"/ self addAcceptToTextViewMenus.
|
|
|
1605 |
|
|
|
1606 |
"Modified: / 08-07-2019 / 00:03:10 / Claus Gittinger"
|
|
|
1607 |
! !
|
|
|
1608 |
|
|
|
1609 |
!FileVersionDiffBrowser methodsFor:'setup'!
|
|
|
1610 |
|
|
|
1611 |
setupForAllVersionsOfFile:aFilename
|
|
|
1612 |
self fileHolder value:aFilename.
|
|
|
1613 |
self updateVersionList.
|
|
|
1614 |
|
|
|
1615 |
"Created: / 07-07-2019 / 22:42:40 / Claus Gittinger"
|
|
|
1616 |
"Modified: / 07-07-2019 / 23:46:28 / Claus Gittinger"
|
|
|
1617 |
!
|
|
|
1618 |
|
|
|
1619 |
setupForFile:aFilename againstVersion:aVersionA
|
|
|
1620 |
"compute the diffs for the file's current version against the repository version A.
|
|
|
1621 |
When setting the diffs, the labels, list etc. of the receiver
|
|
|
1622 |
are updated."
|
|
|
1623 |
|
|
|
1624 |
|text1 text2|
|
|
|
1625 |
|
|
|
1626 |
text1 := aFilename contentsAsString.
|
|
|
1627 |
text2 := self getFile:aFilename version:aVersionA.
|
|
|
1628 |
|
|
|
1629 |
self diffTextView text1:text1 text2:text2.
|
|
|
1630 |
self diffTextLabelA value:('File: %1' bindWith:aFilename baseName).
|
|
|
1631 |
self diffTextLabelB value:aVersionA.
|
|
|
1632 |
|
|
3686
|
1633 |
self addAcceptToTextViewMenus.
|
|
|
1634 |
|
|
3676
|
1635 |
"Created: / 07-07-2019 / 19:57:27 / Claus Gittinger"
|
|
3686
|
1636 |
"Modified: / 08-07-2019 / 02:29:10 / Claus Gittinger"
|
|
3676
|
1637 |
!
|
|
|
1638 |
|
|
|
1639 |
setupForFile:fileA labelA:labelA andFile:fileB labelB:labelB
|
|
|
1640 |
"generate the diffs from the two files A and B.
|
|
|
1641 |
When setting the diffs, the labels, list etc. of the receiver
|
|
|
1642 |
are updated."
|
|
|
1643 |
|
|
|
1644 |
self diffTextView
|
|
|
1645 |
text1:(fileA contentsAsString)
|
|
|
1646 |
text2:(fileB contentsAsString).
|
|
|
1647 |
|
|
|
1648 |
self diffTextLabelA value:labelA.
|
|
|
1649 |
self diffTextLabelB value:labelB.
|
|
|
1650 |
|
|
|
1651 |
"Created: / 07-07-2019 / 19:59:03 / Claus Gittinger"
|
|
|
1652 |
"Modified: / 08-07-2019 / 01:14:36 / Claus Gittinger"
|
|
3849
|
1653 |
!
|
|
|
1654 |
|
|
|
1655 |
setupForFile:aFilename versionA:aVersionA versionB:aVersionB
|
|
|
1656 |
"compute the diffs for two versions of a file.
|
|
|
1657 |
When setting the diffs, the labels, list etc. of the receiver are updated."
|
|
|
1658 |
|
|
|
1659 |
|text1 text2|
|
|
|
1660 |
|
|
|
1661 |
text1 := self getFile:aFilename version:aVersionA.
|
|
|
1662 |
text2 := self getFile:aFilename version:aVersionB.
|
|
|
1663 |
|
|
|
1664 |
self diffTextView text1:text1 text2:text2.
|
|
|
1665 |
self diffTextLabelA value:aVersionA.
|
|
|
1666 |
self diffTextLabelB value:aVersionB.
|
|
|
1667 |
|
|
|
1668 |
self addAcceptToTextViewMenus.
|
|
3676
|
1669 |
! !
|
|
|
1670 |
|
|
|
1671 |
!FileVersionDiffBrowser class methodsFor:'documentation'!
|
|
|
1672 |
|
|
|
1673 |
version_CVS
|
|
|
1674 |
^ '$Header$'
|
|
|
1675 |
! !
|
|
|
1676 |
|