PR#3434: Fix splitting the diff per file - pagure

pagure

#3434 Fix splitting the diff per file

Merged 6 years ago by pingou. Opened 6 years ago by pingou.

fix_split_diff into master

Fix splitting the diff per file

Pierre-Yves Chibon • 6 years ago

ed25f0a

pagure/lib/git.py

file modified

+5 -3

		`@@ -86,9 +86,11 @@`

		`if diff_view:`
		`if separated:`
		`- for el in diff.patch.split('diff --git a/'):`
		`- if el:`
		`- patch.append('diff --git a/' + el)`
		`+ for el in diff.patch.split('\ndiff --git a/'):`
		`+ if el and not el.startswith('diff --git a/'):`
		`+ patch.append('\ndiff --git a/' + el)`
		`+ elif el:`
		`+ patch.append(el)`
		`else:`
		`patch.append(diff.patch)`
		`else:`

pingou commented 6 years ago

Basically, when rendering diffs, we split them by file so we can render
the changes made to each file separately.
However, if one of the file happens to contain a diff itself (for example
if that file is a patch), then we don't want to split that, it'll make a
mess.
So rather than splitting on "diff --git a/" we ensure we're spliting on new
lines starting with this by splitting on "\ndiff --git a/".

Fixes https://pagure.io/pagure/issue/3426

Signed-off-by: Pierre-Yves Chibon pingou@pingoured.fr