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

sslutil: more helpful fingerprint mismatch message...

sslutil: more helpful fingerprint mismatch message This will aid debugging for users of sites that renew certs.

Nicolas Venegas - - Load All Authors

File last commit:

r15462:2b1ec74c stable


                r15997:a45516cb

stable

Download file

             test-diff-unified.t
        
                    153 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-unified.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ cat > a <<EOF

        > c

        > c

        > a

        > a

        > b

        > a

        > a

        > c

        > c

        > EOF

        $ hg ci -Am adda

        adding a

        $ cat > a <<EOF

        > c

        > c

        > a

        > a

        > dd

        > a

        > a

        > c

        > c

        > EOF

      default context

        $ hg diff --nodates

        diff -r cf9f4ba66af2 a

        --- a/a

        +++ b/a

        @@ -2,7 +2,7 @@

         c

         a

         a

        -b

        +dd

         a

         a

         c

      invalid --unified

        $ hg diff --nodates -U foo

        abort: diff context lines count must be an integer, not 'foo'

        [255]

        $ hg diff --nodates -U 2

        diff -r cf9f4ba66af2 a

        --- a/a

        +++ b/a

        @@ -3,5 +3,5 @@

         a

         a

        -b

        +dd

         a

         a

        $ hg --config diff.unified=2 diff --nodates

        diff -r cf9f4ba66af2 a

        --- a/a

        +++ b/a

        @@ -3,5 +3,5 @@

         a

         a

        -b

        +dd

         a

         a

        $ hg diff --nodates -U 1

        diff -r cf9f4ba66af2 a

        --- a/a

        +++ b/a

        @@ -4,3 +4,3 @@

         a

        -b

        +dd

         a

      invalid diff.unified

        $ hg --config diff.unified=foo diff --nodates

        abort: diff context lines count must be an integer, not 'foo'

        [255]

      0 lines of context hunk header matches gnu diff hunk header

        $ hg init diffzero

        $ cd diffzero

        $ cat > f1 << EOF

        > c2

        > c4

        > c5

        > EOF

        $ hg commit -Am0

        adding f1

        $ cat > f2 << EOF

        > c1

        > c2

        > c3

        > c4

        > EOF

        $ diff -U0 f1 f2

        --- f1	* (glob)

        +++ f2	* (glob)

        @@ -0,0 +1 @@

        +c1

        @@ -1,0 +3 @@

        +c3

        @@ -3 +4,0 @@

        -c5

        [1]

        $ mv f2 f1

        $ hg diff -U0 --nodates

        diff -r 55d8ff78db23 f1

        --- a/f1

        +++ b/f1

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

        +c1

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

        +c3

        @@ -3,1 +4,0 @@

        -c5

        $ hg diff -U0 --nodates --git

        diff --git a/f1 b/f1

        --- a/f1

        +++ b/f1

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

        +c1

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

        +c3

        @@ -3,1 +4,0 @@

        -c5

        $ hg diff -U0 --nodates -p

        diff -r 55d8ff78db23 f1

        --- a/f1

        +++ b/f1

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

        +c1

        @@ -1,0 +3,1 @@ c2

        +c3

        @@ -3,1 +4,0 @@ c4

        -c5

	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 repo
				$ cd repo
				$ cat > a <<EOF
				> c
				> c
				> a
				> a
				> b
				> a
				> a
				> c
				> c
				> EOF
				$ hg ci -Am adda
				adding a

				$ cat > a <<EOF
				> c
				> c
				> a
				> a
				> dd
				> a
				> a
				> c
				> c
				> EOF

				default context

				$ hg diff --nodates
				diff -r cf9f4ba66af2 a
				--- a/a
				+++ b/a
				@@ -2,7 +2,7 @@
				c
				a
				a
				-b
				+dd
				a
				a
				c

				invalid --unified

				$ hg diff --nodates -U foo
				abort: diff context lines count must be an integer, not 'foo'
				[255]


				$ hg diff --nodates -U 2
				diff -r cf9f4ba66af2 a
				--- a/a
				+++ b/a
				@@ -3,5 +3,5 @@
				a
				a
				-b
				+dd
				a
				a

				$ hg --config diff.unified=2 diff --nodates
				diff -r cf9f4ba66af2 a
				--- a/a
				+++ b/a
				@@ -3,5 +3,5 @@
				a
				a
				-b
				+dd
				a
				a

				$ hg diff --nodates -U 1
				diff -r cf9f4ba66af2 a
				--- a/a
				+++ b/a
				@@ -4,3 +4,3 @@
				a
				-b
				+dd
				a

				invalid diff.unified

				$ hg --config diff.unified=foo diff --nodates
				abort: diff context lines count must be an integer, not 'foo'
				[255]

				0 lines of context hunk header matches gnu diff hunk header

				$ hg init diffzero
				$ cd diffzero
				$ cat > f1 << EOF
				> c2
				> c4
				> c5
				> EOF
				$ hg commit -Am0
				adding f1

				$ cat > f2 << EOF
				> c1
				> c2
				> c3
				> c4
				> EOF
				$ diff -U0 f1 f2
				--- f1 * (glob)
				+++ f2 * (glob)
				@@ -0,0 +1 @@
				+c1
				@@ -1,0 +3 @@
				+c3
				@@ -3 +4,0 @@
				-c5
				[1]

				$ mv f2 f1
				$ hg diff -U0 --nodates
				diff -r 55d8ff78db23 f1
				--- a/f1
				+++ b/f1
				@@ -0,0 +1,1 @@
				+c1
				@@ -1,0 +3,1 @@
				+c3
				@@ -3,1 +4,0 @@
				-c5

				$ hg diff -U0 --nodates --git
				diff --git a/f1 b/f1
				--- a/f1
				+++ b/f1
				@@ -0,0 +1,1 @@
				+c1
				@@ -1,0 +3,1 @@
				+c3
				@@ -3,1 +4,0 @@
				-c5

				$ hg diff -U0 --nodates -p
				diff -r 55d8ff78db23 f1
				--- a/f1
				+++ b/f1
				@@ -0,0 +1,1 @@
				+c1
				@@ -1,0 +3,1 @@ c2
				+c3
				@@ -3,1 +4,0 @@ c4
				-c5