upstream/mercurial-mirror Files · tests/test-hgwebdirsym.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-hgwebdirsym.t
        
                    80 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-hgwebdirsym.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require serve symlink

      Tests whether or not hgwebdir properly handles various symlink topologies.

      hide outer repo

        $ hg init

        $ hg init a

        $ echo a > a/a

        $ hg --cwd a ci -Ama -d'1 0'

        adding a

        $ mkdir webdir

        $ cd webdir

        $ hg init b

        $ echo b > b/b

        $ hg --cwd b ci -Amb -d'2 0'

        adding b

        $ hg init c

        $ echo c > c/c

        $ hg --cwd c ci -Amc -d'3 0'

        adding c

        $ ln -s ../a al

        $ ln -s ../webdir circle

        $ root=`pwd`

        $ cd ..

        $ cat > collections.conf <<EOF

        > [collections]

        > $root=$root

        > EOF

        $ hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \

        >     -A access-collections.log -E error-collections.log

        $ cat hg.pid >> $DAEMON_PIDS

      should succeed

        $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '?style=raw'

        200 Script output follows

        /al/

        /b/

        /c/

        $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'al/file/tip/a?style=raw'

        200 Script output follows

        a

        $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'b/file/tip/b?style=raw'

        200 Script output follows

        b

        $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'c/file/tip/c?style=raw'

        200 Script output follows

        c

      should fail

        $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'circle/al/file/tip/a?style=raw'

        404 Not Found

        error: repository circle/al/file/tip/a not found

        [1]

        $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'circle/b/file/tip/a?style=raw'

        404 Not Found

        error: repository circle/b/file/tip/a not found

        [1]

        $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'circle/c/file/tip/a?style=raw'

        404 Not Found

        error: repository circle/c/file/tip/a not found

        [1]

      collections errors

        $ cat error-collections.log

	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 serve symlink

				Tests whether or not hgwebdir properly handles various symlink topologies.

				hide outer repo
				$ hg init

				$ hg init a
				$ echo a > a/a
				$ hg --cwd a ci -Ama -d'1 0'
				adding a
				$ mkdir webdir
				$ cd webdir
				$ hg init b
				$ echo b > b/b
				$ hg --cwd b ci -Amb -d'2 0'
				adding b
				$ hg init c
				$ echo c > c/c
				$ hg --cwd c ci -Amc -d'3 0'
				adding c
				$ ln -s ../a al
				$ ln -s ../webdir circle
				$ root=`pwd`
				$ cd ..
				$ cat > collections.conf <<EOF
				> [collections]
				> $root=$root
				> EOF
				$ hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \
				> -A access-collections.log -E error-collections.log
				$ cat hg.pid >> $DAEMON_PIDS

				should succeed

				$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '?style=raw'
				200 Script output follows


				/al/
				/b/
				/c/

				$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'al/file/tip/a?style=raw'
				200 Script output follows

				a
				$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'b/file/tip/b?style=raw'
				200 Script output follows

				b
				$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'c/file/tip/c?style=raw'
				200 Script output follows

				c

				should fail

				$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'circle/al/file/tip/a?style=raw'
				404 Not Found


				error: repository circle/al/file/tip/a not found
				[1]
				$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'circle/b/file/tip/a?style=raw'
				404 Not Found


				error: repository circle/b/file/tip/a not found
				[1]
				$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'circle/c/file/tip/a?style=raw'
				404 Not Found


				error: repository circle/c/file/tip/a not found
				[1]

				collections errors

				$ cat error-collections.log