Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
authorThomas Arendsen Hein <thomas@intevation.de>
Wed, 14 Mar 2007 22:43:57 +0100
changeset 4213 0a95d0e83b4c
parent 4211 1253703853a8 (current diff)
parent 4212 76d541c6f3c0 (diff)
child 4219 2792dbd648c7
merge with crew-stable
mercurial/ui.py file | annotate | diff | comparison | revisions 
--- 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)
mercurial-crew-with-dirclash