diff options
| author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2021-10-06 14:34:11 -0400 |
|---|---|---|
| committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2021-10-06 14:34:11 -0400 |
| commit | b115b6a4496376c40cf38478f1dbccfe6612a4fc (patch) | |
| tree | 93830f9ffbeea4b8286f0830e421a589e90d4335 | |
| parent | 7b1be98a1f49cd42f1405335cb589d575272a041 (diff) | |
| download | korg-helpers-b115b6a4496376c40cf38478f1dbccfe6612a4fc.tar.gz | |
git-patchwork-bot: Handle more merge commit formats
When recognizing merge commits, handle merge messages that do not
mention the refname of the remote.
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
| -rwxr-xr-x | git-patchwork-bot.py | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/git-patchwork-bot.py b/git-patchwork-bot.py index b5fbf7a..19a3267 100755 --- a/git-patchwork-bot.py +++ b/git-patchwork-bot.py @@ -269,7 +269,7 @@ def get_patchwork_pull_requests_by_project(rm, project, fromstate): pull_url = entry.get('pull_url') if pull_url: patch_id = entry.get('id') - logger.debug('Found pull request: %s (%s)', pull_url, patch_id) + logger.info('Found pull request: %s (%s)', pull_url, patch_id) chunks = pull_url.split() pull_host = chunks[0] if len(chunks) > 1: @@ -1157,18 +1157,26 @@ def pwrun(repo, rsettings): revs = dict() for rev, logline, pwhash in hashpairs: if have_prs and pwhash is None: - matches = re.search(r'Merge\s(\S+)\s[\'\"](\S+)[\'\"]\sof\s(\w+://\S+)', logline) - if not matches: + if logline.contains(' of '): + matches = re.search(r'Merge\s\S+\s[\'\"](\S+)[\'\"]\sof\s(\w+://\S+)', logline) + if not matches: + continue + m_refname = matches.group(1) + m_host = matches.group(2) + elif logline.contains('://'): + matches = re.search(r'Merge\s(\w+://\S+)', logline) + if not matches: + continue + m_refname = 'master' + m_host = matches.group(1) + else: continue - m_obj = matches.group(1) - m_refname = matches.group(2) - m_host = matches.group(3) - logger.debug('Looking for %s %s %s', m_obj, m_refname, m_host) + logger.debug('Looking for ref %s host %s', m_refname, m_host) for pull_host, pull_refname, patch_id in prs: if pull_host.find(m_host) > -1 and pull_refname.find(m_refname) > -1: - logger.debug('Found matching pull request in %s (id: %s)', logline, patch_id) + logger.info('Found matching pull request in %s (id: %s)', logline, patch_id) revs[patch_id] = rev break continue |