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

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r23524:a1a7c94d

default

Download file

             test-newcgi.t
        
                    66 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-newcgi.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

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

        Mads Kiilerich
    
tests: introduce 'hghave msys' to skip tests that would fail because of msys

              r15567
            
        Matt Mackall
    
tests: unify test-newcgi

              r12470
            
      This tests if CGI files from after d0db3462d568 but

      before d74fc8dec2b4 still work.

        $ hg init test

        $ cat >hgweb.cgi <<HGWEB

        > #!/usr/bin/env python

        > #

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

        > from mercurial.hgweb.request import wsgiapplication

        > 

        > def make_web_app():

        Adrian Buehlmann
    
check-code: add 'no tab indent' check for unified tests...

              r12743
            
        >     return hgweb("test", "Empty test repository")

        Matt Mackall
    
tests: unify test-newcgi

              r12470
            
        > 

        > wsgicgi.launch(wsgiapplication(make_web_app))

        > HGWEB

        $ chmod 755 hgweb.cgi

        $ cat >hgweb.config <<HGWEBDIRCONF

        > [paths]

        > test = test

        > HGWEBDIRCONF

        $ cat >hgwebdir.cgi <<HGWEBDIR

        > #!/usr/bin/env python

        > #

        > # An example CGI script to export multiple hgweb repos, edit as necessary

        > 

        > import cgitb

        > cgitb.enable()

        > 

        > from mercurial import demandimport; demandimport.enable()

        > from mercurial.hgweb import hgwebdir

        > from mercurial.hgweb import wsgicgi

        > from mercurial.hgweb.request import wsgiapplication

        > 

        > def make_web_app():

        Adrian Buehlmann
    
check-code: add 'no tab indent' check for unified tests...

              r12743
            
        >     return hgwebdir("hgweb.config")

        Matt Mackall
    
tests: unify test-newcgi

              r12470
            
        > 

        > wsgicgi.launch(wsgiapplication(make_web_app))

        > HGWEBDIR

        $ chmod 755 hgwebdir.cgi

        StevenGBrown
    
tests: remove duplication of the CGI environment variables

              r13269
            
        $ . "$TESTDIR/cgienv"

        Matt Mackall
    
tests: unify test-newcgi

              r12470
            
        $ python hgweb.cgi > page1

        $ python hgwebdir.cgi > page2

        $ PATH_INFO="/test/"

        $ PATH_TRANSLATED="/var/something/test.cgi"

        $ REQUEST_URI="/test/test/"

        $ SCRIPT_URI="http://hg.omnifarious.org/test/test/"

        $ SCRIPT_URL="/test/test/"

        $ python hgwebdir.cgi > page3

        $ grep -i error page1 page2 page3

        [1]

	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 no-msys # MSYS will translate web paths as if they were file paths
Mads Kiilerich tests: introduce 'hghave msys' to skip tests that would fail because of msys	r15567
Matt Mackall tests: unify test-newcgi	r12470	This tests if CGI files from after d0db3462d568 but
		before d74fc8dec2b4 still work.

		$ hg init test
		$ cat >hgweb.cgi <<HGWEB
		> #!/usr/bin/env python
		> #
		> # 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
		> from mercurial.hgweb.request import wsgiapplication
		>
		> def make_web_app():
Adrian Buehlmann check-code: add 'no tab indent' check for unified tests...	r12743	> return hgweb("test", "Empty test repository")
Matt Mackall tests: unify test-newcgi	r12470	>
		> wsgicgi.launch(wsgiapplication(make_web_app))
		> HGWEB

		$ chmod 755 hgweb.cgi

		$ cat >hgweb.config <<HGWEBDIRCONF
		> [paths]
		> test = test
		> HGWEBDIRCONF

		$ cat >hgwebdir.cgi <<HGWEBDIR
		> #!/usr/bin/env python
		> #
		> # An example CGI script to export multiple hgweb repos, edit as necessary
		>
		> import cgitb
		> cgitb.enable()
		>
		> from mercurial import demandimport; demandimport.enable()
		> from mercurial.hgweb import hgwebdir
		> from mercurial.hgweb import wsgicgi
		> from mercurial.hgweb.request import wsgiapplication
		>
		> def make_web_app():
Adrian Buehlmann check-code: add 'no tab indent' check for unified tests...	r12743	> return hgwebdir("hgweb.config")
Matt Mackall tests: unify test-newcgi	r12470	>
		> wsgicgi.launch(wsgiapplication(make_web_app))
		> HGWEBDIR

		$ chmod 755 hgwebdir.cgi

StevenGBrown tests: remove duplication of the CGI environment variables	r13269	$ . "$TESTDIR/cgienv"
Matt Mackall tests: unify test-newcgi	r12470	$ python hgweb.cgi > page1
		$ python hgwebdir.cgi > page2

		$ PATH_INFO="/test/"
		$ PATH_TRANSLATED="/var/something/test.cgi"
		$ REQUEST_URI="/test/test/"
		$ SCRIPT_URI="http://hg.omnifarious.org/test/test/"
		$ SCRIPT_URL="/test/test/"
		$ python hgwebdir.cgi > page3

		$ grep -i error page1 page2 page3
		[1]