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
224 lines
6.7 KiB
Perl
224 lines
6.7 KiB
Perl
#require serve
|
|
|
|
creating 'remote
|
|
|
|
$ hg init remote
|
|
$ cd remote
|
|
$ hg unbundle "$TESTDIR/bundles/remote.hg"
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 9 changesets with 7 changes to 4 files (+1 heads)
|
|
new changesets bfaf4b5cbf01:916f1afdef90
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
$ hg up tip
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Starting server
|
|
|
|
$ hg serve -p 0 --port-file $TESTTMP/.port -E ../error.log -d --pid-file=../hg1.pid
|
|
$ HGPORT=`cat $TESTTMP/.port`
|
|
$ cd ..
|
|
$ cat hg1.pid >> $DAEMON_PIDS
|
|
|
|
clone remote via stream
|
|
|
|
$ for i in 0 1 2 3 4 5 6 7 8; do
|
|
> hg clone -r "$i" http://localhost:$HGPORT/ test-"$i"
|
|
> if cd test-"$i"; then
|
|
> hg verify
|
|
> cd ..
|
|
> fi
|
|
> done
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets bfaf4b5cbf01
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 1 changesets, 1 total revisions
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 2 changes to 1 files
|
|
new changesets bfaf4b5cbf01:21f32785131f
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 2 changesets, 2 total revisions
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 1 files
|
|
new changesets bfaf4b5cbf01:4ce51a113780
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 3 changesets, 3 total revisions
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 4 changesets with 4 changes to 1 files
|
|
new changesets bfaf4b5cbf01:93ee6ab32777
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 4 changesets, 4 total revisions
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 2 changes to 1 files
|
|
new changesets bfaf4b5cbf01:c70afb1ee985
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 2 changesets, 2 total revisions
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 1 files
|
|
new changesets bfaf4b5cbf01:f03ae5a9b979
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 3 changesets, 3 total revisions
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 4 changesets with 5 changes to 2 files
|
|
new changesets bfaf4b5cbf01:095cb14b1b4d
|
|
updating to branch default
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
2 files, 4 changesets, 5 total revisions
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 5 changesets with 6 changes to 3 files
|
|
new changesets bfaf4b5cbf01:faa2e4234c7a
|
|
updating to branch default
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
3 files, 5 changesets, 6 total revisions
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 5 changesets with 5 changes to 2 files
|
|
new changesets bfaf4b5cbf01:916f1afdef90
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
2 files, 5 changesets, 5 total revisions
|
|
$ cd test-8
|
|
$ hg pull ../test-7
|
|
pulling from ../test-7
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 4 changesets with 2 changes to 3 files (+1 heads)
|
|
new changesets c70afb1ee985:faa2e4234c7a
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
4 files, 9 changesets, 7 total revisions
|
|
$ cd ..
|
|
$ cd test-1
|
|
$ hg pull -r 4 http://localhost:$HGPORT/
|
|
pulling from http://localhost:$HGPORT/ (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files (+1 heads)
|
|
new changesets c70afb1ee985
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 3 changesets, 2 total revisions
|
|
$ hg pull http://localhost:$HGPORT/
|
|
pulling from http://localhost:$HGPORT/ (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 6 changesets with 5 changes to 4 files
|
|
new changesets 4ce51a113780:916f1afdef90
|
|
(run 'hg update' to get a working copy)
|
|
$ cd ..
|
|
$ cd test-2
|
|
$ hg pull -r 5 http://localhost:$HGPORT/
|
|
pulling from http://localhost:$HGPORT/ (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 0 changes to 0 files (+1 heads)
|
|
new changesets c70afb1ee985:f03ae5a9b979
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 5 changesets, 3 total revisions
|
|
$ hg pull http://localhost:$HGPORT/
|
|
pulling from http://localhost:$HGPORT/ (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 4 changesets with 4 changes to 4 files
|
|
new changesets 93ee6ab32777:916f1afdef90
|
|
(run 'hg update' to get a working copy)
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
4 files, 9 changesets, 7 total revisions
|
|
$ cd ..
|
|
|
|
no default destination if url has no path:
|
|
|
|
$ hg clone http://localhost:$HGPORT/
|
|
abort: empty destination path is not valid
|
|
[255]
|
|
|
|
$ cat error.log
|