Mercurial > public > mercurial-scm > hg-stable
diff mercurial/ui.py @ 13827:f1823b9f073b
url: nuke some newly-introduced underbars in identifiers
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 31 Mar 2011 10:43:53 -0500 |
parents | cc383142e738 |
children | 9f97de157aad |
line wrap: on
line diff
--- a/mercurial/ui.py Wed Mar 30 20:03:05 2011 -0700 +++ b/mercurial/ui.py Thu Mar 31 10:43:53 2011 -0500 @@ -111,7 +111,7 @@ % (n, p, self.configsource('paths', n))) p = p.replace('%%', '%') p = util.expandpath(p) - if not url.has_scheme(p) and not os.path.isabs(p): + if not url.hasscheme(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 url.has_scheme(loc) or os.path.isdir(os.path.join(loc, '.hg')): + if url.hasscheme(loc) or os.path.isdir(os.path.join(loc, '.hg')): return loc path = self.config('paths', loc)