# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2007-03-15 23:55:53
# Node ID 2216535f07d752e93f5626a9d9df1eae7934efef
# Parent  90bb1ab53a853b4f52940186dc6010fdf2290903
# Parent  ea976f5f3fa38eeda7b2f399ae35e410b6599c64

Merge with crew

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- 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)