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

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r23524:a1a7c94d

default

Download file

             test-mq-symlinks.t
        
                    108 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-symlinks.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require symlink

        Nicolas Dumazet
    
tests: unify test-mq-symlinks

              r11908
            
        $ 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

        Thomas Arendsen Hein
    
tests: make tests work if directory contains special characters...

              r16350
            
        $ "$TESTDIR/readlink.py" a

        Nicolas Dumazet
    
tests: unify test-mq-symlinks

              r11908
            
        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

        Thomas Arendsen Hein
    
tests: make tests work if directory contains special characters...

              r16350
            
        $ "$TESTDIR/readlink.py" a

        Nicolas Dumazet
    
tests: unify test-mq-symlinks

              r11908
            
        a -> b

        $ hg qpop

        popping symlink.patch

        now at: base.patch

        $ hg qpush

        applying symlink.patch

        now at: symlink.patch

        Thomas Arendsen Hein
    
tests: make tests work if directory contains special characters...

              r16350
            
        $ "$TESTDIR/readlink.py" a

        Nicolas Dumazet
    
tests: unify test-mq-symlinks

              r11908
            
        a -> b

      test updating a symlink

        $ rm a

        $ ln -s c a

        $ hg qnew --git -f updatelink

        Thomas Arendsen Hein
    
tests: make tests work if directory contains special characters...

              r16350
            
        $ "$TESTDIR/readlink.py" a

        Nicolas Dumazet
    
tests: unify test-mq-symlinks

              r11908
            
        a -> c

        $ hg qpop

        popping updatelink

        now at: symlink.patch

        $ hg qpush --debug

        applying updatelink

        patching file a

        a

        now at: updatelink

        Thomas Arendsen Hein
    
tests: make tests work if directory contains special characters...

              r16350
            
        $ "$TESTDIR/readlink.py" a

        Nicolas Dumazet
    
tests: unify test-mq-symlinks

              r11908
            
        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

        Patrick Mezard
    
Merge with stable

              r12345
            
      replace broken symlink with another broken symlink

        $ ln -s linka linka

        $ hg add linka

        $ hg qnew link

        $ hg mv linka linkb

        Mads Kiilerich
    
merge with stable

              r12398
            
        $ rm linkb

        $ ln -s linkb linkb

        Patrick Mezard
    
Merge with stable

              r12345
            
        $ hg qnew movelink

        $ hg qpop

        popping movelink

        now at: link

        $ hg qpush

        applying movelink

        now at: movelink

        Thomas Arendsen Hein
    
tests: make tests work if directory contains special characters...

              r16350
            
        $ "$TESTDIR/readlink.py" linkb

        Patrick Mezard
    
Merge with stable

              r12345
            
        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

Matt Mackall tests: replace exit 80 with #require	r22046	#require symlink
Nicolas Dumazet tests: unify test-mq-symlinks	r11908
		$ 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
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	$ "$TESTDIR/readlink.py" a
Nicolas Dumazet tests: unify test-mq-symlinks	r11908	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
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	$ "$TESTDIR/readlink.py" a
Nicolas Dumazet tests: unify test-mq-symlinks	r11908	a -> b

		$ hg qpop
		popping symlink.patch
		now at: base.patch
		$ hg qpush
		applying symlink.patch
		now at: symlink.patch
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	$ "$TESTDIR/readlink.py" a
Nicolas Dumazet tests: unify test-mq-symlinks	r11908	a -> b


		test updating a symlink

		$ rm a
		$ ln -s c a
		$ hg qnew --git -f updatelink
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	$ "$TESTDIR/readlink.py" a
Nicolas Dumazet tests: unify test-mq-symlinks	r11908	a -> c
		$ hg qpop
		popping updatelink
		now at: symlink.patch
		$ hg qpush --debug
		applying updatelink
		patching file a
		a
		now at: updatelink
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	$ "$TESTDIR/readlink.py" a
Nicolas Dumazet tests: unify test-mq-symlinks	r11908	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
Patrick Mezard Merge with stable	r12345
		replace broken symlink with another broken symlink

		$ ln -s linka linka
		$ hg add linka
		$ hg qnew link
		$ hg mv linka linkb
Mads Kiilerich merge with stable	r12398	$ rm linkb
		$ ln -s linkb linkb
Patrick Mezard Merge with stable	r12345	$ hg qnew movelink
		$ hg qpop
		popping movelink
		now at: link
		$ hg qpush
		applying movelink
		now at: movelink
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	$ "$TESTDIR/readlink.py" linkb
Patrick Mezard Merge with stable	r12345	linkb -> linkb