changeset 4218:2216535f07d7

Merge with crew
author Matt Mackall <mpm@selenic.com>
date Thu, 15 Mar 2007 18:55:53 -0500
parents 90bb1ab53a85 (current diff) ea976f5f3fa3 (diff)
children 2a8b6d78d7ee 281f9f8f1bd4
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)