tools.patch fails with new/deleted files

[theodelrieu]

Hello,

I tried to apply a .patch using tools.patch, however the dependency conan is using does not handle new/deleted files. (see this line in particular).

Furthermore, this library has not been updated in a year. This one looks maintained, I haven't tested it though.

To workaround that, I used self.run to launch git apply.

[memsharded]

Thanks for having a look at this, and the suggestion. I think we could try to use the proposed, maintained one, lets have a look.

[memsharded]

Could you please give a failing patch to apply? I guess it will be the typical ---- null, ++++new_file, right? We should add some test.

[theodelrieu]

Indeed, here is a minimum patch file that reproduces the error:

diff --git a/newfile b/newfile
new file mode 100644
index 0000000..ea450f9
--- /dev/null
+++ b/newfile
@@ -0,0 +1 @@
+New file

[memsharded]

The https://github.com/vrajat/git-patch repo is just a wrapper over git, I think it is better to use a python solution, for those not using git.

I have tried to contribute upstream: techtonik/python-patch#52

[theodelrieu]

I agree. Not sure the repo is still maintained though, looking at the last closed issue which was in September 2016.

Also I remember the patch command failed at the first warning, that might be why your PR doesn't pass.

[memsharded]

I have proposed a local fix in: #1898

The upstream is abandoned, no response from PR. Also there is already a PR for that issue long time ago, without response

Cannot find viable alternatives. Tried google patch-diff lib, but only from text-text no real unidiff with new and deletes.

[theodelrieu]

That's unfortunate... What about forking the repo? I don't see many options anyway.