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

Update open stubsabot PRs (#8813)

Browse Source 
Fixes #8778

Note that not fixing this has some advantages, particularly if stubsabot
waits a little while after releases before making PRs (as discussed
earlier). Specifically, it gives us more coverage of upstream versions
and might provide a natural division of changes, compared to PRs that
make updates corresponding to several upstream versions.
This commit is contained in:
Shantanu
2022-10-04 08:07:25 -07:00
committed by GitHub
parent 5da171ba45
commit 807f3a8fc6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/stubsabot.py
View File

@@ -377,19 +377,19 @@ async def create_or_update_pull_request(*, title: str, body: str, branch_name: s
response.raise_for_status()
def origin_branch_has_changes(branch: str) -> bool:
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
# patch equivalent to a commit on branch
output = subprocess.check_output(
["git", "rev-list", "--right-only", "--cherry-pick", "--count", f"{branch}...origin/{branch}"],
["git", "log", "--right-only", "--pretty=%an", "--cherry-pick", f"{branch}...origin/{branch}"],
stderr=subprocess.DEVNULL,
)
return bool(set(output.splitlines()) - {b"stubsabot"})
except subprocess.CalledProcessError:
# origin/branch does not exist
return False
return int(output) > 0
class RemoteConflict(Exception):
@@ -397,7 +397,7 @@ class RemoteConflict(Exception):
def somewhat_safe_force_push(branch: str) -> None:
if origin_branch_has_changes(branch):
if has_non_stubsabot_commits(branch):
raise RemoteConflict(f"origin/{branch} has changes not on {branch}!")
subprocess.check_call(["git", "push", "origin", branch, "--force"])