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

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22285:85bded43

default

Download file

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

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require serve

        Patrick Mezard
    
tests: convert test-serve to new format

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

        Kevin Bullock
    
tests: remove last two check-code warnings about killdaemons...

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

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        > }

        $ 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

        Mads Kiilerich
    
tests: fix incorrect markup of continued lines of sh commands

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

        > fi

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        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)

        Matt Mackall
    
tests: skip tests that require not having root (issue4089)...

              r20008
            
      #if no-root

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        $ KILLQUIETLY=Y

        $ hgserve -p daytime

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

        abort: child process failed to start

        % errors

        $ KILLQUIETLY=N

        Matt Mackall
    
tests: skip tests that require not having root (issue4089)...

              r20008
            
      #endif

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
      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

        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 serve
Patrick Mezard tests: convert test-serve to new format	r13540
		$ 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
Kevin Bullock tests: remove last two check-code warnings about killdaemons...	r18602	> "$TESTDIR/killdaemons.py" hg.pid
Patrick Mezard tests: convert test-serve to new format	r13540	> }

		$ 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
Mads Kiilerich tests: fix incorrect markup of continued lines of sh commands	r16487	> echo 'access log created - .hg/hgrc respected'
		> fi
Patrick Mezard tests: convert test-serve to new format	r13540	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)

Matt Mackall tests: skip tests that require not having root (issue4089)...	r20008	#if no-root
Patrick Mezard tests: convert test-serve to new format	r13540	$ KILLQUIETLY=Y
		$ hgserve -p daytime
		abort: cannot start server at 'localhost:13': Permission denied
		abort: child process failed to start
		% errors
		$ KILLQUIETLY=N
Matt Mackall tests: skip tests that require not having root (issue4089)...	r20008	#endif
Patrick Mezard tests: convert test-serve to new format	r13540
		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
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..