1827 util.rename(originpath, self.join(patchname)) |
1827 util.rename(originpath, self.join(patchname)) |
1828 else: |
1828 else: |
1829 patchname = filename |
1829 patchname = filename |
1830 |
1830 |
1831 else: |
1831 else: |
|
1832 if filename == '-' and not patchname: |
|
1833 raise util.Abort(_('need --name to import a patch from -')) |
|
1834 elif not patchname: |
|
1835 patchname = normname(os.path.basename(filename)) |
|
1836 self.check_reserved_name(patchname) |
|
1837 checkfile(patchname) |
1832 try: |
1838 try: |
1833 if filename == '-': |
1839 if filename == '-': |
1834 if not patchname: |
|
1835 raise util.Abort( |
|
1836 _('need --name to import a patch from -')) |
|
1837 text = sys.stdin.read() |
1840 text = sys.stdin.read() |
1838 else: |
1841 else: |
1839 fp = url.open(self.ui, filename) |
1842 fp = url.open(self.ui, filename) |
1840 text = fp.read() |
1843 text = fp.read() |
1841 fp.close() |
1844 fp.close() |
1842 except (OSError, IOError): |
1845 except (OSError, IOError): |
1843 raise util.Abort(_("unable to read file %s") % filename) |
1846 raise util.Abort(_("unable to read file %s") % filename) |
1844 if not patchname: |
|
1845 patchname = normname(os.path.basename(filename)) |
|
1846 self.check_reserved_name(patchname) |
|
1847 checkfile(patchname) |
|
1848 patchf = self.opener(patchname, "w") |
1847 patchf = self.opener(patchname, "w") |
1849 patchf.write(text) |
1848 patchf.write(text) |
1850 patchf.close() |
1849 patchf.close() |
1851 if not force: |
1850 if not force: |
1852 checkseries(patchname) |
1851 checkseries(patchname) |