This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4594

py3: call hgweb.hgweb() with bytes values
ClosedPublic

Authored by pulkit on Sep 14 2018, 5:42 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG23b749b84b8a: py3: call hgweb.hgweb() with bytes values
Summary

skip-blame because just b'' prefixes

I believe this should fix some tests.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Sep 14 2018, 5:42 PM
Closed by commit rHG23b749b84b8a: py3: call hgweb.hgweb() with bytes values (authored by pulkit). · Explain WhySep 14 2018, 6:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11055

tests/test-extension.t

Check hgweb's load order of extensions and registration of functions Check hgweb's load order of extensions and registration of functions
$ cat > hgweb.cgi <<EOF $ cat > hgweb.cgi <<EOF
> #!$PYTHON > #!$PYTHON
> from mercurial import demandimport; demandimport.enable() > from mercurial import demandimport; demandimport.enable()
> from mercurial.hgweb import hgweb > from mercurial.hgweb import hgweb
> from mercurial.hgweb import wsgicgi > from mercurial.hgweb import wsgicgi
> application = hgweb('.', 'test repo') > application = hgweb(b'.', b'test repo')
> wsgicgi.launch(application) > wsgicgi.launch(application)
> EOF > EOF
$ . "$TESTDIR/cgienv" $ . "$TESTDIR/cgienv"
$ PATH_INFO='/' SCRIPT_NAME='' $PYTHON hgweb.cgi \ $ PATH_INFO='/' SCRIPT_NAME='' $PYTHON hgweb.cgi \
> | grep '^[0-9]) ' # ignores HTML output > | grep '^[0-9]) ' # ignores HTML output
1) foo imported 1) foo imported
1) bar imported 1) bar imported

tests/test-hgweb-commands.t

bookmarks view doesn't choke on bookmarks on secret changesets (issue3774) bookmarks view doesn't choke on bookmarks on secret changesets (issue3774)
$ hg phase -fs 4 $ hg phase -fs 4
$ hg bookmark -r4 secret $ hg bookmark -r4 secret
$ cat > hgweb.cgi <<HGWEB $ cat > hgweb.cgi <<HGWEB
> from mercurial import demandimport; demandimport.enable() > from mercurial import demandimport; demandimport.enable()
> from mercurial.hgweb import hgweb > from mercurial.hgweb import hgweb
> from mercurial.hgweb import wsgicgi > from mercurial.hgweb import wsgicgi
> app = hgweb('.', 'test') > app = hgweb(b'.', b'test')
> wsgicgi.launch(app) > wsgicgi.launch(app)
> HGWEB > HGWEB
$ . "$TESTDIR/cgienv" $ . "$TESTDIR/cgienv"
$ PATH_INFO=/bookmarks; export PATH_INFO $ PATH_INFO=/bookmarks; export PATH_INFO
$ QUERY_STRING='style=raw' $ QUERY_STRING='style=raw'
$ $PYTHON hgweb.cgi | grep -v ETag: $ $PYTHON hgweb.cgi | grep -v ETag:
Status: 200 Script output follows\r (esc) Status: 200 Script output follows\r (esc)
Content-Type: text/plain; charset=ascii\r (esc) Content-Type: text/plain; charset=ascii\r (esc)

tests/test-mq.t

Test that secret mq patch does not break hgweb Test that secret mq patch does not break hgweb
$ cat > hgweb.cgi <<HGWEB $ cat > hgweb.cgi <<HGWEB
> from mercurial import demandimport; demandimport.enable() > from mercurial import demandimport; demandimport.enable()
> from mercurial.hgweb import hgweb > from mercurial.hgweb import hgweb
> from mercurial.hgweb import wsgicgi > from mercurial.hgweb import wsgicgi
> import cgitb > import cgitb
> cgitb.enable() > cgitb.enable()
> app = hgweb('.', 'test') > app = hgweb(b'.', b'test')
> wsgicgi.launch(app) > wsgicgi.launch(app)
> HGWEB > HGWEB
$ . "$TESTDIR/cgienv" $ . "$TESTDIR/cgienv"
#if msys #if msys
$ PATH_INFO=//tags; export PATH_INFO $ PATH_INFO=//tags; export PATH_INFO
#else #else
$ PATH_INFO=/tags; export PATH_INFO $ PATH_INFO=/tags; export PATH_INFO
#endif #endif

tests/test-newercgi.t

> >
> import cgitb > import cgitb
> cgitb.enable() > cgitb.enable()
> >
> from mercurial import demandimport; demandimport.enable() > from mercurial import demandimport; demandimport.enable()
> from mercurial.hgweb import hgweb > from mercurial.hgweb import hgweb
> from mercurial.hgweb import wsgicgi > from mercurial.hgweb import wsgicgi
> >
> application = hgweb("test", "Empty test repository") > application = hgweb(b"test", b"Empty test repository")
> wsgicgi.launch(application) > wsgicgi.launch(application)
> HGWEB > HGWEB
$ chmod 755 hgweb.cgi $ chmod 755 hgweb.cgi
$ cat >hgweb.config <<HGWEBDIRCONF $ cat >hgweb.config <<HGWEBDIRCONF
> [paths] > [paths]
> test = test > test = test

tests/test-oldcgi.t

#require no-msys # MSYS will translate web paths as if they were file paths #require no-msys # MSYS will translate web paths as if they were file paths
This tests if CGI files from before d0db3462d568 still work. This tests if CGI files from before d0db3462d568 still work.
$ hg init test $ hg init test
$ cat >hgweb.cgi <<HGWEB $ cat >hgweb.cgi <<HGWEB
> #!$PYTHON > #!$PYTHON
> # > #
> # An example CGI script to use hgweb, edit as necessary > # An example CGI script to use hgweb, edit as necessary
> >
> import cgitb, os, sys > import cgitb, os, sys
> cgitb.enable() > cgitb.enable()
> >
> # sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install > # sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install
> from mercurial import hgweb > from mercurial import hgweb
> >
> h = hgweb.hgweb("test", "Empty test repository") > h = hgweb.hgweb(b"test", b"Empty test repository")
> h.run() > h.run()
> HGWEB > HGWEB
$ chmod 755 hgweb.cgi $ chmod 755 hgweb.cgi
$ cat >hgweb.config <<HGWEBDIRCONF $ cat >hgweb.config <<HGWEBDIRCONF
> [paths] > [paths]
> test = test > test = test

tests/test-push-cgi.t

create hgweb invocation script create hgweb invocation script
$ cat >hgweb.cgi <<HGWEB $ cat >hgweb.cgi <<HGWEB
> import cgitb > import cgitb
> cgitb.enable() > cgitb.enable()
> from mercurial import demandimport; demandimport.enable() > from mercurial import demandimport; demandimport.enable()
> from mercurial.hgweb import hgweb > from mercurial.hgweb import hgweb
> from mercurial.hgweb import wsgicgi > from mercurial.hgweb import wsgicgi
> application = hgweb('.', 'test repository') > application = hgweb(b'.', b'test repository')
> wsgicgi.launch(application) > wsgicgi.launch(application)
> HGWEB > HGWEB
$ chmod 755 hgweb.cgi $ chmod 755 hgweb.cgi
test preparation test preparation
$ . "$TESTDIR/cgienv" $ . "$TESTDIR/cgienv"
$ REQUEST_METHOD="POST"; export REQUEST_METHOD $ REQUEST_METHOD="POST"; export REQUEST_METHOD