Skip to content

stubsabot: add some debug logs #8850

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

Merged
merged 2 commits into from
Oct 4, 2022
Merged

stubsabot: add some debug logs #8850

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d490a1
stubsabot: add some debug logs
hauntsaninja Oct 4, 2022
930dca7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 4, 2022
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
16 changes: 14 additions & 2 deletions scripts/stubsabot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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"])


Expand Down