upstream/mercurial-mirror Files · tests/test-hgweb-raw.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.

Jun Wu - - Load All Authors

File last commit:

r31008:636cf3f7 default


                r32255:7e35d31b

default

Download file

             test-hgweb-raw.t
        
                    58 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-hgweb-raw.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require serve

      Test raw style of hgweb

        $ hg init test

        $ cd test

        $ mkdir sub

        $ cat >'sub/some text%.txt' <<ENDSOME

        > This is just some random text

        > that will go inside the file and take a few lines.

        > It is very boring to read, but computers don't

        > care about things like that.

        > ENDSOME

        $ hg add 'sub/some text%.txt'

        $ hg commit -d "1 0" -m "Just some text"

        $ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid

        $ cat hg.pid >> $DAEMON_PIDS

        $ (get-with-headers.py localhost:$HGPORT '?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw' content-type content-length content-disposition) >getoutput.txt

        $ killdaemons.py hg.pid

        $ cat getoutput.txt

        200 Script output follows

        content-type: application/binary

        content-length: 157

        content-disposition: inline; filename="some text%.txt"

        This is just some random text

        that will go inside the file and take a few lines.

        It is very boring to read, but computers don't

        care about things like that.

        $ cat access.log error.log

        $LOCALIP - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob)

        $ rm access.log error.log

        $ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid \

        > --config web.guessmime=True

        $ cat hg.pid >> $DAEMON_PIDS

        $ (get-with-headers.py localhost:$HGPORT '?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw' content-type content-length content-disposition) >getoutput.txt

        $ killdaemons.py hg.pid

        $ cat getoutput.txt

        200 Script output follows

        content-type: text/plain; charset="ascii"

        content-length: 157

        content-disposition: inline; filename="some text%.txt"

        This is just some random text

        that will go inside the file and take a few lines.

        It is very boring to read, but computers don't

        care about things like that.

        $ cat access.log error.log

        $LOCALIP - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob)

        $ 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

				Test raw style of hgweb

				$ hg init test
				$ cd test
				$ mkdir sub
				$ cat >'sub/some text%.txt' <<ENDSOME
				> This is just some random text
				> that will go inside the file and take a few lines.
				> It is very boring to read, but computers don't
				> care about things like that.
				> ENDSOME
				$ hg add 'sub/some text%.txt'
				$ hg commit -d "1 0" -m "Just some text"

				$ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid

				$ cat hg.pid >> $DAEMON_PIDS
				$ (get-with-headers.py localhost:$HGPORT '?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw' content-type content-length content-disposition) >getoutput.txt

				$ killdaemons.py hg.pid

				$ cat getoutput.txt
				200 Script output follows
				content-type: application/binary
				content-length: 157
				content-disposition: inline; filename="some text%.txt"

				This is just some random text
				that will go inside the file and take a few lines.
				It is very boring to read, but computers don't
				care about things like that.
				$ cat access.log error.log
				$LOCALIP - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob)

				$ rm access.log error.log
				$ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid \
				> --config web.guessmime=True

				$ cat hg.pid >> $DAEMON_PIDS
				$ (get-with-headers.py localhost:$HGPORT '?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw' content-type content-length content-disposition) >getoutput.txt
				$ killdaemons.py hg.pid

				$ cat getoutput.txt
				200 Script output follows
				content-type: text/plain; charset="ascii"
				content-length: 157
				content-disposition: inline; filename="some text%.txt"

				This is just some random text
				that will go inside the file and take a few lines.
				It is very boring to read, but computers don't
				care about things like that.
				$ cat access.log error.log
				$LOCALIP - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob)

				$ cd ..