adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j

tests/test-fetch

@@ -1,65 +1,69 b''
 #!/bin/sh
 
+# adjust to non-default HGPORT, e.g. with run-tests.py -j
+hideport() { sed "s/localhost:$HGPORT/localhost:20059/"; }
+hidehash() { sed "s/changeset 3:............ merges/changeset 3:... merges/"; }
+
 echo "[extensions]" >> $HGRCPATH
 echo "fetch=" >> $HGRCPATH
 
 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
 
 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/
-hg --cwd d tip --template '{desc}\n'
+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/
-hg --cwd e tip --template '{desc}\n'
+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
 
 true

tests/test-fetch.out

@@ -1,75 +1,75 b''
 adding a
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 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
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 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/
 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:0b6439e938f9 merges remote changes with local
+new changeset 3:... merges remote changes with local
 Automated merge with http://localhost:20059/
 % fetch over http with auth (should be hidden in desc)
 pulling from http://user:***@localhost:20059/
 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:0b6439e938f9 merges remote changes with local
+new changeset 3:... merges remote changes with local
 Automated merge with http://localhost:20059/
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 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