##// END OF EJS Templates
mq: clarify the fact that qimport is trying to read a file...
Nicolas Dumazet -
r11709:3e561b6a stable
parent child Browse files
Show More
@@ -1702,7 +1702,7 b' class queue(object):'
1702 else:
1702 else:
1703 text = url.open(self.ui, filename).read()
1703 text = url.open(self.ui, filename).read()
1704 except (OSError, IOError):
1704 except (OSError, IOError):
1705 raise util.Abort(_("unable to read %s") % filename)
1705 raise util.Abort(_("unable to read file %s") % filename)
1706 if not patchname:
1706 if not patchname:
1707 patchname = normname(os.path.basename(filename))
1707 patchname = normname(os.path.basename(filename))
1708 self.check_reserved_name(patchname)
1708 self.check_reserved_name(patchname)
@@ -4,7 +4,7 b' adding a'
4
4
5 #qimport valid patch followed by invalid patch
5 #qimport valid patch followed by invalid patch
6 adding b.patch to series file
6 adding b.patch to series file
7 abort: unable to read fakepatch
7 abort: unable to read file fakepatch
8
8
9 #valid patches before fail added to series
9 #valid patches before fail added to series
10 b.patch
10 b.patch
@@ -1,5 +1,5 b''
1 % qimport non-existing-file
1 % qimport non-existing-file
2 abort: unable to read non-existing-file
2 abort: unable to read file non-existing-file
3 % import email
3 % import email
4 adding email to series file
4 adding email to series file
5 applying email
5 applying email
General Comments 0
You need to be logged in to leave comments. Login now