upstream/mercurial-mirror Files · tests/test-archive-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-archive-symlinks.t
        
                    40 lines
            
             | 676 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-archive-symlinks.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require symlink

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        $ origdir=`pwd`

        $ hg init repo

        $ cd repo

        $ ln -s nothing dangling

      avoid tar warnings about old timestamp

        $ hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink'

        $ hg archive -t files ../archive

        $ hg archive -t tar -p tar ../archive.tar

        $ hg archive -t zip -p zip ../archive.zip

      files

        $ cd "$origdir"

        $ cd archive

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

              r16350
            
        $ "$TESTDIR/readlink.py" dangling

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        dangling -> nothing

      tar

        $ cd "$origdir"

        $ tar xf archive.tar

        $ cd tar

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

              r16350
            
        $ "$TESTDIR/readlink.py" dangling

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        dangling -> nothing

      zip

        $ cd "$origdir"

        Matt Mackall
    
tests: suppress spurious lchmod error from unzip (issue4088)...

              r21216
            
        $ unzip archive.zip > /dev/null 2>&1

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        $ cd zip

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

              r16350
            
        $ "$TESTDIR/readlink.py" dangling

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        dangling -> nothing

        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 symlink
Martin Geisler tests: unify test-archive-symlinks	r11854
		$ origdir=`pwd`

		$ hg init repo
		$ cd repo
		$ ln -s nothing dangling

		avoid tar warnings about old timestamp

		$ hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink'

		$ hg archive -t files ../archive
		$ hg archive -t tar -p tar ../archive.tar
		$ hg archive -t zip -p zip ../archive.zip

		files

		$ cd "$origdir"
		$ cd archive
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	$ "$TESTDIR/readlink.py" dangling
Martin Geisler tests: unify test-archive-symlinks	r11854	dangling -> nothing

		tar

		$ cd "$origdir"
		$ tar xf archive.tar
		$ cd tar
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	$ "$TESTDIR/readlink.py" dangling
Martin Geisler tests: unify test-archive-symlinks	r11854	dangling -> nothing

		zip

		$ cd "$origdir"
Matt Mackall tests: suppress spurious lchmod error from unzip (issue4088)...	r21216	$ unzip archive.zip > /dev/null 2>&1
Martin Geisler tests: unify test-archive-symlinks	r11854	$ cd zip
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	$ "$TESTDIR/readlink.py" dangling
Martin Geisler tests: unify test-archive-symlinks	r11854	dangling -> nothing
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..