Merge with i18n-stable
authorMatt Mackall <mpm@selenic.com>
Wed, 12 Aug 2009 12:06:12 -0500
changeset 9344 eb6af02307ec
parent 9341 e15bc0433897
child 9345 94114ea3503d
child 9353 3ac42ca1f3e6
child 9497 91b9a06088da
Merge with i18n-stable
mercurial/hg.py
--- a/mercurial/hg.py	Wed Aug 05 10:56:20 2009 -0300
+++ b/mercurial/hg.py	Wed Aug 12 12:06:12 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)