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

identify: add template support...

identify: add template support This is based on a patch proposed last year by Mathias De Maré[1], with a few changes. - Tags and bookmarks are now formatted lists, for more flexible queries. - The templater is populated whether or not [-nibtB] is specified. (Plain output is unchanged.) This seems more consistent with other templated commands. - The 'id' property is a string, instead of a list. - The parents of 'wdir()' have their own list of attributes. I left 'id' as a string because it seems very useful for generating version info. It's also a bit strange because the value and meaning changes depending on whether or not --debug is passed (short vs full hash), whether the revision is a merge or not (one hash or two, separated by a '+'), the working directory or not (node vs p1node), and local or not (remote defaults to tip, and never has '+'). The equivalent string built with {rev} seems much less useful, and I couldn't think of a reasonable name, so I left it out. The discussion seemed to be pointing towards having a list of nodes, with more than one entry for a merge. It seems simpler to give the nodes a name, and use {node} for the actual commit probed, especially now that there is a virtual node for 'wdir()'. Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes. I'm not sure if the plan is to fill in all of the context attributes in these items, or if these nested items should simply be made {p1node} and {p1rev}. I used ':' as the tag separator for consistency with {tags} in the log templater. Likewise, bookmarks are separated by a space for consistency with the corresponding log template. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html

Andrew Zwicky - - Load All Authors

File last commit:

r32321:0e29ce16 default


                r33051:15a79ac8

default

Download file

             test-diffstat.t
        
                    187 lines
            
             | 4.0 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 ..

        Andrew Zwicky
    
diffstat: properly count lines starting in '--' or '++' (issue5479)...

              r32321
            
      Files with lines beginning with '--' or '++' should be properly counted in diffstat

        $ hg up -Cr tip

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

        $ rm dir1/new

        $ rm dir2/new

        $ rm "file with spaces"

        $ cat > file << EOF

        > line 1

        > line 2

        > line 3

        > EOF

        $ hg commit -Am file

        adding file

      Lines added starting with '--' should count as additions

        $ cat > file << EOF

        > line 1

        > -- line 2, with dashes

        > line 3

        > EOF

        $ hg diff --root .

        diff -r be1569354b24 file

        --- a/file	Thu Jan 01 00:00:00 1970 +0000

        +++ b/file	* (glob)

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

         line 1

        -line 2

        +-- line 2, with dashes

         line 3

        $ hg diff --root . --stat

         file |  2 +-

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

      Lines changed starting with '--' should count as deletions

        $ hg commit -m filev2

        $ cat > file << EOF

        > line 1

        > -- line 2, with dashes, changed again

        > line 3

        > EOF

        $ hg diff --root .

        diff -r 160f7c034df6 file

        --- a/file	Thu Jan 01 00:00:00 1970 +0000

        +++ b/file	* (glob)

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

         line 1

        --- line 2, with dashes

        +-- line 2, with dashes, changed again

         line 3

        $ hg diff --root . --stat

         file |  2 +-

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

      Lines changed starting with '--' should count as deletions

      and starting with '++' should count as additions

        $ cat > file << EOF

        > line 1

        > ++ line 2, switched dashes to plusses

        > line 3

        > EOF

        $ hg diff --root .

        diff -r 160f7c034df6 file

        --- a/file	Thu Jan 01 00:00:00 1970 +0000

        +++ b/file	* (glob)

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

         line 1

        --- line 2, with dashes

        +++ line 2, switched dashes to plusses

         line 3

        $ hg diff --root . --stat

         file |  2 +-

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

	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 ..
Andrew Zwicky diffstat: properly count lines starting in '--' or '++' (issue5479)...	r32321
		Files with lines beginning with '--' or '++' should be properly counted in diffstat

		$ hg up -Cr tip
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm dir1/new
		$ rm dir2/new
		$ rm "file with spaces"
		$ cat > file << EOF
		> line 1
		> line 2
		> line 3
		> EOF
		$ hg commit -Am file
		adding file

		Lines added starting with '--' should count as additions
		$ cat > file << EOF
		> line 1
		> -- line 2, with dashes
		> line 3
		> EOF

		$ hg diff --root .
		diff -r be1569354b24 file
		--- a/file Thu Jan 01 00:00:00 1970 +0000
		+++ b/file * (glob)
		@@ -1,3 +1,3 @@
		line 1
		-line 2
		+-- line 2, with dashes
		line 3

		$ hg diff --root . --stat
		file \| 2 +-
		1 files changed, 1 insertions(+), 1 deletions(-)

		Lines changed starting with '--' should count as deletions
		$ hg commit -m filev2
		$ cat > file << EOF
		> line 1
		> -- line 2, with dashes, changed again
		> line 3
		> EOF

		$ hg diff --root .
		diff -r 160f7c034df6 file
		--- a/file Thu Jan 01 00:00:00 1970 +0000
		+++ b/file * (glob)
		@@ -1,3 +1,3 @@
		line 1
		--- line 2, with dashes
		+-- line 2, with dashes, changed again
		line 3

		$ hg diff --root . --stat
		file \| 2 +-
		1 files changed, 1 insertions(+), 1 deletions(-)

		Lines changed starting with '--' should count as deletions
		and starting with '++' should count as additions
		$ cat > file << EOF
		> line 1
		> ++ line 2, switched dashes to plusses
		> line 3
		> EOF

		$ hg diff --root .
		diff -r 160f7c034df6 file
		--- a/file Thu Jan 01 00:00:00 1970 +0000
		+++ b/file * (glob)
		@@ -1,3 +1,3 @@
		line 1
		--- line 2, with dashes
		+++ line 2, switched dashes to plusses
		line 3

		$ hg diff --root . --stat
		file \| 2 +-
		1 files changed, 1 insertions(+), 1 deletions(-)