r107875 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r107874‎ \| r107875 \| r107876 >
Date:	10:55, 3 January 2012
Author:	catrope
Status:	ok
Tags:
Comment:	(bug 25697) Add   to empty context lines. Based on a patch by Erwin Dokter. Patch modified to change   to   and update the tests
Modified paths:	/trunk/extensions/wikidiff2/README (modified) (history) /trunk/extensions/wikidiff2/debian/changelog (modified) (history) /trunk/extensions/wikidiff2/tests/001.phpt (modified) (history) /trunk/extensions/wikidiff2/tests/002.phpt (modified) (history) /trunk/extensions/wikidiff2/wikidiff2.cpp (modified) (history)

Diff [purge]

Index: trunk/extensions/wikidiff2/wikidiff2.cpp
—	—	@@ -74,12 +74,12 @@
75	75	// Print context
76	76	result +=
77	77	"<tr>\n"
78		~~- " <td class=\"diff-marker\"> </td>\n"~~
	78	+ " <td class=\"diff-marker\"> </td>\n"
79	79	" <td class=\"diff-context\">";
80	80	printTextWithDiv(*linediff[i].from[j]);
81	81	result +=
82	82	"</td>\n"
83		~~- " <td class=\"diff-marker\"> </td>\n"~~
	83	+ " <td class=\"diff-marker\"> </td>\n"
84	84	" <td class=\"diff-context\">";
85	85	printTextWithDiv(*linediff[i].from[j]);
86	86	result += "</td>\n</tr>\n";
Index: trunk/extensions/wikidiff2/debian/changelog
—	—	@@ -1,3 +1,8 @@
	2	+php5-wikidiff2 (1.1.2-1) lucid; urgency=low
	3	+ * Fixed bug 25697 (empty context lines not showing)
	4	+
	5	+ -- Roan Kattouw <rkattouw@wikimedia.org> Tue, 03 Jan 2012 11:54:25 +0100
	6	+
2	7	php5-wikidiff2 (1.1.1-1) lucid; urgency=low
3	8
4	9	* Fixed bug 33331 (word breaking around punctuation)
Index: trunk/extensions/wikidiff2/tests/001.phpt
—	—	@@ -125,15 +125,15 @@
126	126	<td colspan="2" class="diff-lineno"><!--LINE 1--></td>
127	127	</tr>
128	128	<tr>
129		~~- <td class="diff-marker"> </td>~~
	129	+ <td class="diff-marker"> </td>
130	130	<td class="diff-context"><div>== Added line ==</div></td>
131		~~- <td class="diff-marker"> </td>~~
	131	+ <td class="diff-marker"> </td>
132	132	<td class="diff-context"><div>== Added line ==</div></td>
133	133	</tr>
134	134	<tr>
135		~~- <td class="diff-marker"> </td>~~
	135	+ <td class="diff-marker"> </td>
136	136	<td class="diff-context"></td>
137		~~- <td class="diff-marker"> </td>~~
	137	+ <td class="diff-marker"> </td>
138	138	<td class="diff-context"></td>
139	139	</tr>
140	140	<tr>
—	—	@@ -142,15 +142,15 @@
143	143	<td class="diff-addedline"><div>sjgfkdjfgb</div></td>
144	144	</tr>
145	145	<tr>
146		~~- <td class="diff-marker"> </td>~~
	146	+ <td class="diff-marker"> </td>
147	147	<td class="diff-context"><div>== Removed line ==</div></td>
148		~~- <td class="diff-marker"> </td>~~
	148	+ <td class="diff-marker"> </td>
149	149	<td class="diff-context"><div>== Removed line ==</div></td>
150	150	</tr>
151	151	<tr>
152		~~- <td class="diff-marker"> </td>~~
	152	+ <td class="diff-marker"> </td>
153	153	<td class="diff-context"></td>
154		~~- <td class="diff-marker"> </td>~~
	154	+ <td class="diff-marker"> </td>
155	155	<td class="diff-context"></td>
156	156	</tr>
157	157	<tr>
—	—	@@ -159,15 +159,15 @@
160	160	<td colspan="2"> </td>
161	161	</tr>
162	162	<tr>
163		~~- <td class="diff-marker"> </td>~~
	163	+ <td class="diff-marker"> </td>
164	164	<td class="diff-context"><div>== Moved text ==</div></td>
165		~~- <td class="diff-marker"> </td>~~
	165	+ <td class="diff-marker"> </td>
166	166	<td class="diff-context"><div>== Moved text ==</div></td>
167	167	</tr>
168	168	<tr>
169		~~- <td class="diff-marker"> </td>~~
	169	+ <td class="diff-marker"> </td>
170	170	<td class="diff-context"><div>a</div></td>
171		~~- <td class="diff-marker"> </td>~~
	171	+ <td class="diff-marker"> </td>
172	172	<td class="diff-context"><div>a</div></td>
173	173	</tr>
174	174	<tr>
—	—	@@ -176,15 +176,15 @@
177	177	<td colspan="2"> </td>
178	178	</tr>
179	179	<tr>
180		~~- <td class="diff-marker"> </td>~~
	180	+ <td class="diff-marker"> </td>
181	181	<td class="diff-context"><div>a</div></td>
182		~~- <td class="diff-marker"> </td>~~
	182	+ <td class="diff-marker"> </td>
183	183	<td class="diff-context"><div>a</div></td>
184	184	</tr>
185	185	<tr>
186		~~- <td class="diff-marker"> </td>~~
	186	+ <td class="diff-marker"> </td>
187	187	<td class="diff-context"><div>a</div></td>
188		~~- <td class="diff-marker"> </td>~~
	188	+ <td class="diff-marker"> </td>
189	189	<td class="diff-context"><div>a</div></td>
190	190	</tr>
191	191	<tr>
—	—	@@ -192,15 +192,15 @@
193	193	<td colspan="2" class="diff-lineno"><!--LINE 12--></td>
194	194	</tr>
195	195	<tr>
196		~~- <td class="diff-marker"> </td>~~
	196	+ <td class="diff-marker"> </td>
197	197	<td class="diff-context"><div>a</div></td>
198		~~- <td class="diff-marker"> </td>~~
	198	+ <td class="diff-marker"> </td>
199	199	<td class="diff-context"><div>a</div></td>
200	200	</tr>
201	201	<tr>
202		~~- <td class="diff-marker"> </td>~~
	202	+ <td class="diff-marker"> </td>
203	203	<td class="diff-context"><div>a</div></td>
204		~~- <td class="diff-marker"> </td>~~
	204	+ <td class="diff-marker"> </td>
205	205	<td class="diff-context"><div>a</div></td>
206	206	</tr>
207	207	<tr>
—	—	@@ -209,15 +209,15 @@
210	210	<td class="diff-addedline"><div>---line---</div></td>
211	211	</tr>
212	212	<tr>
213		~~- <td class="diff-marker"> </td>~~
	213	+ <td class="diff-marker"> </td>
214	214	<td class="diff-context"><div>a</div></td>
215		~~- <td class="diff-marker"> </td>~~
	215	+ <td class="diff-marker"> </td>
216	216	<td class="diff-context"><div>a</div></td>
217	217	</tr>
218	218	<tr>
219		~~- <td class="diff-marker"> </td>~~
	219	+ <td class="diff-marker"> </td>
220	220	<td class="diff-context"><div>a</div></td>
221		~~- <td class="diff-marker"> </td>~~
	221	+ <td class="diff-marker"> </td>
222	222	<td class="diff-context"><div>a</div></td>
223	223	</tr>
224	224	<tr>
—	—	@@ -225,15 +225,15 @@
226	226	<td colspan="2" class="diff-lineno"><!--LINE 19--></td>
227	227	</tr>
228	228	<tr>
229		~~- <td class="diff-marker"> </td>~~
	229	+ <td class="diff-marker"> </td>
230	230	<td class="diff-context"><div>a</div></td>
231		~~- <td class="diff-marker"> </td>~~
	231	+ <td class="diff-marker"> </td>
232	232	<td class="diff-context"><div>a</div></td>
233	233	</tr>
234	234	<tr>
235		~~- <td class="diff-marker"> </td>~~
	235	+ <td class="diff-marker"> </td>
236	236	<td class="diff-context"><div>a</div></td>
237		~~- <td class="diff-marker"> </td>~~
	237	+ <td class="diff-marker"> </td>
238	238	<td class="diff-context"><div>a</div></td>
239	239	</tr>
240	240	<tr>
—	—	@@ -247,15 +247,15 @@
248	248	<td colspan="2"> </td>
249	249	</tr>
250	250	<tr>
251		~~- <td class="diff-marker"> </td>~~
	251	+ <td class="diff-marker"> </td>
252	252	<td class="diff-context"><div>a</div></td>
253		~~- <td class="diff-marker"> </td>~~
	253	+ <td class="diff-marker"> </td>
254	254	<td class="diff-context"><div>a</div></td>
255	255	</tr>
256	256	<tr>
257		~~- <td class="diff-marker"> </td>~~
	257	+ <td class="diff-marker"> </td>
258	258	<td class="diff-context"><div>a</div></td>
259		~~- <td class="diff-marker"> </td>~~
	259	+ <td class="diff-marker"> </td>
260	260	<td class="diff-context"><div>a</div></td>
261	261	</tr>
262	262	<tr>
—	—	@@ -263,15 +263,15 @@
264	264	<td colspan="2" class="diff-lineno"><!--LINE 27--></td>
265	265	</tr>
266	266	<tr>
267		~~- <td class="diff-marker"> </td>~~
	267	+ <td class="diff-marker"> </td>
268	268	<td class="diff-context"><div>a</div></td>
269		~~- <td class="diff-marker"> </td>~~
	269	+ <td class="diff-marker"> </td>
270	270	<td class="diff-context"><div>a</div></td>
271	271	</tr>
272	272	<tr>
273		~~- <td class="diff-marker"> </td>~~
	273	+ <td class="diff-marker"> </td>
274	274	<td class="diff-context"><div>a</div></td>
275		~~- <td class="diff-marker"> </td>~~
	275	+ <td class="diff-marker"> </td>
276	276	<td class="diff-context"><div>a</div></td>
277	277	</tr>
278	278	<tr>
—	—	@@ -285,15 +285,15 @@
286	286	<td class="diff-addedline"><div>--line2--</div></td>
287	287	</tr>
288	288	<tr>
289		~~- <td class="diff-marker"> </td>~~
	289	+ <td class="diff-marker"> </td>
290	290	<td class="diff-context"><div>a</div></td>
291		~~- <td class="diff-marker"> </td>~~
	291	+ <td class="diff-marker"> </td>
292	292	<td class="diff-context"><div>a</div></td>
293	293	</tr>
294	294	<tr>
295		~~- <td class="diff-marker"> </td>~~
	295	+ <td class="diff-marker"> </td>
296	296	<td class="diff-context"><div>a</div></td>
297		~~- <td class="diff-marker"> </td>~~
	297	+ <td class="diff-marker"> </td>
298	298	<td class="diff-context"><div>a</div></td>
299	299	</tr>
300	300	<tr>
—	—	@@ -301,15 +301,15 @@
302	302	<td colspan="2" class="diff-lineno"><!--LINE 35--></td>
303	303	</tr>
304	304	<tr>
305		~~- <td class="diff-marker"> </td>~~
	305	+ <td class="diff-marker"> </td>
306	306	<td class="diff-context"><div>a</div></td>
307		~~- <td class="diff-marker"> </td>~~
	307	+ <td class="diff-marker"> </td>
308	308	<td class="diff-context"><div>a</div></td>
309	309	</tr>
310	310	<tr>
311		~~- <td class="diff-marker"> </td>~~
	311	+ <td class="diff-marker"> </td>
312	312	<td class="diff-context"><div>== Shortest sequence in Y ==</div></td>
313		~~- <td class="diff-marker"> </td>~~
	313	+ <td class="diff-marker"> </td>
314	314	<td class="diff-context"><div>== Shortest sequence in Y ==</div></td>
315	315	</tr>
316	316	<tr>
—	—	@@ -318,27 +318,27 @@
319	319	<td colspan="2"> </td>
320	320	</tr>
321	321	<tr>
322		~~- <td class="diff-marker"> </td>~~
	322	+ <td class="diff-marker"> </td>
323	323	<td class="diff-context"><div>x2</div></td>
324		~~- <td class="diff-marker"> </td>~~
	324	+ <td class="diff-marker"> </td>
325	325	<td class="diff-context"><div>x2</div></td>
326	326	</tr>
327	327	<tr>
328		~~- <td class="diff-marker"> </td>~~
	328	+ <td class="diff-marker"> </td>
329	329	<td class="diff-context"><div>x1</div></td>
330		~~- <td class="diff-marker"> </td>~~
	330	+ <td class="diff-marker"> </td>
331	331	<td class="diff-context"><div>x1</div></td>
332	332	</tr>
333	333	<tr>
334		~~- <td class="diff-marker"> </td>~~
	334	+ <td class="diff-marker"> </td>
335	335	<td class="diff-context"><div>x2</div></td>
336		~~- <td class="diff-marker"> </td>~~
	336	+ <td class="diff-marker"> </td>
337	337	<td class="diff-context"><div>x2</div></td>
338	338	</tr>
339	339	<tr>
340		~~- <td class="diff-marker"> </td>~~
	340	+ <td class="diff-marker"> </td>
341	341	<td class="diff-context"><div>x1</div></td>
342		~~- <td class="diff-marker"> </td>~~
	342	+ <td class="diff-marker"> </td>
343	343	<td class="diff-context"><div>x1</div></td>
344	344	</tr>
345	345	<tr>
—	—	@@ -357,15 +357,15 @@
358	358	<td colspan="2"> </td>
359	359	</tr>
360	360	<tr>
361		~~- <td class="diff-marker"> </td>~~
	361	+ <td class="diff-marker"> </td>
362	362	<td class="diff-context"><div>context</div></td>
363		~~- <td class="diff-marker"> </td>~~
	363	+ <td class="diff-marker"> </td>
364	364	<td class="diff-context"><div>context</div></td>
365	365	</tr>
366	366	<tr>
367		~~- <td class="diff-marker"> </td>~~
	367	+ <td class="diff-marker"> </td>
368	368	<td class="diff-context"><div>context</div></td>
369		~~- <td class="diff-marker"> </td>~~
	369	+ <td class="diff-marker"> </td>
370	370	<td class="diff-context"><div>context</div></td>
371	371	</tr>
372	372	<tr>
—	—	@@ -373,15 +373,15 @@
374	374	<td colspan="2" class="diff-lineno"><!--LINE 45--></td>
375	375	</tr>
376	376	<tr>
377		~~- <td class="diff-marker"> </td>~~
	377	+ <td class="diff-marker"> </td>
378	378	<td class="diff-context"><div>context</div></td>
379		~~- <td class="diff-marker"> </td>~~
	379	+ <td class="diff-marker"> </td>
380	380	<td class="diff-context"><div>context</div></td>
381	381	</tr>
382	382	<tr>
383		~~- <td class="diff-marker"> </td>~~
	383	+ <td class="diff-marker"> </td>
384	384	<td class="diff-context"><div>== Changed line ==</div></td>
385		~~- <td class="diff-marker"> </td>~~
	385	+ <td class="diff-marker"> </td>
386	386	<td class="diff-context"><div>== Changed line ==</div></td>
387	387	</tr>
388	388	<tr>
—	—	@@ -391,9 +391,9 @@
392	392	<td class="diff-addedline"><div>blah blah blah <span class="diffchange diffchange-inline">2</span></div></td>
393	393	</tr>
394	394	<tr>
395		~~- <td class="diff-marker"> </td>~~
	395	+ <td class="diff-marker"> </td>
396	396	<td class="diff-context"></td>
397		~~- <td class="diff-marker"> </td>~~
	397	+ <td class="diff-marker"> </td>
398	398	<td class="diff-context"></td>
399	399	</tr>
400	400
Index: trunk/extensions/wikidiff2/tests/002.phpt
—	—	@@ -51,9 +51,9 @@
52	52	<td colspan="2" class="diff-lineno"><!--LINE 1--></td>
53	53	</tr>
54	54	<tr>
55		~~- <td class="diff-marker"> </td>~~
	55	+ <td class="diff-marker"> </td>
56	56	<td class="diff-context"><div>== Shortest sequence in X ==</div></td>
57		~~- <td class="diff-marker"> </td>~~
	57	+ <td class="diff-marker"> </td>
58	58	<td class="diff-context"><div>== Shortest sequence in X ==</div></td>
59	59	</tr>
60	60	<tr>
—	—	@@ -62,27 +62,27 @@
63	63	<td class="diff-addedline"><div>x1</div></td>
64	64	</tr>
65	65	<tr>
66		~~- <td class="diff-marker"> </td>~~
	66	+ <td class="diff-marker"> </td>
67	67	<td class="diff-context"><div>x2</div></td>
68		~~- <td class="diff-marker"> </td>~~
	68	+ <td class="diff-marker"> </td>
69	69	<td class="diff-context"><div>x2</div></td>
70	70	</tr>
71	71	<tr>
72		~~- <td class="diff-marker"> </td>~~
	72	+ <td class="diff-marker"> </td>
73	73	<td class="diff-context"><div>x1</div></td>
74		~~- <td class="diff-marker"> </td>~~
	74	+ <td class="diff-marker"> </td>
75	75	<td class="diff-context"><div>x1</div></td>
76	76	</tr>
77	77	<tr>
78		~~- <td class="diff-marker"> </td>~~
	78	+ <td class="diff-marker"> </td>
79	79	<td class="diff-context"><div>x2</div></td>
80		~~- <td class="diff-marker"> </td>~~
	80	+ <td class="diff-marker"> </td>
81	81	<td class="diff-context"><div>x2</div></td>
82	82	</tr>
83	83	<tr>
84		~~- <td class="diff-marker"> </td>~~
	84	+ <td class="diff-marker"> </td>
85	85	<td class="diff-context"><div>x1</div></td>
86		~~- <td class="diff-marker"> </td>~~
	86	+ <td class="diff-marker"> </td>
87	87	<td class="diff-context"><div>x1</div></td>
88	88	</tr>
89	89	<tr>
—	—	@@ -101,14 +101,14 @@
102	102	<td class="diff-addedline"><div>x2</div></td>
103	103	</tr>
104	104	<tr>
105		~~- <td class="diff-marker"> </td>~~
	105	+ <td class="diff-marker"> </td>
106	106	<td class="diff-context"><div>context</div></td>
107		~~- <td class="diff-marker"> </td>~~
	107	+ <td class="diff-marker"> </td>
108	108	<td class="diff-context"><div>context</div></td>
109	109	</tr>
110	110	<tr>
111		~~- <td class="diff-marker"> </td>~~
	111	+ <td class="diff-marker"> </td>
112	112	<td class="diff-context"><div>context</div></td>
113		~~- <td class="diff-marker"> </td>~~
	113	+ <td class="diff-marker"> </td>
114	114	<td class="diff-context"><div>context</div></td>
115	115	</tr>
Index: trunk/extensions/wikidiff2/README
—	—	@@ -22,6 +22,9 @@
23	23
24	24	== Changelog ==
25	25
	26	+2012-01-03
	27	+* (bug 25697) Add   to empty context lines
	28	+
26	29	2010-09-30
27	30	* Automaticly use CXXFLAGS=-Wno-write-strings
28	31

Sign-offs

User	Flag	Date
Nikerabbit	inspected	20:08, 3 January 2012

Follow-up revisions

Revision	Commit summary	Author	Date
r109575	* Fixed dpkg-source warning from r107875 due to single space instead of doubl...	tstarling	22:24, 19 January 2012

Status & tagging log

18:19, 5 January 2012 MarkAHershberger (talk | contribs) changed the status of r107875 [removed: new added: ok]