Merge with stable
authorMatt Mackall <mpm@selenic.com>
Wed, 12 Aug 2009 12:07:11 -0500
changeset 9345 94114ea3503d
parent 9343 3ebb457d2189 (current diff)
parent 9344 eb6af02307ec (diff)
child 9346 bb3f8f692bc6
child 9555 259a37f4017c
Merge with stable
mercurial/hg.py
--- 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)