# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1266149151 -3600
# Node ID 7fbba0c04f92028c9a7c19f44753c2ba888b9cf2
# Parent  40dfd46d098f179518358b1233f3caa22f63d402# Parent  4f38d03d4975dc34be6b006df01fb77e95e05a7b
Merge with crew-stable

diff -r 40dfd46d098f -r 7fbba0c04f92 contrib/bash_completion
diff -r 40dfd46d098f -r 7fbba0c04f92 contrib/zsh_completion
diff -r 40dfd46d098f -r 7fbba0c04f92 mercurial/subrepo.py
--- a/mercurial/subrepo.py	Sun Feb 07 14:56:18 2010 +0100
+++ b/mercurial/subrepo.py	Sun Feb 14 13:05:51 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 40dfd46d098f -r 7fbba0c04f92 tests/test-subrepo-svn
--- a/tests/test-subrepo-svn	Sun Feb 07 14:56:18 2010 +0100
+++ b/tests/test-subrepo-svn	Sun Feb 14 13:05:51 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 40dfd46d098f -r 7fbba0c04f92 tests/test-subrepo-svn.out
--- a/tests/test-subrepo-svn.out	Sun Feb 07 14:56:18 2010 +0100
+++ b/tests/test-subrepo-svn.out	Sun Feb 14 13:05:51 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