upstream/mercurial-mirror Files · tests/test-convert-hg-svn.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:

r17033:0413f68d default


                r18759:9baf4330

default

Download file

             test-convert-hg-svn.t
        
                    105 lines
            
             | 2.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-hg-svn.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ "$TESTDIR/hghave" svn svn-bindings || exit 80

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "convert = " >> $HGRCPATH

        $ echo "mq = " >> $HGRCPATH

        $ SVNREPOPATH=`pwd`/svn-repo

      #if windows

        $ SVNREPOURL=file:///`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`

      #else

        $ SVNREPOURL=file://`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`

      #endif

        $ svnadmin create "$SVNREPOPATH"

        $ cat > "$SVNREPOPATH"/hooks/pre-revprop-change <<EOF

        > #!/bin/sh

        > 

        > REPOS="$1"

        > REV="$2"

        > USER="$3"

        > PROPNAME="$4"

        > ACTION="$5"

        > 

        > if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:log" ]; then exit 0; fi

        > if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-branch" ]; then exit 0; fi

        > if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-rev" ]; then exit 0; fi

        > 

        > echo "Changing prohibited revision property" >&2

        > exit 1

        > EOF

        $ chmod +x "$SVNREPOPATH"/hooks/pre-revprop-change

        $ svn co "$SVNREPOURL" "$SVNREPOPATH"-wc

        Checked out revision 0.

        $ cd "$SVNREPOPATH"-wc

        $ echo a > a

        $ svn add a

        A         a

        $ svn ci -m'added a' a

        Adding         a

        Transmitting file data .

        Committed revision 1.

        $ cd ..

      initial roundtrip

        $ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg | grep -v initializing

        scanning source...

        sorting...

        converting...

        0 added a

        $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc

        scanning source...

        sorting...

        converting...

      second roundtrip should do nothing

        $ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg

        scanning source...

        sorting...

        converting...

        $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc

        scanning source...

        sorting...

        converting...

      new hg rev

        $ hg clone "$SVNREPOPATH"-hg "$SVNREPOPATH"-work

        updating to branch default

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

        $ cd "$SVNREPOPATH"-work

        $ echo b > b

        $ hg add b

        $ hg ci -mb

      adding an empty revision

        $ hg qnew -m emtpy empty

        $ hg qfinish -a

        $ cd ..

      echo hg to svn

        $ hg --cwd "$SVNREPOPATH"-hg pull -q "$SVNREPOPATH"-work

        $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc

        scanning source...

        sorting...

        converting...

        1 b

        0 emtpy

      svn back to hg should do nothing

        $ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg

        scanning source...

        sorting...

        converting...

      hg back to svn should do nothing

        $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc

        scanning source...

        sorting...

        converting...

	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


				$ "$TESTDIR/hghave" svn svn-bindings \|\| exit 80
				$ echo "[extensions]" >> $HGRCPATH
				$ echo "convert = " >> $HGRCPATH
				$ echo "mq = " >> $HGRCPATH

				$ SVNREPOPATH=`pwd`/svn-repo
				#if windows
				$ SVNREPOURL=file:///`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
				#else
				$ SVNREPOURL=file://`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
				#endif

				$ svnadmin create "$SVNREPOPATH"
				$ cat > "$SVNREPOPATH"/hooks/pre-revprop-change <<EOF
				> #!/bin/sh
				>
				> REPOS="$1"
				> REV="$2"
				> USER="$3"
				> PROPNAME="$4"
				> ACTION="$5"
				>
				> if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:log" ]; then exit 0; fi
				> if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-branch" ]; then exit 0; fi
				> if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-rev" ]; then exit 0; fi
				>
				> echo "Changing prohibited revision property" >&2
				> exit 1
				> EOF
				$ chmod +x "$SVNREPOPATH"/hooks/pre-revprop-change
				$ svn co "$SVNREPOURL" "$SVNREPOPATH"-wc
				Checked out revision 0.
				$ cd "$SVNREPOPATH"-wc
				$ echo a > a
				$ svn add a
				A a
				$ svn ci -m'added a' a
				Adding a
				Transmitting file data .
				Committed revision 1.
				$ cd ..

				initial roundtrip

				$ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg \| grep -v initializing
				scanning source...
				sorting...
				converting...
				0 added a
				$ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
				scanning source...
				sorting...
				converting...

				second roundtrip should do nothing

				$ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg
				scanning source...
				sorting...
				converting...
				$ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
				scanning source...
				sorting...
				converting...

				new hg rev

				$ hg clone "$SVNREPOPATH"-hg "$SVNREPOPATH"-work
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd "$SVNREPOPATH"-work
				$ echo b > b
				$ hg add b
				$ hg ci -mb

				adding an empty revision

				$ hg qnew -m emtpy empty
				$ hg qfinish -a
				$ cd ..

				echo hg to svn

				$ hg --cwd "$SVNREPOPATH"-hg pull -q "$SVNREPOPATH"-work
				$ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
				scanning source...
				sorting...
				converting...
				1 b
				0 emtpy

				svn back to hg should do nothing

				$ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg
				scanning source...
				sorting...
				converting...

				hg back to svn should do nothing

				$ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
				scanning source...
				sorting...
				converting...