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

merge: move dr/rd warning messages out of applyupdates()...

merge: move dr/rd warning messages out of applyupdates() As preparation for making 'dr' and 'rd' actions no longer actions, move the reporting from applyupdates() to its caller update(). This way we won't have to pass additonal arguments to applyupdates() when they are no longer actions. Also, the warnings are equally unrelated to applyupdates() as they are to recordupdates(), as they don't result in any changes to either the working copy or the dirstate. See earlier patch for additional motivation.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r23525:5126d771

default

Download file

             test-mq-symlinks.t
        
                    108 lines
            
             | 1.7 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

        a

        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
				a
				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