revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

using patch instead of "git apply"

Browse source
This commit is contained in:
Christian Kühnel 2020-01-22 13:19:31 +01:00
parent d99d32bdaa
commit 6dfeb6a728
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/phabtalk/apply_patch2.py
View file

@ -78,7 +78,7 @@ class ApplyPatch:
print('Checking out {}...'.format(base_revision)) print('Checking out {}...'.format(base_revision))
self.repo.git.checkout(base_revision) self.repo.git.checkout(base_revision)
print('Revision is {}'.format(self.repo.head.commit.hexsha)) print('Revision is {}'.format(self.repo.head.commit.hexsha))
print('Cleanup...') print('git reset, git cleanup...')
self.repo.git.reset('--hard') self.repo.git.reset('--hard')
self.repo.git.clean('-fdx') self.repo.git.clean('-fdx')
print('Analyzing {}'.format(diff_to_str(revision_id))) print('Analyzing {}'.format(diff_to_str(revision_id)))
@ -139,7 +139,7 @@ class ApplyPatch:
"""Download and apply a diff to the local working copy.""" """Download and apply a diff to the local working copy."""
print('Applying diff {} for revision {}...'.format(diff_id, diff_to_str(revision_id))) print('Applying diff {} for revision {}...'.format(diff_id, diff_to_str(revision_id)))
diff = self.phab.differential.getrawdiff(diffID=diff_id).response diff = self.phab.differential.getrawdiff(diffID=diff_id).response
proc = subprocess.run('git apply --whitespace=nowarn --binary -v', input=diff, shell=True, text=True, proc = subprocess.run('patch -p1', input=diff, shell=True, text=True,
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if proc.returncode != 0: if proc.returncode != 0:
raise Exception('Applying patch failed:\n{}'.format(proc.stdout + proc.stderr)) raise Exception('Applying patch failed:\n{}'.format(proc.stdout + proc.stderr))