Show More
@@ -13,9 +13,14 b' where WRITER is the name of a Docutils w' | |||||
13 | """ |
|
13 | """ | |
14 |
|
14 | |||
15 | import sys |
|
15 | import sys | |
|
16 | try: | |||
16 | from docutils.parsers.rst import roles |
|
17 | from docutils.parsers.rst import roles | |
17 | from docutils.core import publish_cmdline |
|
18 | from docutils.core import publish_cmdline | |
18 | from docutils import nodes, utils |
|
19 | from docutils import nodes, utils | |
|
20 | except ImportError: | |||
|
21 | sys.stderr.write("abort: couldn't generate documentation: docutils " | |||
|
22 | "module is missing\n") | |||
|
23 | sys.exit(-1) | |||
19 |
|
24 | |||
20 | def role_hg(name, rawtext, text, lineno, inliner, |
|
25 | def role_hg(name, rawtext, text, lineno, inliner, | |
21 | options={}, content=[]): |
|
26 | options={}, content=[]): |
@@ -1713,7 +1713,7 b' class queue(object):' | |||||
1713 | else: |
|
1713 | else: | |
1714 | text = url.open(self.ui, filename).read() |
|
1714 | text = url.open(self.ui, filename).read() | |
1715 | except (OSError, IOError): |
|
1715 | except (OSError, IOError): | |
1716 | raise util.Abort(_("unable to read %s") % filename) |
|
1716 | raise util.Abort(_("unable to read file %s") % filename) | |
1717 | if not patchname: |
|
1717 | if not patchname: | |
1718 | patchname = normname(os.path.basename(filename)) |
|
1718 | patchname = normname(os.path.basename(filename)) | |
1719 | self.check_reserved_name(patchname) |
|
1719 | 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 |
General Comments 0
You need to be logged in to leave comments.
Login now