# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1151112212 25200
# Node ID 4a2a4d988eadd46b682d7310a29e3577888d0692
# Parent  73ac956717888789eaa7c918b69d5bf241499245
make ui.expandpath better with default path.

diff -r 73ac95671788 -r 4a2a4d988ead mercurial/ui.py
--- a/mercurial/ui.py	Fri Jun 23 18:09:44 2006 -0700
+++ b/mercurial/ui.py	Fri Jun 23 18:23:32 2006 -0700
@@ -202,7 +202,10 @@
         if loc.find("://") != -1 or os.path.exists(loc):
             return loc
 
-        return self.config("paths", loc, default or loc)
+        path = self.config("paths", loc)
+        if not path and default is not None:
+            path = self.config("paths", default)
+        return path
 
     def write(self, *args):
         if self.header: