Merge with crew

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)