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

Aaron Jensen - - Load All Authors

File last commit:

r21117:91eb6050 default


                r23524:a1a7c94d

default

Download file

             test-hgweb-no-request-uri.t
        
                    171 lines
            
             | 4.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-hgweb-no-request-uri.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-hgweb-no-request-uri

              r12439
            
      This tests if hgweb and hgwebdir still work if the REQUEST_URI variable is

      no longer passed with the request. Instead, SCRIPT_NAME and PATH_INFO

      should be used from d74fc8dec2b4 onward to route the request.

        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init repo

        Matt Mackall
    
tests: unify test-hgweb-no-request-uri

              r12439
            
        $ cd repo

        $ echo foo > bar

        $ hg add bar

        $ hg commit -m "test"

        $ hg tip

        changeset:   0:61c9426e69fe

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     test

        $ cat > request.py <<EOF

        > from mercurial.hgweb import hgweb, hgwebdir

        > from StringIO import StringIO

        > import os, sys

        > 

        > errors = StringIO()

        > input = StringIO()

        > 

        > def startrsp(status, headers):

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

              r12743
            
        >     print '---- STATUS'

        >     print status

        >     print '---- HEADERS'

        >     print [i for i in headers if i[0] != 'ETag']

        >     print '---- DATA'

        >     return output.write

        Matt Mackall
    
tests: unify test-hgweb-no-request-uri

              r12439
            
        > 

        > env = {

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

              r12743
            
        >     'wsgi.version': (1, 0),

        >     'wsgi.url_scheme': 'http',

        >     'wsgi.errors': errors,

        >     'wsgi.input': input,

        >     'wsgi.multithread': False,

        >     'wsgi.multiprocess': False,

        >     'wsgi.run_once': False,

        >     'REQUEST_METHOD': 'GET',

        >     'SCRIPT_NAME': '',

        >     'SERVER_NAME': '127.0.0.1',

        >     'SERVER_PORT': os.environ['HGPORT'],

        >     'SERVER_PROTOCOL': 'HTTP/1.0'

        Matt Mackall
    
tests: unify test-hgweb-no-request-uri

              r12439
            
        > }

        > 

        > def process(app):

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

              r12743
            
        >     content = app(env, startrsp)

        >     sys.stdout.write(output.getvalue())

        >     sys.stdout.write(''.join(content))

        Mads Kiilerich
    
hgweb: make the test suite use hgweb in a more WSGI compliant way...

              r18646
            
        >     getattr(content, 'close', lambda : None)()

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

              r12743
            
        >     print '---- ERRORS'

        >     print errors.getvalue()

        Matt Mackall
    
tests: unify test-hgweb-no-request-uri

              r12439
            
        > 

        > output = StringIO()

        > env['PATH_INFO'] = '/'

        > env['QUERY_STRING'] = 'style=atom'

        > process(hgweb('.', name = 'repo'))

        > 

        > output = StringIO()

        > env['PATH_INFO'] = '/file/tip/'

        > env['QUERY_STRING'] = 'style=raw'

        > process(hgweb('.', name = 'repo'))

        > 

        > output = StringIO()

        > env['PATH_INFO'] = '/'

        > env['QUERY_STRING'] = 'style=raw'

        > process(hgwebdir({'repo': '.'}))

        > 

        > output = StringIO()

        > env['PATH_INFO'] = '/repo/file/tip/'

        > env['QUERY_STRING'] = 'style=raw'

        > process(hgwebdir({'repo': '.'}))

        > EOF

        $ python request.py

        ---- STATUS

        200 Script output follows

        ---- HEADERS

        [('Content-Type', 'application/atom+xml; charset=ascii')]

        ---- DATA

        <?xml version="1.0" encoding="ascii"?>

        <feed xmlns="http://www.w3.org/2005/Atom">

         <!-- Changelog -->

        Mads Kiilerich
    
tests: reintroduce ":$HGPORT" in test output...

              r12643
            
         <id>http://127.0.0.1:$HGPORT/</id>

         <link rel="self" href="http://127.0.0.1:$HGPORT/atom-log"/>

         <link rel="alternate" href="http://127.0.0.1:$HGPORT/"/>

        Matt Mackall
    
tests: unify test-hgweb-no-request-uri

              r12439
            
         <title>repo Changelog</title>

         <updated>1970-01-01T00:00:00+00:00</updated>

         <entry>

        Aaron Jensen
    
hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries

              r21056
            
          <title>[default] test</title>

        Mads Kiilerich
    
tests: reintroduce ":$HGPORT" in test output...

              r12643
            
          <id>http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id>

          <link href="http://127.0.0.1:$HGPORT/rev/61c9426e69fe"/>

        Matt Mackall
    
tests: unify test-hgweb-no-request-uri

              r12439
            
          <author>

           <name>test</name>

           <email>&#116;&#101;&#115;&#116;</email>

          </author>

          <updated>1970-01-01T00:00:00+00:00</updated>

          <published>1970-01-01T00:00:00+00:00</published>

          <content type="xhtml">

        Aaron Jensen
    
hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries

              r21056
            
        	<table xmlns="http://www.w3.org/1999/xhtml">

        	<tr>

        		<th style="text-align:left;">changeset</th>

        		<td>61c9426e69fe</td>

        Aaron Jensen
    
hgweb: adding branch names from inbranch template to atom feed

              r21117
            
                      </tr>

                      <tr>

                                      <th style="text-align:left;">branch</th>

                                      <td>default</td>

                      </tr>

                      <tr>

                                      <th style="text-align:left;">bookmark</th>

        Aaron Jensen
    
hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries

              r21056
            
        		<td></td>

        	</tr>

        	<tr>

        		<th style="text-align:left;">tag</th>

        		<td>tip</td>

        	</tr>

        	<tr>

        		<th style="text-align:left;">user</th>

        		<td>&#116;&#101;&#115;&#116;</td>

        	</tr>

        	<tr>

        		<th style="text-align:left;vertical-align:top;">description</th>

        		<td>test</td>

        	</tr>

        	<tr>

        		<th style="text-align:left;vertical-align:top;">files</th>

        		<td>bar<br /></td>

        	</tr>

        	</table>

        Matt Mackall
    
tests: unify test-hgweb-no-request-uri

              r12439
            
          </content>

         </entry>

        </feed>

        ---- ERRORS

        ---- STATUS

        200 Script output follows

        ---- HEADERS

        [('Content-Type', 'text/plain; charset=ascii')]

        ---- DATA

        -rw-r--r-- 4 bar

        ---- ERRORS

        ---- STATUS

        200 Script output follows

        ---- HEADERS

        [('Content-Type', 'text/plain; charset=ascii')]

        ---- DATA

        /repo/

        ---- ERRORS

        ---- STATUS

        200 Script output follows

        ---- HEADERS

        [('Content-Type', 'text/plain; charset=ascii')]

        ---- DATA

        -rw-r--r-- 4 bar

        ---- ERRORS

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Matt Mackall tests: unify test-hgweb-no-request-uri	r12439	This tests if hgweb and hgwebdir still work if the REQUEST_URI variable is
		no longer passed with the request. Instead, SCRIPT_NAME and PATH_INFO
		should be used from d74fc8dec2b4 onward to route the request.

Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init repo
Matt Mackall tests: unify test-hgweb-no-request-uri	r12439	$ cd repo
		$ echo foo > bar
		$ hg add bar
		$ hg commit -m "test"
		$ hg tip
		changeset: 0:61c9426e69fe
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: test

		$ cat > request.py <<EOF
		> from mercurial.hgweb import hgweb, hgwebdir
		> from StringIO import StringIO
		> import os, sys
		>
		> errors = StringIO()
		> input = StringIO()
		>
		> def startrsp(status, headers):
Adrian Buehlmann check-code: add 'no tab indent' check for unified tests...	r12743	> print '---- STATUS'
		> print status
		> print '---- HEADERS'
		> print [i for i in headers if i[0] != 'ETag']
		> print '---- DATA'
		> return output.write
Matt Mackall tests: unify test-hgweb-no-request-uri	r12439	>
		> env = {
Adrian Buehlmann check-code: add 'no tab indent' check for unified tests...	r12743	> 'wsgi.version': (1, 0),
		> 'wsgi.url_scheme': 'http',
		> 'wsgi.errors': errors,
		> 'wsgi.input': input,
		> 'wsgi.multithread': False,
		> 'wsgi.multiprocess': False,
		> 'wsgi.run_once': False,
		> 'REQUEST_METHOD': 'GET',
		> 'SCRIPT_NAME': '',
		> 'SERVER_NAME': '127.0.0.1',
		> 'SERVER_PORT': os.environ['HGPORT'],
		> 'SERVER_PROTOCOL': 'HTTP/1.0'
Matt Mackall tests: unify test-hgweb-no-request-uri	r12439	> }
		>
		> def process(app):
Adrian Buehlmann check-code: add 'no tab indent' check for unified tests...	r12743	> content = app(env, startrsp)
		> sys.stdout.write(output.getvalue())
		> sys.stdout.write(''.join(content))
Mads Kiilerich hgweb: make the test suite use hgweb in a more WSGI compliant way...	r18646	> getattr(content, 'close', lambda : None)()
Adrian Buehlmann check-code: add 'no tab indent' check for unified tests...	r12743	> print '---- ERRORS'
		> print errors.getvalue()
Matt Mackall tests: unify test-hgweb-no-request-uri	r12439	>
		> output = StringIO()
		> env['PATH_INFO'] = '/'
		> env['QUERY_STRING'] = 'style=atom'
		> process(hgweb('.', name = 'repo'))
		>
		> output = StringIO()
		> env['PATH_INFO'] = '/file/tip/'
		> env['QUERY_STRING'] = 'style=raw'
		> process(hgweb('.', name = 'repo'))
		>
		> output = StringIO()
		> env['PATH_INFO'] = '/'
		> env['QUERY_STRING'] = 'style=raw'
		> process(hgwebdir({'repo': '.'}))
		>
		> output = StringIO()
		> env['PATH_INFO'] = '/repo/file/tip/'
		> env['QUERY_STRING'] = 'style=raw'
		> process(hgwebdir({'repo': '.'}))
		> EOF
		$ python request.py
		---- STATUS
		200 Script output follows
		---- HEADERS
		[('Content-Type', 'application/atom+xml; charset=ascii')]
		---- DATA
		<?xml version="1.0" encoding="ascii"?>
		<feed xmlns="http://www.w3.org/2005/Atom">
		<!-- Changelog -->
Mads Kiilerich tests: reintroduce ":$HGPORT" in test output...	r12643	<id>http://127.0.0.1:$HGPORT/</id>
		<link rel="self" href="http://127.0.0.1:$HGPORT/atom-log"/>
		<link rel="alternate" href="http://127.0.0.1:$HGPORT/"/>
Matt Mackall tests: unify test-hgweb-no-request-uri	r12439	<title>repo Changelog</title>
		<updated>1970-01-01T00:00:00+00:00</updated>

		<entry>
Aaron Jensen hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries	r21056	<title>[default] test</title>
Mads Kiilerich tests: reintroduce ":$HGPORT" in test output...	r12643	<id>http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id>
		<link href="http://127.0.0.1:$HGPORT/rev/61c9426e69fe"/>
Matt Mackall tests: unify test-hgweb-no-request-uri	r12439	<author>
		<name>test</name>
		<email>test</email>
		</author>
		<updated>1970-01-01T00:00:00+00:00</updated>
		<published>1970-01-01T00:00:00+00:00</published>
		<content type="xhtml">
Aaron Jensen hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries	r21056	<table xmlns="http://www.w3.org/1999/xhtml">
		<tr>
		<th style="text-align:left;">changeset</th>
		<td>61c9426e69fe</td>
Aaron Jensen hgweb: adding branch names from inbranch template to atom feed	r21117	</tr>
		<tr>
		<th style="text-align:left;">branch</th>
		<td>default</td>
		</tr>
		<tr>
		<th style="text-align:left;">bookmark</th>
Aaron Jensen hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries	r21056	<td></td>
		</tr>
		<tr>
		<th style="text-align:left;">tag</th>
		<td>tip</td>
		</tr>
		<tr>
		<th style="text-align:left;">user</th>
		<td>test</td>
		</tr>
		<tr>
		<th style="text-align:left;vertical-align:top;">description</th>
		<td>test</td>
		</tr>
		<tr>
		<th style="text-align:left;vertical-align:top;">files</th>
		<td>bar<br /></td>
		</tr>
		</table>
Matt Mackall tests: unify test-hgweb-no-request-uri	r12439	</content>
		</entry>

		</feed>
		---- ERRORS

		---- STATUS
		200 Script output follows
		---- HEADERS
		[('Content-Type', 'text/plain; charset=ascii')]
		---- DATA

		-rw-r--r-- 4 bar


		---- ERRORS

		---- STATUS
		200 Script output follows
		---- HEADERS
		[('Content-Type', 'text/plain; charset=ascii')]
		---- DATA

		/repo/

		---- ERRORS

		---- STATUS
		200 Script output follows
		---- HEADERS
		[('Content-Type', 'text/plain; charset=ascii')]
		---- DATA

		-rw-r--r-- 4 bar


		---- ERRORS

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..