switch to git apply of the generated patch (#12)

switch to git apply of the generated patch

In comparison to a regular diff we have binary files already in patch. It is also created with the purpose to be shared (by email). Try applying it instead.

Reviewed-by: OpenTelekomCloud Bot <None>

playbooks/propose_update.yaml

@@ -80,7 +80,8 @@
           vars:
             doc_label: "{{ doc.label }}"
             apply_doc_patch_repository: "{{ doc.repository }}"
-            apply_doc_patch_patch_file: "{{ ansible_user_dir }}/{{ doc.label }}.patch"
+            apply_doc_patch_diff_patch_file: "{{ ansible_user_dir }}/{{ doc.label }}.diff.patch"
+            apply_doc_patch_git_patch_file: "{{ ansible_user_dir }}/{{ doc.label }}.git.patch"
             apply_doc_patch_target_location: "{{ doc.project_location }}"
           loop: "{{ docs }}"
           loop_control:

roles/apply_doc_patch/defaults/main.yaml

@@ -4,3 +4,4 @@ apply_doc_patch_pr_title: |
   Changes to {{ doc_label }} from doc-exports#{{ zuul.change }}
 apply_doc_patch_pr_body_file: "{{ ansible_user_dir }}/{{ doc_label }}_pr_body.txt"
 apply_doc_patch_pr_label: "autoPR"
+apply_doc_patch_reject_file: "{{ ansible_user_dir }}/{{ doc_label }}_rej"

roles/apply_doc_patch/templates/patch_remainder_comment.txt.j2

@@ -0,0 +1,9 @@
+I tried my best, but could not apply the patch as is, therefore I will report you what I could not apply.
+
+BTW, if in the diff you see removed line equal to the added line it may be caused by invisible trailing spaces. This is safe to ignore.
+
+In most cases content of the patch remainder need to be carefully analyzed and necessary changes applied manually (i.e. by pushing additional commits to the PR once original PR in the doc-exports#{{ zuul.change }} repository closes or making another PR into {{ apply_doc_patch_branch_name }}).
+
+Following is the patch remainder:
+
+```