# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1173908637 -3600
# Node ID 0a95d0e83b4cf9c4026e0e15c73936b5cee99e95
# Parent  1253703853a89a0922f7d06526d573c2c98314d6# Parent  76d541c6f3c0ddc926825276af02fbf7192c774a
merge with crew-stable

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