upstream/mercurial-mirror Files · tests/test-rebase-check-restore.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:

r16913:f2719b38 default


                r18759:9baf4330

default

Download file

             test-rebase-check-restore.t
        
                    150 lines
            
             | 2.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-check-restore.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > rebase=

        > 

        > [phases]

        > publish=False

        > 

        > [alias]

        > tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n"

        > EOF

        $ hg init a

        $ cd a

        $ echo A > A

        $ hg add A

        $ hg ci -m A

        $ echo 'B' > B

        $ hg add B

        $ hg ci -m B

        $ echo C >> A

        $ hg ci -m C

        $ hg up -q -C 0

        $ echo D >> A

        $ hg ci -m D

        created new head

        $ echo E > E

        $ hg add E

        $ hg ci -m E

        $ hg up -q -C 0

        $ hg branch 'notdefault'

        marked working directory as branch notdefault

        (branches are permanent and global, did you want a bookmark?)

        $ echo F >> A

        $ hg ci -m F

        $ cd ..

      Rebasing B onto E - check keep: and phases

        $ hg clone -q -u . a a1

        $ cd a1

        $ hg phase --force --secret 2

        $ hg tglog

        @  5:draft 'F' notdefault

        |

        | o  4:draft 'E'

        | |

        | o  3:draft 'D'

        |/

        | o  2:secret 'C'

        | |

        | o  1:draft 'B'

        |/

        o  0:draft 'A'

        $ hg rebase -s 1 -d 4 --keep

        merging A

        warning: conflicts during merge.

        merging A incomplete! (edit conflicts, then use 'hg resolve --mark')

        abort: unresolved conflicts (see hg resolve, then hg rebase --continue)

        [255]

      Solve the conflict and go on:

        $ echo 'conflict solved' > A

        $ rm A.orig

        $ hg resolve -m A

        $ hg rebase --continue

        $ hg tglog

        @  7:secret 'C'

        |

        o  6:draft 'B'

        |

        | o  5:draft 'F' notdefault

        | |

        o |  4:draft 'E'

        | |

        o |  3:draft 'D'

        |/

        | o  2:secret 'C'

        | |

        | o  1:draft 'B'

        |/

        o  0:draft 'A'

        $ cd ..

      Rebase F onto E - check keepbranches:

        $ hg clone -q -u . a a2

        $ cd a2

        $ hg phase --force --secret 2

        $ hg tglog

        @  5:draft 'F' notdefault

        |

        | o  4:draft 'E'

        | |

        | o  3:draft 'D'

        |/

        | o  2:secret 'C'

        | |

        | o  1:draft 'B'

        |/

        o  0:draft 'A'

        $ hg rebase -s 5 -d 4 --keepbranches

        merging A

        warning: conflicts during merge.

        merging A incomplete! (edit conflicts, then use 'hg resolve --mark')

        abort: unresolved conflicts (see hg resolve, then hg rebase --continue)

        [255]

      Solve the conflict and go on:

        $ echo 'conflict solved' > A

        $ rm A.orig

        $ hg resolve -m A

        $ hg rebase --continue

        saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)

        $ hg tglog

        @  5:draft 'F' notdefault

        |

        o  4:draft 'E'

        |

        o  3:draft 'D'

        |

        | o  2:secret 'C'

        | |

        | o  1:draft 'B'

        |/

        o  0:draft 'A'

        $ 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

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> graphlog=
				> rebase=
				>
				> [phases]
				> publish=False
				>
				> [alias]
				> tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
				> EOF


				$ hg init a
				$ cd a

				$ echo A > A
				$ hg add A
				$ hg ci -m A

				$ echo 'B' > B
				$ hg add B
				$ hg ci -m B

				$ echo C >> A
				$ hg ci -m C

				$ hg up -q -C 0

				$ echo D >> A
				$ hg ci -m D
				created new head

				$ echo E > E
				$ hg add E
				$ hg ci -m E

				$ hg up -q -C 0

				$ hg branch 'notdefault'
				marked working directory as branch notdefault
				(branches are permanent and global, did you want a bookmark?)
				$ echo F >> A
				$ hg ci -m F

				$ cd ..


				Rebasing B onto E - check keep: and phases

				$ hg clone -q -u . a a1
				$ cd a1
				$ hg phase --force --secret 2

				$ hg tglog
				@ 5:draft 'F' notdefault
				\|
				\| o 4:draft 'E'
				\| \|
				\| o 3:draft 'D'
				\|/
				\| o 2:secret 'C'
				\| \|
				\| o 1:draft 'B'
				\|/
				o 0:draft 'A'

				$ hg rebase -s 1 -d 4 --keep
				merging A
				warning: conflicts during merge.
				merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
				abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
				[255]

				Solve the conflict and go on:

				$ echo 'conflict solved' > A
				$ rm A.orig
				$ hg resolve -m A
				$ hg rebase --continue

				$ hg tglog
				@ 7:secret 'C'
				\|
				o 6:draft 'B'
				\|
				\| o 5:draft 'F' notdefault
				\| \|
				o \| 4:draft 'E'
				\| \|
				o \| 3:draft 'D'
				\|/
				\| o 2:secret 'C'
				\| \|
				\| o 1:draft 'B'
				\|/
				o 0:draft 'A'

				$ cd ..


				Rebase F onto E - check keepbranches:

				$ hg clone -q -u . a a2
				$ cd a2
				$ hg phase --force --secret 2

				$ hg tglog
				@ 5:draft 'F' notdefault
				\|
				\| o 4:draft 'E'
				\| \|
				\| o 3:draft 'D'
				\|/
				\| o 2:secret 'C'
				\| \|
				\| o 1:draft 'B'
				\|/
				o 0:draft 'A'

				$ hg rebase -s 5 -d 4 --keepbranches
				merging A
				warning: conflicts during merge.
				merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
				abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
				[255]

				Solve the conflict and go on:

				$ echo 'conflict solved' > A
				$ rm A.orig
				$ hg resolve -m A
				$ hg rebase --continue
				saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 5:draft 'F' notdefault
				\|
				o 4:draft 'E'
				\|
				o 3:draft 'D'
				\|
				\| o 2:secret 'C'
				\| \|
				\| o 1:draft 'B'
				\|/
				o 0:draft 'A'


				$ cd ..