author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Fri, 07 Sep 2012 18:30:05 +0100 | |
branch | jv |
changeset 12288 | 2fa2855b6ba5 |
parent 12227 | f82b3ed0726a |
child 12307 | d7a3df44366a |
permissions | -rw-r--r-- |
12198 | 1 |
" |
2 |
COPYRIGHT (c) 2006 by eXept Software AG |
|
3 |
All Rights Reserved |
|
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 |
" |
|
12 |
"{ Package: 'stx:libtool' }" |
|
13 |
||
14 |
"{ NameSpace: Tools }" |
|
15 |
||
16 |
Object subclass:#TextMergeInfo |
|
17 |
instanceVariableNames:'list listInfos' |
|
18 |
classVariableNames:'' |
|
19 |
poolDictionaries:'' |
|
20 |
category:'Interface-Diff' |
|
21 |
! |
|
22 |
||
23 |
Object subclass:#LineInfo |
|
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
24 |
instanceVariableNames:'line resolution conflict offset' |
12198 | 25 |
classVariableNames:'' |
26 |
poolDictionaries:'' |
|
27 |
privateIn:TextMergeInfo |
|
28 |
! |
|
29 |
||
30 |
!TextMergeInfo class methodsFor:'documentation'! |
|
31 |
||
32 |
copyright |
|
33 |
" |
|
34 |
COPYRIGHT (c) 2006 by eXept Software AG |
|
35 |
All Rights Reserved |
|
36 |
||
37 |
This software is furnished under a license and may be used |
|
38 |
only in accordance with the terms of that license and with the |
|
39 |
inclusion of the above copyright notice. This software may not |
|
40 |
be provided or otherwise made available to, or used by, any |
|
41 |
other person. No title to or ownership of the software is |
|
42 |
hereby transferred. |
|
43 |
" |
|
44 |
! ! |
|
45 |
||
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
46 |
!TextMergeInfo methodsFor:'* uncategorized *'! |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
47 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
48 |
conflictLineText |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
49 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
50 |
^ '<conflict>' asText allBold colorizeAllWith: Color red. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
51 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
52 |
"Created: / 03-04-2012 / 23:26:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
53 |
! |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
54 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
55 |
noSourceLineText |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
56 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
57 |
^'<no source line>' asText colorizeAllWith: Color red. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
58 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
59 |
"Created: / 03-04-2012 / 23:26:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
60 |
! ! |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
61 |
|
12198 | 62 |
!TextMergeInfo methodsFor:'accessing'! |
63 |
||
64 |
list |
|
65 |
^ list |
|
66 |
! |
|
67 |
||
68 |
listInfos |
|
69 |
^ listInfos |
|
70 |
! |
|
71 |
||
72 |
text |
|
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
73 |
^String streamContents:[:s| |
12288 | 74 |
list withIndexDo:[:ln :i| |
75 |
| info | |
|
76 |
||
77 |
info := listInfos at: i ifAbsent:[nil]. |
|
78 |
(info isNil or:[info offset ~~ -1]) ifTrue:[ |
|
79 |
ln notNil ifTrue:[ |
|
80 |
s nextPutLine: (list at: i) |
|
81 |
]. |
|
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
82 |
] |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
83 |
]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
84 |
]. |
12198 | 85 |
|
86 |
"Created: / 19-03-2012 / 14:58:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
87 |
! ! |
|
88 |
||
89 |
!TextMergeInfo methodsFor:'initialization'! |
|
90 |
||
91 |
text1: text1 text2: text2 text3: text3 |
|
92 |
||
12227 | 93 |
| t1c t2c t3c diff3 diffs merges resolution lnr i | |
12198 | 94 |
|
95 |
list := StringCollection new. |
|
96 |
listInfos := OrderedCollection new. |
|
97 |
||
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
98 |
t1c := (text1 ? #()) asStringCollection. |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
99 |
t2c := (text2 ? #()) asStringCollection. |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
100 |
t3c := (text3 ? #()) asStringCollection. |
12198 | 101 |
|
102 |
||
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
103 |
diff3 := Diff3 new |
12198 | 104 |
file0: t1c; "/Base version |
105 |
file1: t2c; "/A |
|
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
106 |
file2: t3c. "/B\ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
107 |
diffs := diff3 diffIndices. |
12227 | 108 |
merges := diff3 mergeIndicesDiscardEmpty: false. |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
109 |
|
12198 | 110 |
lnr := 1. |
12227 | 111 |
i := 1. |
112 |
[ i <= merges size ] whileTrue:[ |
|
113 |
| diff merge lines | |
|
114 |
||
115 |
diff := diffs at: i. |
|
116 |
merge := merges at: i. |
|
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
117 |
diff isChunk ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
118 |
lines := merge extractFromDiff: diff3. |
12227 | 119 |
1 to: diff length do:[:j| |
120 |
list add: (lines at: j). |
|
121 |
listInfos add: (LineInfo line: lnr resolution: #NoConflict conflict: diff offset: j ). |
|
12198 | 122 |
lnr := lnr + 1. |
123 |
]. |
|
124 |
]. |
|
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
125 |
diff isConflict ifTrue:[ |
12227 | 126 |
1 to: diff length do:[:j| |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
127 |
merge isConflict ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
128 |
list add: self conflictLineText. |
12227 | 129 |
listInfos add: (LineInfo line: lnr resolution: #Conflict conflict: diff offset: j). |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
130 |
] ifFalse:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
131 |
lines := merge extractFromDiff: diff3. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
132 |
resolution := merge extractResolution. |
12227 | 133 |
j <= lines size ifTrue:[ |
134 |
list add: (lines at: j). |
|
135 |
listInfos add: (LineInfo line: lnr resolution: resolution conflict: diff offset: j). |
|
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
136 |
] ifFalse:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
137 |
list add: self noSourceLineText. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
138 |
listInfos add: (LineInfo line: lnr resolution: resolution conflict: diff offset: -1). |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
139 |
]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
140 |
]. |
12198 | 141 |
lnr := lnr + 1. |
142 |
]. |
|
143 |
]. |
|
12227 | 144 |
i := i + 1. |
145 |
]. |
|
146 |
"Sanity check:" |
|
147 |
i < diffs size ifTrue:[ |
|
148 |
i + 1 to: diffs size do:[:j| |
|
149 |
self assert: (diffs at:j) length == 0. |
|
150 |
] |
|
12198 | 151 |
]. |
152 |
||
153 |
self changed: #value |
|
154 |
||
155 |
"Created: / 19-03-2012 / 12:10:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
156 |
! ! |
|
157 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
158 |
!TextMergeInfo methodsFor:'merging'! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
159 |
|
12203
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
160 |
mergeUsingA: textA |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
161 |
|
12204 | 162 |
list := (textA ? #()) asStringCollection. |
12203
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
163 |
listInfos := |
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
164 |
(1 to: list size) collect:[:lineNr| |
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
165 |
(LineInfo line: lineNr resolution: #MergedUsingA ) |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
166 |
]. |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
167 |
self changed:#resolution |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
168 |
|
12203
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
169 |
"Created: / 21-03-2012 / 12:03:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
170 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
171 |
|
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
172 |
mergeUsingA: textA interval: interval |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
173 |
"Given textA and section interval, merges the section |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
174 |
using textA." |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
175 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
176 |
| listA offset | |
12288 | 177 |
listA := (textA ? '') asStringCollection. |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
178 |
offset := 0. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
179 |
interval do:[:lineNr| |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
180 |
| info chunk line | |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
181 |
info := listInfos at: lineNr. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
182 |
chunk := info conflict left. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
183 |
offset < chunk length ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
184 |
line := listA at: chunk offset + offset. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
185 |
info offset: offset + 1. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
186 |
] ifFalse:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
187 |
line := self noSourceLineText. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
188 |
info offset: -1 |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
189 |
]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
190 |
list at: lineNr put: line. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
191 |
info resolution: #MergedUsingA. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
192 |
offset := offset + 1. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
193 |
]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
194 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
195 |
self changed:#resolution |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
196 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
197 |
"Created: / 04-04-2012 / 00:51:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
198 |
! |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
199 |
|
12203
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
200 |
mergeUsingB: textB |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
201 |
|
12204 | 202 |
list := (textB ? #()) asStringCollection. |
12203
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
203 |
listInfos := |
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
204 |
(1 to: list size) collect:[:lineNr| |
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
205 |
(LineInfo line: lineNr resolution: #MergedUsingB ) |
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
206 |
]. |
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
207 |
self changed:#resulution |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
208 |
|
12203
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
209 |
"Created: / 21-03-2012 / 12:04:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
210 |
! |
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
211 |
|
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
212 |
mergeUsingB: textA interval: interval |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
213 |
"Given textA and section interval, merges the section |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
214 |
using textA." |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
215 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
216 |
| listA offset | |
12288 | 217 |
listA := (textA ? #()) asStringCollection. |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
218 |
offset := 0. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
219 |
interval do:[:lineNr| |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
220 |
| info chunk line | |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
221 |
info := listInfos at: lineNr. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
222 |
chunk := info conflict right. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
223 |
offset < chunk length ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
224 |
line := listA at: chunk offset + offset. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
225 |
info offset: offset + 1. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
226 |
] ifFalse:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
227 |
line := self noSourceLineText. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
228 |
info offset: -1 |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
229 |
]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
230 |
list at: lineNr put: line. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
231 |
info resolution: #MergedUsingB. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
232 |
offset := offset + 1. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
233 |
]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
234 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
235 |
self changed:#resolution |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
236 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
237 |
"Created: / 04-04-2012 / 01:01:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
238 |
! |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
239 |
|
12203
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
240 |
mergeUsingBase: textBase |
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
241 |
|
12204 | 242 |
list := (textBase ? #()) asStringCollection. |
12203
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
243 |
listInfos := |
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
244 |
(1 to: list size) collect:[:lineNr| |
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
245 |
(LineInfo line: lineNr resolution: #MergedUsingBase ) |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
246 |
]. |
12203
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
247 |
self changed:#resulution |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
248 |
|
12203
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
249 |
"Created: / 21-03-2012 / 12:07:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
250 |
! |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
251 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
252 |
mergeUsingBase: textA interval: interval |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
253 |
"Given textA and section interval, merges the section |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
254 |
using textA." |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
255 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
256 |
| listA offset | |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
257 |
listA := textA asStringCollection. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
258 |
offset := 0. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
259 |
interval do:[:lineNr| |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
260 |
| info chunk line | |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
261 |
info := listInfos at: lineNr. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
262 |
chunk := info conflict original. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
263 |
offset < chunk length ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
264 |
line := listA at: chunk offset + offset. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
265 |
info offset: offset + 1. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
266 |
] ifFalse:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
267 |
line := self noSourceLineText. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
268 |
info offset: -1 |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
269 |
]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
270 |
list at: lineNr put: line. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
271 |
info resolution: #MergedUsingBase. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
272 |
offset := offset + 1. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
273 |
]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
274 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
275 |
self changed:#resolution |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
276 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
277 |
"Created: / 04-04-2012 / 01:01:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
278 |
! ! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
279 |
|
12198 | 280 |
!TextMergeInfo methodsFor:'testing'! |
281 |
||
282 |
isMerged |
|
283 |
||
12225 | 284 |
^listInfos allSatisfy:[:info|info isMergedOrNoConflict]. |
12198 | 285 |
|
286 |
"Created: / 19-03-2012 / 15:09:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
287 |
! ! |
|
288 |
||
289 |
!TextMergeInfo::LineInfo class methodsFor:'accessing'! |
|
290 |
||
291 |
line:lineArg resolution:resolutionArg |
|
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
292 |
^self new line:lineArg resolution:resolutionArg conflict:nil offset: nil |
12198 | 293 |
|
294 |
"Created: / 19-03-2012 / 15:04:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
295 |
! |
|
296 |
||
297 |
line:lineArg resolution:resolutionArg conflict:conflictArg |
|
298 |
||
299 |
^self new line:lineArg resolution:resolutionArg conflict:conflictArg |
|
300 |
||
301 |
"Modified: / 19-03-2012 / 15:07:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
302 |
! |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
303 |
|
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
304 |
line:lineArg resolution:resolutionArg conflict:conflictArg offset: offsetArg |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
305 |
|
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
306 |
^self new line:lineArg resolution:resolutionArg conflict:conflictArg offset: offsetArg |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
307 |
|
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
308 |
"Modified: / 19-03-2012 / 15:07:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
309 |
"Created: / 20-03-2012 / 20:42:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12198 | 310 |
! ! |
311 |
||
312 |
!TextMergeInfo::LineInfo methodsFor:'accessing'! |
|
313 |
||
314 |
color |
|
315 |
||
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
316 |
| color | |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
317 |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
318 |
self isMerged ifTrue:[ |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
319 |
self isMergedUsingA ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
320 |
color := Tools::TextDiff3Tool colorA |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
321 |
] ifFalse:[self isMergedUsingB ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
322 |
color := Tools::TextDiff3Tool colorB |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
323 |
] ifFalse:[self isMergedUsingBase ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
324 |
color := Tools::TextDiff3Tool colorBase |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
325 |
] ifFalse:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
326 |
color := Tools::TextDiff3Tool colorMerged |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
327 |
]]]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
328 |
offset == -1 ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
329 |
color := color lighter. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
330 |
]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
331 |
] ifFalse:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
332 |
self isConflict ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
333 |
color := Tools::TextDiff3Tool colorConflict |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
334 |
]. |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
335 |
]. |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
336 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
337 |
^color |
12198 | 338 |
|
339 |
"Created: / 19-03-2012 / 15:05:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
340 |
! |
|
341 |
||
342 |
conflict |
|
343 |
^ conflict |
|
344 |
! |
|
345 |
||
346 |
line |
|
347 |
^ line |
|
348 |
! |
|
349 |
||
350 |
line:lineArg resolution:resolutionArg |
|
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
351 |
self line:lineArg resolution:resolutionArg conflict:nil offset: nil |
12198 | 352 |
|
353 |
"Created: / 19-03-2012 / 15:04:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
354 |
! |
|
355 |
||
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
356 |
line:lineArg resolution:resolutionArg conflict:conflictArg offset: offsetArg |
12198 | 357 |
line := lineArg. |
358 |
resolution := resolutionArg. |
|
359 |
conflict := conflictArg. |
|
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
360 |
offset := offsetArg |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
361 |
|
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
362 |
"Created: / 20-03-2012 / 20:41:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
363 |
! |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
364 |
|
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
365 |
offset |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
366 |
^ offset |
12198 | 367 |
! |
368 |
||
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
369 |
offset:something |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
370 |
offset := something. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
371 |
! |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12204
diff
changeset
|
372 |
|
12198 | 373 |
resolution |
374 |
^ resolution |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
375 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
376 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
377 |
resolution:something |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
378 |
resolution := something. |
12198 | 379 |
! ! |
380 |
||
381 |
!TextMergeInfo::LineInfo methodsFor:'printing & storing'! |
|
382 |
||
383 |
printOn:aStream |
|
384 |
"append a printed representation if the receiver to the argument, aStream" |
|
385 |
||
386 |
self class nameWithoutPrefix printOn:aStream. |
|
387 |
aStream space. |
|
388 |
aStream nextPutAll:'line: '. |
|
389 |
line printOn:aStream. |
|
390 |
aStream space. |
|
391 |
aStream nextPutAll:'resolution: '. |
|
392 |
resolution printOn:aStream. |
|
393 |
||
394 |
"Modified: / 19-03-2012 / 12:30:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
395 |
"Created: / 19-03-2012 / 15:05:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
396 |
! ! |
|
397 |
||
398 |
!TextMergeInfo::LineInfo methodsFor:'testing'! |
|
399 |
||
400 |
isConflict |
|
401 |
||
402 |
^resolution == #Conflict |
|
403 |
||
404 |
"Created: / 19-03-2012 / 15:06:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
405 |
! |
|
406 |
||
407 |
isMerged |
|
408 |
||
12225 | 409 |
^ |
410 |
resolution == #Merged |
|
411 |
or:[self isMergedUsingA |
|
412 |
or:[self isMergedUsingB |
|
413 |
or:[self isMergedUsingBase]]] |
|
12198 | 414 |
|
415 |
"Created: / 19-03-2012 / 15:06:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
416 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
417 |
|
12225 | 418 |
isMergedOrNoConflict |
419 |
||
420 |
^resolution == #NoConflict or:[self isMerged] |
|
421 |
||
422 |
"Created: / 06-04-2012 / 10:40:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
423 |
! |
|
424 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
425 |
isMergedUsingA |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
426 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
427 |
^resolution == #MergedUsingA |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
428 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
429 |
"Created: / 20-03-2012 / 14:21:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
430 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
431 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
432 |
isMergedUsingB |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
433 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
434 |
^resolution == #MergedUsingB |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
435 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
436 |
"Created: / 20-03-2012 / 14:21:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
437 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
438 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
439 |
isMergedUsingBase |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
440 |
|
12203
bcfd4488d8a2
Improvements in Diff3/Merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
441 |
^resolution == #MergedUsingBase |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
442 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
443 |
"Created: / 20-03-2012 / 14:21:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12198 | 444 |
! ! |
445 |
||
446 |
!TextMergeInfo class methodsFor:'documentation'! |
|
447 |
||
448 |
version_SVN |
|
12288 | 449 |
^ '$Id: Tools__TextMergeInfo.st 8049 2012-09-07 17:30:05Z vranyj1 $' |
12198 | 450 |
! ! |