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

r30238:9843e3d9 stable
r36916:219b2335 default
Show More
test-journal-share.t
153 lines | 4.5 KiB | text/troff | Tads3Lexer
/ tests / test-journal-share.t
Martijn Pieters
journal: add share extension support...
r29503 Journal extension test: tests the share extension support
$ cat >> testmocks.py << EOF
> # mock out util.getuser() and util.makedate() to supply testable values
> import os
> from mercurial import util
> def mockgetuser():
> return 'foobar'
>
> def mockmakedate():
> filename = os.path.join(os.environ['TESTTMP'], 'testtime')
> try:
> with open(filename, 'rb') as timef:
> time = float(timef.read()) + 1
> except IOError:
> time = 0.0
> with open(filename, 'wb') as timef:
> timef.write(str(time))
> return (time, 0)
>
> util.getuser = mockgetuser
> util.makedate = mockmakedate
> EOF
$ cat >> $HGRCPATH << EOF
> [extensions]
> journal=
> share=
> testmocks=`pwd`/testmocks.py
> [remotenames]
> rename.default=remote
> EOF
$ hg init repo
$ cd repo
$ hg bookmark bm
$ touch file0
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 $ hg commit -Am file0-added
Martijn Pieters
journal: add share extension support...
r29503 adding file0
$ hg journal --all
previous locations of the working copy and bookmarks:
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 0fd3805711f9 . commit -Am file0-added
0fd3805711f9 bm commit -Am file0-added
Martijn Pieters
journal: add share extension support...
r29503
A shared working copy initially receives the same bookmarks and working copy
$ cd ..
$ hg share repo shared1
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd shared1
$ hg journal --all
previous locations of the working copy and bookmarks:
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 0fd3805711f9 . share repo shared1
Martijn Pieters
journal: add share extension support...
r29503
unless you explicitly share bookmarks
$ cd ..
$ hg share --bookmarks repo shared2
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd shared2
$ hg journal --all
previous locations of the working copy and bookmarks:
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 0fd3805711f9 . share --bookmarks repo shared2
0fd3805711f9 bm commit -Am file0-added
Martijn Pieters
journal: add share extension support...
r29503
Moving the bookmark in the original repository is only shown in the repository
that shares bookmarks
$ cd ../repo
$ touch file1
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 $ hg commit -Am file1-added
Martijn Pieters
journal: add share extension support...
r29503 adding file1
$ cd ../shared1
$ hg journal --all
previous locations of the working copy and bookmarks:
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 0fd3805711f9 . share repo shared1
Martijn Pieters
journal: add share extension support...
r29503 $ cd ../shared2
$ hg journal --all
previous locations of the working copy and bookmarks:
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 4f354088b094 bm commit -Am file1-added
0fd3805711f9 . share --bookmarks repo shared2
0fd3805711f9 bm commit -Am file0-added
Martijn Pieters
journal: add share extension support...
r29503
But working copy changes are always 'local'
$ cd ../repo
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark bm)
$ hg journal --all
previous locations of the working copy and bookmarks:
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 0fd3805711f9 . up 0
4f354088b094 . commit -Am file1-added
4f354088b094 bm commit -Am file1-added
0fd3805711f9 . commit -Am file0-added
0fd3805711f9 bm commit -Am file0-added
Martijn Pieters
journal: add share extension support...
r29503 $ cd ../shared2
$ hg journal --all
previous locations of the working copy and bookmarks:
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 4f354088b094 bm commit -Am file1-added
0fd3805711f9 . share --bookmarks repo shared2
0fd3805711f9 bm commit -Am file0-added
Martijn Pieters
journal: add share extension support...
r29503 $ hg up tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg journal
previous locations of '.':
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 0fd3805711f9 up 0
4f354088b094 up tip
0fd3805711f9 share --bookmarks repo shared2
Martijn Pieters
journal: add share extension support...
r29503
Unsharing works as expected; the journal remains consistent
$ cd ../shared1
$ hg unshare
$ hg journal --all
previous locations of the working copy and bookmarks:
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 0fd3805711f9 . share repo shared1
Martijn Pieters
journal: add share extension support...
r29503 $ cd ../shared2
$ hg unshare
$ hg journal --all
previous locations of the working copy and bookmarks:
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 0fd3805711f9 . up 0
4f354088b094 . up tip
4f354088b094 bm commit -Am file1-added
0fd3805711f9 . share --bookmarks repo shared2
0fd3805711f9 bm commit -Am file0-added
Martijn Pieters
journal: add share extension support...
r29503
New journal entries in the source repo no longer show up in the other working copies
$ cd ../repo
$ hg bookmark newbm -r tip
$ hg journal newbm
previous locations of 'newbm':
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 4f354088b094 bookmark newbm -r tip
Martijn Pieters
journal: add share extension support...
r29503 $ cd ../shared2
$ hg journal newbm
previous locations of 'newbm':
no recorded locations
This applies for both directions
$ hg bookmark shared2bm -r tip
$ hg journal shared2bm
previous locations of 'shared2bm':
FUJIWARA Katsunori
tests: avoid quoting of commit messages for test portability...
r30238 4f354088b094 bookmark shared2bm -r tip
Martijn Pieters
journal: add share extension support...
r29503 $ cd ../repo
$ hg journal shared2bm
previous locations of 'shared2bm':
no recorded locations