##// END OF EJS Templates
qimport: report filename in case of IOError...
Martin Geisler -
r6940:05ec2753 default
parent child Browse files
Show More
@@ -1494,7 +1494,7 b' class queue:'
1494 else:
1494 else:
1495 text = file(filename, 'rb').read()
1495 text = file(filename, 'rb').read()
1496 except IOError:
1496 except IOError:
1497 raise util.Abort(_("unable to read %s") % patchname)
1497 raise util.Abort(_("unable to read %s") % filename)
1498 if not patchname:
1498 if not patchname:
1499 patchname = normname(os.path.basename(filename))
1499 patchname = normname(os.path.basename(filename))
1500 self.check_reserved_name(patchname)
1500 self.check_reserved_name(patchname)
@@ -21,9 +21,13 b' echo "mq=" >> $HGRCPATH'
21 echo "[diff]" >> $HGRCPATH
21 echo "[diff]" >> $HGRCPATH
22 echo "git=1" >> $HGRCPATH
22 echo "git=1" >> $HGRCPATH
23
23
24 echo % build diff with CRLF
25 hg init repo
24 hg init repo
26 cd repo
25 cd repo
26
27 echo % qimport non-existing-file
28 hg qimport non-existing-file
29
30 echo % build diff with CRLF
27 python ../writelines.py b 5 'a\n' 5 'a\r\n'
31 python ../writelines.py b 5 'a\n' 5 'a\r\n'
28 hg ci -Am addb
32 hg ci -Am addb
29 python ../writelines.py b 2 'a\n' 10 'b\n' 2 'a\r\n'
33 python ../writelines.py b 2 'a\n' 10 'b\n' 2 'a\r\n'
@@ -1,3 +1,5 b''
1 % qimport non-existing-file
2 abort: unable to read non-existing-file
1 % build diff with CRLF
3 % build diff with CRLF
2 adding b
4 adding b
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
General Comments 0
You need to be logged in to leave comments. Login now