upstream/mercurial-mirror Files · tests/test-diff-hashes.t

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.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r38649:e1987261

default

Download file

             test-diff-hashes.t
        
                    46 lines
            
             | 1013 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-hashes.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init a

        $ cd a

        $ hg diff inexistent1 inexistent2

        inexistent1: * (glob)

        inexistent2: * (glob)

        $ echo bar > foo

        $ hg add foo

        $ hg ci -m 'add foo'

        $ echo foobar > foo

        $ hg ci -m 'change foo'

        $ hg --quiet diff -r 0 -r 1

        --- a/foo	Thu Jan 01 00:00:00 1970 +0000

        +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,1 +1,1 @@

        -bar

        +foobar

        $ hg diff -r 0 -r 1

        diff -r a99fb63adac3 -r 9b8568d3af2f foo

        --- a/foo	Thu Jan 01 00:00:00 1970 +0000

        +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,1 +1,1 @@

        -bar

        +foobar

        $ hg --verbose diff -r 0 -r 1

        diff -r a99fb63adac3 -r 9b8568d3af2f foo

        --- a/foo	Thu Jan 01 00:00:00 1970 +0000

        +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,1 +1,1 @@

        -bar

        +foobar

        $ hg --debug diff -r 0 -r 1

        diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo

        --- a/foo	Thu Jan 01 00:00:00 1970 +0000

        +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,1 +1,1 @@

        -bar

        +foobar

        $ cd ..

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				$ hg init a
				$ cd a

				$ hg diff inexistent1 inexistent2
				inexistent1: * (glob)
				inexistent2: * (glob)

				$ echo bar > foo
				$ hg add foo
				$ hg ci -m 'add foo'

				$ echo foobar > foo
				$ hg ci -m 'change foo'

				$ hg --quiet diff -r 0 -r 1
				--- a/foo Thu Jan 01 00:00:00 1970 +0000
				+++ b/foo Thu Jan 01 00:00:00 1970 +0000
				@@ -1,1 +1,1 @@
				-bar
				+foobar

				$ hg diff -r 0 -r 1
				diff -r a99fb63adac3 -r 9b8568d3af2f foo
				--- a/foo Thu Jan 01 00:00:00 1970 +0000
				+++ b/foo Thu Jan 01 00:00:00 1970 +0000
				@@ -1,1 +1,1 @@
				-bar
				+foobar

				$ hg --verbose diff -r 0 -r 1
				diff -r a99fb63adac3 -r 9b8568d3af2f foo
				--- a/foo Thu Jan 01 00:00:00 1970 +0000
				+++ b/foo Thu Jan 01 00:00:00 1970 +0000
				@@ -1,1 +1,1 @@
				-bar
				+foobar

				$ hg --debug diff -r 0 -r 1
				diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo
				--- a/foo Thu Jan 01 00:00:00 1970 +0000
				+++ b/foo Thu Jan 01 00:00:00 1970 +0000
				@@ -1,1 +1,1 @@
				-bar
				+foobar

				$ cd ..