Merge with mpm
authorBrendan Cully <brendan@kublai.com>
Thu, 26 Jul 2007 10:43:01 -0700
changeset 5009 30570c2f576f
parent 4998 b6c3abdbe0eb (diff)
parent 5008 3addf4531643 (current diff)
child 5010 6b2d8caf87b2
child 5011 89fbb0a5e8e3
Merge with mpm
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -36,6 +36,11 @@ try:
 except ImportError:
     pass
 
+def geturl(path):
+    if os.path.isdir(path):
+        return 'file://%s' % os.path.normpath(os.path.abspath(path))
+    return path
+
 class CompatibilityException(Exception): pass
 
 class changedpath(object):
@@ -74,10 +79,10 @@ class convert_svn(converter_source):
                 url = url[:at]
         except ValueError, e:
             pass
-        self.url = url
+        self.url = geturl(url)
         self.encoding = 'UTF-8' # Subversion is always nominal UTF-8
         try:
-            self.transport = transport.SvnRaTransport(url=url)
+            self.transport = transport.SvnRaTransport(url=self.url)
             self.ra = self.transport.ra
             self.ctx = self.transport.client
             self.base = svn.ra.get_repos_root(self.ra)