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

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

mq: use dirstateguard instead of dirstate.invalidate (qrefresh) Before this patch, "mq.queue.refresh()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during a failure. 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" during a failure even if "dirstate.write()" is executed before a failure. This patch also removes "beginparentchage()" and "endparentchange()", because "dirstateguard" makes them useless. 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:

r23749:a387b039 default


                r24997:12f3c714

default

Download file

             test-mq-symlinks.t
        
                    111 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-symlinks.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require symlink

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init

        $ hg qinit

        $ hg qnew base.patch

        $ echo aaa > a

        $ echo bbb > b

        $ echo ccc > c

        $ hg add a b c

        $ hg qrefresh

        $ "$TESTDIR/readlink.py" a

        a -> a not a symlink

      test replacing a file with a symlink

        $ hg qnew symlink.patch

        $ rm a

        $ ln -s b a

        $ hg qrefresh --git

        $ "$TESTDIR/readlink.py" a

        a -> b

        $ hg qpop

        popping symlink.patch

        now at: base.patch

        $ hg qpush

        applying symlink.patch

        now at: symlink.patch

        $ "$TESTDIR/readlink.py" a

        a -> b

      test updating a symlink

        $ rm a

        $ ln -s c a

        $ hg qnew --git -f updatelink

        $ "$TESTDIR/readlink.py" a

        a -> c

        $ hg qpop

        popping updatelink

        now at: symlink.patch

        $ hg qpush --debug

        applying updatelink

        patching file a

        committing files:

        a

        committing manifest

        committing changelog

        now at: updatelink

        $ "$TESTDIR/readlink.py" a

        a -> c

        $ hg st

      test replacing a symlink with a file

        $ ln -s c s

        $ hg add s

        $ hg qnew --git -f addlink

        $ rm s

        $ echo sss > s

        $ hg qnew --git -f replacelinkwithfile

        $ hg qpop

        popping replacelinkwithfile

        now at: addlink

        $ hg qpush

        applying replacelinkwithfile

        now at: replacelinkwithfile

        $ cat s

        sss

        $ hg st

      test symlink removal

        $ hg qnew removesl.patch

        $ hg rm a

        $ hg qrefresh --git

        $ hg qpop

        popping removesl.patch

        now at: replacelinkwithfile

        $ hg qpush

        applying removesl.patch

        now at: removesl.patch

        $ hg st -c

        C b

        C c

        C s

      replace broken symlink with another broken symlink

        $ ln -s linka linka

        $ hg add linka

        $ hg qnew link

        $ hg mv linka linkb

        $ rm linkb

        $ ln -s linkb linkb

        $ hg qnew movelink

        $ hg qpop

        popping movelink

        now at: link

        $ hg qpush

        applying movelink

        now at: movelink

        $ "$TESTDIR/readlink.py" linkb

        linkb -> linkb

	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

				#require symlink

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "mq=" >> $HGRCPATH

				$ hg init
				$ hg qinit
				$ hg qnew base.patch
				$ echo aaa > a
				$ echo bbb > b
				$ echo ccc > c
				$ hg add a b c
				$ hg qrefresh
				$ "$TESTDIR/readlink.py" a
				a -> a not a symlink


				test replacing a file with a symlink

				$ hg qnew symlink.patch
				$ rm a
				$ ln -s b a
				$ hg qrefresh --git
				$ "$TESTDIR/readlink.py" a
				a -> b

				$ hg qpop
				popping symlink.patch
				now at: base.patch
				$ hg qpush
				applying symlink.patch
				now at: symlink.patch
				$ "$TESTDIR/readlink.py" a
				a -> b


				test updating a symlink

				$ rm a
				$ ln -s c a
				$ hg qnew --git -f updatelink
				$ "$TESTDIR/readlink.py" a
				a -> c
				$ hg qpop
				popping updatelink
				now at: symlink.patch
				$ hg qpush --debug
				applying updatelink
				patching file a
				committing files:
				a
				committing manifest
				committing changelog
				now at: updatelink
				$ "$TESTDIR/readlink.py" a
				a -> c
				$ hg st


				test replacing a symlink with a file

				$ ln -s c s
				$ hg add s
				$ hg qnew --git -f addlink
				$ rm s
				$ echo sss > s
				$ hg qnew --git -f replacelinkwithfile
				$ hg qpop
				popping replacelinkwithfile
				now at: addlink
				$ hg qpush
				applying replacelinkwithfile
				now at: replacelinkwithfile
				$ cat s
				sss
				$ hg st


				test symlink removal

				$ hg qnew removesl.patch
				$ hg rm a
				$ hg qrefresh --git
				$ hg qpop
				popping removesl.patch
				now at: replacelinkwithfile
				$ hg qpush
				applying removesl.patch
				now at: removesl.patch
				$ hg st -c
				C b
				C c
				C s

				replace broken symlink with another broken symlink

				$ ln -s linka linka
				$ hg add linka
				$ hg qnew link
				$ hg mv linka linkb
				$ rm linkb
				$ ln -s linkb linkb
				$ hg qnew movelink
				$ hg qpop
				popping movelink
				now at: link
				$ hg qpush
				applying movelink
				now at: movelink
				$ "$TESTDIR/readlink.py" linkb
				linkb -> linkb