fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pick-ui: rename s/out/commit_message/ variable to make its contents clearer

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34117>
This commit is contained in:
Eric Engestrom 2020-04-29 19:40:10 +02:00 • committed by Marge Bot
parent 2c9ae634ef
commit f8d07396fa
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bin/pick/core.py
View file

@ -276,10 +276,10 @@ async def resolve_nomination(commit: 'Commit', version: str) -> 'Commit':
)
_out, _ = await p.communicate()
assert p.returncode == 0, f'git log for {commit.sha} failed'
out = _out.decode()
commit_message = _out.decode()
# We give precedence to fixes and cc tags over revert tags.
if fix_for_commit := IS_FIX.search(out):
if fix_for_commit := IS_FIX.search(commit_message):
# We set the nomination_type and because_sha here so that we can later
# check to see if this fixes another staged commit.
try:
@ -292,19 +292,19 @@ async def resolve_nomination(commit: 'Commit', version: str) -> 'Commit':
commit.nominated = True
return commit
if backport_to := IS_BACKPORT.search(out):
if backport_to := IS_BACKPORT.search(commit_message):
if version in backport_to.groups():
commit.nominated = True
commit.nomination_type = NominationType.BACKPORT
return commit
if cc_to := IS_CC.search(out):
if cc_to := IS_CC.search(commit_message):
if cc_to.groups() == (None, None) or version in cc_to.groups():
commit.nominated = True
commit.nomination_type = NominationType.CC
return commit
if revert_of := IS_REVERT.search(out):
if revert_of := IS_REVERT.search(commit_message):
# See comment for IS_FIX path
try:
commit.because_sha = reverted = await full_sha(revert_of.group(1))