changeset 9345:94114ea3503d

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 12 Aug 2009 12:07:11 -0500
parents 3ebb457d2189 (current diff) eb6af02307ec (diff)
children bb3f8f692bc6 259a37f4017c
files mercurial/hg.py
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Wed Aug 12 12:05:35 2009 -0500
+++ b/mercurial/hg.py	Wed Aug 12 12:07:11 2009 -0500
@@ -89,6 +89,8 @@
 
     if not dest:
         dest = os.path.basename(source)
+    else:
+        dest = ui.expandpath(dest)
 
     if isinstance(source, str):
         origsource = ui.expandpath(source)
@@ -189,6 +191,8 @@
     if dest is None:
         dest = defaultdest(source)
         ui.status(_("destination directory: %s\n") % dest)
+    else:
+        dest = ui.expandpath(dest)
 
     dest = localpath(dest)
     source = localpath(source)