##// 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:

r38178:aa10675c default
r38649:e1987261 default
Show More
test-lfs-pointer.py.out
12 lines | 850 B | text/plain | TextLexer
/ tests / test-lfs-pointer.py.out
Matt Harbison
lfs: clarify pointer validation error messages...
r38178 missing lfs pointer keys: oid, size
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 ok
Matt Harbison
lfs: clarify pointer validation error messages...
r38178 unexpected lfs pointer value: version='https://unknown.github.com/spec/v1'
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 cannot parse git-lfs text: 'version https://git-lfs.github.com/spec/v1\n\noid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393\nsize 12345\nx-foo extra-information\n'
Matt Harbison
lfs: clarify pointer validation error messages...
r38178 unexpected lfs pointer value: oid='ahs256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393'
unexpected lfs pointer value: oid='4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393'
unexpected lfs pointer value: size='0x12345'
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 ok
cannot parse git-lfs text: 'version https://git-lfs.github.com/spec/v1\noid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393\nsize 12345\nx-foo extra\ninformation\n'
Matt Harbison
lfs: clarify pointer validation error messages...
r38178 unexpected lfs pointer key: x_foo
missing lfs pointer keys: oid
missing lfs pointer keys: oid, size