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

mq: silence spurious output....

mq: silence spurious output. When using a versioned patch repository, you would get a spurious warning when deleting and adding the same patch. Before: $ hg qdelete --keep 3.diff $ hg qimport --existing 3.diff adding 3.diff to series file 3.diff already tracked! After: $ hg qdelete --keep 3.diff $ hg qimport --existing 3.diff adding 3.diff to series file

Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r12658:97d7ee44 default


                r12658:97d7ee44

default

Download file

             test-mq-qdelete.t
        
                    164 lines
            
             | 2.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-qdelete.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init a

        $ cd a

        $ echo 'base' > base

        $ hg ci -Ambase -d '1 0'

        adding base

        $ hg qnew -d '1 0' a

        $ hg qnew -d '1 0' b

        $ hg qnew -d '1 0' c

        $ hg qdel

        abort: qdelete requires at least one revision or patch name

        [255]

        $ hg qdel c

        abort: cannot delete applied patch c

        [255]

        $ hg qpop

        popping c

        now at: b

      Delete the same patch twice in one command (issue2427)

        $ hg qdel c c

        $ hg qseries

        a

        b

        $ ls .hg/patches

        a

        b

        series

        status

        $ hg qpop

        popping b

        now at: a

        $ hg qdel -k 1

        $ ls .hg/patches

        a

        b

        series

        status

        $ hg qdel -r a

        patch a finalized without changeset message

        $ hg qapplied

        $ hg log --template '{rev} {desc}\n'

        1 [mq]: a

        0 base

        $ hg qnew d

        $ hg qnew e

        $ hg qnew f

        $ hg qdel -r e

        abort: cannot delete revision 3 above applied patches

        [255]

        $ hg qdel -r qbase:e

        patch d finalized without changeset message

        patch e finalized without changeset message

        $ hg qapplied

        f

        $ hg log --template '{rev} {desc}\n'

        4 [mq]: f

        3 [mq]: e

        2 [mq]: d

        1 [mq]: a

        0 base

        $ cd ..

        $ hg init b

        $ cd b

        $ echo 'base' > base

        $ hg ci -Ambase -d '1 0'

        adding base

        $ hg qfinish

        abort: no revisions specified

        [255]

        $ hg qfinish -a

        no patches applied

        $ hg qnew -d '1 0' a

        $ hg qnew -d '1 0' b

        $ hg qnew c # XXX fails to apply by /usr/bin/patch if we put a date

        $ hg qfinish 0

        abort: revision 0 is not managed

        [255]

        $ hg qfinish b

        abort: cannot delete revision 2 above applied patches

        [255]

        $ hg qpop

        popping c

        now at: b

        $ hg qfinish -a c

        abort: unknown revision 'c'!

        [255]

        $ hg qpush

        applying c

        patch c is empty

        now at: c

        $ hg qfinish qbase:b

        patch a finalized without changeset message

        patch b finalized without changeset message

        $ hg qapplied

        c

        $ hg log --template '{rev} {desc}\n'

        3 imported patch c

        2 [mq]: b

        1 [mq]: a

        0 base

        $ hg qfinish -a c

        patch c finalized without changeset message

        $ hg qapplied

        $ hg log --template '{rev} {desc}\n'

        3 imported patch c

        2 [mq]: b

        1 [mq]: a

        0 base

        $ ls .hg/patches

        series

        status

      qdel -k X && hg qimp -e X used to trigger spurious output with versioned queues

        $ hg init --mq

        $ hg qimport -r 3

        $ hg qpop

        popping 3.diff

        patch queue now empty

        $ hg qdel -k 3.diff

        $ hg qimp -e 3.diff

        adding 3.diff to series file

        $ hg qfinish -a

        no patches applied

	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

				$ hg init a
				$ cd a

				$ echo 'base' > base
				$ hg ci -Ambase -d '1 0'
				adding base

				$ hg qnew -d '1 0' a
				$ hg qnew -d '1 0' b
				$ hg qnew -d '1 0' c

				$ hg qdel
				abort: qdelete requires at least one revision or patch name
				[255]

				$ hg qdel c
				abort: cannot delete applied patch c
				[255]

				$ hg qpop
				popping c
				now at: b

				Delete the same patch twice in one command (issue2427)

				$ hg qdel c c

				$ hg qseries
				a
				b

				$ ls .hg/patches
				a
				b
				series
				status

				$ hg qpop
				popping b
				now at: a

				$ hg qdel -k 1

				$ ls .hg/patches
				a
				b
				series
				status

				$ hg qdel -r a
				patch a finalized without changeset message

				$ hg qapplied

				$ hg log --template '{rev} {desc}\n'
				1 [mq]: a
				0 base

				$ hg qnew d
				$ hg qnew e
				$ hg qnew f

				$ hg qdel -r e
				abort: cannot delete revision 3 above applied patches
				[255]

				$ hg qdel -r qbase:e
				patch d finalized without changeset message
				patch e finalized without changeset message

				$ hg qapplied
				f

				$ hg log --template '{rev} {desc}\n'
				4 [mq]: f
				3 [mq]: e
				2 [mq]: d
				1 [mq]: a
				0 base

				$ cd ..

				$ hg init b
				$ cd b

				$ echo 'base' > base
				$ hg ci -Ambase -d '1 0'
				adding base

				$ hg qfinish
				abort: no revisions specified
				[255]

				$ hg qfinish -a
				no patches applied

				$ hg qnew -d '1 0' a
				$ hg qnew -d '1 0' b
				$ hg qnew c # XXX fails to apply by /usr/bin/patch if we put a date

				$ hg qfinish 0
				abort: revision 0 is not managed
				[255]

				$ hg qfinish b
				abort: cannot delete revision 2 above applied patches
				[255]

				$ hg qpop
				popping c
				now at: b

				$ hg qfinish -a c
				abort: unknown revision 'c'!
				[255]

				$ hg qpush
				applying c
				patch c is empty
				now at: c

				$ hg qfinish qbase:b
				patch a finalized without changeset message
				patch b finalized without changeset message

				$ hg qapplied
				c

				$ hg log --template '{rev} {desc}\n'
				3 imported patch c
				2 [mq]: b
				1 [mq]: a
				0 base

				$ hg qfinish -a c
				patch c finalized without changeset message

				$ hg qapplied

				$ hg log --template '{rev} {desc}\n'
				3 imported patch c
				2 [mq]: b
				1 [mq]: a
				0 base

				$ ls .hg/patches
				series
				status

				qdel -k X && hg qimp -e X used to trigger spurious output with versioned queues

				$ hg init --mq
				$ hg qimport -r 3
				$ hg qpop
				popping 3.diff
				patch queue now empty
				$ hg qdel -k 3.diff
				$ hg qimp -e 3.diff
				adding 3.diff to series file
				$ hg qfinish -a
				no patches applied