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

r16948:a0cbbf78 default
r38649:e1987261 default
Show More
test-convert-authormap.t
58 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-convert-authormap.t
Matt Mackall
tests: unify test-convert-authormap
r12511
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert=
> EOF
Prepare orig repo
$ hg init orig
$ cd orig
$ echo foo > foo
$ HGUSER='user name' hg ci -qAm 'foo'
$ cd ..
Explicit --authors
$ cat > authormap.txt <<EOF
> user name = Long User Name
>
> # comment
> this line is ignored
> EOF
$ hg convert --authors authormap.txt orig new
initializing destination new repository
Martin Geisler
convert: lowercase status and abort messages
r16925 ignoring bad line in author map file authormap.txt: this line is ignored
Matt Mackall
tests: unify test-convert-authormap
r12511 scanning source...
sorting...
converting...
0 foo
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 writing author map file $TESTTMP/new/.hg/authormap
Matt Mackall
tests: unify test-convert-authormap
r12511 $ cat new/.hg/authormap
user name=Long User Name
$ hg -Rnew log
changeset: 0:d89716e88087
tag: tip
user: Long User Name
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo
$ rm -rf new
Implicit .hg/authormap
$ hg init new
$ mv authormap.txt new/.hg/authormap
$ hg convert orig new
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored
Matt Mackall
tests: unify test-convert-authormap
r12511 scanning source...
sorting...
converting...
0 foo
$ hg -Rnew log
changeset: 0:d89716e88087
tag: tip
user: Long User Name
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo