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

r34662:eb586ed5 default
r38649:e1987261 default
Show More
test-glog-topological.t
116 lines | 1.4 KiB | text/troff | Tads3Lexer
/ tests / test-glog-topological.t
This test file aims at test topological iteration and the various configuration it can has.
$ cat >> $HGRCPATH << EOF
> [ui]
> logtemplate={rev}\n
> EOF
On this simple example, all topological branch are displayed in turn until we
can finally display 0. this implies skipping from 8 to 3 and coming back to 7
later.
$ hg init test01
$ cd test01
$ hg unbundle $TESTDIR/bundles/remote.hg
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
new changesets bfaf4b5cbf01:916f1afdef90
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -G
o 8
|
| o 7
| |
| o 6
| |
| o 5
| |
| o 4
| |
o | 3
| |
o | 2
| |
o | 1
|/
o 0
(display all nodes)
$ hg log -G -r 'sort(all(), topo)'
o 8
|
o 3
|
o 2
|
o 1
|
| o 7
| |
| o 6
| |
| o 5
| |
| o 4
|/
o 0
(display nodes filtered by log options)
$ hg log -G -r 'sort(all(), topo)' -k '.3'
o 8
|
o 3
|
~
o 7
|
o 6
|
~
(revset skipping nodes)
$ hg log -G --rev 'sort(not (2+6), topo)'
o 8
|
o 3
:
o 1
|
| o 7
| :
| o 5
| |
| o 4
|/
o 0
(begin) from the other branch
$ hg log -G -r 'sort(all(), topo, topo.firstbranch=5)'
o 7
|
o 6
|
o 5
|
o 4
|
| o 8
| |
| o 3
| |
| o 2
| |
| o 1
|/
o 0