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

Martin von Zweigbergk - - Load All Authors

File last commit:

r27902:51b6ce25 default


                r38649:e1987261

default

Download file

             test-diffdir.t
        
                    77 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diffdir.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pradeepkumar Gayam
    
tests: unify test-diffdir

              r11921
            
        $ hg init

        $ touch a

        $ hg add a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -m "a"

        Pradeepkumar Gayam
    
tests: unify test-diffdir

              r11921
            
        $ echo 123 > b

        $ hg add b

        $ hg diff --nodates

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        diff -r 3903775176ed b

        Pradeepkumar Gayam
    
tests: unify test-diffdir

              r11921
            
        --- /dev/null

        +++ b/b

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

        +123

        $ hg diff --nodates -r tip

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        diff -r 3903775176ed b

        Pradeepkumar Gayam
    
tests: unify test-diffdir

              r11921
            
        --- /dev/null

        +++ b/b

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

        +123

        $ echo foo > a

        $ hg diff --nodates

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        diff -r 3903775176ed a

        Pradeepkumar Gayam
    
tests: unify test-diffdir

              r11921
            
        --- a/a

        +++ b/a

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

        +foo

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        diff -r 3903775176ed b

        Pradeepkumar Gayam
    
tests: unify test-diffdir

              r11921
            
        --- /dev/null

        +++ b/b

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

        +123

        $ hg diff -r ""

        Matt Mackall
    
revsets: make revpair revsets-aware...

              r12617
            
        hg: parse error: empty query

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Pradeepkumar Gayam
    
tests: unify test-diffdir

              r11921
            
        $ hg diff -r tip -r ""

        Matt Mackall
    
revsets: make revpair revsets-aware...

              r12617
            
        hg: parse error: empty query

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Martin von Zweigbergk
    
diff: don't crash when merged-in addition was removed (issue4786)...

              r27901
            
      Remove a file that was added via merge. Since the file is not in parent 1,

      it should not be in the diff.

        $ hg ci -m 'a=foo' a

        $ hg co -Cq null

        $ echo 123 > b

        $ hg add b

        $ hg ci -m "b"

        created new head

        $ hg merge 1

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

        $ hg rm -f a

        $ hg diff --nodates

      Rename a file that was added via merge. Since the rename source is not in

      parent 1, the diff should be relative to /dev/null

        $ hg co -Cq 2

        $ hg merge 1

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

        $ hg mv a a2

        $ hg diff --nodates

        diff -r cf44b38435e5 a2

        --- /dev/null

        +++ b/a2

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

        +foo

        Martin von Zweigbergk
    
diff: don't crash when merged-in addition is copied...

              r27902
            
        $ hg diff --nodates --git

        diff --git a/a2 b/a2

        new file mode 100644

        --- /dev/null

        +++ b/a2

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

        +foo

	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

Pradeepkumar Gayam tests: unify test-diffdir	r11921	$ hg init
		$ touch a
		$ hg add a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -m "a"
Pradeepkumar Gayam tests: unify test-diffdir	r11921
		$ echo 123 > b
		$ hg add b
		$ hg diff --nodates
Martin Geisler tests: remove unneeded -d flags...	r12156	diff -r 3903775176ed b
Pradeepkumar Gayam tests: unify test-diffdir	r11921	--- /dev/null
		+++ b/b
		@@ -0,0 +1,1 @@
		+123

		$ hg diff --nodates -r tip
Martin Geisler tests: remove unneeded -d flags...	r12156	diff -r 3903775176ed b
Pradeepkumar Gayam tests: unify test-diffdir	r11921	--- /dev/null
		+++ b/b
		@@ -0,0 +1,1 @@
		+123

		$ echo foo > a
		$ hg diff --nodates
Martin Geisler tests: remove unneeded -d flags...	r12156	diff -r 3903775176ed a
Pradeepkumar Gayam tests: unify test-diffdir	r11921	--- a/a
		+++ b/a
		@@ -0,0 +1,1 @@
		+foo
Martin Geisler tests: remove unneeded -d flags...	r12156	diff -r 3903775176ed b
Pradeepkumar Gayam tests: unify test-diffdir	r11921	--- /dev/null
		+++ b/b
		@@ -0,0 +1,1 @@
		+123

		$ hg diff -r ""
Matt Mackall revsets: make revpair revsets-aware...	r12617	hg: parse error: empty query
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Pradeepkumar Gayam tests: unify test-diffdir	r11921	$ hg diff -r tip -r ""
Matt Mackall revsets: make revpair revsets-aware...	r12617	hg: parse error: empty query
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Martin von Zweigbergk diff: don't crash when merged-in addition was removed (issue4786)...	r27901
		Remove a file that was added via merge. Since the file is not in parent 1,
		it should not be in the diff.

		$ hg ci -m 'a=foo' a
		$ hg co -Cq null
		$ echo 123 > b
		$ hg add b
		$ hg ci -m "b"
		created new head
		$ hg merge 1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg rm -f a
		$ hg diff --nodates

		Rename a file that was added via merge. Since the rename source is not in
		parent 1, the diff should be relative to /dev/null

		$ hg co -Cq 2
		$ hg merge 1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg mv a a2
		$ hg diff --nodates
		diff -r cf44b38435e5 a2
		--- /dev/null
		+++ b/a2
		@@ -0,0 +1,1 @@
		+foo
Martin von Zweigbergk diff: don't crash when merged-in addition is copied...	r27902	$ hg diff --nodates --git
		diff --git a/a2 b/a2
		new file mode 100644
		--- /dev/null
		+++ b/a2
		@@ -0,0 +1,1 @@
		+foo