changeset 4216:76d541c6f3c0

Only hg repositories override [paths], not simple directories (fixes issue510)
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 14 Mar 2007 22:38:40 +0100
parents f80cf8b7bbd9
children ea976f5f3fa3 0a95d0e83b4c
files mercurial/ui.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/ui.py	Tue Mar 13 18:53:23 2007 -0500
+++ b/mercurial/ui.py	Wed Mar 14 22:38:40 2007 +0100
@@ -362,7 +362,7 @@
 
     def expandpath(self, loc, default=None):
         """Return repository location relative to cwd or from [paths]"""
-        if "://" in loc or os.path.isdir(loc):
+        if "://" in loc or os.path.isdir(os.path.join(loc, '.hg')):
             return loc
 
         path = self.config("paths", loc)