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

r36228:5c9bdfb3 default
r36916:219b2335 default
Show More
test-narrow-commit.t
102 lines | 2.6 KiB | text/troff | Tads3Lexer
/ tests / test-narrow-commit.t
Augie Fackler
tests: fold narrow treemanifest tests into main test file using testcases...
r36101 #testcases flat tree
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 $ . "$TESTDIR/narrow-library.sh"
Augie Fackler
tests: fold narrow treemanifest tests into main test file using testcases...
r36101 #if tree
$ cat << EOF >> $HGRCPATH
> [experimental]
> treemanifest = 1
> EOF
#endif
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 create full repo
$ hg init master
$ cd master
$ mkdir inside
$ echo inside > inside/f1
$ mkdir outside
$ echo outside > outside/f1
$ hg ci -Aqm 'initial'
$ echo modified > inside/f1
$ hg ci -qm 'modify inside'
$ echo modified > outside/f1
$ hg ci -qm 'modify outside'
$ cd ..
$ hg clone --narrow ssh://user@dummy/master narrow --include inside
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 1 files
new changesets *:* (glob)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow
$ hg update -q 0
Can not modify dirstate outside
$ mkdir outside
$ touch outside/f1
$ hg debugwalk -I 'relglob:f1'
matcher: <includematcher includes='(?:(?:|.*/)f1(?:/|$))'>
f inside/f1 inside/f1
$ hg add outside/f1
abort: cannot track 'outside/f1' - it is outside the narrow clone
[255]
$ touch outside/f3
$ hg add outside/f3
abort: cannot track 'outside/f3' - it is outside the narrow clone
[255]
Yuya Nishihara
dirstate: drop explicit files that shouldn't match (BC) (issue4679)...
r36218
But adding a truly excluded file shouldn't count
$ hg add outside/f3 -X outside/f3
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 $ rm -r outside
Can modify dirstate inside
$ echo modified > inside/f1
$ touch inside/f3
$ hg add inside/f3
$ hg status
M inside/f1
A inside/f3
$ hg revert -qC .
$ rm inside/f3
Can commit changes inside. Leaves outside unchanged.
$ hg update -q 'desc("initial")'
$ echo modified2 > inside/f1
Martin von Zweigbergk
manifest: add support for including directories outside narrowspec...
r36228 $ hg manifest --debug
4d6a634d5ba06331a60c29ee0db8412490a54fcd 644 inside/f1
7fb3bb6356d28d4dc352c5ba52d7350a81b6bd46 644 outside/f1 (flat !)
d0f2f706468ab0e8bec7af87446835fb1b13511b 755 d outside/ (tree !)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 $ hg commit -m 'modify inside/f1'
created new head
$ hg files -r .
inside/f1
Augie Fackler
tests: fold narrow treemanifest tests into main test file using testcases...
r36101 outside/f1 (flat !)
outside/ (tree !)
Martin von Zweigbergk
manifest: add support for including directories outside narrowspec...
r36228 $ hg manifest --debug
3f4197b4a11b9016e77ebc47fe566944885fd11b 644 inside/f1
7fb3bb6356d28d4dc352c5ba52d7350a81b6bd46 644 outside/f1 (flat !)
d0f2f706468ab0e8bec7af87446835fb1b13511b 755 d outside/ (tree !)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 Some filesystems (notably FAT/exFAT only store timestamps with 2
seconds of precision, so by sleeping for 3 seconds, we can ensure that
the timestamps of files stored by dirstate will appear older than the
dirstate file, and therefore we'll be able to get stable output from
debugdirstate. If we don't do this, the test can be slightly flaky.
$ sleep 3
$ hg status
$ hg debugdirstate --nodates
n 644 10 set inside/f1