equal
deleted
inserted
replaced
106 vfs as vfsmod, |
106 vfs as vfsmod, |
107 ) |
107 ) |
108 from mercurial.utils import ( |
108 from mercurial.utils import ( |
109 dateutil, |
109 dateutil, |
110 stringutil, |
110 stringutil, |
|
111 urlutil, |
111 ) |
112 ) |
112 |
113 |
113 release = lockmod.release |
114 release = lockmod.release |
114 seriesopts = [(b's', b'summary', None, _(b'print first line of patch header'))] |
115 seriesopts = [(b's', b'summary', None, _(b'print first line of patch header'))] |
115 |
116 |
2507 raise error.Abort( |
2508 raise error.Abort( |
2508 _(b'-e is incompatible with import from -') |
2509 _(b'-e is incompatible with import from -') |
2509 ) |
2510 ) |
2510 filename = normname(filename) |
2511 filename = normname(filename) |
2511 self.checkreservedname(filename) |
2512 self.checkreservedname(filename) |
2512 if util.url(filename).islocal(): |
2513 if urlutil.url(filename).islocal(): |
2513 originpath = self.join(filename) |
2514 originpath = self.join(filename) |
2514 if not os.path.isfile(originpath): |
2515 if not os.path.isfile(originpath): |
2515 raise error.Abort( |
2516 raise error.Abort( |
2516 _(b"patch %s does not exist") % filename |
2517 _(b"patch %s does not exist") % filename |
2517 ) |
2518 ) |