##// END OF EJS Templates
patch: don't separate \r and \n when colorizing diff output...
patch: don't separate \r and \n when colorizing diff output When displaying diffs, \r at the end of a line is treated as trailing whitespace. This causes an ANSI escape code to be inserted between \r and \n. Some programs, such as less since version 530 (maybe earlier, but at least not version 487) displays ^M when it encounters a lone \r. This causes a lot of noise in diff output on Windows, where \r\n is used to terminate lines. We avoid that by treating both \n and \r\n as end of line when considering trailing whitespace.

File last commit:

r38015:6f9ac3cb default
r38649:e1987261 default
Show More
test-dispatch.py.out
23 lines | 466 B | text/plain | TextLexer
/ tests / test-dispatch.py.out
running: init test1
result: 0
running: add foo
result: 0
running: commit -m commit1 -d 2000-01-01 foo
result: 0
running: commit -m commit2 -d 2000-01-02 foo
result: 0
running: log -r 0
changeset: 0:0e4634943879
user: test
date: Sat Jan 01 00:00:00 2000 +0000
summary: commit1
result: 0
running: log -r tip
changeset: 1:45589e459b2e
tag: tip
user: test
date: Sun Jan 02 00:00:00 2000 +0000
summary: commit2
result: 0