# HG changeset patch # User David Soria Parra # Date 1265736777 -3600 # Node ID 4f38d03d4975dc34be6b006df01fb77e95e05a7b # Parent 64a6a896e5fba0308bac98bf6631a6516b5d1dce subrepo: make sure that the source path is stripped Test by Patrick Mézard diff -r 64a6a896e5fb -r 4f38d03d4975 mercurial/subrepo.py --- a/mercurial/subrepo.py Sat Feb 13 23:50:38 2010 -0600 +++ b/mercurial/subrepo.py Tue Feb 09 18:32:57 2010 +0100 @@ -41,7 +41,7 @@ raise util.Abort(_('missing ] in subrepo source')) kind, src = src.split(']', 1) kind = kind[1:] - state[path] = (src, rev.get(path, ''), kind) + state[path] = (src.strip(), rev.get(path, ''), kind) return state diff -r 64a6a896e5fb -r 4f38d03d4975 tests/test-subrepo-svn --- a/tests/test-subrepo-svn Sat Feb 13 23:50:38 2010 -0600 +++ b/tests/test-subrepo-svn Tue Feb 09 18:32:57 2010 +0100 @@ -49,8 +49,8 @@ echo a > a hg ci -Am0 -echo % add first svn sub -echo "s = [svn]$SVNREPO/src" >> .hgsub +echo % add first svn sub with leading whitespaces +echo "s = [svn] $SVNREPO/src" >> .hgsub svn co --quiet $SVNREPO/src s hg add .hgsub hg ci -m1 diff -r 64a6a896e5fb -r 4f38d03d4975 tests/test-subrepo-svn.out --- a/tests/test-subrepo-svn.out Sat Feb 13 23:50:38 2010 -0600 +++ b/tests/test-subrepo-svn.out Tue Feb 09 18:32:57 2010 +0100 @@ -18,7 +18,7 @@ % create hg repo % first revision, no sub adding a -% add first svn sub +% add first svn sub with leading whitespaces committing subrepository s % debugsub path s