upstream/mercurial-mirror Files · tests/test-diffstat.t

mq: use dirstateguard instead of dirstate.invalidate (qpush)...

mq: use dirstateguard instead of dirstate.invalidate (qpush) Before this patch, "mq.queue.apply()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during afailure. But it just discards changes in memory, and doesn't actually restore ".hg/dirstate". Then, it can't work as expected, if "dirstate.write()" is executed while processing. This patch uses "dirstateguard" instead of "dirstate.invalidate()" to restore ".hg/dirstate" at failure even if "dirstate.write()" is executed before failure. This is a part of preparations to fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hook).

Matt Harbison - - Load All Authors

File last commit:

r24497:2e0301ac default


                r24996:58308dde

default

Download file

             test-diffstat.t
        
                    107 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diffstat.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-diffstat

              r12147
            
        $ hg init repo

        $ cd repo

        $ i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done

        $ hg add a

        Steven Brown
    
patch: restore the previous output of 'diff --stat'...

              r14437
            
        $ cp a b

        $ hg add b

        Adrian Buehlmann
    
tests: unify test-diffstat

              r12147
            
      Wide diffstat:

        $ hg diff --stat

         a |  213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

        Steven Brown
    
patch: restore the previous output of 'diff --stat'...

              r14437
            
         b |  213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

         2 files changed, 426 insertions(+), 0 deletions(-)

        Adrian Buehlmann
    
tests: unify test-diffstat

              r12147
            
      diffstat width:

        $ COLUMNS=24 hg diff --config ui.interactive=true --stat

         a |  213 ++++++++++++++

        Steven Brown
    
patch: restore the previous output of 'diff --stat'...

              r14437
            
         b |  213 ++++++++++++++

         2 files changed, 426 insertions(+), 0 deletions(-)

        Adrian Buehlmann
    
tests: unify test-diffstat

              r12147
            
        $ hg ci -m adda

        $ cat >> a <<EOF

        > a

        > a

        > a

        > EOF

      Narrow diffstat:

        $ hg diff --stat

         a |  3 +++

         1 files changed, 3 insertions(+), 0 deletions(-)

        $ hg ci -m appenda

        Jim Hague
    
tests: tighten checks for octal escapes in shell printf....

              r16098
            
        >>> open("c", "wb").write("\0")

        Patrick Mezard
    
diffstat: be more picky when marking file as 'binary' (issue2816)...

              r15363
            
        $ touch d

        $ hg add c d

        Adrian Buehlmann
    
tests: unify test-diffstat

              r12147
            
      Binary diffstat:

        $ hg diff --stat

        Patrick Mezard
    
diffstat: be more picky when marking file as 'binary' (issue2816)...

              r15363
            
         c |  Bin 

        Adrian Buehlmann
    
tests: unify test-diffstat

              r12147
            
         1 files changed, 0 insertions(+), 0 deletions(-)

      Binary git diffstat:

        $ hg diff --stat --git

        Steven Brown
    
patch: restore the previous output of 'diff --stat'...

              r14437
            
         c |  Bin 

        Patrick Mezard
    
diffstat: be more picky when marking file as 'binary' (issue2816)...

              r15363
            
         d |    0 

         2 files changed, 0 insertions(+), 0 deletions(-)

        Adrian Buehlmann
    
tests: unify test-diffstat

              r12147
            
        Gastón Kleiman
    
diffstat: fix parsing of filenames with spaces...

              r13395
            
        $ hg ci -m createb

        Jim Hague
    
tests: tighten checks for octal escapes in shell printf....

              r16098
            
        >>> open("file with spaces", "wb").write("\0")

        Gastón Kleiman
    
diffstat: fix parsing of filenames with spaces...

              r13395
            
        $ hg add "file with spaces"

      Filename with spaces diffstat:

        $ hg diff --stat

        Patrick Mezard
    
diffstat: be more picky when marking file as 'binary' (issue2816)...

              r15363
            
         file with spaces |  Bin 

        Gastón Kleiman
    
diffstat: fix parsing of filenames with spaces...

              r13395
            
         1 files changed, 0 insertions(+), 0 deletions(-)

      Filename with spaces git diffstat:

        $ hg diff --stat --git

         file with spaces |  Bin 

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

        Mads Kiilerich
    
check-code: fix check for trailing whitespace on empty lines...

              r17346
            
        Siddharth Agarwal
    
commands.diff: add support for diffs relative to a subdirectory...

              r24432
            
      diffstat within directories:

        $ hg rm -f 'file with spaces'

        $ mkdir dir1 dir2

        $ echo new1 > dir1/new

        $ echo new2 > dir2/new

        $ hg add dir1/new dir2/new

        $ hg diff --stat

         dir1/new |  1 +

         dir2/new |  1 +

         2 files changed, 2 insertions(+), 0 deletions(-)

        Sean Farley
    
diff: rename --relative option to --root...

              r24455
            
        $ hg diff --stat --root dir1

        Siddharth Agarwal
    
commands.diff: add support for diffs relative to a subdirectory...

              r24432
            
         new |  1 +

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

        Sean Farley
    
diff: rename --relative option to --root...

              r24455
            
        $ hg diff --stat --root dir1 dir2

        Siddharth Agarwal
    
commands.diff: add support for diffs relative to a subdirectory...

              r24432
            
        warning: dir2 not inside relative root dir1

        Sean Farley
    
diff: rename --relative option to --root...

              r24455
            
        $ hg diff --stat --root dir1 -I dir1/old

        Siddharth Agarwal
    
commands.diff: add support for diffs relative to a subdirectory...

              r24432
            
        $ cd dir1

        $ hg diff --stat .

         dir1/new |  1 +

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

        Sean Farley
    
diff: rename --relative option to --root...

              r24455
            
        $ hg diff --stat --root .

        Siddharth Agarwal
    
commands.diff: add support for diffs relative to a subdirectory...

              r24432
            
         new |  1 +

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

        Sean Farley
    
diff: rename --relative option to --root...

              r24455
            
        $ hg diff --stat --root ../dir1 ../dir2

        Matt Harbison
    
test-diffstat: add a glob the test runner wants on Windows...

              r24497
            
        warning: ../dir2 not inside relative root . (glob)

        Siddharth Agarwal
    
commands.diff: add support for diffs relative to a subdirectory...

              r24432
            
        Sean Farley
    
diff: rename --relative option to --root...

              r24455
            
        $ hg diff --stat --root . -I old

        Siddharth Agarwal
    
commands.diff: add support for diffs relative to a subdirectory...

              r24432
            
        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

Adrian Buehlmann tests: unify test-diffstat	r12147	$ hg init repo
		$ cd repo
		$ i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done
		$ hg add a
Steven Brown patch: restore the previous output of 'diff --stat'...	r14437	$ cp a b
		$ hg add b
Adrian Buehlmann tests: unify test-diffstat	r12147
		Wide diffstat:

		$ hg diff --stat
		a \| 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Steven Brown patch: restore the previous output of 'diff --stat'...	r14437	b \| 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
		2 files changed, 426 insertions(+), 0 deletions(-)
Adrian Buehlmann tests: unify test-diffstat	r12147
		diffstat width:

		$ COLUMNS=24 hg diff --config ui.interactive=true --stat
		a \| 213 ++++++++++++++
Steven Brown patch: restore the previous output of 'diff --stat'...	r14437	b \| 213 ++++++++++++++
		2 files changed, 426 insertions(+), 0 deletions(-)
Adrian Buehlmann tests: unify test-diffstat	r12147
		$ hg ci -m adda

		$ cat >> a <<EOF
		> a
		> a
		> a
		> EOF

		Narrow diffstat:

		$ hg diff --stat
		a \| 3 +++
		1 files changed, 3 insertions(+), 0 deletions(-)

		$ hg ci -m appenda

Jim Hague tests: tighten checks for octal escapes in shell printf....	r16098	>>> open("c", "wb").write("\0")
Patrick Mezard diffstat: be more picky when marking file as 'binary' (issue2816)...	r15363	$ touch d
		$ hg add c d
Adrian Buehlmann tests: unify test-diffstat	r12147
		Binary diffstat:

		$ hg diff --stat
Patrick Mezard diffstat: be more picky when marking file as 'binary' (issue2816)...	r15363	c \| Bin
Adrian Buehlmann tests: unify test-diffstat	r12147	1 files changed, 0 insertions(+), 0 deletions(-)

		Binary git diffstat:

		$ hg diff --stat --git
Steven Brown patch: restore the previous output of 'diff --stat'...	r14437	c \| Bin
Patrick Mezard diffstat: be more picky when marking file as 'binary' (issue2816)...	r15363	d \| 0
		2 files changed, 0 insertions(+), 0 deletions(-)
Adrian Buehlmann tests: unify test-diffstat	r12147
Gastón Kleiman diffstat: fix parsing of filenames with spaces...	r13395	$ hg ci -m createb

Jim Hague tests: tighten checks for octal escapes in shell printf....	r16098	>>> open("file with spaces", "wb").write("\0")
Gastón Kleiman diffstat: fix parsing of filenames with spaces...	r13395	$ hg add "file with spaces"

		Filename with spaces diffstat:

		$ hg diff --stat
Patrick Mezard diffstat: be more picky when marking file as 'binary' (issue2816)...	r15363	file with spaces \| Bin
Gastón Kleiman diffstat: fix parsing of filenames with spaces...	r13395	1 files changed, 0 insertions(+), 0 deletions(-)

		Filename with spaces git diffstat:

		$ hg diff --stat --git
		file with spaces \| Bin
		1 files changed, 0 insertions(+), 0 deletions(-)
Mads Kiilerich check-code: fix check for trailing whitespace on empty lines...	r17346
Siddharth Agarwal commands.diff: add support for diffs relative to a subdirectory...	r24432	diffstat within directories:

		$ hg rm -f 'file with spaces'

		$ mkdir dir1 dir2
		$ echo new1 > dir1/new
		$ echo new2 > dir2/new
		$ hg add dir1/new dir2/new
		$ hg diff --stat
		dir1/new \| 1 +
		dir2/new \| 1 +
		2 files changed, 2 insertions(+), 0 deletions(-)

Sean Farley diff: rename --relative option to --root...	r24455	$ hg diff --stat --root dir1
Siddharth Agarwal commands.diff: add support for diffs relative to a subdirectory...	r24432	new \| 1 +
		1 files changed, 1 insertions(+), 0 deletions(-)

Sean Farley diff: rename --relative option to --root...	r24455	$ hg diff --stat --root dir1 dir2
Siddharth Agarwal commands.diff: add support for diffs relative to a subdirectory...	r24432	warning: dir2 not inside relative root dir1

Sean Farley diff: rename --relative option to --root...	r24455	$ hg diff --stat --root dir1 -I dir1/old
Siddharth Agarwal commands.diff: add support for diffs relative to a subdirectory...	r24432
		$ cd dir1
		$ hg diff --stat .
		dir1/new \| 1 +
		1 files changed, 1 insertions(+), 0 deletions(-)
Sean Farley diff: rename --relative option to --root...	r24455	$ hg diff --stat --root .
Siddharth Agarwal commands.diff: add support for diffs relative to a subdirectory...	r24432	new \| 1 +
		1 files changed, 1 insertions(+), 0 deletions(-)

Sean Farley diff: rename --relative option to --root...	r24455	$ hg diff --stat --root ../dir1 ../dir2
Matt Harbison test-diffstat: add a glob the test runner wants on Windows...	r24497	warning: ../dir2 not inside relative root . (glob)
Siddharth Agarwal commands.diff: add support for diffs relative to a subdirectory...	r24432
Sean Farley diff: rename --relative option to --root...	r24455	$ hg diff --stat --root . -I old
Siddharth Agarwal commands.diff: add support for diffs relative to a subdirectory...	r24432
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..