mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
4a7b28d08b
Summary:
Previously `hg server` uses `HGPORT` that might be in use. This patch uses
`-p 0 --port-file ...` so `hg server` always gets assigned a free port.
The change was first made by the following Ruby script:
```
re = /^ \$ hg serve(.*) -p \$(HGPORT[12]?) (.*[^\\])$\n \$/
Dir['*.t'].each do |path|
old = File.read(path)
new = old.lines.map do |l|
next l if l[/\(glob\)/] or not l['$HGPORT'] or l[/^ [$>]/]
"#{l.chomp} (glob)\n"
end.join.gsub re, <<-'EOS'.chomp
$ hg serve\1 -p 0 --port-file $TESTTMP/.port \3
$ \2=`cat $TESTTMP/.port`
$
EOS
File.write(path, new) if old != new
end
```
Then there are some manual changes:
run-tests.py: It now treats `$HGPORT` in output as glob pattern `*`, since
it does not know the assigned value in tests.
test-bookmarks-pushpull.t, test-https.t: Some `hg pull`s were changed to use
explicit paths instead of relying on `.hgrc` since the test restarts the
server and `.hg/hgrc` having an outdated URL.
test-schemes.t: The test writes `$HGPORT` to `.hgrc` before assigning it.
Changed the order so the correct `$HGPORT` is written.
test-patchbomb-tls.t: Changed `(?) (glob)` to `(glob) (?)`.
Reviewed By: DurhamG
Differential Revision: D6925398
fbshipit-source-id: d5c10476f43ce23f9e99618807580cf8ba92595c
78 lines
1.5 KiB
Perl
78 lines
1.5 KiB
Perl
#require serve
|
|
|
|
$ cat <<EOF >> $HGRCPATH
|
|
> [extensions]
|
|
> schemes=
|
|
>
|
|
> [schemes]
|
|
> z = file:\$PWD/
|
|
> EOF
|
|
$ hg init test
|
|
$ cd test
|
|
$ echo a > a
|
|
$ hg ci -Am initial
|
|
adding a
|
|
|
|
invalid scheme
|
|
|
|
$ hg log -R z:z
|
|
abort: no '://' in scheme url 'z:z'
|
|
[255]
|
|
|
|
http scheme
|
|
|
|
$ hg serve -n test -p 0 --port-file $TESTTMP/.port -d --pid-file=hg.pid -A access.log -E errors.log
|
|
$ HGPORT=`cat $TESTTMP/.port`
|
|
$ cat <<EOF >> $HGRCPATH
|
|
> l = http://localhost:$HGPORT/
|
|
> parts = http://{1}:$HGPORT/
|
|
> EOF
|
|
$ cat hg.pid >> $DAEMON_PIDS
|
|
$ hg incoming l://
|
|
comparing with l://
|
|
searching for changes
|
|
no changes found
|
|
[1]
|
|
|
|
check that {1} syntax works
|
|
|
|
$ hg incoming --debug parts://localhost
|
|
using http://localhost:$HGPORT/ (glob)
|
|
sending capabilities command
|
|
comparing with parts://localhost/
|
|
query 1; heads
|
|
sending batch command
|
|
searching for changes
|
|
all remote heads known locally
|
|
no changes found
|
|
[1]
|
|
|
|
check that paths are expanded
|
|
|
|
$ PWD=`pwd` hg incoming z://
|
|
comparing with z://
|
|
searching for changes
|
|
no changes found
|
|
[1]
|
|
|
|
check that debugexpandscheme outputs the canonical form
|
|
|
|
$ hg debugexpandscheme bb://user/repo
|
|
https://bitbucket.org/user/repo
|
|
|
|
expanding an unknown scheme emits the input
|
|
|
|
$ hg debugexpandscheme foobar://this/that
|
|
foobar://this/that
|
|
|
|
expanding a canonical URL emits the input
|
|
|
|
$ hg debugexpandscheme https://bitbucket.org/user/repo
|
|
https://bitbucket.org/user/repo
|
|
|
|
errors
|
|
|
|
$ cat errors.log
|
|
|
|
$ cd ..
|