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

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Matt Harbison - - Load All Authors

File last commit:

r31771:5e92ba77 default


                r32255:7e35d31b

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

        >    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 *$LOCALIP*:HGPORT1) (glob) (?)

        % errors

      With -v and -p HGPORT2

        $ hgserve -p "$HGPORT2"

        listening at http://localhost/ (bound to *$LOCALIP*:HGPORT2) (glob) (?)

        % errors

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

      #if no-root no-windows

        $ 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 *$LOCALIP*:HGPORT1) (glob) (?)

        % errors

      With --prefix /foo

        $ hgserve --prefix /foo

        listening at http://localhost/foo/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)

        % errors

      With --prefix foo/

        $ hgserve --prefix foo/

        listening at http://localhost/foo/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)

        % errors

      With --prefix /foo/

        $ hgserve --prefix /foo/

        listening at http://localhost/foo/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)

        % 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
				> 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 $LOCALIP:HGPORT1) (glob) (?)
				% errors

				With -v and -p HGPORT2

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

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

				#if no-root no-windows
				$ 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 $LOCALIP:HGPORT1) (glob) (?)
				% errors

				With --prefix /foo

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

				With --prefix foo/

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

				With --prefix /foo/

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

				$ cd ..