Fix test-push-validation under Windows

tests/filtertmp.py

@@ -1,14 +1,15 b''
 #!/usr/bin/env python
 #
 # This used to be a simple sed call like:
 #
 #  $ sed "s:$HGTMP:*HGTMP*:"
 #
 # But $HGTMP has ':' under Windows which breaks the sed call.
 #
 import sys, os
 
 input = sys.stdin.read()
-input = input.replace(os.environ['HGTMP'], '$HGTMP')
 input = input.replace(os.sep, '/')
+hgtmp = os.environ['HGTMP'].replace(os.sep, '/')
+input = input.replace(hgtmp, '$HGTMP')
 sys.stdout.write(input)

tests/test-push-validation

@@ -1,24 +1,22 b''
 #!/bin/sh
 
-STRIP=`pwd`
-
 hg init test
 cd test
 cat > .hg/hgrc <<EOF
 [server]
 validate=1
 EOF
 echo alpha > alpha
 echo beta > beta
 hg addr
 hg ci -m 1
 
 cd ..
 hg clone test test-clone
 
 cd test-clone
 cp .hg/store/data/beta.i tmp
 echo blah >> beta
 hg ci -m '2 (corrupt)'
 mv tmp .hg/store/data/beta.i
-hg push 2>&1 | sed "s%$STRIP%test-root%"
+hg push 2>&1 | "$TESTDIR/filtertmp.py"

tests/test-push-validation.out

@@ -1,12 +1,12 b''
 adding alpha
 adding beta
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-pushing to test-root/test
+pushing to $HGTMP/test-push-validation/test
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 transaction abort!
 rollback completed
 abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify