VimPlug/typeshed
1
0
Fork 0
mirror of https://github.com/davidhalter/typeshed.git synced 2025-12-08 04:54:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

stubsabot: add some debug logs (#8850)

Browse Source 
For #8778
This commit is contained in:
Shantanu
2022-10-04 15:05:17 -07:00
committed by GitHub
parent 4b44119d0d
commit 9b5ea00fed
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/stubsabot.py
View File

@@ -511,8 +511,20 @@ async def create_or_update_pull_request(*, title: str, body: str, branch_name: s
def has_non_stubsabot_commits(branch: str) -> bool:
assert not branch.startswith("origin/")
try:
# number of commits on origin/branch that are not on branch or are
# commits on origin/branch that are not on branch or are
# patch equivalent to a commit on branch
print(
"[debugprint]",
subprocess.check_output(
["git", "log", "--right-only", "--pretty=%an %s", "--cherry-pick", f"{branch}...origin/{branch}"]
),
)
print(
"[debugprint]",
subprocess.check_output(
["git", "log", "--right-only", "--pretty=%an", "--cherry-pick", f"{branch}...origin/{branch}"]
),
)
output = subprocess.check_output(
["git", "log", "--right-only", "--pretty=%an", "--cherry-pick", f"{branch}...origin/{branch}"],
stderr=subprocess.DEVNULL,
@@ -529,7 +541,7 @@ class RemoteConflict(Exception):
def somewhat_safe_force_push(branch: str) -> None:
if has_non_stubsabot_commits(branch):
raise RemoteConflict(f"origin/{branch} has changes not on {branch}!")
raise RemoteConflict(f"origin/{branch} has non-stubsabot changes that are not on {branch}!")
subprocess.check_call(["git", "push", "origin", branch, "--force"])