test-mq-qclone-http: hide port number

tests/test-mq-qclone-http

@@ -1,81 +1,81 b''
 #! /bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "mq=" >> $HGRCPATH
 
 mkdir webdir
 cd webdir
 
 hg init a
 hg --cwd a qinit -c
 echo a > a/a
 hg --cwd a ci -A -m a
 echo b > a/b
 hg --cwd a addremove
 hg --cwd a qnew -f b.patch
 hg --cwd a qcommit -m b.patch
 
 hg --cwd a log --template "{desc}\n"
 hg --cwd a/.hg/patches log --template "{desc}\n"
 
 root=`pwd`
 
 cd ..
 
 echo % test with recursive collection
 
 cat > collections.conf <<EOF
 [paths]
 /=$root/**
 EOF
 
 hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \
     -A access-paths.log -E error-paths-1.log
 cat hg.pid >> $DAEMON_PIDS
 
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw'
 
 hg qclone http://localhost:$HGPORT/a b
 hg --cwd b log --template "{desc}\n"
 hg --cwd b qpush -a
 hg --cwd b log --template "{desc}\n"
 
 echo % test with normal collection
 
 cat > collections1.conf <<EOF
 [paths]
 /=$root/*
 EOF
 
 hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf collections1.conf \
     -A access-paths.log -E error-paths-1.log
 cat hg.pid >> $DAEMON_PIDS
 
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw'
 
 hg qclone http://localhost:$HGPORT1/a c
 hg --cwd c log --template "{desc}\n"
 hg --cwd c qpush -a
 hg --cwd c log --template "{desc}\n"
 
 echo % test with old-style collection
 
 cat > collections2.conf <<EOF
 [collections]
 $root=$root
 EOF
 
 hg serve -p $HGPORT2 -d --pid-file=hg.pid --webdir-conf collections2.conf \
     -A access-paths.log -E error-paths-1.log
 cat hg.pid >> $DAEMON_PIDS
 
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/?style=raw'
 
 hg qclone http://localhost:$HGPORT2/a d
 hg --cwd d log --template "{desc}\n"
 hg --cwd d qpush -a
 hg --cwd d log --template "{desc}\n"
 
 echo '% test --mq works and uses correct repository config'
-hg --cwd d outgoing --mq
+hg --cwd d outgoing --mq | sed "s|$HGPORT2|\$HGPORT2|"
 hg --cwd d log --mq --template '{rev} {desc|firstline}\n'

tests/test-mq-qclone-http.out

@@ -1,85 +1,85 b''
 adding a
 adding b
 [mq]: b.patch
 a
 b.patch
 % test with recursive collection
 200 Script output follows
 
 
 /a/
 /a/.hg/patches/
 
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 3 changes to 3 files
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 a
 applying b.patch
 now at: b.patch
 imported patch b.patch
 a
 % test with normal collection
 200 Script output follows
 
 
 /a/
 /a/.hg/patches/
 
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 3 changes to 3 files
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 a
 applying b.patch
 now at: b.patch
 imported patch b.patch
 a
 % test with old-style collection
 200 Script output follows
 
 
 /a/
 /a/.hg/patches/
 
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 3 changes to 3 files
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 a
 applying b.patch
 now at: b.patch
 imported patch b.patch
 a
 % test --mq works and uses correct repository config
-comparing with http://localhost:20061/a/.hg/patches
+comparing with http://localhost:$HGPORT2/a/.hg/patches
 searching for changes
 no changes found
 0 b.patch