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] runbot_merge: debug logging when rebasing

Browse Source
This commit is contained in:
Xavier Morel 2019-01-25 15:45:38 +01:00
parent e169934e61
commit 4490c8f119
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runbot_merge/github.py
View File

@ -137,10 +137,14 @@ class GH(object):
Returns the hash of the rebased head. Returns the hash of the rebased head.
""" """
logger = _logger.getChild('rebase')
original_head = self.head(dest) original_head = self.head(dest)
if commits is None: if commits is None:
commits = self.commits(pr) commits = self.commits(pr)
logger.debug("rebasing %s, %s on %s (reset=%s, commits=%s)",
self._repo, pr, dest, reset, len(commits))
assert commits, "can't rebase a PR with no commits" assert commits, "can't rebase a PR with no commits"
for c in commits: for c in commits:
assert len(c['parents']) == 1, "can't rebase commits with more than one parent" assert len(c['parents']) == 1, "can't rebase commits with more than one parent"
@ -156,6 +160,7 @@ class GH(object):
'author': c['commit']['author'], 'author': c['commit']['author'],
'committer': c['commit']['committer'], 'committer': c['commit']['committer'],
}, check={409: exceptions.MergeError}).json() }, check={409: exceptions.MergeError}).json()
logger.debug('copied %s to %s (parent: %s)', c['sha'], copy['sha'], prev)
prev = copy['sha'] prev = copy['sha']
if reset: if reset:
@ -163,8 +168,8 @@ class GH(object):
else: else:
self.set_ref(dest, prev) self.set_ref(dest, prev)
_logger.debug('%s, %s, %s, reset=%s, commits=%s) -> %s', logger.debug('rebased %s, %s on %s (reset=%s, commits=%s) -> %s',
self._repo, pr, dest, reset, commits and len(commits), self._repo, pr, dest, reset, len(commits),
prev) prev)
# prev is updated after each copy so it's the rebased PR head # prev is updated after each copy so it's the rebased PR head
return prev return prev