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

blackbox: fix recording exit codes (issue3938)...

blackbox: fix recording exit codes (issue3938) Previously the blackbox wrapped runcommand, but this failed to see the error codes that were created if an exception occurred. I moved that logging to now wrap _runcatch, so it can observe and log the actual error code (such as when a user ctrl+c's during a command). Updated the tests as well. Tested the change by running all the tests with the blackbox extension enabled and verifying nothing broke (aside from things that printed what extensions were enabeld). The progress tests are affected by calls to time.time() so they needed to be updated to pass.

Brodie Rao - - Load All Authors

File last commit:

r12376:97ffc68f default


                r19229:41e39a02

stable

Download file

             test-mq-qfold.t
        
                    144 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-qfold.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ echo "[mq]" >> $HGRCPATH

        $ echo "git=keep" >> $HGRCPATH

        $ echo "[diff]" >> $HGRCPATH

        $ echo "nodates=1" >> $HGRCPATH

      init:

        $ hg init repo

        $ cd repo

        $ echo a > a

        $ hg ci -Am adda

        adding a

        $ echo a >> a

        $ hg qnew -f p1

        $ echo b >> a

        $ hg qnew -f p2

        $ echo c >> a

        $ hg qnew -f p3

      Fold in the middle of the queue:

        $ hg qpop p1

        popping p3

        popping p2

        now at: p1

        $ hg qdiff

        diff -r 07f494440405 a

        --- a/a

        +++ b/a

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

         a

        +a

        $ hg qfold p2

        $ grep git .hg/patches/p1 && echo 'git patch found!'

        [1]

        $ hg qser

        p1

        p3

        $ hg qdiff

        diff -r 07f494440405 a

        --- a/a

        +++ b/a

        @@ -1,1 +1,3 @@

         a

        +a

        +b

      Fold with local changes:

        $ echo d >> a

        $ hg qfold p3

        abort: local changes found, refresh first

        [255]

        $ hg diff -c .

        diff -r 07f494440405 -r ???????????? a (glob)

        --- a/a

        +++ b/a

        @@ -1,1 +1,3 @@

         a

        +a

        +b

        $ hg revert -a --no-backup

        reverting a

      Fold git patch into a regular patch, expect git patch:

        $ echo a >> a

        $ hg qnew -f regular

        $ hg cp a aa

        $ hg qnew --git -f git

        $ hg qpop

        popping git

        now at: regular

        $ hg qfold git

        $ cat .hg/patches/regular

        # HG changeset patch

        # Parent ???????????????????????????????????????? (glob)

        diff --git a/a b/a

        --- a/a

        +++ b/a

        @@ -1,3 +1,4 @@

         a

         a

         b

        +a

        diff --git a/a b/aa

        copy from a

        copy to aa

        --- a/a

        +++ b/aa

        @@ -1,3 +1,4 @@

         a

         a

         b

        +a

        $ hg qpop

        popping regular

        now at: p1

        $ hg qdel regular

      Fold regular patch into a git patch, expect git patch:

        $ hg cp a aa

        $ hg qnew --git -f git

        $ echo b >> aa

        $ hg qnew -f regular

        $ hg qpop

        popping regular

        now at: git

        $ hg qfold regular

        $ cat .hg/patches/git

        # HG changeset patch

        # Parent ???????????????????????????????????????? (glob)

        diff --git a/a b/aa

        copy from a

        copy to aa

        --- a/a

        +++ b/aa

        @@ -1,3 +1,4 @@

         a

         a

         b

        +b

        $ 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

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "mq=" >> $HGRCPATH
				$ echo "[mq]" >> $HGRCPATH
				$ echo "git=keep" >> $HGRCPATH
				$ echo "[diff]" >> $HGRCPATH
				$ echo "nodates=1" >> $HGRCPATH

				init:

				$ hg init repo
				$ cd repo
				$ echo a > a
				$ hg ci -Am adda
				adding a
				$ echo a >> a
				$ hg qnew -f p1
				$ echo b >> a
				$ hg qnew -f p2
				$ echo c >> a
				$ hg qnew -f p3

				Fold in the middle of the queue:

				$ hg qpop p1
				popping p3
				popping p2
				now at: p1

				$ hg qdiff
				diff -r 07f494440405 a
				--- a/a
				+++ b/a
				@@ -1,1 +1,2 @@
				a
				+a

				$ hg qfold p2
				$ grep git .hg/patches/p1 && echo 'git patch found!'
				[1]

				$ hg qser
				p1
				p3

				$ hg qdiff
				diff -r 07f494440405 a
				--- a/a
				+++ b/a
				@@ -1,1 +1,3 @@
				a
				+a
				+b

				Fold with local changes:

				$ echo d >> a
				$ hg qfold p3
				abort: local changes found, refresh first
				[255]

				$ hg diff -c .
				diff -r 07f494440405 -r ???????????? a (glob)
				--- a/a
				+++ b/a
				@@ -1,1 +1,3 @@
				a
				+a
				+b

				$ hg revert -a --no-backup
				reverting a

				Fold git patch into a regular patch, expect git patch:

				$ echo a >> a
				$ hg qnew -f regular
				$ hg cp a aa
				$ hg qnew --git -f git

				$ hg qpop
				popping git
				now at: regular

				$ hg qfold git

				$ cat .hg/patches/regular
				# HG changeset patch
				# Parent ???????????????????????????????????????? (glob)

				diff --git a/a b/a
				--- a/a
				+++ b/a
				@@ -1,3 +1,4 @@
				a
				a
				b
				+a
				diff --git a/a b/aa
				copy from a
				copy to aa
				--- a/a
				+++ b/aa
				@@ -1,3 +1,4 @@
				a
				a
				b
				+a

				$ hg qpop
				popping regular
				now at: p1

				$ hg qdel regular

				Fold regular patch into a git patch, expect git patch:

				$ hg cp a aa
				$ hg qnew --git -f git
				$ echo b >> aa
				$ hg qnew -f regular

				$ hg qpop
				popping regular
				now at: git

				$ hg qfold regular

				$ cat .hg/patches/git
				# HG changeset patch
				# Parent ???????????????????????????????????????? (glob)

				diff --git a/a b/aa
				copy from a
				copy to aa
				--- a/a
				+++ b/aa
				@@ -1,3 +1,4 @@
				a
				a
				b
				+b

				$ cd ..