mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 11:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

scripts:move_mrs: Revert cherry-picking when aborting

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/959>
This commit is contained in:
Thibault Saunier 2021-09-29 10:07:48 -03:00 committed by GStreamer Marge Bot
parent be616121b8
commit 18378ec8c7
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/move_mrs_to_monorepo.py
View file

@ -215,7 +215,7 @@ class GstMRMover:
' then set it in the "GITLAB_API_TOKEN" environment variable:"' ' then set it in the "GITLAB_API_TOKEN" environment variable:"'
f'\n\n $ GITLAB_API_TOKEN=<your token> {" ".join(sys.argv)}\n')) f'\n\n $ GITLAB_API_TOKEN=<your token> {" ".join(sys.argv)}\n'))
def git(self, *args, can_fail=False, interaction_message=None, call=False): def git(self, *args, can_fail=False, interaction_message=None, call=False, revert_operation=None):
cwd = ROOT_DIR cwd = ROOT_DIR
retry = True retry = True
while retry: while retry:
@ -265,8 +265,12 @@ class GstMRMover:
retry = True retry = True
continue continue
elif e.returncode == 2: elif e.returncode == 2:
if revert_operation:
self.git(*revert_operation, can_fail=True)
return "SKIP" return "SKIP"
elif e.returncode == 3: elif e.returncode == 3:
if revert_operation:
self.git(*revert_operation, can_fail=True)
sys.exit(3) sys.exit(3)
except: except:
# Result of subshell does not really matter # Result of subshell does not really matter
@ -468,9 +472,9 @@ class GstMRMover:
for commit in reversed([c for c in mr.commits()]): for commit in reversed([c for c in mr.commits()]):
if self.git("cherry-pick", commit.id, if self.git("cherry-pick", commit.id,
interaction_message=f"cherry-picking {commit.id} onto {branch} with:\n " interaction_message=f"cherry-picking {commit.id} onto {branch} with:\n "
f" `$ git cherry-pick {commit.id}`") == "SKIP": f" `$ git cherry-pick {commit.id}`",
revert_operation=["cherry-pick", "--abort"]) == "SKIP":
fprint(f"{yellow('SKIPPED')} (couldn't cherry-pick).", nested=False) fprint(f"{yellow('SKIPPED')} (couldn't cherry-pick).", nested=False)
self.git("cherry-pick", "--abort", can_fail=True)
return False return False
self.git("show", remote_branch + "..", call=True) self.git("show", remote_branch + "..", call=True)