Mercurial > hg > mercurial-crew

changeset 6086:152b6c5c1574

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 13 Feb 2008 19:34:28 -0200
parents e85deb6dcf9d (current diff) 28054773438c (diff)
children 41aa0a37d9be
files mercurial/hg.py mercurial/util.py
diffstat 3 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -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)
--- a/tests/test-clone
+++ b/tests/test-clone
@@ -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
--- a/tests/test-clone.out
+++ b/tests/test-clone.out
@@ -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