upstream/mercurial-mirror Files · tests/test-clone-cgi.t

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Pulkit Goyal - - Load All Authors

File last commit:

r37686:2a42ca26 default


                r38817:bb54db4a

@96 default

Download file

             test-clone-cgi.t
        
                    39 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-clone-cgi.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require no-msys # MSYS will translate web paths as if they were file paths

      This is a test of the wire protocol over CGI-based hgweb.

      initialize repository

        $ hg init test

        $ cd test

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ cd ..

        $ cat >hgweb.cgi <<HGWEB

        > #

        > # An example CGI script to use hgweb, edit as necessary

        > import cgitb

        > cgitb.enable()

        > from mercurial import demandimport; demandimport.enable()

        > from mercurial.hgweb import hgweb

        > from mercurial.hgweb import wsgicgi

        > application = hgweb(b"test", b"Empty test repository")

        > wsgicgi.launch(application)

        > HGWEB

        $ chmod 755 hgweb.cgi

      try hgweb request

        $ . "$TESTDIR/cgienv"

        $ QUERY_STRING="cmd=changegroup&roots=0000000000000000000000000000000000000000"; export QUERY_STRING

        $ $PYTHON hgweb.cgi >page1 2>&1

        $ $PYTHON "$TESTDIR/md5sum.py" page1

        1f424bb22ec05c3c6bc866b6e67efe43  page1

      make sure headers are sent even when there is no body

        $ QUERY_STRING="cmd=listkeys&namespace=nosuchnamespace" $PYTHON hgweb.cgi

        Status: 200 Script output follows\r (esc)

        Content-Type: application/mercurial-0.1\r (esc)

        Content-Length: 0\r (esc)

        \r (esc)

	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 no-msys # MSYS will translate web paths as if they were file paths

				This is a test of the wire protocol over CGI-based hgweb.
				initialize repository

				$ hg init test
				$ cd test
				$ echo a > a
				$ hg ci -Ama
				adding a
				$ cd ..
				$ cat >hgweb.cgi <<HGWEB
				> #
				> # An example CGI script to use hgweb, edit as necessary
				> import cgitb
				> cgitb.enable()
				> from mercurial import demandimport; demandimport.enable()
				> from mercurial.hgweb import hgweb
				> from mercurial.hgweb import wsgicgi
				> application = hgweb(b"test", b"Empty test repository")
				> wsgicgi.launch(application)
				> HGWEB
				$ chmod 755 hgweb.cgi

				try hgweb request

				$ . "$TESTDIR/cgienv"
				$ QUERY_STRING="cmd=changegroup&roots=0000000000000000000000000000000000000000"; export QUERY_STRING
				$ $PYTHON hgweb.cgi >page1 2>&1
				$ $PYTHON "$TESTDIR/md5sum.py" page1
				1f424bb22ec05c3c6bc866b6e67efe43 page1

				make sure headers are sent even when there is no body

				$ QUERY_STRING="cmd=listkeys&namespace=nosuchnamespace" $PYTHON hgweb.cgi
				Status: 200 Script output follows\r (esc)
				Content-Type: application/mercurial-0.1\r (esc)
				Content-Length: 0\r (esc)
				\r (esc)