--- a/mercurial/ui.py Wed Mar 30 20:02:09 2011 -0700
+++ b/mercurial/ui.py Wed Mar 30 20:02:17 2011 -0700
@@ -7,7 +7,7 @@
from i18n import _
import errno, getpass, os, socket, sys, tempfile, traceback
-import config, util, error
+import config, util, error, url
class ui(object):
def __init__(self, src=None):
@@ -111,7 +111,7 @@
% (n, p, self.configsource('paths', n)))
p = p.replace('%%', '%')
p = util.expandpath(p)
- if '://' not in p and not os.path.isabs(p):
+ if not url.has_scheme(p) and not os.path.isabs(p):
p = os.path.normpath(os.path.join(root, p))
c.set("paths", n, p)
@@ -325,7 +325,7 @@
def expandpath(self, loc, default=None):
"""Return repository location relative to cwd or from [paths]"""
- if "://" in loc or os.path.isdir(os.path.join(loc, '.hg')):
+ if url.has_scheme(loc) or os.path.isdir(os.path.join(loc, '.hg')):
return loc
path = self.config('paths', loc)