upstream/mercurial-mirror Files · tests/test-mq-qimport-fail-cleanup.t

mq: use dirstateguard instead of dirstate.invalidate (qpush)...

mq: use dirstateguard instead of dirstate.invalidate (qpush) Before this patch, "mq.queue.apply()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during afailure. But it just discards changes in memory, and doesn't actually restore ".hg/dirstate". Then, it can't work as expected, if "dirstate.write()" is executed while processing. This patch uses "dirstateguard" instead of "dirstate.invalidate()" to restore ".hg/dirstate" at failure even if "dirstate.write()" is executed before failure. This is a part of preparations to fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hook).

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r24996:58308dde

default

Download file

             test-mq-qimport-fail-cleanup.t
        
                    42 lines
            
             | 772 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-qimport-fail-cleanup.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-mq-qimport-fail-cleanup

              r12465
            
      Failed qimport of patches from files should cleanup by recording successfully

      imported patches in series file.

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init repo

        $ cd repo

        $ echo a > a

        $ hg ci -Am'add a'

        adding a

        $ cat >b.patch<<EOF

        > diff --git a/a b/a

        > --- a/a

        > +++ b/a

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

        >  a

        > +b

        > EOF

      empty series

        $ hg qseries

      qimport valid patch followed by invalid patch

        $ hg qimport b.patch fakepatch

        adding b.patch to series file

        abort: unable to read file fakepatch

        [255]

      valid patches before fail added to series

        $ hg qseries

        b.patch

        Pierre-Yves David
    
phases: prevent mq to qimport immutable change.

              r15704
            
        $ hg pull -q -r 0 . # update phase

        $ hg qimport -r 0

        abort: revision 0 is not mutable

        (see "hg help phases" for details)

        [255]

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Matt Mackall tests: unify test-mq-qimport-fail-cleanup	r12465	Failed qimport of patches from files should cleanup by recording successfully
		imported patches in series file.

		$ echo "[extensions]" >> $HGRCPATH
		$ echo "mq=" >> $HGRCPATH
		$ hg init repo
		$ cd repo
		$ echo a > a
		$ hg ci -Am'add a'
		adding a
		$ cat >b.patch<<EOF
		> diff --git a/a b/a
		> --- a/a
		> +++ b/a
		> @@ -1,1 +1,2 @@
		> a
		> +b
		> EOF

		empty series

		$ hg qseries

		qimport valid patch followed by invalid patch

		$ hg qimport b.patch fakepatch
		adding b.patch to series file
		abort: unable to read file fakepatch
		[255]

		valid patches before fail added to series

		$ hg qseries
		b.patch
Pierre-Yves David phases: prevent mq to qimport immutable change.	r15704
		$ hg pull -q -r 0 . # update phase
		$ hg qimport -r 0
		abort: revision 0 is not mutable
		(see "hg help phases" for details)
		[255]
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..