upstream/mercurial-mirror Files · tests/test-diff-subdir.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.

Sean Farley - - Load All Authors

File last commit:

r24455:16961d43 default


                r38649:e1987261

default

Download file

             test-diff-subdir.t
        
                    67 lines
            
             | 943 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-subdir.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ mkdir alpha

        $ touch alpha/one

        $ mkdir beta

        $ touch beta/two

        $ hg add alpha/one beta/two

        $ hg ci -m "start"

        $ echo 1 > alpha/one

        $ echo 2 > beta/two

      everything

        $ hg diff --nodates

        diff -r 7d5ef1aea329 alpha/one

        --- a/alpha/one

        +++ b/alpha/one

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

        +1

        diff -r 7d5ef1aea329 beta/two

        --- a/beta/two

        +++ b/beta/two

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

        +2

      beta only

        $ hg diff --nodates beta

        diff -r 7d5ef1aea329 beta/two

        --- a/beta/two

        +++ b/beta/two

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

        +2

      inside beta

        $ cd beta

        $ hg diff --nodates .

        diff -r 7d5ef1aea329 beta/two

        --- a/beta/two

        +++ b/beta/two

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

        +2

      relative to beta

        $ cd ..

        $ hg diff --nodates --root beta

        diff -r 7d5ef1aea329 two

        --- a/two

        +++ b/two

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

        +2

      inside beta

        $ cd beta

        $ hg diff --nodates --root .

        diff -r 7d5ef1aea329 two

        --- a/two

        +++ b/two

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

        +2

        $ 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

				$ mkdir alpha
				$ touch alpha/one
				$ mkdir beta
				$ touch beta/two

				$ hg add alpha/one beta/two
				$ hg ci -m "start"

				$ echo 1 > alpha/one
				$ echo 2 > beta/two

				everything

				$ hg diff --nodates
				diff -r 7d5ef1aea329 alpha/one
				--- a/alpha/one
				+++ b/alpha/one
				@@ -0,0 +1,1 @@
				+1
				diff -r 7d5ef1aea329 beta/two
				--- a/beta/two
				+++ b/beta/two
				@@ -0,0 +1,1 @@
				+2

				beta only

				$ hg diff --nodates beta
				diff -r 7d5ef1aea329 beta/two
				--- a/beta/two
				+++ b/beta/two
				@@ -0,0 +1,1 @@
				+2

				inside beta

				$ cd beta
				$ hg diff --nodates .
				diff -r 7d5ef1aea329 beta/two
				--- a/beta/two
				+++ b/beta/two
				@@ -0,0 +1,1 @@
				+2

				relative to beta

				$ cd ..
				$ hg diff --nodates --root beta
				diff -r 7d5ef1aea329 two
				--- a/two
				+++ b/two
				@@ -0,0 +1,1 @@
				+2

				inside beta

				$ cd beta
				$ hg diff --nodates --root .
				diff -r 7d5ef1aea329 two
				--- a/two
				+++ b/two
				@@ -0,0 +1,1 @@
				+2

				$ cd ..