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

localrepo: make journal.dirstate contain in-memory changes before transaction...

localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see for detail) and prevents from certainly reproducing the issue.

Matt Mackall - - Load All Authors

File last commit:

r25472:4d2b9b30 default


                r25878:800e090e

stable

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 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
				> 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 ..