thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Parce commit message from merge commit name and search for it instead of commit number.

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-03-17 17:38:11 +03:00
parent d1556ba3ab
commit 339e818051
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
utils/make_changelog.py
View File

@ -131,6 +131,15 @@ def parse_original_commits_from_cherry_pick_message(commit_message):
# Use GitHub search api to check if commit from any pull request. Update pull_requests info. # Use GitHub search api to check if commit from any pull request. Update pull_requests info.
def find_pull_request_for_commit(commit_info, pull_requests, token, max_retries, retry_timeout): def find_pull_request_for_commit(commit_info, pull_requests, token, max_retries, retry_timeout):
commits = [commit_info['sha']] + parse_original_commits_from_cherry_pick_message(commit_info['commit']['message']) commits = [commit_info['sha']] + parse_original_commits_from_cherry_pick_message(commit_info['commit']['message'])
# Special case for cherry-picked merge commits without -x option. Parse pr number from commit message and search it.
if commit_info['commit']['message'].startswith('Merge pull request'):
tokens = commit_info['commit']['message'][len('Merge pull request'):].split()
if len(tokens) > 0 and tokens[0].startswith('#'):
pr_number = tokens[0][1:]
if len(pr_number) > 0 and pr_number.isdigit():
commits = [pr_number]
query = 'search/issues?q={}+type:pr+repo:{}&sort=created&order=asc'.format(' '.join(commits), repo) query = 'search/issues?q={}+type:pr+repo:{}&sort=created&order=asc'.format(' '.join(commits), repo)
resp = github_api_get_json(query, token, max_retries, retry_timeout) resp = github_api_get_json(query, token, max_retries, retry_timeout)