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

largefiles: unlink standins not known to the restored dirstate at rollback...

largefiles: unlink standins not known to the restored dirstate at rollback Before this patch, standinds not known to the restored dirstate at rollback still exist after rollback of the parent of the working directory, and they become orphans unexpectedly. This patch unlinks standins not known to the restored dirstate. This patch saves names of standins matched against not "repo.dirstate[f] == 'a'" but "repo.dirstate[f] != 'r'" before rollback, because branch merging marks files newly added to dirstate as not "a" but "n". Such standins will also become orphan after rollback, because they are not known to the restored dirstate.

Mads Kiilerich - - Load All Authors

File last commit:

r17346:2944a6d3 default


                r22286:3f3b9483

default

Download file

             test-diffstat.t
        
                    72 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

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

        $ 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

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

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

        $ 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

				$ 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

				>>> open("c", "wb").write("\0")
				$ 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

				>>> open("file with spaces", "wb").write("\0")
				$ 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(-)

				$ cd ..