merge with crew-stable
authorThomas Arendsen Hein <thomas@intevation.de>
Wed, 14 Mar 2007 22:43:57 +0100
changeset 4221 0a95d0e83b4c
parent 4220 1253703853a8 (current diff)
parent 4216 76d541c6f3c0 (diff)
child 4222 2792dbd648c7
merge with crew-stable
mercurial/ui.py
--- a/mercurial/ui.py	Wed Mar 14 11:46:07 2007 -0700
+++ b/mercurial/ui.py	Wed Mar 14 22:43:57 2007 +0100
@@ -361,7 +361,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)