# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 2008-04-13 02:41:07
# Node ID ba0b2dacc6235daab2ee2a0223692ac4c5c617b7
# Parent  a7582980d65484557673077290dccb174ddc7588

fix import with -p0

diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -789,7 +789,7 @@ def selectfile(afile_orig, bfile_orig, h
         pathlen = len(path)
         i = 0
         if count == 0:
-            return path.rstrip()
+            return '', path.rstrip()
         while count > 0:
             i = path.find('/', i)
             if i == -1:
diff --git a/tests/test-import b/tests/test-import
--- a/tests/test-import
+++ b/tests/test-import
@@ -244,3 +244,20 @@ echo % view a2
 # and a2 should have duplicated it
 cat a2
 cd ..
+
+echo % 'test -p0'
+hg init p0
+cd p0
+echo a > a
+hg ci -Am t
+hg import -p0 - << EOF
+foobar
+--- a	Sat Apr 12 22:43:58 2008 -0400
++++ a	Sat Apr 12 22:44:05 2008 -0400
+@@ -1,1 +1,1 @@
+-a
++bb
+EOF
+hg status
+cat a
+cd ..
diff --git a/tests/test-import.out b/tests/test-import.out
--- a/tests/test-import.out
+++ b/tests/test-import.out
@@ -256,3 +256,7 @@ applying copy.diff
 a
 % view a2
 a
+% test -p0
+adding a
+applying patch from stdin
+bb