Merge with crew
authorMatt Mackall <mpm@selenic.com>
Thu, 15 Mar 2007 18:55:53 -0500
changeset 4218 2216535f07d7
parent 4215 90bb1ab53a85 (current diff)
parent 4217 ea976f5f3fa3 (diff)
child 4224 2a8b6d78d7ee
child 4225 281f9f8f1bd4
Merge with crew
--- a/mercurial/ui.py	Thu Mar 15 18:38:46 2007 -0500
+++ b/mercurial/ui.py	Thu Mar 15 18:55:53 2007 -0500
@@ -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)