##// END OF EJS Templates
ui: replace parentui mechanism with repo.baseui
ui: replace parentui mechanism with repo.baseui

File last commit:

r7421:4c432447 default
r8189:d2899a85 default
Show More
test-mq-qimport
72 lines | 1.3 KiB | text/plain | TextLexer
Patrick Mezard
mq: qimport must read patches in binary mode
r6027 #!/bin/sh
cat > writelines.py <<EOF
import sys
path = sys.argv[1]
args = sys.argv[2:]
assert (len(args) % 2) == 0
f = file(path, 'wb')
for i in xrange(len(args)/2):
count, s = args[2*i:2*i+2]
count = int(count)
s = s.decode('string_escape')
f.write(s*count)
f.close()
EOF
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
echo "[diff]" >> $HGRCPATH
echo "git=1" >> $HGRCPATH
hg init repo
cd repo
Martin Geisler
qimport: report filename in case of IOError...
r6940
echo % qimport non-existing-file
Benoit Boissinot
Catch both IOError and OSError, fix regression introduced by 8046f0a070a6
r7421 hg qimport non-existing-file
Martin Geisler
qimport: report filename in case of IOError...
r6940
Brendan Cully
mq: let qimport read patches from URLs
r7158 echo % import URL
echo foo >> foo
hg add foo
hg diff > $HGTMP/url.diff
hg revert --no-backup foo
rm foo
Patrick Mezard
test-mq-qimport: fix URL generation under windows
r7266 # Under unix: file:///foobar/blah
# Under windows: file:///c:/foobar/blah
Benoit Boissinot
'\' should be escaped twice, for the shell, and for tr
r7273 patchurl=`echo $HGTMP/url.diff | tr '\\\\' /`
Patrick Mezard
test-mq-qimport: fix URL generation under windows
r7266 expr $patchurl : "\/" > /dev/null
if [ $? -ne 0 ]; then
patchurl='/'$patchurl
fi
hg qimport file://$patchurl
Brendan Cully
mq: let qimport read patches from URLs
r7158 hg qun
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
r7160 echo % import patch that already exists
echo foo2 >> foo
hg add foo
hg diff > ../url.diff
hg revert --no-backup foo
rm foo
hg qimport ../url.diff
hg qpush
cat foo
hg qpop
echo % qimport -f
hg qimport -f ../url.diff
hg qpush
cat foo
hg qpop
Martin Geisler
qimport: report filename in case of IOError...
r6940 echo % build diff with CRLF
Patrick Mezard
mq: qimport must read patches in binary mode
r6027 python ../writelines.py b 5 'a\n' 5 'a\r\n'
hg ci -Am addb
python ../writelines.py b 2 'a\n' 10 'b\n' 2 'a\r\n'
hg diff > b.diff
hg up -C
echo % qimport CRLF diff
hg qimport b.diff
hg qpush