tests: don't just silently strip port numbers

tests/test-fetch

@@ -1,202 +1,202
 #!/bin/sh
 
 # adjust to non-default HGPORT, e.g. with run-tests.py -j
-hideport() { sed "s/localhost:$HGPORT/localhost:20059/"; }
+hideport() { sed "s/localhost:$HGPORT/localhost:\$HGPORT/"; }
 hidehash() { sed "s/changeset 3:............ merges/changeset 3:... merges/"; }
 
 echo "[extensions]" >> $HGRCPATH
 echo "fetch=" >> $HGRCPATH
 
 echo % test fetch with default branches only
 hg init a
 echo a > a/a
 hg --cwd a commit -d '1 0' -Ama
 
 hg clone a b
 hg clone a c
 
 echo b > a/b
 hg --cwd a commit -d '2 0' -Amb
 hg --cwd a parents -q
 
 echo % should pull one change
 hg --cwd b fetch ../a
 hg --cwd b parents -q
 
 echo c > c/c
 hg --cwd c commit -d '3 0' -Amc
 
 hg clone c d
 hg clone c e
 
 # We cannot use the default commit message if fetching from a local
 # repo, because the path of the repo will be included in the commit
 # message, making every commit appear different.
 
 echo % should merge c into a
 hg --cwd c fetch -d '4 0' -m 'automated merge' ../a
 ls c
 
 netstat -tnap 2>/dev/null | grep $HGPORT | grep LISTEN
 hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid
 cat a/hg.pid >> "$DAEMON_PIDS"
 
 echo '% fetch over http, no auth'
 hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/ | hideport | hidehash
 hg --cwd d tip --template '{desc}\n' | hideport
 
 echo '% fetch over http with auth (should be hidden in desc)'
 hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/ | hideport | hidehash
 hg --cwd e tip --template '{desc}\n' | hideport
 
 hg clone a f
 hg clone a g
 
 echo f > f/f
 hg --cwd f ci -d '6 0' -Amf
 
 echo g > g/g
 hg --cwd g ci -d '6 0' -Amg
 
 hg clone -q f h
 hg clone -q g i
 
 echo % should merge f into g
 hg --cwd g fetch -d '7 0' --switch -m 'automated merge' ../f
 
 rm i/g
 echo % should abort, because i is modified
 hg --cwd i fetch ../h
 
 
 echo % test fetch with named branches
 hg init nbase
 echo base > nbase/a
 hg -R nbase ci -d '1 0' -Am base
 hg -R nbase branch a
 echo a > nbase/a
 hg -R nbase ci -d '2 0' -m a
 hg -R nbase up -C 0
 hg -R nbase branch b
 echo b > nbase/b
 hg -R nbase ci -Ad '3 0' -m b
 
 echo
 echo % pull in change on foreign branch
 hg clone nbase n1
 hg clone nbase n2
 hg -R n1 up -C a
 echo aa > n1/a
 hg -R n1 ci -d '4 0' -m a1
 
 hg -R n2 up -C b
 hg -R n2 fetch -d '9 0' -m 'merge' n1
 echo '% parent should be 2 (no automatic update)'
 hg -R n2 parents --template '{rev}\n'
 rm -fr n1 n2
 
 echo
 echo % pull in changes on both foreign and local branches
 hg clone nbase n1
 hg clone nbase n2
 hg -R n1 up -C a
 echo aa > n1/a
 hg -R n1 ci -d '4 0' -m a1
 hg -R n1 up -C b
 echo bb > n1/b
 hg -R n1 ci -d '5 0' -m b1
 
 hg -R n2 up -C b
 hg -R n2 fetch -d '9 0' -m 'merge' n1
 echo '% parent should be 4 (fast forward)'
 hg -R n2 parents --template '{rev}\n'
 rm -fr n1 n2
 
 echo
 echo '% pull changes on foreign (2 new heads) and local (1 new head) branches'
 echo % with a local change
 hg clone nbase n1
 hg clone nbase n2
 hg -R n1 up -C a
 echo a1 > n1/a
 hg -R n1 ci -d '4 0' -m a1
 hg -R n1 up -C b
 echo bb > n1/b
 hg -R n1 ci -d '5 0' -m b1
 hg -R n1 up -C 1
 echo a2 > n1/a
 hg -R n1 ci -d '6 0' -m a2
 
 hg -R n2 up -C b
 echo change >> n2/c
 hg -R n2 ci -Ad '7 0' -m local
 hg -R n2 fetch -d '9 0' -m 'merge' n1
 echo '% parent should be 7 (new merge changeset)'
 hg -R n2 parents --template '{rev}\n'
 rm -fr n1 n2
 
 echo '% pull in changes on foreign (merge of local branch) and local (2 new'
 echo '% heads) with a local change'
 hg clone nbase n1
 hg clone nbase n2
 hg -R n1 up -C a
 hg -R n1 merge b
 hg -R n1 ci -d '4 0' -m merge
 hg -R n1 up -C 2
 echo c > n1/a
 hg -R n1 ci -d '5 0' -m c
 hg -R n1 up -C 2
 echo cc > n1/a
 hg -R n1 ci -d '6 0' -m cc
 
 hg -R n2 up -C b
 echo change >> n2/b
 hg -R n2 ci -Ad '7 0' -m local
 hg -R n2 fetch -d '9 0' -m 'merge' n1
 echo '% parent should be 3 (fetch did not merge anything)'
 hg -R n2 parents --template '{rev}\n'
 rm -fr n1 n2
 
 echo % pull in change on different branch than dirstate
 hg init n1
 echo a > n1/a
 hg -R n1 ci -Am initial
 hg clone n1 n2
 echo b > n1/a
 hg -R n1 ci -m next
 hg -R n2 branch topic
 hg -R n2 fetch -d '0 0' -m merge n1
 echo '% parent should be 0 (fetch did not update or merge anything)'
 hg -R n2 parents --template '{rev}\n'
 rm -fr n1 n2
 
 echo % test fetch with inactive branches
 hg init ib1
 echo a > ib1/a
 hg --cwd ib1 ci -Am base
 hg --cwd ib1 branch second
 echo b > ib1/b
 hg --cwd ib1 ci -Am onsecond
 hg --cwd ib1 branch -f default
 echo c > ib1/c
 hg --cwd ib1 ci -Am newdefault
 hg clone ib1 ib2
 echo % fetch should succeed
 hg --cwd ib2 fetch ../ib1
 rm -fr ib1 ib2
 
 echo % test issue1726
 hg init i1726r1
 echo a > i1726r1/a
 hg --cwd i1726r1 ci -Am base
 hg clone i1726r1 i1726r2
 echo b > i1726r1/a
 hg --cwd i1726r1 ci -m second
 echo c > i1726r2/a
 hg --cwd i1726r2 ci -m third
 HGMERGE=true hg --cwd i1726r2 fetch ../i1726r1 | sed 's/new changeset 3:[0-9a-zA-Z]* /new changeset 3 /'
 hg --cwd i1726r2 heads default --template '{rev}\n'
 
 "$TESTDIR/killdaemons.py"
 
 true

tests/test-fetch.out

@@ -1,209 +1,209
 % test fetch with default branches only
 adding a
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b
 1:97d72e5f12c7
 % should pull one change
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1:97d72e5f12c7
 adding c
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % should merge c into a
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 updating to 2:97d72e5f12c7
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 merging with 1:5e056962225c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 new changeset 3:cd3a41621cf0 merges remote changes with local
 a
 b
 c
 % fetch over http, no auth
-pulling from http://localhost:20059/
+pulling from http://localhost:$HGPORT/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 updating to 2:97d72e5f12c7
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 merging with 1:5e056962225c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 new changeset 3:... merges remote changes with local
-Automated merge with http://localhost:20059/
+Automated merge with http://localhost:$HGPORT/
 % fetch over http with auth (should be hidden in desc)
-pulling from http://user:***@localhost:20059/
+pulling from http://user:***@localhost:$HGPORT/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 updating to 2:97d72e5f12c7
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 merging with 1:5e056962225c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 new changeset 3:... merges remote changes with local
-Automated merge with http://localhost:20059/
+Automated merge with http://localhost:$HGPORT/
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding f
 adding g
 % should merge f into g
 pulling from ../f
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 merging with 3:cc6a3744834d
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 new changeset 4:55aa4f32ec59 merges remote changes with local
 % should abort, because i is modified
 abort: working directory is missing some files
 % test fetch with named branches
 adding a
 marked working directory as branch a
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 marked working directory as branch b
 adding b
 created new head
 
 % pull in change on foreign branch
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from n1
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 % parent should be 2 (no automatic update)
 2
 
 % pull in changes on both foreign and local branches
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from n1
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % parent should be 4 (fast forward)
 4
 
 % pull changes on foreign (2 new heads) and local (1 new head) branches
 % with a local change
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding c
 pulling from n1
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 2 files (+2 heads)
 updating to 5:708c6cce3d26
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 merging with 3:d83427717b1f
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 new changeset 7:48f1a33f52af merges remote changes with local
 % parent should be 7 (new merge changeset)
 7
 % pull in changes on foreign (merge of local branch) and local (2 new
 % heads) with a local change
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from n1
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 2 changes to 1 files (+2 heads)
 not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them)
 % parent should be 3 (fetch did not merge anything)
 3
 % pull in change on different branch than dirstate
 adding a
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 marked working directory as branch topic
 abort: working dir not at branch tip (use "hg update" to check out branch tip)
 % parent should be 0 (fetch did not update or merge anything)
 0
 % test fetch with inactive branches
 adding a
 marked working directory as branch second
 adding b
 marked working directory as branch default
 adding c
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % fetch should succeed
 pulling from ../ib1
 searching for changes
 no changes found
 % test issue1726
 adding a
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from ../i1726r1
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 updating to 2:7837755a2789
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 merging with 1:d1f0c6c48ebd
 merging a
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 new changeset 3 merges remote changes with local
 3

tests/test-http

@@ -1,43 +1,43
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 hg init test
 cd test
 echo foo>foo
 mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
 echo foo>foo.d/foo
 echo bar>foo.d/bAr.hg.d/BaR
 echo bar>foo.d/baR.d.hg/bAR
 
 hg commit -A -m 1
 hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=../hg1.pid
 hg serve -p $HGPORT1 -d --pid-file=../hg2.pid
 # Test server address cannot be reused
-hg serve -p $HGPORT1 2>&1 | sed -e "s/abort: cannot start server at ':$HGPORT1':.*/abort: cannot start server at ':20060':/"
+hg serve -p $HGPORT1 2>&1 | sed -e "s/abort: cannot start server at ':$HGPORT1':.*/abort: cannot start server at ':\$HGPORT1':/"
 cd ..
 cat hg1.pid hg2.pid >> $DAEMON_PIDS
 
 echo % clone via stream
 hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1 | \
   sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/'
 hg verify -R copy
 
 echo % try to clone via stream, should use pull instead
 hg clone --uncompressed http://localhost:$HGPORT1/ copy2
 
 echo % clone via pull
 hg clone http://localhost:$HGPORT1/ copy-pull
 hg verify -R copy-pull
 
 cd test
 echo bar > bar
 hg commit -A -d '1 0' -m 2
 cd ..
 
 echo % pull
 cd copy-pull
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
-hg pull | sed -e 's,:[0-9][0-9]*/,/,'
+hg pull | sed -e "s,:$HGPORT1/,:\$HGPORT1/,"
 cd ..

tests/test-http-clone-r

@@ -1,79 +1,79
 #!/bin/sh
 
 hg init remote
 cd remote
 echo "# creating 'remote'"
 cat >>afile <<EOF
 0
 EOF
 hg add afile
 hg commit -m "0.0"
 cat >>afile <<EOF
 1
 EOF
 hg commit -m "0.1"
 cat >>afile <<EOF
 2
 EOF
 hg commit -m "0.2"
 cat >>afile <<EOF
 3
 EOF
 hg commit -m "0.3"
 hg update -C 0
 cat >>afile <<EOF
 1
 EOF
 hg commit -m "1.1"
 cat >>afile <<EOF
 2
 EOF
 hg commit -m "1.2"
 cat >fred <<EOF
 a line
 EOF
 cat >>afile <<EOF
 3
 EOF
 hg add fred
 hg commit -m "1.3"
 hg mv afile adifferentfile
 hg commit -m "1.3m"
 hg update -C 3
 hg mv afile anotherfile
 hg commit -m "0.3m"
 hg debugindex .hg/store/data/afile.i
 hg debugindex .hg/store/data/adifferentfile.i
 hg debugindex .hg/store/data/anotherfile.i
 hg debugindex .hg/store/data/fred.i
 hg debugindex .hg/store/00manifest.i
 hg verify
 echo "# Starting server"
 hg serve -p $HGPORT -E ../error.log -d --pid-file=../hg1.pid
 cd ..
 cat hg1.pid >> $DAEMON_PIDS
 
 echo "# 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" 2>&1
    if cd test-"$i"; then
       hg verify
       cd ..
    fi
 done
 cd test-8
 hg pull ../test-7
 hg verify
 cd ..
 cd test-1
-hg pull -r 4 http://localhost:$HGPORT/ 2>&1 | sed -e 's,:[0-9][0-9]*/,/,'
+hg pull -r 4 http://localhost:$HGPORT/ 2>&1 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 hg verify
-hg pull http://localhost:$HGPORT/ 2>&1 | sed -e 's,:[0-9][0-9]*/,/,'
+hg pull http://localhost:$HGPORT/ 2>&1 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 cd ..
 cd test-2
-hg pull -r 5 http://localhost:$HGPORT/ 2>&1 | sed -e 's,:[0-9][0-9]*/,/,'
+hg pull -r 5 http://localhost:$HGPORT/ 2>&1 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 hg verify
-hg pull http://localhost:$HGPORT/ 2>&1 | sed -e 's,:[0-9][0-9]*/,/,'
+hg pull http://localhost:$HGPORT/ 2>&1 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 hg verify
 cd ..
 cat error.log

tests/test-http-clone-r.out

@@ -1,193 +1,193
 # creating 'remote'
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 362fef284ce2 000000000000 000000000000
      1         3       5      1       1 125144f7e028 362fef284ce2 000000000000
      2         8       7      2       2 4c982badb186 125144f7e028 000000000000
      3        15       9      3       3 19b1fc555737 4c982badb186 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      75      0       7 905359268f77 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      75      0       8 905359268f77 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       8      0       6 12ab3bcc5ea4 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      48      0       0 43eadb1d2d06 000000000000 000000000000
      1        48      48      1       1 8b89697eba2c 43eadb1d2d06 000000000000
      2        96      48      2       2 626a32663c2f 8b89697eba2c 000000000000
      3       144      48      3       3 f54c32f13478 626a32663c2f 000000000000
      4       192      58      3       6 de68e904d169 626a32663c2f 000000000000
      5       250      68      3       7 3b45cc2ab868 de68e904d169 000000000000
      6       318      54      6       8 24d86153a002 f54c32f13478 000000000000
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
 # Starting server
 # clone remote via stream
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 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
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 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
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 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
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 1 files
 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
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 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
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 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
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 5 changes to 2 files
 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
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 6 changes to 3 files
 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
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 5 changes to 2 files
 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
 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)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
-pulling from http://localhost/
+pulling from http://localhost:$HGPORT/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 0 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 2 total revisions
-pulling from http://localhost/
+pulling from http://localhost:$HGPORT/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 6 changesets with 5 changes to 4 files
 (run 'hg update' to get a working copy)
-pulling from http://localhost/
+pulling from http://localhost:$HGPORT/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 0 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 5 changesets, 3 total revisions
-pulling from http://localhost/
+pulling from http://localhost:$HGPORT/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 4 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions

tests/test-http.out

@@ -1,47 +1,47
 adding foo
 adding foo.d/bAr.hg.d/BaR
 adding foo.d/baR.d.hg/bAR
 adding foo.d/foo
-abort: cannot start server at ':20060':
+abort: cannot start server at ':$HGPORT1':
 % clone via stream
 streaming all changes
 XXX files to transfer, XXX bytes of data
 transferred XXX bytes in XXX seconds (XXX XB/sec)
 updating to branch default
 XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 1 changesets, 4 total revisions
 % try to clone via stream, should use pull instead
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 4 changes to 4 files
 updating to branch default
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % clone via pull
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 4 changes to 4 files
 updating to branch default
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 1 changesets, 4 total revisions
 adding bar
 % pull
-changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=http://localhost/ 
-pulling from http://localhost/
+changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=http://localhost:$HGPORT1/ 
+pulling from http://localhost:$HGPORT1/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)

tests/test-incoming-outgoing

@@ -1,54 +1,54
 #!/bin/sh
 
 mkdir test
 cd test
 hg init
 for i in 0 1 2 3 4 5 6 7 8; do
 	echo $i >> foo
 	hg commit -A -m $i -d "1000000 0"
 done
 hg verify
 hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
 cd ..
 
 hg init new
 # http incoming
-hg -R new incoming http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
-hg -R new incoming -r 4 http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
+hg -R new incoming http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"
+hg -R new incoming -r 4 http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 # local incoming
 hg -R new incoming test
 hg -R new incoming -r 4 test
 echo "% limit to 2 changesets"
 hg -R new incoming -l 2 test
 echo "% limit to 2 changesets, test with -p --git"
 hg -R new incoming -l 2 -p --git test
 
 # test with --bundle
-hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
+hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 hg -R new incoming --bundle test2.hg test
 
 # test the resulting bundles
 hg init temp
 hg init temp2
 hg -R temp unbundle test.hg
 hg -R temp2 unbundle test2.hg
 hg -R temp tip
 hg -R temp2 tip
 
 rm -r temp temp2 new
 
 # test outgoing
 hg clone test test-dev
 cd test-dev
 for i in 9 10 11 12 13; do
 	echo $i >> foo
 	hg commit -A -m $i -d "1000000 0"
 done
 hg verify
 cd ..
 hg -R test-dev outgoing test
 echo "% limit to 3 changesets"
 hg -R test-dev outgoing -l 3 test
-hg -R test-dev outgoing http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
-hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
+hg -R test-dev outgoing http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"
+hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"

tests/test-incoming-outgoing.out

@@ -1,405 +1,405
 adding foo
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 9 changesets, 9 total revisions
-comparing with http://localhost/
+comparing with http://localhost:$HGPORT/
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 changeset:   2:c0d6b86da426
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   3:dfacbd43b3fe
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 changeset:   4:1f3a964b6022
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     4
 
 changeset:   5:c028bcc7a28a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     5
 
 changeset:   6:a0c0095f3389
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     6
 
 changeset:   7:d4be65f4e891
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     7
 
 changeset:   8:92b83e334ef8
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     8
 
-comparing with http://localhost/
+comparing with http://localhost:$HGPORT/
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 changeset:   2:c0d6b86da426
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   3:dfacbd43b3fe
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 changeset:   4:1f3a964b6022
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     4
 
 comparing with test
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 changeset:   2:c0d6b86da426
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   3:dfacbd43b3fe
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 changeset:   4:1f3a964b6022
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     4
 
 changeset:   5:c028bcc7a28a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     5
 
 changeset:   6:a0c0095f3389
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     6
 
 changeset:   7:d4be65f4e891
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     7
 
 changeset:   8:92b83e334ef8
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     8
 
 comparing with test
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 changeset:   2:c0d6b86da426
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   3:dfacbd43b3fe
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 changeset:   4:1f3a964b6022
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     4
 
 % limit to 2 changesets
 comparing with test
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 % limit to 2 changesets, test with -p --git
 comparing with test
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 diff --git a/foo b/foo
 new file mode 100644
 --- /dev/null
 +++ b/foo
 @@ -0,0 +1,1 @@
 +0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 diff --git a/foo b/foo
 --- a/foo
 +++ b/foo
 @@ -1,1 +1,2 @@
  0
 +1
 
-comparing with http://localhost/
+comparing with http://localhost:$HGPORT/
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 changeset:   2:c0d6b86da426
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   3:dfacbd43b3fe
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 changeset:   4:1f3a964b6022
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     4
 
 changeset:   5:c028bcc7a28a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     5
 
 changeset:   6:a0c0095f3389
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     6
 
 changeset:   7:d4be65f4e891
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     7
 
 changeset:   8:92b83e334ef8
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     8
 
 comparing with test
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 changeset:   2:c0d6b86da426
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   3:dfacbd43b3fe
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 changeset:   4:1f3a964b6022
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     4
 
 changeset:   5:c028bcc7a28a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     5
 
 changeset:   6:a0c0095f3389
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     6
 
 changeset:   7:d4be65f4e891
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     7
 
 changeset:   8:92b83e334ef8
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     8
 
 adding changesets
 adding manifests
 adding file changes
 added 9 changesets with 9 changes to 1 files
 (run 'hg update' to get a working copy)
 adding changesets
 adding manifests
 adding file changes
 added 9 changesets with 9 changes to 1 files
 (run 'hg update' to get a working copy)
 changeset:   8:92b83e334ef8
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     8
 
 changeset:   8:92b83e334ef8
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     8
 
 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, 14 changesets, 14 total revisions
 comparing with test
 searching for changes
 changeset:   9:3741c3ad1096
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     9
 
 changeset:   10:de4143c8d9a5
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     10
 
 changeset:   11:0e1c188b9a7a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     11
 
 changeset:   12:251354d0fdd3
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     12
 
 changeset:   13:bdaadd969642
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     13
 
 % limit to 3 changesets
 comparing with test
 searching for changes
 changeset:   9:3741c3ad1096
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     9
 
 changeset:   10:de4143c8d9a5
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     10
 
 changeset:   11:0e1c188b9a7a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     11
 
-comparing with http://localhost/
+comparing with http://localhost:$HGPORT/
 searching for changes
 changeset:   9:3741c3ad1096
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     9
 
 changeset:   10:de4143c8d9a5
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     10
 
 changeset:   11:0e1c188b9a7a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     11
 
 changeset:   12:251354d0fdd3
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     12
 
 changeset:   13:bdaadd969642
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     13
 
-comparing with http://localhost/
+comparing with http://localhost:$HGPORT/
 searching for changes
 changeset:   9:3741c3ad1096
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     9
 
 changeset:   10:de4143c8d9a5
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     10
 
 changeset:   11:0e1c188b9a7a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     11
 

tests/test-pull

@@ -1,31 +1,31
 #!/bin/sh
 
 mkdir test
 cd test
 echo foo>foo
 hg init
 hg addremove
 hg commit -m 1
 hg verify
 hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
 cd ..
 
-hg clone --pull http://localhost:$HGPORT/ copy | sed -e 's,:[0-9][0-9]*/,/,'
+hg clone --pull http://localhost:$HGPORT/ copy | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 cd copy
 hg verify
 hg co
 cat foo
 hg manifest --debug
-hg pull | sed -e 's,:[0-9][0-9]*/,/,'
+hg pull | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 echo % issue 622
 cd ..
 hg init empty
 cd empty
 hg pull -u ../test
 
 echo % test file: uri handling
 hg pull -q file://../test-doesnt-exist
 hg pull -q file:../test
 hg pull -q file://foobar`pwd`/../test

tests/test-pull-http

@@ -1,36 +1,36
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 hg init test
 cd test
 echo a > a
 hg ci -Ama
 
 cd ..
 hg clone test test2
 cd test2
 echo a >> a
 hg ci -mb
 
 echo % expect error, cloning not allowed
 echo '[web]' > .hg/hgrc
 echo 'allowpull = false' >> .hg/hgrc
 hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
 cat hg.pid >> $DAEMON_PIDS
-hg clone http://localhost:$HGPORT/ test3 | sed -e 's,:[0-9][0-9]*/,/,'
+hg clone http://localhost:$HGPORT/ test3 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 "$TESTDIR/killdaemons.py"
 echo % serve errors
 cat errors.log
 
 req() {
 	hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
 	cat hg.pid >> $DAEMON_PIDS
-	hg --cwd ../test pull http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
+	hg --cwd ../test pull http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 	kill `cat hg.pid`
 	echo % serve errors
 	cat errors.log
 }
 
 echo % expect error, pulling not allowed
 req

tests/test-pull-http.out

@@ -1,12 +1,12
 adding a
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % expect error, cloning not allowed
 abort: authorization failed
 requesting all changes
 % serve errors
 % expect error, pulling not allowed
 abort: authorization failed
-pulling from http://localhost/
+pulling from http://localhost:$HGPORT/
 searching for changes
 % serve errors

tests/test-pull.out

@@ -1,34 +1,34
 adding foo
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 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
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 foo
 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   foo
-pulling from http://localhost/
+pulling from http://localhost:$HGPORT/
 searching for changes
 no changes found
 % issue 622
 pulling from ../test
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % test file: uri handling
 abort: repository /test-doesnt-exist not found!

tests/test-push-http

@@ -1,56 +1,56
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 hg init test
 cd test
 echo a > a
 hg ci -Ama
 
 cd ..
 hg clone test test2
 cd test2
 echo a >> a
 hg ci -mb
 
 req() {
 	hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
 	cat hg.pid >> $DAEMON_PIDS
-	hg --cwd ../test2 push http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
+	hg --cwd ../test2 push http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 	kill `cat hg.pid`
 	echo % serve errors
 	cat errors.log
 }
 
 cd ../test
 
 echo % expect ssl error
 req
 
 echo % expect authorization error
 echo '[web]' > .hg/hgrc
 echo 'push_ssl = false' >> .hg/hgrc
 req
 
 echo % expect authorization error: must have authorized user
 echo 'allow_push = unperson' >> .hg/hgrc
 req
 
 echo % expect success
 echo 'allow_push = *' >> .hg/hgrc
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup 0 ../urls' >> .hg/hgrc
 req
 
 cat ../urls
 
 hg rollback
 echo % expect authorization error: all users denied
 echo '[web]' > .hg/hgrc
 echo 'push_ssl = false' >> .hg/hgrc
 echo 'deny_push = *' >> .hg/hgrc
 req
 
 echo % expect authorization error: some users denied, users must be authenticated
 echo 'deny_push = unperson' >> .hg/hgrc
 req

tests/test-push-http.out

@@ -1,38 +1,38
 adding a
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % expect ssl error
-pushing to http://localhost/
+pushing to http://localhost:$HGPORT/
 searching for changes
 ssl required
 % serve errors
 % expect authorization error
 abort: authorization failed
-pushing to http://localhost/
+pushing to http://localhost:$HGPORT/
 searching for changes
 % serve errors
 % expect authorization error: must have authorized user
 abort: authorization failed
-pushing to http://localhost/
+pushing to http://localhost:$HGPORT/
 searching for changes
 % serve errors
 % expect success
-pushing to http://localhost/
+pushing to http://localhost:$HGPORT/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 % serve errors
 changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http 
 rolling back last transaction
 % expect authorization error: all users denied
 abort: authorization failed
-pushing to http://localhost/
+pushing to http://localhost:$HGPORT/
 searching for changes
 % serve errors
 % expect authorization error: some users denied, users must be authenticated
 abort: authorization failed
-pushing to http://localhost/
+pushing to http://localhost:$HGPORT/
 searching for changes
 % serve errors

tests/test-static-http

@@ -1,87 +1,87
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 hg clone http://localhost:$HGPORT/ copy
 echo $?
 test -d copy || echo copy: No such file or directory
 
 # This server doesn't do range requests so it's basically only good for
 # one pull
 cat > dumb.py <<EOF
 import BaseHTTPServer, SimpleHTTPServer, os, signal
 
 def run(server_class=BaseHTTPServer.HTTPServer,
         handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
     server_address = ('localhost', int(os.environ['HGPORT']))
     httpd = server_class(server_address, handler_class)
     httpd.serve_forever()
 
 signal.signal(signal.SIGTERM, lambda x: sys.exit(0))
 run()
 EOF
 
 python dumb.py 2>/dev/null &
 echo $! >> $DAEMON_PIDS
 
 mkdir remote
 cd remote
 hg init
 echo foo > bar
 hg add bar
 hg commit -m"test" -d "1000000 0"
 hg tip
 
 cd ..
 
-hg clone static-http://localhost:$HGPORT/remote local | sed -e 's,:[0-9][0-9]*/,/,'
+hg clone static-http://localhost:$HGPORT/remote local | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 cd local
 hg verify
 cat bar
 
 cd ../remote
 echo baz > quux
 hg commit -A -mtest2 -d '100000000 0'
 
 cd ../local
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
-hg pull | sed -e 's,:[0-9][0-9]*/,/,'
+hg pull | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 echo '% trying to push'
 hg update
 echo more foo >> bar
 hg commit -m"test" -d "100000000 0"
-hg push | sed -e 's,:[0-9][0-9]*/,/,'
+hg push | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 echo '% test with "/" URI (issue 747)'
 cd ..
 hg init
 echo a > a
 hg add a
 hg ci -ma
 
-hg clone static-http://localhost:$HGPORT/ local2 | sed -e 's,:[0-9][0-9]*/,/,'
+hg clone static-http://localhost:$HGPORT/ local2 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 cd local2
 hg verify
 cat a
-hg paths | sed -e 's,:[0-9][0-9]*/,/,'
+hg paths | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 echo '% test with empty repo (issue965)'
 cd ..
 hg init remotempty
 
-hg clone static-http://localhost:$HGPORT/remotempty local3 | sed -e 's,:[0-9][0-9]*/,/,'
+hg clone static-http://localhost:$HGPORT/remotempty local3 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 cd local3
 hg verify
-hg paths | sed -e 's,:[0-9][0-9]*/,/,'
+hg paths | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 echo '% test with non-repo'
 cd ..
 mkdir notarepo
-hg clone static-http://localhost:$HGPORT/notarepo local3 2>&1 | sed -e 's,:[0-9][0-9]*/,/,'
+hg clone static-http://localhost:$HGPORT/notarepo local3 2>&1 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
 
 kill $!

tests/test-static-http.out

@@ -1,62 +1,62
 abort: error: Connection refused
 255
 copy: No such file or directory
 changeset:   0:53e17d176ae6
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     test
 
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 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
 foo
 adding quux
-changegroup hook: HG_NODE=34401e0e9971e9720b613d9089ffa9a6eefb3d2d HG_SOURCE=pull HG_URL=http://localhost/remote 
-pulling from static-http://localhost/remote
+changegroup hook: HG_NODE=34401e0e9971e9720b613d9089ffa9a6eefb3d2d HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/remote 
+pulling from static-http://localhost:$HGPORT/remote
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 % trying to push
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 abort: cannot lock static-http repository
-pushing to static-http://localhost/remote
+pushing to static-http://localhost:$HGPORT/remote
 % test with "/" URI (issue 747)
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 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
 a
-default = static-http://localhost/
+default = static-http://localhost:$HGPORT/
 % test with empty repo (issue965)
 no changes found
 updating to branch default
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 0 files, 0 changesets, 0 total revisions
-default = static-http://localhost/remotempty
+default = static-http://localhost:$HGPORT/remotempty
 % test with non-repo
-abort: 'http://localhost/notarepo' does not appear to be an hg repository!
+abort: 'http://localhost:$HGPORT/notarepo' does not appear to be an hg repository!