257 \x1b[0;32m+end tab\x1b[0m\x1b[0;1;41m \x1b[0m (esc) |
257 \x1b[0;32m+end tab\x1b[0m\x1b[0;1;41m \x1b[0m (esc) |
258 \x1b[0;32m+mid\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mtab\x1b[0m (esc) |
258 \x1b[0;32m+mid\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mtab\x1b[0m (esc) |
259 \x1b[0;32m+\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mall\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mtabs\x1b[0m\x1b[0;1;41m \x1b[0m (esc) |
259 \x1b[0;32m+\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mall\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mtabs\x1b[0m\x1b[0;1;41m \x1b[0m (esc) |
260 |
260 |
261 $ cd .. |
261 $ cd .. |
|
262 |
|
263 test inline color diff |
|
264 |
|
265 $ hg init inline |
|
266 $ cd inline |
|
267 $ cat > file1 << EOF |
|
268 > this is the first line |
|
269 > this is the second line |
|
270 > third line starts with space |
|
271 > + starts with a plus sign |
|
272 > |
|
273 > this line won't change |
|
274 > |
|
275 > two lines are going to |
|
276 > be changed into three! |
|
277 > |
|
278 > three of those lines will |
|
279 > collapse onto one |
|
280 > (to see if it works) |
|
281 > EOF |
|
282 $ hg add file1 |
|
283 $ hg ci -m 'commit' |
|
284 $ cat > file1 << EOF |
|
285 > that is the first paragraph |
|
286 > this is the second line |
|
287 > third line starts with space |
|
288 > - starts with a minus sign |
|
289 > |
|
290 > this line won't change |
|
291 > |
|
292 > two lines are going to |
|
293 > (entirely magically, |
|
294 > assuming this works) |
|
295 > be changed into four! |
|
296 > |
|
297 > three of those lines have |
|
298 > collapsed onto one |
|
299 > EOF |
|
300 $ hg diff --config experimental.worddiff=False --color=debug |
|
301 [diff.diffline|diff --git a/file1 b/file1] |
|
302 [diff.file_a|--- a/file1] |
|
303 [diff.file_b|+++ b/file1] |
|
304 [diff.hunk|@@ -1,13 +1,14 @@] |
|
305 [diff.deleted|-this is the first line] |
|
306 [diff.deleted|-this is the second line] |
|
307 [diff.deleted|- third line starts with space] |
|
308 [diff.deleted|-+ starts with a plus sign] |
|
309 [diff.inserted|+that is the first paragraph] |
|
310 [diff.inserted|+ this is the second line] |
|
311 [diff.inserted|+third line starts with space] |
|
312 [diff.inserted|+- starts with a minus sign] |
|
313 |
|
314 this line won't change |
|
315 |
|
316 two lines are going to |
|
317 [diff.deleted|-be changed into three!] |
|
318 [diff.inserted|+(entirely magically,] |
|
319 [diff.inserted|+ assuming this works)] |
|
320 [diff.inserted|+be changed into four!] |
|
321 |
|
322 [diff.deleted|-three of those lines will] |
|
323 [diff.deleted|-collapse onto one] |
|
324 [diff.deleted|-(to see if it works)] |
|
325 [diff.inserted|+three of those lines have] |
|
326 [diff.inserted|+collapsed onto one] |
|
327 $ hg diff --config experimental.worddiff=True --color=debug |
|
328 [diff.diffline|diff --git a/file1 b/file1] |
|
329 [diff.file_a|--- a/file1] |
|
330 [diff.file_b|+++ b/file1] |
|
331 [diff.hunk|@@ -1,13 +1,14 @@] |
|
332 [diff.deleted|-this is the ][diff.deleted.highlight|first][diff.deleted| line] |
|
333 [diff.deleted|-this is the second line] |
|
334 [diff.deleted|-][diff.deleted.highlight| ][diff.deleted|third line starts with space] |
|
335 [diff.deleted|-][diff.deleted.highlight|+][diff.deleted| starts with a ][diff.deleted.highlight|plus][diff.deleted| sign] |
|
336 [diff.inserted|+that is the first paragraph] |
|
337 [diff.inserted|+][diff.inserted.highlight| ][diff.inserted|this is the ][diff.inserted.highlight|second][diff.inserted| line] |
|
338 [diff.inserted|+third line starts with space] |
|
339 [diff.inserted|+][diff.inserted.highlight|-][diff.inserted| starts with a ][diff.inserted.highlight|minus][diff.inserted| sign] |
|
340 |
|
341 this line won't change |
|
342 |
|
343 two lines are going to |
|
344 [diff.deleted|-be changed into ][diff.deleted.highlight|three][diff.deleted|!] |
|
345 [diff.inserted|+(entirely magically,] |
|
346 [diff.inserted|+ assuming this works)] |
|
347 [diff.inserted|+be changed into ][diff.inserted.highlight|four][diff.inserted|!] |
|
348 |
|
349 [diff.deleted|-three of those lines ][diff.deleted.highlight|will] |
|
350 [diff.deleted|-][diff.deleted.highlight|collapse][diff.deleted| onto one] |
|
351 [diff.deleted|-(to see if it works)] |
|
352 [diff.inserted|+three of those lines ][diff.inserted.highlight|have] |
|
353 [diff.inserted|+][diff.inserted.highlight|collapsed][diff.inserted| onto one] |