1541181 - `hg import` incorrectly handles files without newlines

Status: RESOLVED FIXED

(Conduit Graveyard :: Transplant, defect, P2)

Description

[:glob ✱]

hg import incorrectly handles files without newlines.

steps to reproduce:

1. create a file without a trailing newline
2. commit to a hg
3. delete the file
4. generate a diff
5. revert deletion
6. try to hg import the diff to delete the file

the diff will look like

$ hg diff
diff --git a/test-file b/test-file
deleted file mode 100644
--- a/test-file
+++ /dev/null
@@ -1,1 +0,0 @@
-content mybrowser file:chrome/content/
\ No newline at end of file

trying to apply results in

$ hg import patch
applying patch
patching file test-file
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file test-file.rej
abort: patch failed to apply

the bug is in mercurial's parsing of the hunk - it only reads the specified lines of context from the hunk header (one line as per -1,1), and never reads the \ No newline at end of file line to strip the trailing \n. this extra \n prevents the patch from applying.

Comment 2

[Steven MacLeod [:smacleod]]

I will file this with upstream mercurial.

Comment 3

[Steven MacLeod [:smacleod]]

Filed upstream as https://bz.mercurial-scm.org/show_bug.cgi?id=6127