##// END OF EJS Templates
hgweb: support constructing URLs from an alternate base URL...
hgweb: support constructing URLs from an alternate base URL The web.baseurl config option allows server operators to define a custom URL for hosted content. The way it works today is that hgwebdir parses this config option into URL components then updates the appropriate WSGI environment variables so the request "lies" about its details. For example, SERVER_NAME is updated to reflect the alternate base URL's hostname. The WSGI environment should not be modified because WSGI applications may want to know the original request details (for debugging, etc). This commit teaches our request parser about the existence of an alternate base URL. If defined, the advertised URL and other self-reflected paths will take the alternate base URL into account. The hgweb WSGI application didn't use web.baseurl. But hgwebdir did. We update hgwebdir to alter the environment parsing accordingly. The old code around environment manipulation has been removed. With this change, parserequestfromenv() has grown to a bit unwieldy. Now that practically everyone is using it, it is obvious that there is some unused features that can be trimmed. So look for this in follow-up commits. Differential Revision: https://phab.mercurial-scm.org/D2822

File last commit:

r34075:7bbc4e11 default
r36916:219b2335 default
Show More
test-revset-dirstate-parents.t
66 lines | 880 B | text/troff | Tads3Lexer
/ tests / test-revset-dirstate-parents.t
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928 $ HGENCODING=utf-8
$ export HGENCODING
$ try() {
> hg debugrevspec --debug $@
> }
$ log() {
> hg log --template '{rev}\n' -r "$1"
> }
$ hg init repo
$ cd repo
$ try 'p1()'
Patrick Mezard
debugrevspec: pretty print output...
r16218 (func
Yuya Nishihara
parser: stabilize output of prettyformat() by using byte-safe repr()...
r34075 (symbol 'p1')
Patrick Mezard
debugrevspec: pretty print output...
r16218 None)
Yuya Nishihara
debugrevspec: show nesting structure of smartsets if verbose...
r24458 * set:
<baseset []>
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928 $ try 'p2()'
Patrick Mezard
debugrevspec: pretty print output...
r16218 (func
Yuya Nishihara
parser: stabilize output of prettyformat() by using byte-safe repr()...
r34075 (symbol 'p2')
Patrick Mezard
debugrevspec: pretty print output...
r16218 None)
Yuya Nishihara
debugrevspec: show nesting structure of smartsets if verbose...
r24458 * set:
<baseset []>
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 $ try 'parents()'
Patrick Mezard
debugrevspec: pretty print output...
r16218 (func
Yuya Nishihara
parser: stabilize output of prettyformat() by using byte-safe repr()...
r34075 (symbol 'parents')
Patrick Mezard
debugrevspec: pretty print output...
r16218 None)
Yuya Nishihara
debugrevspec: show nesting structure of smartsets if verbose...
r24458 * set:
<baseset+ []>
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928
null revision
$ log 'p1()'
$ log 'p2()'
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 $ log 'parents()'
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928
working dir with a single parent
$ echo a > a
$ hg ci -Aqm0
$ log 'p1()'
0
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 $ log 'tag() and p1()'
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928 $ log 'p2()'
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 $ log 'parents()'
0
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 $ log 'tag() and parents()'
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928
merge in progress
$ echo b > b
$ hg ci -Aqm1
$ hg up -q 0
$ echo c > c
$ hg ci -Aqm2
$ hg merge -q
$ log 'p1()'
2
$ log 'p2()'
1
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 $ log 'tag() and p2()'
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 $ log 'parents()'
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 1
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 2
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..