thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 09:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18873 from abyss7/backport-lts

Browse Source 
Minor fix in backport script
This commit is contained in:
alexey-milovidov 2021-01-09 06:37:55 +03:00 committed by GitHub
commit 0e48d8fc86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
utils/github/backport.py
View File

@ -32,8 +32,8 @@ class Backport:
branches.append(pull_request['headRefName'])
return branches
def execute(self, repo, until_commit, number, run_cherrypick, find_lts=False):
repo = LocalRepo(repo, 'origin', self.default_branch_name)
def execute(self, repo, upstream, until_commit, number, run_cherrypick, find_lts=False):
repo = LocalRepo(repo, upstream, self.default_branch_name)
all_branches = repo.get_release_branches() # [(branch_name, base_commit)]
last_branches = set([branch[0] for branch in all_branches[-number:]])
@ -42,7 +42,7 @@ class Backport:
branches = []
# iterate over all branches to preserve their precedence.
for branch in all_branches:
if branch in last_branches or branch in lts_branches:
if branch[0] in last_branches or branch[0] in lts_branches:
branches.append(branch)
if not branches:
@ -119,6 +119,7 @@ if __name__ == "__main__":
parser.add_argument('--lts', action='store_true', help='consider branches with LTS')
parser.add_argument('--dry-run', action='store_true', help='do not create or merge any PRs', default=False)
parser.add_argument('--verbose', '-v', action='store_true', help='more verbose output', default=False)
parser.add_argument('--upstream', '-u', type=str, help='remote name of upstream in repository', default='origin')
args = parser.parse_args()
if args.verbose:
@ -128,4 +129,4 @@ if __name__ == "__main__":
cherrypick_run = lambda token, pr, branch: CherryPick(token, 'ClickHouse', 'ClickHouse', 'core', pr, branch).execute(args.repo, args.dry_run)
bp = Backport(args.token, 'ClickHouse', 'ClickHouse', 'core')
bp.execute(args.repo, args.til, args.number, cherrypick_run, args.lts)
bp.execute(args.repo, args.upstream, args.til, args.number, cherrypick_run, args.lts)