diff tests/test-import-git.t @ 16522:a8065323c003 stable

patch: display a nice error for invalid base85 data

Before, import was terminating with a traceback. Now it says:

 $ hg import --no-commit ../bad.patch
 applying ../bad.patch
 abort: could not decode binary patch: bad base85 character at position 66

--- a/tests/test-import-git.t	Thu Apr 26 14:24:46 2012 +0200
+++ b/tests/test-import-git.t	Sat Apr 21 19:58:18 2012 +0200
@@ -362,6 +362,25 @@
   A binary2
     text2
   R text2
+
+Invalid base85 content
+  $ hg rollback
+  repository tip rolled back to revision 15 (undo import)
+  working directory now based on revision 15
+  $ hg revert -aq
+  $ hg import -d "1000000 0" -m invalid-binary - <<"EOF"
+  > diff --git a/text2 b/binary2
+  > rename from text2
+  > rename to binary2
+  > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757
+  > GIT binary patch
+  > literal 5
+  > Mc$`b*O.$Pw00T?_*Z=?k
+  > 
+  > EOF
+  applying patch from stdin
+  abort: could not decode binary patch: bad base85 character at position 6
+  [255]
   $ cd ..
 
 Consecutive import with renames (issue2459)