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

r38282:dbf31732 default
r38649:e1987261 default
Show More
test-eolfilename.t
80 lines | 1.5 KiB | text/troff | Tads3Lexer
/ tests / test-eolfilename.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require eol-in-paths
Matt Mackall
tests: unify test-eolfilename
r12425
Matt Mackall
urls: bulk-change BTS urls to new location
r26420 https://bz.mercurial-scm.org/352
Matt Mackall
tests: unify test-eolfilename
r12425
test issue352
$ hg init foo
$ cd foo
$ A=`printf 'he\rllo'`
$ echo foo > "$A"
$ hg add
Mads Kiilerich
run-tests: allow test output lines to be terminated with \r in addition to \n...
r17742 adding he\r (no-eol) (esc)
llo
Matt Mackall
tests: unify test-eolfilename
r12425 abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
[255]
$ hg ci -A -m m
Mads Kiilerich
run-tests: allow test output lines to be terminated with \r in addition to \n...
r17742 adding he\r (no-eol) (esc)
llo
Matt Mackall
tests: unify test-eolfilename
r12425 abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
[255]
$ rm "$A"
$ echo foo > "hell
> o"
$ hg add
adding hell
o
abort: '\n' and '\r' disallowed in filenames: 'hell\no'
[255]
$ hg ci -A -m m
adding hell
o
abort: '\n' and '\r' disallowed in filenames: 'hell\no'
[255]
$ echo foo > "$A"
Yuya Nishihara
debugwalk: show matcher output only if -v/--verbose...
r38281 $ hg debugwalk -v
Yuya Nishihara
debugwalk: pretty-print nested matcher...
r38282 * matcher:
<alwaysmatcher>
Mads Kiilerich
run-tests: allow test output lines to be terminated with \r in addition to \n...
r17742 f he\r (no-eol) (esc)
llo he\r (no-eol) (esc)
llo
Matt Mackall
tests: unify test-eolfilename
r12425 f hell
o hell
o
Adrian Buehlmann
copy: do not copy file if name is disallowed anyway
r13945 $ echo bla > quickfox
$ hg add quickfox
$ hg ci -m 2
$ A=`printf 'quick\rfox'`
$ hg cp quickfox "$A"
abort: '\n' and '\r' disallowed in filenames: 'quick\rfox'
[255]
$ hg mv quickfox "$A"
abort: '\n' and '\r' disallowed in filenames: 'quick\rfox'
[255]
Matt Mackall
urls: bulk-change BTS urls to new location
r26420 https://bz.mercurial-scm.org/2036
Matt Mackall
tests: unify test-eolfilename
r12425
$ cd ..
test issue2039
$ hg init bar
$ cd bar
Yuya Nishihara
tests: write hgrc of more than two lines by using shell heredoc...
r23172 $ cat <<EOF >> $HGRCPATH
> [extensions]
> color =
> [color]
> mode = ansi
> EOF
Matt Mackall
tests: unify test-eolfilename
r12425 $ A=`printf 'foo\nbar'`
$ B=`printf 'foo\nbar.baz'`
$ touch "$A"
$ touch "$B"
$ hg status --color=always
Matt Mackall
status: use condwrite to avoid zero-width format string hack
r17910 \x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mfoo\x1b[0m (esc)
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 \x1b[0;35;1;4mbar\x1b[0m (esc)
Matt Mackall
status: use condwrite to avoid zero-width format string hack
r17910 \x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mfoo\x1b[0m (esc)
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 \x1b[0;35;1;4mbar.baz\x1b[0m (esc)
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..