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

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

diffstat: be more picky when marking file as 'binary' (issue2816) The 'Bin' marker was added to every changed file for which we could not find any diff changes. This included binary files but also copy/renames and mode changes. Since Mercurial regular diff format emits a 'Binary file XXX has changed' line when fed with binary files, we use that and the usual git marker to tell them from other cases. In particular, new empty files are no longer reported as binary. Still, this fix is not complete since copy/renames/mode changes are now reported as '0' lines changes, instead of 'Bin'.

Patrick Mezard - - Load All Authors

File last commit:

r15363:628a4a9e stable


                r15363:628a4a9e

stable

Download file

             test-diffstat.t
        
                    71 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diffstat.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

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

        $ hg add a

        $ cp a b

        $ hg add b

      Wide diffstat:

        $ hg diff --stat

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

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

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

      diffstat width:

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

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

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

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

        $ 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

        $ printf '\0' > c

        $ touch d

        $ hg add c d

      Binary diffstat:

        $ hg diff --stat

         c |  Bin 

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

      Binary git diffstat:

        $ hg diff --stat --git

         c |  Bin 

         d |    0 

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

        $ hg ci -m createb

        $ printf '\0' > "file with spaces"

        $ hg add "file with spaces"

      Filename with spaces diffstat:

        $ hg diff --stat

         file with spaces |  Bin 

         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(-)

	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
				$ i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done
				$ hg add a
				$ cp a b
				$ hg add b

				Wide diffstat:

				$ hg diff --stat
				a \| 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
				b \| 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
				2 files changed, 426 insertions(+), 0 deletions(-)

				diffstat width:

				$ COLUMNS=24 hg diff --config ui.interactive=true --stat
				a \| 213 ++++++++++++++
				b \| 213 ++++++++++++++
				2 files changed, 426 insertions(+), 0 deletions(-)

				$ 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

				$ printf '\0' > c
				$ touch d
				$ hg add c d

				Binary diffstat:

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

				Binary git diffstat:

				$ hg diff --stat --git
				c \| Bin
				d \| 0
				2 files changed, 0 insertions(+), 0 deletions(-)

				$ hg ci -m createb

				$ printf '\0' > "file with spaces"
				$ hg add "file with spaces"

				Filename with spaces diffstat:

				$ hg diff --stat
				file with spaces \| Bin
				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(-)