upstream/mercurial-mirror Files · tests/test-serve.t

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22284:72b37865

default

Download file

             test-serve.t
        
                    81 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-serve.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require serve

        $ hgserve()

        > {

        >    hg serve -a localhost -d --pid-file=hg.pid -E errors.log -v $@ \

        >        | sed -e "s/:$HGPORT1\\([^0-9]\\)/:HGPORT1\1/g" \

        >              -e "s/:$HGPORT2\\([^0-9]\\)/:HGPORT2\1/g" \

        >              -e 's/http:\/\/[^/]*\//http:\/\/localhost\//'

        >    cat hg.pid >> "$DAEMON_PIDS"

        >    echo % errors

        >    cat errors.log

        >    "$TESTDIR/killdaemons.py" hg.pid

        > }

        $ hg init test

        $ cd test

        $ echo '[web]' > .hg/hgrc

        $ echo 'accesslog = access.log' >> .hg/hgrc

        $ echo "port = $HGPORT1" >> .hg/hgrc

      Without -v

        $ hg serve -a localhost -p $HGPORT -d --pid-file=hg.pid -E errors.log

        $ cat hg.pid >> "$DAEMON_PIDS"

        $ if [ -f access.log ]; then

        >     echo 'access log created - .hg/hgrc respected'

        > fi

        access log created - .hg/hgrc respected

      errors

        $ cat errors.log

      With -v

        $ hgserve

        listening at http://localhost/ (bound to 127.0.0.1:HGPORT1)

        % errors

      With -v and -p HGPORT2

        $ hgserve -p "$HGPORT2"

        listening at http://localhost/ (bound to 127.0.0.1:HGPORT2)

        % errors

      With -v and -p daytime (should fail because low port)

      #if no-root

        $ KILLQUIETLY=Y

        $ hgserve -p daytime

        abort: cannot start server at 'localhost:13': Permission denied

        abort: child process failed to start

        % errors

        $ KILLQUIETLY=N

      #endif

      With --prefix foo

        $ hgserve --prefix foo

        listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)

        % errors

      With --prefix /foo

        $ hgserve --prefix /foo

        listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)

        % errors

      With --prefix foo/

        $ hgserve --prefix foo/

        listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)

        % errors

      With --prefix /foo/

        $ hgserve --prefix /foo/

        listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)

        % errors

        $ 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

				#require serve

				$ hgserve()
				> {
				> hg serve -a localhost -d --pid-file=hg.pid -E errors.log -v $@ \
				> \| sed -e "s/:$HGPORT1\\([^0-9]\\)/:HGPORT1\1/g" \
				> -e "s/:$HGPORT2\\([^0-9]\\)/:HGPORT2\1/g" \
				> -e 's/http:\/\/[^/]*\//http:\/\/localhost\//'
				> cat hg.pid >> "$DAEMON_PIDS"
				> echo % errors
				> cat errors.log
				> "$TESTDIR/killdaemons.py" hg.pid
				> }

				$ hg init test
				$ cd test
				$ echo '[web]' > .hg/hgrc
				$ echo 'accesslog = access.log' >> .hg/hgrc
				$ echo "port = $HGPORT1" >> .hg/hgrc

				Without -v

				$ hg serve -a localhost -p $HGPORT -d --pid-file=hg.pid -E errors.log
				$ cat hg.pid >> "$DAEMON_PIDS"
				$ if [ -f access.log ]; then
				> echo 'access log created - .hg/hgrc respected'
				> fi
				access log created - .hg/hgrc respected

				errors

				$ cat errors.log

				With -v

				$ hgserve
				listening at http://localhost/ (bound to 127.0.0.1:HGPORT1)
				% errors

				With -v and -p HGPORT2

				$ hgserve -p "$HGPORT2"
				listening at http://localhost/ (bound to 127.0.0.1:HGPORT2)
				% errors

				With -v and -p daytime (should fail because low port)

				#if no-root
				$ KILLQUIETLY=Y
				$ hgserve -p daytime
				abort: cannot start server at 'localhost:13': Permission denied
				abort: child process failed to start
				% errors
				$ KILLQUIETLY=N
				#endif

				With --prefix foo

				$ hgserve --prefix foo
				listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
				% errors

				With --prefix /foo

				$ hgserve --prefix /foo
				listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
				% errors

				With --prefix foo/

				$ hgserve --prefix foo/
				listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
				% errors

				With --prefix /foo/

				$ hgserve --prefix /foo/
				listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
				% errors

				$ cd ..