Mercurial > hg
annotate tests/test-oldcgi.t @ 24306:6ddc86eedc3b
style: kill ersatz if-else ternary operators
Although Python supports `X = Y if COND else Z`, this was only
introduced in Python 2.5. Since we have to support Python 2.4, it was
a very common thing to write instead `X = COND and Y or Z`, which is a
bit obscure at a glance. It requires some intricate knowledge of
Python to understand how to parse these one-liners.
We change instead all of these one-liners to 4-liners. This was
executed with the following perlism:
find -name "*.py" -exec perl -pi -e 's,(\s*)([\.\w]+) = \(?(\S+)\s+and\s+(\S*)\)?\s+or\s+(\S*)$,$1if $3:\n$1 $2 = $4\n$1else:\n$1 $2 = $5,' {} \;
I tweaked the following cases from the automatic Perl output:
prev = (parents and parents[0]) or nullid
port = (use_ssl and 443 or 80)
cwd = (pats and repo.getcwd()) or ''
rename = fctx and webutil.renamelink(fctx) or []
ctx = fctx and fctx or ctx
self.base = (mapfile and os.path.dirname(mapfile)) or ''
I also added some newlines wherever they seemd appropriate for readability
There are probably a few ersatz ternary operators still in the code
somewhere, lurking away from the power of a simple regex.
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Fri, 13 Mar 2015 17:00:06 -0400 |
parents | 7a9cbb315d84 |
children | b6776b34e44e |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
15567
diff
changeset
|
1 #require no-msys # MSYS will translate web paths as if they were file paths |
15567
8b84d040d9f9
tests: introduce 'hghave msys' to skip tests that would fail because of msys
Mads Kiilerich <mads@kiilerich.com>
parents:
13269
diff
changeset
|
2 |
12472 | 3 This tests if CGI files from before d0db3462d568 still work. |
2533
589474a1dc36
Create a test to make sure old CGI scripts will still work.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
4 |
12472 | 5 $ hg init test |
6 $ cat >hgweb.cgi <<HGWEB | |
7 > #!/usr/bin/env python | |
8 > # | |
9 > # An example CGI script to use hgweb, edit as necessary | |
10 > | |
11 > import cgitb, os, sys | |
12 > cgitb.enable() | |
13 > | |
14 > # sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install | |
15 > from mercurial import hgweb | |
16 > | |
17 > h = hgweb.hgweb("test", "Empty test repository") | |
18 > h.run() | |
19 > HGWEB | |
2533
589474a1dc36
Create a test to make sure old CGI scripts will still work.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
20 |
12472 | 21 $ chmod 755 hgweb.cgi |
2533
589474a1dc36
Create a test to make sure old CGI scripts will still work.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
22 |
12472 | 23 $ cat >hgweb.config <<HGWEBDIRCONF |
24 > [paths] | |
25 > test = test | |
26 > HGWEBDIRCONF | |
2533
589474a1dc36
Create a test to make sure old CGI scripts will still work.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
27 |
12472 | 28 $ cat >hgwebdir.cgi <<HGWEBDIR |
29 > #!/usr/bin/env python | |
30 > # | |
31 > # An example CGI script to export multiple hgweb repos, edit as necessary | |
32 > | |
33 > import cgitb, sys | |
34 > cgitb.enable() | |
35 > | |
36 > # sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install | |
37 > from mercurial import hgweb | |
38 > | |
39 > # The config file looks like this. You can have paths to individual | |
40 > # repos, collections of repos in a directory tree, or both. | |
41 > # | |
42 > # [paths] | |
43 > # virtual/path = /real/path | |
44 > # virtual/path = /real/path | |
45 > # | |
46 > # [collections] | |
47 > # /prefix/to/strip/off = /root/of/tree/full/of/repos | |
48 > # | |
49 > # collections example: say directory tree /foo contains repos /foo/bar, | |
50 > # /foo/quux/baz. Give this config section: | |
51 > # [collections] | |
52 > # /foo = /foo | |
53 > # Then repos will list as bar and quux/baz. | |
54 > | |
55 > # Alternatively you can pass a list of ('virtual/path', '/real/path') tuples | |
56 > # or use a dictionary with entries like 'virtual/path': '/real/path' | |
57 > | |
58 > h = hgweb.hgwebdir("hgweb.config") | |
59 > h.run() | |
60 > HGWEBDIR | |
2533
589474a1dc36
Create a test to make sure old CGI scripts will still work.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
61 |
12472 | 62 $ chmod 755 hgwebdir.cgi |
2533
589474a1dc36
Create a test to make sure old CGI scripts will still work.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
63 |
13269
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
12472
diff
changeset
|
64 $ . "$TESTDIR/cgienv" |
12472 | 65 $ python hgweb.cgi > page1 |
66 $ python hgwebdir.cgi > page2 | |
67 | |
68 $ PATH_INFO="/test/" | |
69 $ PATH_TRANSLATED="/var/something/test.cgi" | |
70 $ REQUEST_URI="/test/test/" | |
71 $ SCRIPT_URI="http://hg.omnifarious.org/test/test/" | |
72 $ SCRIPT_URL="/test/test/" | |
73 $ python hgwebdir.cgi > page3 | |
74 | |
75 $ grep -i error page1 page2 page3 | |
76 [1] |