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

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r24996:58308dde

default

Download file

             test-update-issue1456.t
        
                    45 lines
            
             | 858 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-issue1456.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require execbit

        Mads Kiilerich
    
tests: use 'hghave execbit' for tests that manipulate x bit in file system

              r15442
            
        Adrian Buehlmann
    
combine tests

              r12279
            
        $ rm -rf a

        $ hg init a

        $ cd a

        $ echo foo > foo

        $ hg ci -qAm0

        Siddharth Agarwal
    
manifestmerge: handle workdir removed, remote removed with flags...

              r18895
            
        $ echo toremove > toremove

        $ echo todelete > todelete

        $ chmod +x foo toremove todelete

        $ hg ci -qAm1

      Test that local removed/deleted, remote removed works with flags

        $ hg rm toremove

        $ rm todelete

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg co -q 0

        Siddharth Agarwal
    
manifestmerge: handle workdir removed, remote removed with flags...

              r18895
            
        Adrian Buehlmann
    
combine tests

              r12279
            
        $ echo dirty > foo

        $ hg up -c

        Siddharth Agarwal
    
update: standardize error message for dirty update --check...

              r19801
            
        abort: uncommitted changes

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg up -q

        $ cat foo

        dirty

        $ hg st -A

        M foo

        Siddharth Agarwal
    
manifestmerge: handle workdir removed, remote removed with flags...

              r18895
            
        C todelete

        C toremove

        Adrian Buehlmann
    
combine tests

              r12279
            
      Validate update of standalone execute bit change:

        $ hg up -C 0

        Siddharth Agarwal
    
manifestmerge: handle workdir removed, remote removed with flags...

              r18895
            
        1 files updated, 0 files merged, 2 files removed, 0 files unresolved

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ chmod -x foo

        $ hg ci -m removeexec

        nothing changed

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg up -C 0

        0 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg up

        Siddharth Agarwal
    
manifestmerge: handle workdir removed, remote removed with flags...

              r18895
            
        3 files updated, 0 files merged, 0 files removed, 0 files unresolved

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg st

        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: replace exit 80 with #require	r22046	#require execbit
Mads Kiilerich tests: use 'hghave execbit' for tests that manipulate x bit in file system	r15442
Adrian Buehlmann combine tests	r12279	$ rm -rf a
		$ hg init a
		$ cd a

		$ echo foo > foo
		$ hg ci -qAm0
Siddharth Agarwal manifestmerge: handle workdir removed, remote removed with flags...	r18895	$ echo toremove > toremove
		$ echo todelete > todelete
		$ chmod +x foo toremove todelete
		$ hg ci -qAm1

		Test that local removed/deleted, remote removed works with flags
		$ hg rm toremove
		$ rm todelete
Adrian Buehlmann combine tests	r12279	$ hg co -q 0
Siddharth Agarwal manifestmerge: handle workdir removed, remote removed with flags...	r18895
Adrian Buehlmann combine tests	r12279	$ echo dirty > foo
		$ hg up -c
Siddharth Agarwal update: standardize error message for dirty update --check...	r19801	abort: uncommitted changes
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann combine tests	r12279	$ hg up -q
		$ cat foo
		dirty
		$ hg st -A
		M foo
Siddharth Agarwal manifestmerge: handle workdir removed, remote removed with flags...	r18895	C todelete
		C toremove
Adrian Buehlmann combine tests	r12279
		Validate update of standalone execute bit change:

		$ hg up -C 0
Siddharth Agarwal manifestmerge: handle workdir removed, remote removed with flags...	r18895	1 files updated, 0 files merged, 2 files removed, 0 files unresolved
Adrian Buehlmann combine tests	r12279	$ chmod -x foo
		$ hg ci -m removeexec
		nothing changed
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Adrian Buehlmann combine tests	r12279	$ hg up -C 0
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg up
Siddharth Agarwal manifestmerge: handle workdir removed, remote removed with flags...	r18895	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann combine tests	r12279	$ hg st

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