NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] forwardport: cherrypick logging

Browse Source 
Enable GIT_TRACE to try and get more information pertaining to the
cherrypicking process during failure.

Related to #449
This commit is contained in:
Xavier Morel 2021-01-18 07:37:59 +01:00
parent 1b7040cd26
commit b0576d1d41
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
forwardport/models/project.py
View File

@ -899,15 +899,20 @@ stderr:
# config (global -c) or commit options don't really give access to # config (global -c) or commit options don't really give access to
# setting dates # setting dates
cm = commit['commit'] # get the "git" commit object rather than the "github" commit resource cm = commit['commit'] # get the "git" commit object rather than the "github" commit resource
configured = working_copy.with_config(env={ env = {
'GIT_AUTHOR_NAME': cm['author']['name'], 'GIT_AUTHOR_NAME': cm['author']['name'],
'GIT_AUTHOR_EMAIL': cm['author']['email'], 'GIT_AUTHOR_EMAIL': cm['author']['email'],
'GIT_AUTHOR_DATE': cm['author']['date'], 'GIT_AUTHOR_DATE': cm['author']['date'],
'GIT_COMMITTER_NAME': cm['committer']['name'], 'GIT_COMMITTER_NAME': cm['committer']['name'],
'GIT_COMMITTER_EMAIL': cm['committer']['email'], 'GIT_COMMITTER_EMAIL': cm['committer']['email'],
}) }
configured = working_copy.with_config(env=env)
conf = configured.with_config(stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False) conf = working_copy.with_config(
env={**env, 'GIT_TRACE': 'true'},
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
check=False
)
# first try with default / low renamelimit # first try with default / low renamelimit
r = conf.cherry_pick(commit_sha) r = conf.cherry_pick(commit_sha)
logger.debug("Cherry-picked %s: %s\n%s\n%s", commit_sha, r.returncode, r.stdout.decode(), _clean_rename(r.stderr.decode())) logger.debug("Cherry-picked %s: %s\n%s\n%s", commit_sha, r.returncode, r.stdout.decode(), _clean_rename(r.stderr.decode()))