changeset 4220:ea976f5f3fa3

Merge with hg-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 15 Mar 2007 09:49:45 +0100
parents 76d541c6f3c0 (diff) 3be4785f8994 (current diff)
children 6af3df7822ed 2216535f07d7
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -362,7 +362,7 @@ class ui(object):
 
     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)