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

sshpeer: store subprocess so it cleans up correctly...

sshpeer: store subprocess so it cleans up correctly When running 'hg pull --rebase', I was seeing this exception 100% of the time as the python process was closing down: Exception TypeError: TypeError("'NoneType' object is not callable",) in <bound method Popen.__del__ of <subprocess.Popen object at 0x937c10>> ignored By storing the subprocess on the sshpeer, the subprocess seems to clean up correctly, and I no longer see the exception. I have no idea why this actually works, but I get a 0% repro if I store the subprocess in self.subprocess, and a 100% repro if I store None in self.subprocess. Possibly related to issue 2240.

Mads Kiilerich - - Load All Authors

File last commit:

r17346:2944a6d3 default


                r18759:9baf4330

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 ..