author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Wed, 30 Jan 2013 11:15:09 +0000 | |
branch | jv |
changeset 12401 | 4714b9640528 |
parent 12261 | b2a507f45d87 |
parent 11537 | fea377e66bfd |
child 12650 | e0f607754b9a |
permissions | -rw-r--r-- |
271 | 1 |
" |
277 | 2 |
COPYRIGHT (c) 1995 by Claus Gittinger |
3 |
All Rights Reserved |
|
271 | 4 |
|
5 |
This software is furnished under a license and may be used |
|
6 |
only in accordance with the terms of that license and with the |
|
7 |
inclusion of the above copyright notice. This software may not |
|
8 |
be provided or otherwise made available to, or used by, any |
|
9 |
other person. No title to or ownership of the software is |
|
10 |
hereby transferred. |
|
11 |
" |
|
2851
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
12 |
"{ Package: 'stx:libtool' }" |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
13 |
|
271 | 14 |
ThreeColumnTextView subclass:#Diff3TextView |
15 |
instanceVariableNames:'useColors showSeparators addedColor addedBgColor removedColor |
|
16 |
removedBgColor changedColor changedBgColor' |
|
17 |
classVariableNames:'' |
|
18 |
poolDictionaries:'' |
|
19 |
category:'Views-Text' |
|
20 |
! |
|
21 |
||
2245 | 22 |
!Diff3TextView class methodsFor:'documentation'! |
271 | 23 |
|
24 |
copyright |
|
25 |
" |
|
277 | 26 |
COPYRIGHT (c) 1995 by Claus Gittinger |
27 |
All Rights Reserved |
|
271 | 28 |
|
29 |
This software is furnished under a license and may be used |
|
30 |
only in accordance with the terms of that license and with the |
|
31 |
inclusion of the above copyright notice. This software may not |
|
32 |
be provided or otherwise made available to, or used by, any |
|
33 |
other person. No title to or ownership of the software is |
|
34 |
hereby transferred. |
|
35 |
" |
|
36 |
! |
|
37 |
||
38 |
documentation |
|
39 |
" |
|
277 | 40 |
a view showing merged diff3 (see rcsmerge / merge unix manual pages) output in a |
271 | 41 |
user-friendly form. |
42 |
The view is created and opened with: |
|
43 |
||
277 | 44 |
d := Diff3TextView openOn:text label:l1 label:l2 label:l3. |
271 | 45 |
|
277 | 46 |
and it will show the 3 versions side-by-side |
47 |
Its main use is for the SourceCodeManager, to show merged sources after |
|
48 |
a failed checkin. |
|
2245 | 49 |
|
50 |
Notice: |
|
51 |
This has diff3 output (or cvs diff output) hardwired into it. |
|
52 |
Needs to be adapted, if that format ever changes. |
|
53 |
||
54 |
[see also:] |
|
55 |
TextView EditTextView DiffTextView |
|
56 |
||
57 |
[author:] |
|
58 |
Claus Gittinger |
|
271 | 59 |
" |
60 |
! ! |
|
61 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
62 |
|
2245 | 63 |
!Diff3TextView class methodsFor:'instance creation'! |
271 | 64 |
|
65 |
openOnMergedText:text label:firstLabel label:secondLabel label:thirdLabel |
|
66 |
"open up a view showing firstText, secondText and thirdText side-by-side, |
|
67 |
and labels for all views." |
|
68 |
||
69 |
|top v l1 l2 l3| |
|
70 |
||
71 |
top := StandardSystemView label:'three texts'. |
|
72 |
||
73 |
l1 := Label label:firstLabel in:top. |
|
74 |
l1 origin:0.0@0.0 corner:0.33@(l1 height). |
|
75 |
l2 := Label label:secondLabel in:top. |
|
76 |
l2 origin:0.33@0.0 corner:0.67@(l1 height). |
|
77 |
l3 := Label label:thirdLabel in:top. |
|
78 |
l3 origin:0.67@0.0 corner:1.0@(l1 height). |
|
79 |
||
80 |
v := HVScrollableView |
|
81 |
for:self |
|
82 |
miniScrollerH:true miniScrollerV:false |
|
83 |
in:top. |
|
84 |
v origin:0.0 @ (l1 height + ViewSpacing) corner:1.0 @ 1.0. |
|
85 |
v scrolledView updateListsFromMergedText:text. |
|
2245 | 86 |
|
87 |
"/ self addNextPreviousButtons. |
|
271 | 88 |
^ top open |
89 |
||
90 |
" |
|
91 |
ThreeColumnTextView |
|
92 |
openOn:('smalltalk.rc' asFilename contentsOfEntireFile) |
|
93 |
label:'smalltalk.rc' |
|
94 |
and:('display.rc' asFilename contentsOfEntireFile) |
|
95 |
label:'display.rc' |
|
96 |
and:('private.rc' asFilename contentsOfEntireFile) |
|
97 |
label:'private.rc' |
|
98 |
" |
|
99 |
||
100 |
"Modified: 12.12.1995 / 13:09:13 / cg" |
|
101 |
! ! |
|
102 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
103 |
|
2245 | 104 |
!Diff3TextView class methodsFor:'public helpers'! |
713 | 105 |
|
106 |
emphasizeMergedDiff3Text:mergedText emphasize1:e1 emphasize2:e2 emphasizeSep:e3 |
|
107 |
"given the merge()/rcsmerge() merged output (as created by 'cvs update'), |
|
108 |
create & return a text object which contains the conflicts |
|
109 |
highlighted. |
|
110 |
CAVEAT: this is a highly specialized method - probably not the right place |
|
111 |
for it here ..." |
|
112 |
||
3703
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
113 |
|dIdx dEnd state entry list skip l1 l2 buffer |
2851
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
114 |
sameAtStart sameAtEnd sepYourVersion sepOtherVersion sepLine| |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
115 |
|
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
116 |
sepYourVersion := '----- your version -----'. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
117 |
sepOtherVersion := '----- other version ----'. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
118 |
sepLine := '------------------------'. |
713 | 119 |
|
120 |
list := OrderedCollection new. |
|
121 |
||
122 |
dIdx := 1. |
|
123 |
dEnd := mergedText size + 1. |
|
124 |
state := #initial. |
|
125 |
[dIdx < dEnd] whileTrue:[ |
|
126 |
dIdx == dEnd ifTrue:[ |
|
127 |
"dummy cleanup entry" |
|
128 |
entry := nil. |
|
129 |
state := #initial. |
|
130 |
] ifFalse:[ |
|
131 |
entry := mergedText at:dIdx. |
|
132 |
dIdx := dIdx + 1. |
|
133 |
]. |
|
134 |
||
135 |
skip := false. |
|
136 |
||
137 |
entry notNil ifTrue:[ |
|
138 |
(entry startsWith:'<<<<<<<') ifTrue:[ |
|
2851
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
139 |
state := 1. skip := true. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
140 |
l1 := OrderedCollection new. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
141 |
buffer := l1. |
713 | 142 |
] ifFalse:[ |
143 |
(entry startsWith:'|||||||') ifTrue:[ |
|
144 |
state := 2. skip := true. |
|
2851
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
145 |
buffer := nil. |
713 | 146 |
] ifFalse:[ |
147 |
(entry startsWith:'=======') ifTrue:[ |
|
148 |
state == 2 ifFalse:[ |
|
149 |
state := 23 "/ on both 2 and 3 |
|
150 |
] ifTrue:[ |
|
151 |
state := 3 "/ only in 3 |
|
152 |
]. |
|
153 |
skip := true. |
|
2851
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
154 |
l2 := OrderedCollection new. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
155 |
buffer := l2. |
713 | 156 |
] ifFalse:[ |
157 |
(entry startsWith:'>>>>>>>') ifTrue:[ |
|
158 |
state := #initial. |
|
159 |
skip := true. |
|
2851
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
160 |
buffer := nil. |
713 | 161 |
] |
162 |
] |
|
163 |
] |
|
164 |
]. |
|
165 |
||
2851
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
166 |
state == #initial ifTrue:[ |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
167 |
l1 notNil ifTrue:[ |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
168 |
"/ diff3-output is sometimes stupid; fix some here |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
169 |
sameAtStart := OrderedCollection new. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
170 |
[l1 notEmpty and:[l2 notEmpty and:[l1 first = l2 first or:[l1 first withTabsExpanded = l2 first withTabsExpanded]]]] whileTrue:[ |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
171 |
sameAtStart addLast:l1 removeFirst. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
172 |
l2 removeFirst |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
173 |
]. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
174 |
sameAtEnd := OrderedCollection new. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
175 |
[l1 notEmpty and:[l2 notEmpty and:[l1 last = l2 last or:[l1 last withTabsExpanded = l2 last withTabsExpanded]]]] whileTrue:[ |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
176 |
sameAtEnd addFirst:l1 removeLast. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
177 |
l2 removeLast |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
178 |
]. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
179 |
sameAtStart do:[:eachEntry | list add:eachEntry]. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
180 |
|
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
181 |
(l1 notEmpty or:[l2 notEmpty]) ifTrue:[ |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
182 |
list add:(e3 isNil ifTrue:[sepYourVersion] ifFalse:[Text string:sepYourVersion emphasis:e3]). |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
183 |
l1 do:[:eachEntry | list add:(e1 isNil ifTrue:[eachEntry] ifFalse:[Text string:eachEntry emphasis:e1])]. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
184 |
list add:(e3 isNil ifTrue:[sepOtherVersion] ifFalse:[Text string:sepOtherVersion emphasis:e3]). |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
185 |
l2 do:[:eachEntry | list add:(e2 isNil ifTrue:[eachEntry] ifFalse:[Text string:eachEntry emphasis:e2])]. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
186 |
list add:(e3 isNil ifTrue:[sepLine] ifFalse:[Text string:sepLine emphasis:e3]). |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
187 |
]. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
188 |
sameAtEnd do:[:eachEntry | list add:eachEntry]. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
189 |
l1 := l2 := nil. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
190 |
]. |
713 | 191 |
]. |
192 |
||
193 |
skip ifFalse:[ |
|
194 |
state == #initial ifTrue:[ |
|
195 |
list add:entry |
|
196 |
]. |
|
197 |
state == 1 ifTrue:[ |
|
2851
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
198 |
l1 add:entry. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
199 |
"/ e1 notNil ifTrue:[ |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
200 |
"/ list add:(Text string:entry emphasis:e1) |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
201 |
"/ ] ifFalse:[ |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
202 |
"/ list add:entry |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
203 |
"/ ] |
713 | 204 |
]. |
205 |
(state == 3 or:[state == 23]) ifTrue:[ |
|
2851
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
206 |
l2 add:entry |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
207 |
"/ e2 notNil ifTrue:[ |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
208 |
"/ list add:(Text string:entry emphasis:e2) |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
209 |
"/ ] ifFalse:[ |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
210 |
"/ list add:entry |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
211 |
"/ ] |
713 | 212 |
]. |
213 |
]. |
|
214 |
]. |
|
215 |
]. |
|
216 |
||
2851
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
217 |
l1 notNil ifTrue:[ |
3703
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
218 |
state ~~ #initial ifTrue:[self error:'oops - bad state should not happen ...']. |
2851
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
219 |
|
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
220 |
"/ diff3-output is sometimes stupid; fix some here |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
221 |
[l1 notEmpty and:[l2 notEmpty and:[l1 first = l2 first or:[l1 first withTabsExpanded = l2 first withTabsExpanded]]]] whileTrue:[l1 removeFirst. l2 removeFirst]. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
222 |
[l1 notEmpty and:[l2 notEmpty and:[l1 last = l2 last or:[l1 last withTabsExpanded = l2 last withTabsExpanded]]]] whileTrue:[l1 removeLast. l2 removeLast]. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
223 |
|
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
224 |
(l1 notEmpty or:[l2 notEmpty]) ifTrue:[ |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
225 |
list add:(e3 isNil ifTrue:[sepYourVersion] ifFalse:[Text string:sepYourVersion emphasis:e3]). |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
226 |
l1 do:[:eachEntry | list add:(e1 isNil ifTrue:[eachEntry] ifFalse:[Text string:eachEntry emphasis:e1])]. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
227 |
list add:(e3 isNil ifTrue:[sepOtherVersion] ifFalse:[Text string:sepOtherVersion emphasis:e3]). |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
228 |
l2 do:[:eachEntry | list add:(e2 isNil ifTrue:[eachEntry] ifFalse:[Text string:eachEntry emphasis:e2])]. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
229 |
list add:(e3 isNil ifTrue:[sepLine] ifFalse:[Text string:sepLine emphasis:e3]). |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
230 |
]. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
231 |
l1 := l2 := nil. |
1d2fabb348d2
better diff3-output processing
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
232 |
]. |
713 | 233 |
^ list |
234 |
||
235 |
"Created: 9.9.1996 / 19:54:00 / cg" |
|
236 |
"Modified: 9.9.1996 / 20:41:40 / cg" |
|
11537 | 237 |
! |
238 |
||
239 |
emphasizeMergedDiff3TextFromPerforce:mergedText origEmphasis:origEmphasize otherEmphasis:otherEmphasize yourEmphasis:yourEmphasize separatorEmphasis:separatorEmphasize |
|
240 |
"given the merge()/rcsmerge() merged output (as created by 'cvs update'), |
|
241 |
create & return a text object which contains the conflicts |
|
242 |
highlighted. |
|
243 |
CAVEAT: this is a highly specialized method - probably not the right place |
|
244 |
for it here ..." |
|
245 |
||
246 |
|list origSeparator otherSeparator yourSeparator endSeparator line currentEmphasis nextEmphasis| |
|
247 |
||
248 |
list := StringCollection new. |
|
249 |
||
250 |
origSeparator := '>>>> ORIGINAL //'. |
|
251 |
otherSeparator := '==== THEIRS //'. |
|
252 |
yourSeparator := '==== YOURS //'. |
|
253 |
endSeparator := '<<<<'. |
|
254 |
mergedText do:[:aLine| |
|
255 |
line := aLine withoutTrailingSeparators. |
|
256 |
(aLine startsWith:origSeparator) ifTrue:[ |
|
257 |
currentEmphasis := separatorEmphasize. |
|
258 |
nextEmphasis := origEmphasize. |
|
259 |
] ifFalse:[ |
|
260 |
(aLine startsWith:otherSeparator) ifTrue:[ |
|
261 |
currentEmphasis := separatorEmphasize. |
|
262 |
nextEmphasis := otherEmphasize. |
|
263 |
] ifFalse:[ |
|
264 |
(aLine startsWith:yourSeparator) ifTrue:[ |
|
265 |
currentEmphasis := separatorEmphasize. |
|
266 |
nextEmphasis := yourEmphasize. |
|
267 |
] ifFalse:[ |
|
268 |
(aLine startsWith:endSeparator) ifTrue:[ |
|
269 |
currentEmphasis := separatorEmphasize. |
|
270 |
nextEmphasis := nil. |
|
271 |
] ifFalse:[ |
|
272 |
nextEmphasis := currentEmphasis. |
|
273 |
]. |
|
274 |
]. |
|
275 |
]. |
|
276 |
]. |
|
277 |
list add:(currentEmphasis isNil ifTrue:[aLine] ifFalse:[Text string:aLine emphasis:currentEmphasis]). |
|
278 |
||
279 |
currentEmphasis := nextEmphasis. |
|
280 |
]. |
|
281 |
^ list |
|
282 |
||
283 |
"Created: / 01-06-2012 / 10:44:31 / cg" |
|
713 | 284 |
! ! |
285 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
286 |
|
271 | 287 |
!Diff3TextView methodsFor:'initialization'! |
288 |
||
289 |
initStyle |
|
290 |
super initStyle. |
|
291 |
||
292 |
showSeparators := false. |
|
293 |
||
3703
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
294 |
useColors := true. |
271 | 295 |
useColors ifTrue:[ |
3703
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
296 |
device hasColors ifTrue:[ |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
297 |
addedColor := Color black. |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
298 |
addedBgColor := Color green. |
271 | 299 |
|
3703
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
300 |
removedColor := Color white. |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
301 |
removedBgColor := Color red. |
271 | 302 |
|
3703
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
303 |
changedColor := Color white. |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
304 |
changedBgColor := Color blue. |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
305 |
] ifFalse:[ |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
306 |
addedBgColor := removedBgColor := changedBgColor := Color black. |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
307 |
addedColor := removedColor := changedColor := Color white. |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
308 |
] |
271 | 309 |
]. |
310 |
||
311 |
"Created: 16.11.1995 / 16:59:48 / cg" |
|
312 |
"Modified: 12.12.1995 / 12:25:55 / cg" |
|
313 |
! ! |
|
314 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
315 |
|
271 | 316 |
!Diff3TextView methodsFor:'private'! |
317 |
||
318 |
updateListsFromMergedText:mergedText |
|
319 |
"given the merge()/rcsmerge() merged output (as created by 'cvs update'), |
|
320 |
update my views contents" |
|
321 |
||
3703
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
322 |
|idx1 idx2 idx3 dIdx dEnd state entry l1 l2 l3 |
271 | 323 |
textView1 textView2 textView3 skip max| |
324 |
||
325 |
textView1 := textViews at:1. |
|
326 |
textView2 := textViews at:2. |
|
327 |
textView3 := textViews at:3. |
|
328 |
||
329 |
l1 := OrderedCollection new. |
|
330 |
l2 := OrderedCollection new. |
|
331 |
l3 := OrderedCollection new. |
|
332 |
||
333 |
idx1 := 1. |
|
334 |
idx2 := 1. |
|
335 |
idx3 := 1. |
|
336 |
||
337 |
dIdx := 1. |
|
338 |
dEnd := mergedText size + 1. |
|
339 |
state := #initial. |
|
340 |
[dIdx < dEnd] whileTrue:[ |
|
341 |
dIdx == dEnd ifTrue:[ |
|
342 |
"dummy cleanup entry" |
|
343 |
entry := nil. |
|
344 |
state := #initial. |
|
345 |
] ifFalse:[ |
|
346 |
entry := mergedText at:dIdx. |
|
347 |
dIdx := dIdx + 1. |
|
348 |
]. |
|
349 |
||
350 |
state == #initial ifTrue:[ |
|
351 |
" |
|
352 |
fill up to size difference from previous change |
|
353 |
" |
|
354 |
max := (l1 size max:l2 size) max:l3 size. |
|
355 |
[l1 size < max] whileTrue:[ |
|
356 |
l1 add:nil |
|
357 |
]. |
|
358 |
[l2 size < max] whileTrue:[ |
|
359 |
l2 add:nil |
|
360 |
]. |
|
361 |
[l3 size < max] whileTrue:[ |
|
362 |
l3 add:nil |
|
363 |
]. |
|
364 |
||
365 |
" |
|
366 |
except for the first chunk, add a separating line |
|
367 |
" |
|
368 |
l1 size ~~ 0 ifTrue:[ |
|
369 |
showSeparators ifTrue:[ |
|
370 |
l1 add:'--------'. |
|
371 |
l2 add:'--------'. |
|
372 |
l3 add:'--------'. |
|
373 |
] |
|
374 |
]. |
|
375 |
]. |
|
376 |
||
377 |
skip := false. |
|
378 |
||
379 |
entry notNil ifTrue:[ |
|
380 |
(entry startsWith:'<<<<<<<') ifTrue:[ |
|
381 |
state := 1. skip := true. |
|
382 |
] ifFalse:[ |
|
383 |
(entry startsWith:'|||||||') ifTrue:[ |
|
384 |
state := 2. skip := true. |
|
385 |
] ifFalse:[ |
|
386 |
(entry startsWith:'=======') ifTrue:[ |
|
290
5b9361cfa7b8
oops - merge output is different than expected sometimes
Claus Gittinger <cg@exept.de>
parents:
277
diff
changeset
|
387 |
state == 2 ifFalse:[ |
5b9361cfa7b8
oops - merge output is different than expected sometimes
Claus Gittinger <cg@exept.de>
parents:
277
diff
changeset
|
388 |
state := 23 "/ on both 2 and 3 |
5b9361cfa7b8
oops - merge output is different than expected sometimes
Claus Gittinger <cg@exept.de>
parents:
277
diff
changeset
|
389 |
] ifTrue:[ |
5b9361cfa7b8
oops - merge output is different than expected sometimes
Claus Gittinger <cg@exept.de>
parents:
277
diff
changeset
|
390 |
state := 3 "/ only in 3 |
5b9361cfa7b8
oops - merge output is different than expected sometimes
Claus Gittinger <cg@exept.de>
parents:
277
diff
changeset
|
391 |
]. |
5b9361cfa7b8
oops - merge output is different than expected sometimes
Claus Gittinger <cg@exept.de>
parents:
277
diff
changeset
|
392 |
skip := true. |
271 | 393 |
] ifFalse:[ |
394 |
(entry startsWith:'>>>>>>>') ifTrue:[ |
|
395 |
state := #initial. |
|
396 |
skip := true. |
|
397 |
] |
|
398 |
] |
|
399 |
] |
|
400 |
]. |
|
401 |
||
402 |
skip ifFalse:[ |
|
403 |
(state == #initial or:[state == 1]) ifTrue:[ |
|
404 |
(useColors and:[state == 1]) ifTrue:[ |
|
3703
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
405 |
l1 add:(Text string:entry |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
406 |
emphasis:(Array with:(#color->changedColor) |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
407 |
with:(#backgroundColor->changedBgColor))). |
271 | 408 |
] ifFalse:[ |
409 |
l1 add:entry |
|
410 |
] |
|
411 |
]. |
|
290
5b9361cfa7b8
oops - merge output is different than expected sometimes
Claus Gittinger <cg@exept.de>
parents:
277
diff
changeset
|
412 |
(state == #initial or:[state == 2 or:[state == 23]]) ifTrue:[ |
5b9361cfa7b8
oops - merge output is different than expected sometimes
Claus Gittinger <cg@exept.de>
parents:
277
diff
changeset
|
413 |
(useColors and:[state == 2 or:[state == 23]]) ifTrue:[ |
3703
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
414 |
l2 add:(Text string:entry |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
415 |
emphasis:(Array with:(#color->changedColor) |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
416 |
with:(#backgroundColor->changedBgColor))). |
271 | 417 |
] ifFalse:[ |
418 |
l2 add:entry |
|
419 |
] |
|
420 |
]. |
|
290
5b9361cfa7b8
oops - merge output is different than expected sometimes
Claus Gittinger <cg@exept.de>
parents:
277
diff
changeset
|
421 |
(state == #initial or:[state == 3 or:[state == 23]]) ifTrue:[ |
5b9361cfa7b8
oops - merge output is different than expected sometimes
Claus Gittinger <cg@exept.de>
parents:
277
diff
changeset
|
422 |
(useColors and:[state == 3 or:[state == 23]]) ifTrue:[ |
3703
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
423 |
l3 add:(Text string:entry |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
424 |
emphasis:(Array with:(#color->changedColor) |
97c92239e22f
Use Text instead of ColoredListEntry
Stefan Vogel <sv@exept.de>
parents:
2852
diff
changeset
|
425 |
with:(#backgroundColor->changedBgColor))). |
271 | 426 |
] ifFalse:[ |
427 |
l3 add:entry |
|
428 |
] |
|
429 |
]. |
|
430 |
]. |
|
431 |
]. |
|
432 |
]. |
|
433 |
||
434 |
textView1 list:l1. |
|
435 |
textView2 list:l2. |
|
436 |
textView3 list:l3. |
|
437 |
||
290
5b9361cfa7b8
oops - merge output is different than expected sometimes
Claus Gittinger <cg@exept.de>
parents:
277
diff
changeset
|
438 |
"Modified: 13.12.1995 / 19:56:32 / cg" |
271 | 439 |
! ! |
440 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
441 |
|
2245 | 442 |
!Diff3TextView class methodsFor:'documentation'! |
271 | 443 |
|
444 |
version |
|
11537 | 445 |
^ '$Header: /cvs/stx/stx/libtool/Diff3TextView.st,v 1.9 2012-06-01 10:44:15 cg Exp $' |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12125
diff
changeset
|
446 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12125
diff
changeset
|
447 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12125
diff
changeset
|
448 |
version_SVN |
12261
b2a507f45d87
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12254
diff
changeset
|
449 |
^ '$Id: Diff3TextView.st 8016 2012-07-18 09:57:46Z vranyj1 $' |
271 | 450 |
! ! |
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
451 |