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

tryimportone: use dirstateguard instead of beginparentchange/endparentchange...

tryimportone: use dirstateguard instead of beginparentchange/endparentchange To fix the issue that the recent (in memory) dirstate isn't visible to external process (e.g. "precommit" hook), a subsequent patch makes "localrepository.commit()" invoke "dirstate.write()" in it. This change will make "beginparentchange()" and "endparentchange()" on dirstate in "cmdutil.tryimportone()" meaningless, because: - "dirstate.write()" writes changed data into ".hg/dirstate", but - aborting between "beginparentchange()" and "endparentchange()" doesn't cause any restoring ".hg/dirstate" it just discards changes in memory. This patch uses "dirstateguard" instead of "beginparentchange()" and "endparentchange()" in "cmdutil.tryimportone()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch uses "lockmod.release(dsguard)" instead of "dsguard.release()", because processing may be aborted before assignment to "dsguard" , and the "if dsguard" examination for safety is redundant.

Bryan O'Sullivan - - Load All Authors

File last commit:

r17708:4f2f0f36 default


                r24995:0579b0c2

default

Download file

             test-mq-qqueue.t
        
                    188 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-qqueue.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init foo

        $ cd foo

        $ echo a > a

        $ hg ci -qAm a

      Default queue:

        $ hg qqueue

        patches (active)

        $ echo b > a

        $ hg qnew -fgDU somestuff

      Applied patches in default queue:

        $ hg qap

        somestuff

      Try to change patch (create succeeds, switch fails):

        $ hg qqueue foo --create

        abort: new queue created, but cannot make active as patches are applied

        [255]

        $ hg qqueue

        foo

        patches (active)

      Empty default queue:

        $ hg qpop

        popping somestuff

        patch queue now empty

      Switch queue:

        $ hg qqueue foo

        $ hg qqueue

        foo (active)

        patches

      List queues, quiet:

        $ hg qqueue --quiet

        foo

        patches

      Fail creating queue with already existing name:

        $ hg qqueue --create foo

        abort: queue "foo" already exists

        [255]

        $ hg qqueue

        foo (active)

        patches

      Create new queue for rename:

        $ hg qqueue --create bar

        $ hg qqueue

        bar (active)

        foo

        patches

      Rename queue, same name:

        $ hg qqueue --rename bar

        abort: can't rename "bar" to its current name

        [255]

      Rename queue to existing:

        $ hg qqueue --rename foo

        abort: queue "foo" already exists

        [255]

      Rename queue:

        $ hg qqueue --rename buz

        $ hg qqueue

        buz (active)

        foo

        patches

      Switch back to previous queue:

        $ hg qqueue foo

        $ hg qqueue --delete buz

        $ hg qqueue

        foo (active)

        patches

      Create queue for purge:

        $ hg qqueue --create purge-me

        $ hg qqueue

        foo

        patches

        purge-me (active)

      Create patch for purge:

        $ hg qnew patch-purge-me

        $ ls -1d .hg/patches-purge-me 2>/dev/null || true

        .hg/patches-purge-me

        $ hg qpop -a

        popping patch-purge-me

        patch queue now empty

      Purge queue:

        $ hg qqueue foo

        $ hg qqueue --purge purge-me

        $ hg qqueue

        foo (active)

        patches

        $ ls -1d .hg/patches-purge-me 2>/dev/null || true

      Unapplied patches:

        $ hg qun

        $ echo c > a

        $ hg qnew -fgDU otherstuff

      Fail switching back:

        $ hg qqueue patches

        abort: new queue created, but cannot make active as patches are applied

        [255]

      Fail deleting current:

        $ hg qqueue foo --delete

        abort: cannot delete currently active queue

        [255]

      Switch back and delete foo:

        $ hg qpop -a

        popping otherstuff

        patch queue now empty

        $ hg qqueue patches

        $ hg qqueue foo --delete

        $ hg qqueue

        patches (active)

      Tricky cases:

        $ hg qqueue store --create

        $ hg qnew journal

        $ hg qqueue

        patches

        store (active)

        $ hg qpop -a

        popping journal

        patch queue now empty

        $ hg qqueue patches

        $ hg qun

        somestuff

      Invalid names:

        $ hg qqueue test/../../bar --create

        abort: invalid queue name, may not contain the characters ":\/."

        [255]

        $ hg qqueue . --create

        abort: invalid queue name, may not contain the characters ":\/."

        [255]

        $ 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 foo
				$ cd foo
				$ echo a > a
				$ hg ci -qAm a

				Default queue:

				$ hg qqueue
				patches (active)

				$ echo b > a
				$ hg qnew -fgDU somestuff

				Applied patches in default queue:

				$ hg qap
				somestuff

				Try to change patch (create succeeds, switch fails):

				$ hg qqueue foo --create
				abort: new queue created, but cannot make active as patches are applied
				[255]

				$ hg qqueue
				foo
				patches (active)

				Empty default queue:

				$ hg qpop
				popping somestuff
				patch queue now empty

				Switch queue:

				$ hg qqueue foo
				$ hg qqueue
				foo (active)
				patches

				List queues, quiet:

				$ hg qqueue --quiet
				foo
				patches

				Fail creating queue with already existing name:

				$ hg qqueue --create foo
				abort: queue "foo" already exists
				[255]

				$ hg qqueue
				foo (active)
				patches

				Create new queue for rename:

				$ hg qqueue --create bar

				$ hg qqueue
				bar (active)
				foo
				patches

				Rename queue, same name:

				$ hg qqueue --rename bar
				abort: can't rename "bar" to its current name
				[255]

				Rename queue to existing:

				$ hg qqueue --rename foo
				abort: queue "foo" already exists
				[255]

				Rename queue:

				$ hg qqueue --rename buz

				$ hg qqueue
				buz (active)
				foo
				patches

				Switch back to previous queue:

				$ hg qqueue foo
				$ hg qqueue --delete buz

				$ hg qqueue
				foo (active)
				patches

				Create queue for purge:

				$ hg qqueue --create purge-me

				$ hg qqueue
				foo
				patches
				purge-me (active)

				Create patch for purge:

				$ hg qnew patch-purge-me

				$ ls -1d .hg/patches-purge-me 2>/dev/null \|\| true
				.hg/patches-purge-me

				$ hg qpop -a
				popping patch-purge-me
				patch queue now empty

				Purge queue:

				$ hg qqueue foo
				$ hg qqueue --purge purge-me

				$ hg qqueue
				foo (active)
				patches

				$ ls -1d .hg/patches-purge-me 2>/dev/null \|\| true

				Unapplied patches:

				$ hg qun
				$ echo c > a
				$ hg qnew -fgDU otherstuff

				Fail switching back:

				$ hg qqueue patches
				abort: new queue created, but cannot make active as patches are applied
				[255]

				Fail deleting current:

				$ hg qqueue foo --delete
				abort: cannot delete currently active queue
				[255]

				Switch back and delete foo:

				$ hg qpop -a
				popping otherstuff
				patch queue now empty

				$ hg qqueue patches
				$ hg qqueue foo --delete
				$ hg qqueue
				patches (active)

				Tricky cases:

				$ hg qqueue store --create
				$ hg qnew journal

				$ hg qqueue
				patches
				store (active)

				$ hg qpop -a
				popping journal
				patch queue now empty

				$ hg qqueue patches
				$ hg qun
				somestuff

				Invalid names:

				$ hg qqueue test/../../bar --create
				abort: invalid queue name, may not contain the characters ":\/."
				[255]

				$ hg qqueue . --create
				abort: invalid queue name, may not contain the characters ":\/."
				[255]

				$ cd ..