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

pycompat: custom implementation of urllib.parse.quote()...

pycompat: custom implementation of urllib.parse.quote() urllib.parse.quote() accepts either str or bytes and returns str. There exists a urllib.parse.quote_from_bytes() which only accepts bytes. We should probably use that to retain strong typing and avoid surprises. In addition, since nearly all strings in Mercurial are bytes, we probably don't want quote() returning unicode. So, this patch implements a custom quote() that only accepts bytes and returns bytes. The quoted URL should only contain URL safe characters which is a strict subset of ASCII. So `.encode('ascii', 'strict')` should be safe.

Mads Kiilerich - - Load All Authors

File last commit:

r26736:143b52fc default


                r31400:fb1f7033

default

Download file

             test-mq-qdelete.t
        
                    197 lines
            
             | 3.5 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' pa

        $ hg qnew -d '1 0' pb

        $ hg qnew -d '1 0' pc

        $ hg qdel

        abort: qdelete requires at least one revision or patch name

        [255]

        $ hg qdel pc

        abort: cannot delete applied patch pc

        [255]

        $ hg qpop

        popping pc

        now at: pb

      Delete the same patch twice in one command (issue2427)

        $ hg qdel pc pc

        $ hg qseries

        pa

        pb

        $ ls .hg/patches

        pa

        pb

        series

        status

        $ hg qpop

        popping pb

        now at: pa

        $ hg qdel -k 1

        $ ls .hg/patches

        pa

        pb

        series

        status

        $ hg qdel -r pa

        patch pa finalized without changeset message

        $ hg qapplied

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

        1 [mq]: pa

        0 base

        $ hg qnew pd

        $ hg qnew pe

        $ hg qnew pf

        $ hg qdel -r pe

        abort: cannot delete revision 3 above applied patches

        [255]

        $ hg qdel -r qbase:pe

        patch pd finalized without changeset message

        patch pe finalized without changeset message

        $ hg qapplied

        pf

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

        4 [mq]: pf

        3 [mq]: pe

        2 [mq]: pd

        1 [mq]: pa

        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' pa

        $ hg qnew -d '1 0' pb

        $ hg qnew pc # 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 pb

        abort: cannot delete revision 2 above applied patches

        [255]

        $ hg qpop

        popping pc

        now at: pb

        $ hg qfinish -a pc

        abort: unknown revision 'pc'!

        [255]

        $ hg qpush

        applying pc

        patch pc is empty

        now at: pc

        $ hg qfinish qbase:pb

        patch pa finalized without changeset message

        patch pb finalized without changeset message

        $ hg qapplied

        pc

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

        3 imported patch pc

        2 [mq]: pb

        1 [mq]: pa

        0 base

        $ hg qfinish -a pc

        patch pc finalized without changeset message

        $ hg qapplied

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

        3 imported patch pc

        2 [mq]: pb

        1 [mq]: pa

        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 imported_patch_pc

        patch queue now empty

        $ hg qdel -k imported_patch_pc

        $ hg qimp -e imported_patch_pc

        adding imported_patch_pc to series file

        $ hg qfinish -a

        no patches applied

      resilience to inconsistency: qfinish -a with applied patches not in series

        $ hg qser

        imported_patch_pc

        $ hg qapplied

        $ hg qpush

        applying imported_patch_pc

        patch imported_patch_pc is empty

        now at: imported_patch_pc

        $ echo next >>  base

        $ hg qrefresh -d '1 0'

        $ echo > .hg/patches/series # remove 3.diff from series to confuse mq

        $ hg qfinish -a

        revision 47dfa8501675 refers to unknown patches: imported_patch_pc

      more complex state 'both known and unknown patches

        $ echo hip >>  base

        $ hg qnew -f -d '1 0' -m 4 4.diff

        $ echo hop >>  base

        $ hg qnew -f -d '1 0' -m 5 5.diff

        $ echo > .hg/patches/series # remove 4.diff and 5.diff from series to confuse mq

        $ echo hup >>  base

        $ hg qnew -f -d '1 0' -m 6 6.diff

        $ echo pup > base

        $ hg qfinish -a

        warning: uncommitted changes in the working directory

        revision 2b1c98802260 refers to unknown patches: 5.diff

        revision 33a6861311c0 refers to unknown patches: 4.diff

        $ 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

				$ hg init a
				$ cd a

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

				$ hg qnew -d '1 0' pa
				$ hg qnew -d '1 0' pb
				$ hg qnew -d '1 0' pc

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

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

				$ hg qpop
				popping pc
				now at: pb

				Delete the same patch twice in one command (issue2427)

				$ hg qdel pc pc

				$ hg qseries
				pa
				pb

				$ ls .hg/patches
				pa
				pb
				series
				status

				$ hg qpop
				popping pb
				now at: pa

				$ hg qdel -k 1

				$ ls .hg/patches
				pa
				pb
				series
				status

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

				$ hg qapplied

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

				$ hg qnew pd
				$ hg qnew pe
				$ hg qnew pf

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

				$ hg qdel -r qbase:pe
				patch pd finalized without changeset message
				patch pe finalized without changeset message

				$ hg qapplied
				pf

				$ hg log --template '{rev} {desc}\n'
				4 [mq]: pf
				3 [mq]: pe
				2 [mq]: pd
				1 [mq]: pa
				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' pa
				$ hg qnew -d '1 0' pb
				$ hg qnew pc # 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 pb
				abort: cannot delete revision 2 above applied patches
				[255]

				$ hg qpop
				popping pc
				now at: pb

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

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

				$ hg qfinish qbase:pb
				patch pa finalized without changeset message
				patch pb finalized without changeset message

				$ hg qapplied
				pc

				$ hg log --template '{rev} {desc}\n'
				3 imported patch pc
				2 [mq]: pb
				1 [mq]: pa
				0 base

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

				$ hg qapplied

				$ hg log --template '{rev} {desc}\n'
				3 imported patch pc
				2 [mq]: pb
				1 [mq]: pa
				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 imported_patch_pc
				patch queue now empty
				$ hg qdel -k imported_patch_pc
				$ hg qimp -e imported_patch_pc
				adding imported_patch_pc to series file
				$ hg qfinish -a
				no patches applied


				resilience to inconsistency: qfinish -a with applied patches not in series

				$ hg qser
				imported_patch_pc
				$ hg qapplied
				$ hg qpush
				applying imported_patch_pc
				patch imported_patch_pc is empty
				now at: imported_patch_pc
				$ echo next >> base
				$ hg qrefresh -d '1 0'
				$ echo > .hg/patches/series # remove 3.diff from series to confuse mq
				$ hg qfinish -a
				revision 47dfa8501675 refers to unknown patches: imported_patch_pc

				more complex state 'both known and unknown patches

				$ echo hip >> base
				$ hg qnew -f -d '1 0' -m 4 4.diff
				$ echo hop >> base
				$ hg qnew -f -d '1 0' -m 5 5.diff
				$ echo > .hg/patches/series # remove 4.diff and 5.diff from series to confuse mq
				$ echo hup >> base
				$ hg qnew -f -d '1 0' -m 6 6.diff
				$ echo pup > base
				$ hg qfinish -a
				warning: uncommitted changes in the working directory
				revision 2b1c98802260 refers to unknown patches: 5.diff
				revision 33a6861311c0 refers to unknown patches: 4.diff

				$ cd ..