Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Abort cherry-picks when failure #17

Merged
merged 1 commit into from
Nov 29, 2021
Merged

Abort cherry-picks when failure #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def must_create_dir(filename):
def overwrite_conflict_files(ci):
print(">>> Overwrite PR conflict files")
for f in ci.files:
if f.status == "removed":
if f.status == "removed" and os.path.exists(f.filename):
git.rm('-rf', f.filename)
else:
must_create_dir(f.filename)
Expand Down Expand Up @@ -108,6 +108,7 @@ def apply_patch(branch, comm_ci):
git('cherry-pick', git_commit.sha)
except Exception as e:
print(">>> Fail to apply the patch to branch {}, cause: {}".format(branch, e))
git('cherry-pick', '--abort')
overwrite_conflict_files(git_commit)
commit_changes(comm_ci)
stopped = True
Expand Down