Mercurial > hg-stable
changeset 6940:05ec27530d04
qimport: report filename in case of IOError
The old behaviour was to say "abort: unable to read" since the
patchname variable was always None.
| author | Martin Geisler <mg@daimi.au.dk> |
|---|---|
| date | Tue, 26 Aug 2008 00:04:18 +0200 |
| parents | 40cacb049ef6 |
| children | b2bc2d984bac |
| files | hgext/mq.py tests/test-mq-qimport tests/test-mq-qimport.out |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Wed Aug 27 12:49:39 2008 +0200 +++ b/hgext/mq.py Tue Aug 26 00:04:18 2008 +0200 @@ -1494,7 +1494,7 @@ else: text = file(filename, 'rb').read() except IOError: - raise util.Abort(_("unable to read %s") % patchname) + raise util.Abort(_("unable to read %s") % filename) if not patchname: patchname = normname(os.path.basename(filename)) self.check_reserved_name(patchname)
--- a/tests/test-mq-qimport Wed Aug 27 12:49:39 2008 +0200 +++ b/tests/test-mq-qimport Tue Aug 26 00:04:18 2008 +0200 @@ -21,9 +21,13 @@ echo "[diff]" >> $HGRCPATH echo "git=1" >> $HGRCPATH -echo % build diff with CRLF hg init repo cd repo + +echo % qimport non-existing-file +hg qimport non-existing-file + +echo % build diff with CRLF 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'
--- a/tests/test-mq-qimport.out Wed Aug 27 12:49:39 2008 +0200 +++ b/tests/test-mq-qimport.out Tue Aug 26 00:04:18 2008 +0200 @@ -1,3 +1,5 @@ +% qimport non-existing-file +abort: unable to read non-existing-file % build diff with CRLF adding b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved