upstream/mercurial-mirror Files · tests/test-mq-git.t

progress: retry ferr.flush() and .write() on EINTR (issue5532)...

progress: retry ferr.flush() and .write() on EINTR (issue5532) See the inline comment how this could mitigate the issue. I couldn't reproduce the exact problem on my Linux machine, but there are at least two people who got EINTR in progress.py, and it seems file_write() of Python 2 is fundamentally broken [1]. Let's make something in on 4.2. [1]: https://hg.python.org/cpython/file/v2.7.13/Objects/fileobject.c#l1850

Yuya Nishihara - - Load All Authors

File last commit:

r23172:e955549c default


                r32049:ed42e00a

default

Download file

             test-mq-git.t
        
                    212 lines
            
             | 3.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-git.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
      # Test the plumbing of mq.git option

      # Automatic upgrade itself is tested elsewhere.

        Yuya Nishihara
    
tests: write hgrc of more than two lines by using shell heredoc...

              r23172
            
        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > mq =

        > [diff]

        > nodates = 1

        > EOF

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        $ hg init repo-auto

        $ cd repo-auto

      git=auto: regular patch creation:

        $ echo a > a

        $ hg add a

        $ hg qnew -d '0 0' -f adda

        $ cat .hg/patches/adda

        # HG changeset patch

        Mads Kiilerich
    
mq: write headers for new HG patches in the same order as export (BC)

              r22520
            
        # Date 0 0

        Mads Kiilerich
    
mq: write '# Parent  ' lines with two spaces like export does (BC)...

              r22521
            
        # Parent  0000000000000000000000000000000000000000

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        diff -r 000000000000 -r ef8dafc9fa4c a

        --- /dev/null

        +++ b/a

        @@ -0,0 +1,1 @@

        +a

      git=auto: git patch creation with copy:

        $ hg cp a b

        $ hg qnew -d '0 0' -f copy

        $ cat .hg/patches/copy

        # HG changeset patch

        Mads Kiilerich
    
mq: write headers for new HG patches in the same order as export (BC)

              r22520
            
        # Date 0 0

        Mads Kiilerich
    
mq: write '# Parent  ' lines with two spaces like export does (BC)...

              r22521
            
        # Parent  ef8dafc9fa4caff80f6e243eb0171bcd60c455b4

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        diff --git a/a b/b

        copy from a

        copy to b

      git=auto: git patch when using --git:

        $ echo regular > regular

        $ hg add regular

        $ hg qnew -d '0 0' --git -f git

        $ cat .hg/patches/git

        # HG changeset patch

        Mads Kiilerich
    
mq: write headers for new HG patches in the same order as export (BC)

              r22520
            
        # Date 0 0

        Mads Kiilerich
    
mq: write '# Parent  ' lines with two spaces like export does (BC)...

              r22521
            
        # Parent  99586d5f048c399e20f81cee41fbb3809c0e735d

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        diff --git a/regular b/regular

        new file mode 100644

        --- /dev/null

        +++ b/regular

        @@ -0,0 +1,1 @@

        +regular

      git=auto: regular patch after qrefresh without --git:

        $ hg qrefresh -d '0 0'

        $ cat .hg/patches/git

        # HG changeset patch

        Mads Kiilerich
    
mq: write headers for new HG patches in the same order as export (BC)

              r22520
            
        # Date 0 0

        Mads Kiilerich
    
mq: write '# Parent  ' lines with two spaces like export does (BC)...

              r22521
            
        # Parent  99586d5f048c399e20f81cee41fbb3809c0e735d

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        diff -r 99586d5f048c regular

        --- /dev/null

        +++ b/regular

        @@ -0,0 +1,1 @@

        +regular

        $ cd ..

        $ hg init repo-keep

        $ cd repo-keep

        $ echo '[mq]' > .hg/hgrc

        $ echo 'git = KEEP' >> .hg/hgrc

      git=keep: git patch with --git:

        $ echo a > a

        $ hg add a

        $ hg qnew -d '0 0' -f --git git

        $ cat .hg/patches/git

        # HG changeset patch

        Mads Kiilerich
    
mq: write headers for new HG patches in the same order as export (BC)

              r22520
            
        # Date 0 0

        Mads Kiilerich
    
mq: write '# Parent  ' lines with two spaces like export does (BC)...

              r22521
            
        # Parent  0000000000000000000000000000000000000000

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        diff --git a/a b/a

        new file mode 100644

        --- /dev/null

        +++ b/a

        @@ -0,0 +1,1 @@

        +a

      git=keep: git patch after qrefresh without --git:

        $ echo a >> a

        $ hg qrefresh -d '0 0'

        $ cat .hg/patches/git

        # HG changeset patch

        Mads Kiilerich
    
mq: write headers for new HG patches in the same order as export (BC)

              r22520
            
        # Date 0 0

        Mads Kiilerich
    
mq: write '# Parent  ' lines with two spaces like export does (BC)...

              r22521
            
        # Parent  0000000000000000000000000000000000000000

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        diff --git a/a b/a

        new file mode 100644

        --- /dev/null

        +++ b/a

        @@ -0,0 +1,2 @@

        +a

        +a

        $ cd ..

        $ hg init repo-yes

        $ cd repo-yes

        $ echo '[mq]' > .hg/hgrc

        $ echo 'git = yes' >> .hg/hgrc

      git=yes: git patch:

        $ echo a > a

        $ hg add a

        $ hg qnew -d '0 0' -f git

        $ cat .hg/patches/git

        # HG changeset patch

        Mads Kiilerich
    
mq: write headers for new HG patches in the same order as export (BC)

              r22520
            
        # Date 0 0

        Mads Kiilerich
    
mq: write '# Parent  ' lines with two spaces like export does (BC)...

              r22521
            
        # Parent  0000000000000000000000000000000000000000

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        diff --git a/a b/a

        new file mode 100644

        --- /dev/null

        +++ b/a

        @@ -0,0 +1,1 @@

        +a

      git=yes: git patch after qrefresh:

        $ echo a >> a

        $ hg qrefresh -d '0 0'

        $ cat .hg/patches/git

        # HG changeset patch

        Mads Kiilerich
    
mq: write headers for new HG patches in the same order as export (BC)

              r22520
            
        # Date 0 0

        Mads Kiilerich
    
mq: write '# Parent  ' lines with two spaces like export does (BC)...

              r22521
            
        # Parent  0000000000000000000000000000000000000000

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        diff --git a/a b/a

        new file mode 100644

        --- /dev/null

        +++ b/a

        @@ -0,0 +1,2 @@

        +a

        +a

        $ cd ..

        $ hg init repo-no

        $ cd repo-no

        $ echo '[diff]' > .hg/hgrc

        $ echo 'git = True' >> .hg/hgrc

        $ echo '[mq]' > .hg/hgrc

        $ echo 'git = False' >> .hg/hgrc

      git=no: regular patch with copy:

        $ echo a > a

        $ hg add a

        $ hg qnew -d '0 0' -f adda

        $ hg cp a b

        $ hg qnew -d '0 0' -f regular

        $ cat .hg/patches/regular

        # HG changeset patch

        Mads Kiilerich
    
mq: write headers for new HG patches in the same order as export (BC)

              r22520
            
        # Date 0 0

        Mads Kiilerich
    
mq: write '# Parent  ' lines with two spaces like export does (BC)...

              r22521
            
        # Parent  ef8dafc9fa4caff80f6e243eb0171bcd60c455b4

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        diff -r ef8dafc9fa4c -r a70404f79ba3 b

        --- /dev/null

        +++ b/b

        @@ -0,0 +1,1 @@

        +a

      git=no: regular patch after qrefresh with copy:

        $ hg cp a c

        $ hg qrefresh -d '0 0'

        $ cat .hg/patches/regular

        # HG changeset patch

        Mads Kiilerich
    
mq: write headers for new HG patches in the same order as export (BC)

              r22520
            
        # Date 0 0

        Mads Kiilerich
    
mq: write '# Parent  ' lines with two spaces like export does (BC)...

              r22521
            
        # Parent  ef8dafc9fa4caff80f6e243eb0171bcd60c455b4

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        diff -r ef8dafc9fa4c b

        --- /dev/null

        +++ b/b

        @@ -0,0 +1,1 @@

        +a

        diff -r ef8dafc9fa4c c

        --- /dev/null

        +++ b/c

        @@ -0,0 +1,1 @@

        +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

Adrian Buehlmann tests: unify some of test-mq*	r12324	# Test the plumbing of mq.git option
		# Automatic upgrade itself is tested elsewhere.

Yuya Nishihara tests: write hgrc of more than two lines by using shell heredoc...	r23172	$ cat <<EOF >> $HGRCPATH
		> [extensions]
		> mq =
		> [diff]
		> nodates = 1
		> EOF
Adrian Buehlmann tests: unify some of test-mq*	r12324
		$ hg init repo-auto
		$ cd repo-auto

		git=auto: regular patch creation:

		$ echo a > a
		$ hg add a
		$ hg qnew -d '0 0' -f adda

		$ cat .hg/patches/adda
		# HG changeset patch
Mads Kiilerich mq: write headers for new HG patches in the same order as export (BC)	r22520	# Date 0 0
Mads Kiilerich mq: write '# Parent ' lines with two spaces like export does (BC)...	r22521	# Parent 0000000000000000000000000000000000000000
Adrian Buehlmann tests: unify some of test-mq*	r12324
		diff -r 000000000000 -r ef8dafc9fa4c a
		--- /dev/null
		+++ b/a
		@@ -0,0 +1,1 @@
		+a

		git=auto: git patch creation with copy:

		$ hg cp a b
		$ hg qnew -d '0 0' -f copy

		$ cat .hg/patches/copy
		# HG changeset patch
Mads Kiilerich mq: write headers for new HG patches in the same order as export (BC)	r22520	# Date 0 0
Mads Kiilerich mq: write '# Parent ' lines with two spaces like export does (BC)...	r22521	# Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4
Adrian Buehlmann tests: unify some of test-mq*	r12324
		diff --git a/a b/b
		copy from a
		copy to b

		git=auto: git patch when using --git:

		$ echo regular > regular
		$ hg add regular
		$ hg qnew -d '0 0' --git -f git

		$ cat .hg/patches/git
		# HG changeset patch
Mads Kiilerich mq: write headers for new HG patches in the same order as export (BC)	r22520	# Date 0 0
Mads Kiilerich mq: write '# Parent ' lines with two spaces like export does (BC)...	r22521	# Parent 99586d5f048c399e20f81cee41fbb3809c0e735d
Adrian Buehlmann tests: unify some of test-mq*	r12324
		diff --git a/regular b/regular
		new file mode 100644
		--- /dev/null
		+++ b/regular
		@@ -0,0 +1,1 @@
		+regular

		git=auto: regular patch after qrefresh without --git:

		$ hg qrefresh -d '0 0'

		$ cat .hg/patches/git
		# HG changeset patch
Mads Kiilerich mq: write headers for new HG patches in the same order as export (BC)	r22520	# Date 0 0
Mads Kiilerich mq: write '# Parent ' lines with two spaces like export does (BC)...	r22521	# Parent 99586d5f048c399e20f81cee41fbb3809c0e735d
Adrian Buehlmann tests: unify some of test-mq*	r12324
		diff -r 99586d5f048c regular
		--- /dev/null
		+++ b/regular
		@@ -0,0 +1,1 @@
		+regular

		$ cd ..

		$ hg init repo-keep
		$ cd repo-keep
		$ echo '[mq]' > .hg/hgrc
		$ echo 'git = KEEP' >> .hg/hgrc

		git=keep: git patch with --git:

		$ echo a > a
		$ hg add a
		$ hg qnew -d '0 0' -f --git git

		$ cat .hg/patches/git
		# HG changeset patch
Mads Kiilerich mq: write headers for new HG patches in the same order as export (BC)	r22520	# Date 0 0
Mads Kiilerich mq: write '# Parent ' lines with two spaces like export does (BC)...	r22521	# Parent 0000000000000000000000000000000000000000
Adrian Buehlmann tests: unify some of test-mq*	r12324
		diff --git a/a b/a
		new file mode 100644
		--- /dev/null
		+++ b/a
		@@ -0,0 +1,1 @@
		+a

		git=keep: git patch after qrefresh without --git:

		$ echo a >> a
		$ hg qrefresh -d '0 0'

		$ cat .hg/patches/git
		# HG changeset patch
Mads Kiilerich mq: write headers for new HG patches in the same order as export (BC)	r22520	# Date 0 0
Mads Kiilerich mq: write '# Parent ' lines with two spaces like export does (BC)...	r22521	# Parent 0000000000000000000000000000000000000000
Adrian Buehlmann tests: unify some of test-mq*	r12324
		diff --git a/a b/a
		new file mode 100644
		--- /dev/null
		+++ b/a
		@@ -0,0 +1,2 @@
		+a
		+a
		$ cd ..

		$ hg init repo-yes
		$ cd repo-yes
		$ echo '[mq]' > .hg/hgrc
		$ echo 'git = yes' >> .hg/hgrc

		git=yes: git patch:

		$ echo a > a
		$ hg add a
		$ hg qnew -d '0 0' -f git

		$ cat .hg/patches/git
		# HG changeset patch
Mads Kiilerich mq: write headers for new HG patches in the same order as export (BC)	r22520	# Date 0 0
Mads Kiilerich mq: write '# Parent ' lines with two spaces like export does (BC)...	r22521	# Parent 0000000000000000000000000000000000000000
Adrian Buehlmann tests: unify some of test-mq*	r12324
		diff --git a/a b/a
		new file mode 100644
		--- /dev/null
		+++ b/a
		@@ -0,0 +1,1 @@
		+a

		git=yes: git patch after qrefresh:

		$ echo a >> a
		$ hg qrefresh -d '0 0'

		$ cat .hg/patches/git
		# HG changeset patch
Mads Kiilerich mq: write headers for new HG patches in the same order as export (BC)	r22520	# Date 0 0
Mads Kiilerich mq: write '# Parent ' lines with two spaces like export does (BC)...	r22521	# Parent 0000000000000000000000000000000000000000
Adrian Buehlmann tests: unify some of test-mq*	r12324
		diff --git a/a b/a
		new file mode 100644
		--- /dev/null
		+++ b/a
		@@ -0,0 +1,2 @@
		+a
		+a
		$ cd ..

		$ hg init repo-no
		$ cd repo-no
		$ echo '[diff]' > .hg/hgrc
		$ echo 'git = True' >> .hg/hgrc
		$ echo '[mq]' > .hg/hgrc
		$ echo 'git = False' >> .hg/hgrc

		git=no: regular patch with copy:

		$ echo a > a
		$ hg add a
		$ hg qnew -d '0 0' -f adda
		$ hg cp a b
		$ hg qnew -d '0 0' -f regular

		$ cat .hg/patches/regular
		# HG changeset patch
Mads Kiilerich mq: write headers for new HG patches in the same order as export (BC)	r22520	# Date 0 0
Mads Kiilerich mq: write '# Parent ' lines with two spaces like export does (BC)...	r22521	# Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4
Adrian Buehlmann tests: unify some of test-mq*	r12324
		diff -r ef8dafc9fa4c -r a70404f79ba3 b
		--- /dev/null
		+++ b/b
		@@ -0,0 +1,1 @@
		+a

		git=no: regular patch after qrefresh with copy:

		$ hg cp a c
		$ hg qrefresh -d '0 0'

		$ cat .hg/patches/regular
		# HG changeset patch
Mads Kiilerich mq: write headers for new HG patches in the same order as export (BC)	r22520	# Date 0 0
Mads Kiilerich mq: write '# Parent ' lines with two spaces like export does (BC)...	r22521	# Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4
Adrian Buehlmann tests: unify some of test-mq*	r12324
		diff -r ef8dafc9fa4c b
		--- /dev/null
		+++ b/b
		@@ -0,0 +1,1 @@
		+a
		diff -r ef8dafc9fa4c c
		--- /dev/null
		+++ b/c
		@@ -0,0 +1,1 @@
		+a

		$ cd ..