admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flush NewContents cache in CheckPatchFormatted

Browse Source 
Prior to https://crrev.com/c/5740609, NewContents never flushed cache
so the second NewContents() would always produce the same contents
post-yapf as as pre-yapf. Flush cache on second NewContents() call to
get updated file contents. Also fix the formatting a bit.

Bug: b/333744051
Change-Id: Ic627dd72675d7d3694b1978635ae047b38f06596
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357960
Auto-Submit: Gavin Mak <gavinmak@google.com>
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42677}
This commit is contained in:
Gavin Mak 2024-07-26 19:50:13 +00:00 committed by WebRTC LUCI CQ
parent 76430c0bf1
commit be6bda7f64
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
infra/specs/PRESUBMIT.py
View File

@ -34,17 +34,18 @@ def CheckPatchFormatted(input_api, output_api):
output_api.PresubmitError('Error calling "' + shlex.join(cmd) + '"') output_api.PresubmitError('Error calling "' + shlex.join(cmd) + '"')
) )
new_content = f.NewContents() # Make sure NewContents reads the updated files from disk and not cache.
new_content = f.NewContents(flush_cache=True)
if new_content != prev_content: if new_content != prev_content:
path = f.LocalPath() path = f.LocalPath()
diff = difflib.unified_diff(prev_content, new_content, path, path) diff = difflib.unified_diff(prev_content, new_content, path, path, lineterm='')
diffs.append(''.join(diff)) diffs.append('\n'.join(diff))
if diffs: if diffs:
combined_diffs = '\n'.join(diffs) combined_diffs = '\n'.join(diffs)
msg = ( msg = (
'Diff found after running "yapf -i" on modified .pyl files:\n' 'Diff found after running "yapf -i" on modified .pyl files:\n\n'
f'{combined_diffs}\n' f'{combined_diffs}\n\n'
'Please commit or discard the new changes.' 'Please commit or discard the new changes.'
) )
results.append(output_api.PresubmitError(msg)) results.append(output_api.PresubmitError(msg))