upstream/mercurial-mirror Files · tests/test-revert-unknown.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).

Martin Geisler - - Load All Authors

File last commit:

r12156:4c94b6d0 default


                r24996:58308dde

default

Download file

             test-revert-unknown.t
        
                    29 lines
            
             | 319 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revert-unknown.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Nicolas Dumazet
    
tests: unify test-revert-unknown

              r12111
            
        $ hg init

        $ touch unknown

        $ touch a

        $ hg add a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -m "1"

        Nicolas Dumazet
    
tests: unify test-revert-unknown

              r12111
            
        $ touch b

        $ hg add b

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -m "2"

        Nicolas Dumazet
    
tests: unify test-revert-unknown

              r12111
            
      Should show unknown

        $ hg status

        ? unknown

        $ hg revert -r 0 --all

        removing b

      Should show unknown and b removed

        $ hg status

        R b

        ? unknown

      Should show a and unknown

        $ ls

        a

        unknown

	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

Nicolas Dumazet tests: unify test-revert-unknown	r12111	$ hg init
		$ touch unknown

		$ touch a
		$ hg add a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -m "1"
Nicolas Dumazet tests: unify test-revert-unknown	r12111
		$ touch b
		$ hg add b
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -m "2"
Nicolas Dumazet tests: unify test-revert-unknown	r12111
		Should show unknown

		$ hg status
		? unknown
		$ hg revert -r 0 --all
		removing b

		Should show unknown and b removed

		$ hg status
		R b
		? unknown

		Should show a and unknown

		$ ls
		a
		unknown