From 249b27a14228dc8abe45ce5a89a42a7c593949a4 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 10 2019 10:30:21 +0000 Subject: Pull the changes merged once the PR was merged --- diff --git a/monitor_gating.py b/monitor_gating.py index a3df838..ee6bc91 100644 --- a/monitor_gating.py +++ b/monitor_gating.py @@ -193,6 +193,21 @@ def push_changes(folder, target, branch, force=False): print_user(info_log, success=False) +def pull_changes(folder, target, branch): + """ Pull all changes using git. + """ + info_log = f"Pushing changes" + print_user(info_log) + try: + cmd = ["git", "pull", "--rebase", target, branch] + run_command( + cmd, + cwd=folder) + print_user(info_log, success=True) + except MonitoringException: + print_user(info_log, success=False) + + def open_pullrequest(base_url, username, namespace, name, branch, token): """ Open a pull-request from the user's fork to the main project for the specified branch. @@ -607,6 +622,7 @@ def main(): pr_id=pr_id, token=conf["pagure_token"], ) + pull_changes(gitfolder, "origin", branch) else: return