merge with crew-stable

mercurial/hg.py

@@ -105,14 +105,14 b' def clone(ui, source, dest=None, pull=Fa'
     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)

tests/test-clone

@@ -32,4 +32,8 b' cd ../..'
 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

tests/test-clone.out

@@ -15,3 +15,4 b' destination directory: a'
 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