Submitted PR: https://github.com/jenkinsci/patch-parameter-plugin/pull/2

H Shah,

I updated the test case to take care of line endings, but I am not sure if it fixes the "real" problem.

Are you trying to use patch file created on Unix on a Windows machine, or vice versa? If so, could you please update the description above?

Hi Charles

The problem lies with the diff4j jar. I tried using System.lineSeparator() and the test case passed but I am concerned with ContextualPatch. It reads a file using bufferedReader which is OS dependent and so will create a problem.

I am trying to use a patch file created on Unix machine on a windows machine.

Hi H Shah,

I pushed some changes to my local branch and updated the tests cases:
https://github.com/charleswhchan/patch-parameter-plugin/tree/JENKINS-27169/src/test/resources/org/jenkinsci/plugins/patch

Specifically, I created 2 patch files. One file for UNIX platform (LF line ending) and the other for Windows (CRLF line ending).

$ file unix-gitstyle.patch 
unix-gitstyle.patch: unified diff output, ASCII text

$ file windows-gitstyle.patch 
windows-gitstyle.patch: unified diff output, ASCII text, with CRLF line terminators

Then each patch is applied against foo.txt and verifies the output ends up in the native line ending format.
https://github.com/charleswhchan/patch-parameter-plugin/blob/JENKINS-27169/src/test/java/org/jenkinsci/plugins/patch/SomeTest.java

So base on the tests, your scenario should work?

Feel free to run and modify the test and let me know of your result.

H Shah, any updates?

Not yet will update once I work on it again.

Code changed in jenkins
User: Charles Chan
Path:
src/test/java/org/jenkinsci/plugins/patch/SomeTest.java
http://jenkins-ci.org/commit/patch-parameter-plugin/f35bfbe04b1db0839e79c915910e6cdd13aaeb43
Log:
CC - JENKINS-27169 - Modified the test to use System.lineSeparator() to ensure it pass on both Unix ("\n") and Windows ("\r\n") platforms.

Code changed in jenkins
User: Charles Chan
Path:
src/test/java/org/jenkinsci/plugins/patch/SomeTest.java
http://jenkins-ci.org/commit/patch-parameter-plugin/af3edaae7bcc7b6441348e3744c6fcc199ca3709
Log:
CC - JENKINS-27169 - Replace string concatenation with String.format().

Code changed in jenkins
User: Charles Chan
Path:
src/test/java/org/jenkinsci/plugins/patch/SomeTest.java
src/test/resources/org/jenkinsci/plugins/patch/.gitattributes
src/test/resources/org/jenkinsci/plugins/patch/gitstyle.patch
src/test/resources/org/jenkinsci/plugins/patch/unix-gitstyle.patch
src/test/resources/org/jenkinsci/plugins/patch/windows-gitstyle.patch
http://jenkins-ci.org/commit/patch-parameter-plugin/5309d4d92cd03317b7eab47f56065a721ca4955d
Log:
CC - JENKINS-27169 - Add test to verify ContextualPatch can work with patch files generated from either Windows or Unix platforms, each with their respective line endings (CRLF vs LF).

Note: Add .gitattributes files to preserve line ending for *.patch files.

Code changed in jenkins
User: Hugo Trippaers
Path:
src/test/java/org/jenkinsci/plugins/patch/SomeTest.java
src/test/resources/org/jenkinsci/plugins/patch/.gitattributes
src/test/resources/org/jenkinsci/plugins/patch/gitstyle.patch
src/test/resources/org/jenkinsci/plugins/patch/unix-gitstyle.patch
src/test/resources/org/jenkinsci/plugins/patch/windows-gitstyle.patch
http://jenkins-ci.org/commit/patch-parameter-plugin/69d93611c42ab5a0c406781cfe543329645f90fe
Log:
Merge pull request #2 from charleswhchan/JENKINS-27169

CC - JENKINS-27169 - Modified the test to use System.lineSeparator() to ...

Compare: https://github.com/jenkinsci/patch-parameter-plugin/compare/eae05e713ad0...69d93611c42a