diff mercurial/util.py @ 14918:ebdfdba0faaf

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 22 Jul 2011 17:17:23 -0500
parents ec46a7da9f2c 28edd65000d9
children 4e7e63fc685a
line wrap: on
line diff
--- a/mercurial/util.py	Thu Jul 21 15:10:16 2011 +0200
+++ b/mercurial/util.py	Fri Jul 22 17:17:23 2011 -0500
@@ -1332,6 +1332,8 @@
     <url scheme: 'ssh', host: '[::1]', port: '2200', path: '/home/joe/repo'>
     >>> url('file:///home/joe/repo')
     <url scheme: 'file', path: '/home/joe/repo'>
+    >>> url('file:///c:/temp/foo/')
+    <url scheme: 'file', path: 'c:/temp/foo/'>
     >>> url('bundle:foo')
     <url scheme: 'bundle', path: 'foo'>
     >>> url('bundle://../foo')
@@ -1421,7 +1423,7 @@
                     path = None
                 if not self.host:
                     self.host = None
-                    if path:
+                    if path and not hasdriveletter(path):
                         path = '/' + path
 
             if self.host and '@' in self.host: