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

rebase: fix pull --rev options clashing with --rebase (issue3619)...

rebase: fix pull --rev options clashing with --rebase (issue3619) Rebase also have a plain `--rev` option used to select the rebase set (as `--base` or `--source` would). But the content of the --rev option was intended for the remote repo and is irrelevant for the local rebase operation. We expect `hg pull --rebase` to stick with the default behavior here: hg rebase --base . --dest tip(branch(.)) The `rev` option is dropped from the option passed to rebase.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r17988:848345a8

stable

Download file

             test-diff-color.t
        
                    130 lines
            
             | 2.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-color.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
      Setup

        Danek Duvall
    
color: add support for terminfo-based attributes and color...

              r13987
            
        $ echo "[color]" >> $HGRCPATH

        $ echo "mode = ansi" >> $HGRCPATH

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
        $ echo "[extensions]" >> $HGRCPATH

        $ echo "color=" >> $HGRCPATH

        $ 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 --color=always

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)

        \x1b[0;31;1m--- a/a\x1b[0m (esc)

        \x1b[0;32;1m+++ b/a\x1b[0m (esc)

        \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         c

         a

         a

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;31m-b\x1b[0m (esc)

        \x1b[0;32m+dd\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         a

         a

         c

      --unified=2

        $ hg diff --nodates -U 2  --color=always

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)

        \x1b[0;31;1m--- a/a\x1b[0m (esc)

        \x1b[0;32;1m+++ b/a\x1b[0m (esc)

        \x1b[0;35m@@ -3,5 +3,5 @@\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         a

         a

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;31m-b\x1b[0m (esc)

        \x1b[0;32m+dd\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         a

         a

      diffstat

        $ hg diff --stat --color=always

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
         a |  2 \x1b[0;32m+\x1b[0m\x1b[0;31m-\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         1 files changed, 1 insertions(+), 1 deletions(-)

        $ echo "record=" >> $HGRCPATH

        $ echo "[ui]" >> $HGRCPATH

        $ echo "interactive=true" >> $HGRCPATH

        $ echo "[diff]" >> $HGRCPATH

        $ echo "git=True" >> $HGRCPATH

        Mads Kiilerich
    
tests: convert some 'hghave execbit' to #if...

              r16899
            
      #if execbit

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
      record

        Mads Kiilerich
    
tests: use 'hghave execbit' for tests that manipulate x bit in file system

              r15442
            
        $ chmod +x a

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
        $ hg record --color=always -m moda a <<EOF

        > y

        > y

        > EOF

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)

        \x1b[0;36;1mold mode 100644\x1b[0m (esc)

        \x1b[0;36;1mnew mode 100755\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
        1 hunks, 1 lines changed

        A. S. Budden
    
record: allow splitting of hunks by manually editing patches...

              r16324
            
        \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m  (esc)

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         c

         a

         a

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;31m-b\x1b[0m (esc)

        \x1b[0;32m+dd\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         a

         a

         c

        A. S. Budden
    
record: allow splitting of hunks by manually editing patches...

              r16324
            
        \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m  (esc)

        Mads Kiilerich
    
tests: cleanup of echo statements left over from test conversion

              r15243
            
        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg rollback

        Gilles Moris
    
rollback: clarifies the message about the reverted state (issue2628)...

              r13446
            
        repository tip rolled back to revision 0 (undo commit)

        working directory now based on revision 0

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
      qrecord

        $ hg qrecord --color=always -m moda patch <<EOF

        > y

        > y

        > EOF

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)

        \x1b[0;36;1mold mode 100644\x1b[0m (esc)

        \x1b[0;36;1mnew mode 100755\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
        1 hunks, 1 lines changed

        A. S. Budden
    
record: allow splitting of hunks by manually editing patches...

              r16324
            
        \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m  (esc)

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         c

         a

         a

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;31m-b\x1b[0m (esc)

        \x1b[0;32m+dd\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         a

         a

         c

        A. S. Budden
    
record: allow splitting of hunks by manually editing patches...

              r16324
            
        \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m  (esc)

        Mads Kiilerich
    
tests: convert some 'hghave execbit' to #if...

              r16899
            
      #endif

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Matt Mackall tests: unify test-diff-color	r12415	Setup

Danek Duvall color: add support for terminfo-based attributes and color...	r13987	$ echo "[color]" >> $HGRCPATH
		$ echo "mode = ansi" >> $HGRCPATH
Matt Mackall tests: unify test-diff-color	r12415	$ echo "[extensions]" >> $HGRCPATH
		$ echo "color=" >> $HGRCPATH
		$ 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 --color=always
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
		\x1b[0;31;1m--- a/a\x1b[0m (esc)
		\x1b[0;32;1m+++ b/a\x1b[0m (esc)
		\x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	c
		a
		a
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;31m-b\x1b[0m (esc)
		\x1b[0;32m+dd\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	a
		a
		c

		--unified=2

		$ hg diff --nodates -U 2 --color=always
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
		\x1b[0;31;1m--- a/a\x1b[0m (esc)
		\x1b[0;32;1m+++ b/a\x1b[0m (esc)
		\x1b[0;35m@@ -3,5 +3,5 @@\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	a
		a
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;31m-b\x1b[0m (esc)
		\x1b[0;32m+dd\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	a
		a

		diffstat

		$ hg diff --stat --color=always
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	a \| 2 \x1b[0;32m+\x1b[0m\x1b[0;31m-\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	1 files changed, 1 insertions(+), 1 deletions(-)
		$ echo "record=" >> $HGRCPATH
		$ echo "[ui]" >> $HGRCPATH
		$ echo "interactive=true" >> $HGRCPATH
		$ echo "[diff]" >> $HGRCPATH
		$ echo "git=True" >> $HGRCPATH

Mads Kiilerich tests: convert some 'hghave execbit' to #if...	r16899	#if execbit

Matt Mackall tests: unify test-diff-color	r12415	record

Mads Kiilerich tests: use 'hghave execbit' for tests that manipulate x bit in file system	r15442	$ chmod +x a
Matt Mackall tests: unify test-diff-color	r12415	$ hg record --color=always -m moda a <<EOF
		> y
		> y
		> EOF
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
		\x1b[0;36;1mold mode 100644\x1b[0m (esc)
		\x1b[0;36;1mnew mode 100755\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	1 hunks, 1 lines changed
A. S. Budden record: allow splitting of hunks by manually editing patches...	r16324	\x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m (esc)
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	c
		a
		a
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;31m-b\x1b[0m (esc)
		\x1b[0;32m+dd\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	a
		a
		c
A. S. Budden record: allow splitting of hunks by manually editing patches...	r16324	\x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m (esc)
Mads Kiilerich tests: cleanup of echo statements left over from test conversion	r15243
Matt Mackall tests: unify test-diff-color	r12415	$ echo "[extensions]" >> $HGRCPATH
		$ echo "mq=" >> $HGRCPATH
		$ hg rollback
Gilles Moris rollback: clarifies the message about the reverted state (issue2628)...	r13446	repository tip rolled back to revision 0 (undo commit)
		working directory now based on revision 0
Matt Mackall tests: unify test-diff-color	r12415
		qrecord

		$ hg qrecord --color=always -m moda patch <<EOF
		> y
		> y
		> EOF
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
		\x1b[0;36;1mold mode 100644\x1b[0m (esc)
		\x1b[0;36;1mnew mode 100755\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	1 hunks, 1 lines changed
A. S. Budden record: allow splitting of hunks by manually editing patches...	r16324	\x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m (esc)
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	c
		a
		a
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;31m-b\x1b[0m (esc)
		\x1b[0;32m+dd\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	a
		a
		c
A. S. Budden record: allow splitting of hunks by manually editing patches...	r16324	\x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m (esc)
Mads Kiilerich tests: convert some 'hghave execbit' to #if...	r16899
		#endif
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..