1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
#!/usr/bin/env python3
import os
import datetime
import logging
import subprocess
import argparse
from github import Github, GithubException, GithubObject, Commit
class CherryPickCreator:
def __init__(self, args):
def __split(s: str, seps: str = ', \n'):
if not s:
return []
if not seps:
return [s]
result = []
for part in s.split(seps[0]):
result += __split(part, seps[1:])
return result
def __add_commit(c: str, single: bool):
commit = self.repo.get_commit(c)
pulls = commit.get_pulls()
if pulls.totalCount > 0:
pr = pulls.get_page(0)[0]
if single:
self.pr_title_list.append(pr.title)
else:
self.pr_title_list.append(f'commit {commit.sha}')
self.pr_body_list.append(f"* commit {commit.html_url}: {pr.title }")
else:
if single:
self.pr_title_list.append(f'cherry-pick commit {commit.sha}')
else:
self.pr_title_list.append(f'commit {commit.sha}')
self.pr_body_list.append(f"* commit {commit.html_url}")
self.commit_shas.append(commit.sha)
def __add_pull(p: int, single: bool):
pull = self.repo.get_pull(p)
if single:
self.pr_title_list.append(f"{pull.title}")
else:
self.pr_title_list.append(f'PR {pull.number}')
self.pr_body_list.append(f"* PR {pull.html_url}")
self.commit_shas.append(pull.merge_commit_sha)
self.repo_name = os.environ["REPO"]
self.target_branches = __split(args.target_branches)
self.token = os.environ["TOKEN"]
self.gh = Github(login_or_token=self.token)
self.repo = self.gh.get_repo(self.repo_name)
self.commit_shas: list[str] = []
self.pr_title_list: list[str] = []
self.pr_body_list: list[str] = []
commits = __split(args.commits)
for c in commits:
id = c.split('/')[-1]
try:
__add_pull(int(id), len(commits) == 1)
except ValueError:
__add_commit(id, len(commits) == 1)
self.dtm = datetime.datetime.now().strftime("%y%m%d-%H%M")
self.logger = logging.getLogger("cherry-pick")
try:
self.workflow_url = self.repo.get_workflow_run(int(os.getenv('GITHUB_RUN_ID', 0))).html_url
except:
self.workflow_url = None
def pr_title(self, target_branch) -> str:
if len(self.pr_title_list) == 1:
return f"{target_branch}: {self.pr_title_list[0]}"
return f"{target_branch}: cherry-pick {', '.join(self.pr_title_list)}"
def pr_body(self, with_wf: bool) -> str:
commits = '\n'.join(self.pr_body_list)
pr_body = f"Cherry-pick:\n{commits}\n"
if with_wf:
if self.workflow_url:
pr_body += f"\nPR was created by cherry-pick workflow [run]({self.workflow_url})\n"
else:
pr_body += "\nPR was created by cherry-pick script\n"
return pr_body
def add_summary(self, msg):
self.logger.info(msg)
summary_path = os.getenv('GITHUB_STEP_SUMMARY')
if summary_path:
with open(summary_path, 'a') as summary:
summary.write(f'{msg}\n')
def git_run(self, *args):
args = ["git"] + list(args)
self.logger.info("run: %r", args)
try:
output = subprocess.check_output(args).decode()
except subprocess.CalledProcessError as e:
self.logger.error(e.output.decode())
raise
else:
self.logger.info("output:\n%s", output)
return output
def create_pr_for_branch(self, target_branch):
dev_branch_name = f"cherry-pick-{target_branch}-{self.dtm}"
self.git_run("reset", "--hard")
self.git_run("checkout", target_branch)
self.git_run("checkout", "-b", dev_branch_name)
self.git_run("cherry-pick", "--allow-empty", *self.commit_shas)
self.git_run("push", "--set-upstream", "origin", dev_branch_name)
pr = self.repo.create_pull(
target_branch, dev_branch_name, title=self.pr_title(target_branch), body=self.pr_body(True), maintainer_can_modify=True
)
self.add_summary(f'{target_branch}: PR {pr.html_url} created')
def process(self):
br = ', '.join([f'[{b}]({self.repo.html_url}/tree/{b})' for b in self.target_branches])
self.logger.info(self.pr_title(br))
self.add_summary(f"{self.pr_body(False)}to {br}")
if len(self.commit_shas) == 0 or len(self.target_branches) == 0:
self.add_summary("Noting to cherry-pick or no targets branches, my life is meaningless.")
return
self.git_run(
"clone", f"https://{self.token}@github.com/{self.repo_name}.git", "-c", "protocol.version=2", f"ydb-new-pr"
)
os.chdir(f"ydb-new-pr")
for target in self.target_branches:
try:
self.create_pr_for_branch(target)
except GithubException as e:
self.add_summary(f'{target} error {type(e)}\n```\n{e}\n```')
except BaseException as e:
self.add_summary(f'{target} error {type(e)}\n```\n{e}\n```')
def main():
parser = argparse.ArgumentParser()
parser.add_argument(
"--commits",
help="List of commits to cherry-pick. Can be represented as full or short commit SHA, PR number or URL to commit or PR. Separated by space, comma or line end.",
)
parser.add_argument(
"--target-branches", help="List of branchs to cherry-pick. Separated by space, comma or line end."
)
args = parser.parse_args()
log_fmt = "%(asctime)s - %(levelname)s - %(name)s - %(message)s"
logging.basicConfig(format=log_fmt, level=logging.DEBUG)
CherryPickCreator(args).process()
if __name__ == "__main__":
main()
|
