Mercurial > public > mercurial-scm > hg

diff hgext/mq.py @ 14396:170747a3e139

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: strip all leading slashes from url when importing When trying to import a url that ends with a slash os.path.basename() would return an empty string. So when seeing a leading slash, remove it and infer the patch name from the remaining url. e.g. `hg qimport http://paste.pocoo.org/raw/xxx/` deduced '.' to be the patch name. Now we'll deduce 'xxx'.
author Idan Kamara <idankk86@gmail.com>
date Fri, 20 May 2011 21:20:24 +0300
parents dc961471efde
children 2e77525e52d9
line wrap: on
line diff
--- a/hgext/mq.py	Fri May 20 21:19:33 2011 +0300
+++ b/hgext/mq.py	Fri May 20 21:20:24 2011 +0300
@@ -1832,7 +1832,7 @@
                 if filename == '-' and not patchname:
                     raise util.Abort(_('need --name to import a patch from -'))
                 elif not patchname:
-                    patchname = normname(os.path.basename(filename))
+                    patchname = normname(os.path.basename(filename.rstrip('/')))
                 self.check_reserved_name(patchname)
                 checkfile(patchname)
                 try: