# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1202938468 7200
# Node ID 152b6c5c1574871124f9c093bcbbbeda5594e927
# Parent  e85deb6dcf9d9265a2a35b5ec6fac36dfed28aee# Parent  28054773438cc31fa91de5501c43b086507a2882
merge with crew-stable

diff -r e85deb6dcf9d -r 152b6c5c1574 mercurial/hg.py
--- a/mercurial/hg.py	Wed Feb 13 16:46:43 2008 +0100
+++ b/mercurial/hg.py	Wed Feb 13 19:34:28 2008 -0200
@@ -105,14 +105,14 @@
     destination is local repository
     """
 
-    origsource = source
-    source, rev, checkout = parseurl(ui.expandpath(source), rev)
-
     if isinstance(source, str):
+        origsource = ui.expandpath(source)
+        source, rev, checkout = parseurl(origsource, rev)
         src_repo = repository(ui, source)
     else:
         src_repo = source
-        source = src_repo.url()
+        origsource = source = src_repo.url()
+        checkout = None
 
     if dest is None:
         dest = defaultdest(source)
diff -r e85deb6dcf9d -r 152b6c5c1574 mercurial/util.py
diff -r e85deb6dcf9d -r 152b6c5c1574 tests/test-clone
--- a/tests/test-clone	Wed Feb 13 16:46:43 2008 +0100
+++ b/tests/test-clone	Wed Feb 13 19:34:28 2008 -0200
@@ -32,4 +32,8 @@
 hg clone file://a e
 grep 'file:' e/.hg/hgrc
 
+# check that path aliases are expanded
+hg clone -q -U --config 'paths.foobar=a#0' foobar f
+hg -R f showconfig paths.default | sed -e 's,.*/,,'
+
 exit 0
diff -r e85deb6dcf9d -r 152b6c5c1574 tests/test-clone.out
--- a/tests/test-clone.out	Wed Feb 13 16:46:43 2008 +0100
+++ b/tests/test-clone.out	Wed Feb 13 19:34:28 2008 -0200
@@ -15,3 +15,4 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 a
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+a#0