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
138 lines
3.8 KiB
Perl
138 lines
3.8 KiB
Perl
#require serve
|
|
|
|
$ hg init test
|
|
$ cd test
|
|
|
|
$ echo foo>foo
|
|
$ hg addremove
|
|
adding foo
|
|
$ hg commit -m 1
|
|
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 1 changesets, 1 total revisions
|
|
|
|
$ hg serve -p 0 --port-file $TESTTMP/.port -d --pid-file=hg.pid
|
|
$ HGPORT=`cat $TESTTMP/.port`
|
|
$ cat hg.pid >> $DAEMON_PIDS
|
|
$ cd ..
|
|
|
|
$ hg clone --pull http://foo:bar@localhost:$HGPORT/ copy
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets 340e38bdcde4
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd copy
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 1 changesets, 1 total revisions
|
|
|
|
$ hg co
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cat foo
|
|
foo
|
|
|
|
$ hg manifest --debug
|
|
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
|
|
|
|
$ hg pull
|
|
pulling from http://foo@localhost:$HGPORT/ (glob)
|
|
searching for changes
|
|
no changes found
|
|
|
|
$ hg rollback --dry-run --verbose
|
|
repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/) (glob)
|
|
|
|
Test pull of non-existing 20 character revision specification, making sure plain ascii identifiers
|
|
not are encoded like a node:
|
|
|
|
$ hg pull -r 'xxxxxxxxxxxxxxxxxxxy'
|
|
pulling from http://foo@localhost:$HGPORT/ (glob)
|
|
abort: unknown revision 'xxxxxxxxxxxxxxxxxxxy'!
|
|
[255]
|
|
$ hg pull -r 'xxxxxxxxxxxxxxxxxx y'
|
|
pulling from http://foo@localhost:$HGPORT/ (glob)
|
|
abort: unknown revision '7878787878787878787878787878787878782079'!
|
|
[255]
|
|
|
|
Issue622: hg init && hg pull -u URL doesn't checkout default branch
|
|
|
|
$ cd ..
|
|
$ hg init empty
|
|
$ cd empty
|
|
$ hg pull -u ../test
|
|
pulling from ../test
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets 340e38bdcde4
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Test 'file:' uri handling:
|
|
|
|
$ hg pull -q file://../test-does-not-exist
|
|
abort: file:// URLs can only refer to localhost
|
|
[255]
|
|
|
|
$ hg pull -q file://../test
|
|
abort: file:// URLs can only refer to localhost
|
|
[255]
|
|
|
|
MSYS changes 'file:' into 'file;'
|
|
|
|
#if no-msys
|
|
$ hg pull -q file:../test # no-msys
|
|
#endif
|
|
|
|
It's tricky to make file:// URLs working on every platform with
|
|
regular shell commands.
|
|
|
|
$ URL=`$PYTHON -c "import os; print 'file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`
|
|
$ hg pull -q "$URL"
|
|
abort: file:// URLs can only refer to localhost
|
|
[255]
|
|
|
|
$ URL=`$PYTHON -c "import os; print 'file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`
|
|
$ hg pull -q "$URL"
|
|
|
|
SEC: check for unsafe ssh url
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [ui]
|
|
> ssh = sh -c "read l; read l; read l"
|
|
> EOF
|
|
|
|
$ hg pull 'ssh://-oProxyCommand=touch${IFS}owned/path'
|
|
pulling from ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path
|
|
abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
|
|
[255]
|
|
$ hg pull 'ssh://%2DoProxyCommand=touch${IFS}owned/path'
|
|
pulling from ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path
|
|
abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
|
|
[255]
|
|
$ hg pull 'ssh://fakehost|touch${IFS}owned/path'
|
|
pulling from ssh://fakehost%7Ctouch%24%7BIFS%7Downed/path
|
|
abort: no suitable response from remote hg!
|
|
[255]
|
|
$ hg pull 'ssh://fakehost%7Ctouch%20owned/path'
|
|
pulling from ssh://fakehost%7Ctouch%20owned/path
|
|
abort: no suitable response from remote hg!
|
|
[255]
|
|
|
|
$ [ ! -f owned ] || echo 'you got owned'
|
|
|
|
$ cd ..
|