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

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Mads Kiilerich - - Load All Authors

File last commit:

r17346:2944a6d3 default


                r22285:85bded43

default

Download file

             test-diffstat.t
        
                    72 lines
            
             | 1.4 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
            
        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
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..