hgmerge: various cleanups
Details:
- put temporary file names into variables
- make all temporary file names end with random part
- cleanup FileMerge handling
- do not use hardlinks in FileMerge change test (breaks on FAT)
- try harder to keep file mtime unchanged in case of failed merge
#!/bin/sh
http_proxy= hg clone old-http://localhost:20059/ copy
echo $?
ls copy
# This server doesn't do range requests so it's basically only good for
# one pull
cat > dumb.py <<EOF
import BaseHTTPServer, SimpleHTTPServer, signal
def run(server_class=BaseHTTPServer.HTTPServer,
handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
server_address = ('localhost', 20059)
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 &
mkdir remote
cd remote
hg init
echo foo > bar
hg add bar
hg commit -m"test" -d"0 0"
hg tip
cd ..
http_proxy= hg clone old-http://localhost:20059/remote local
cd local
hg verify
cat bar
http_proxy= hg pull
kill $!