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

patch: refactor file creation/removal detection...

patch: refactor file creation/removal detection The patcher has to know if a file is being created or removed to check if the target already exists, or to actually unlink the file when a hunk emptying it is applied. This was done by embedding the creation/removal information in the first (and only) hunk attached to the file. There are two problems with this approach: - creation/removal is really a property of the file being patched and not its hunk. - for regular patches, file creation cannot be deduced at parsing time: there are case where the *stripped* file paths must be compared. Modifying hunks after their creation is clumsy and prevent further refactorings related to copies handling. Instead, we delegate this job to selectfile() which has all the relevant information, and remove the hunk createfile() and rmfile() methods.

Mads Kiilerich - - Load All Authors

File last commit:

r12398:2bc926ad default


                r14451:c78d41db

default

Download file

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

        $ "$TESTDIR/hghave" symlink || exit 80

        $ 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

      check patch does not overwrite untracked symlinks

        $ hg qpop

        popping movelink

        now at: link

        $ ln -s linkbb linkb

        $ hg qpush

        applying movelink

        patch failed, unable to continue (try -v)

        patch failed, rejects left in working dir

        errors during apply, please fix and refresh movelink

        [2]

	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

				$ "$TESTDIR/hghave" symlink \|\| exit 80

				$ 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

				check patch does not overwrite untracked symlinks

				$ hg qpop
				popping movelink
				now at: link
				$ ln -s linkbb linkb
				$ hg qpush
				applying movelink
				patch failed, unable to continue (try -v)
				patch failed, rejects left in working dir
				errors during apply, please fix and refresh movelink
				[2]