wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

patchutils.py: Generate diff in git format.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-07-01 01:28:38 +02:00
parent 270b4f702b
commit 004c3abe40
2 changed files with 483 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

954
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

File diff suppressed because it is too large Load Diff

8
staging/patchutils.py
View File

@ -639,7 +639,7 @@ def generate_ifdef_patch(original, patched, ifdef):
# Now we can finally compute the diff between the patched file and our intermediate file
diff = tempfile.NamedTemporaryFile(mode='w+')
exitcode = subprocess.call(["diff", "-u", patched.name, intermediate.name],
exitcode = subprocess.call(["git", "diff", "--no-index", patched.name, intermediate.name],
stdout=diff, stderr=_devnull)
if exitcode != 1: # exitcode 0 cannot (=shouldn't) happen in this situation
raise PatchDiffError("Failed to compute diff (exitcode %d)." % exitcode)
@ -647,7 +647,11 @@ def generate_ifdef_patch(original, patched, ifdef):
diff.flush()
diff.seek(0)
# We expect this output format from 'diff', if this is not the case things might go wrong.
# We expect this output format from 'git diff', if this is not the case things might go wrong.
line = diff.readline()
assert line.startswith("diff --git ")
line = diff.readline()
assert line.startswith("index ")
line = diff.readline()
assert line.startswith("--- ")
line = diff.readline()