Mercurial > hg
changeset 11709:3e561b6af810 stable
mq: clarify the fact that qimport is trying to read a file
"hg qimport tip" would throw "abort: unable to read tip" before this.
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Sat, 31 Jul 2010 10:50:29 +0900 |
| parents | 13d79a7bf5b7 |
| children | 58a038605a2b |
| files | hgext/mq.py tests/test-mq-qimport-fail-cleanup.out tests/test-mq-qimport.out |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Fri Jul 30 14:41:47 2010 +0900 +++ b/hgext/mq.py Sat Jul 31 10:50:29 2010 +0900 @@ -1702,7 +1702,7 @@ else: text = url.open(self.ui, filename).read() except (OSError, IOError): - raise util.Abort(_("unable to read %s") % filename) + raise util.Abort(_("unable to read file %s") % filename) if not patchname: patchname = normname(os.path.basename(filename)) self.check_reserved_name(patchname)
--- a/tests/test-mq-qimport-fail-cleanup.out Fri Jul 30 14:41:47 2010 +0900 +++ b/tests/test-mq-qimport-fail-cleanup.out Sat Jul 31 10:50:29 2010 +0900 @@ -4,7 +4,7 @@ #qimport valid patch followed by invalid patch adding b.patch to series file -abort: unable to read fakepatch +abort: unable to read file fakepatch #valid patches before fail added to series b.patch
--- a/tests/test-mq-qimport.out Fri Jul 30 14:41:47 2010 +0900 +++ b/tests/test-mq-qimport.out Sat Jul 31 10:50:29 2010 +0900 @@ -1,5 +1,5 @@ % qimport non-existing-file -abort: unable to read non-existing-file +abort: unable to read file non-existing-file % import email adding email to series file applying email