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

Remove squash from command list #187

Merged
merged 2 commits into from
Dec 14, 2022
Merged

Remove squash from command list #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8afbeb
Remove `squash` from command list
Noratrieb Nov 26, 2022
9c26f56
Disable the `squash` command in command parsing.
Noratrieb Nov 27, 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
2 changes: 0 additions & 2 deletions homu/html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ <h3>Commands</h3>
<li><code>rollup</code>: Mark the PR as likely to merge without issue, short for <code>rollup=always</code></li>
<li><code>rollup-</code>: Unmark the PR as <code>rollup</code>.</li>
<li><code>rollup=maybe|always|iffy|never</code>: Mark the PR as "always", "maybe", "iffy", and "never" rollup-able.</li>
<li><code>squash</code>: Squash all commits into one just before performing the merge.</li>
<li><code>squash-</code>: Do not squash commits before merging.</li>
<li><code>retry</code>: Signal that the PR is not bad, and should be retried by buildbot.</li>
<li><code>try</code>: Request that the PR be tested by buildbot, without accepting it.</li>
<li><code>force</code>: Stop all the builds on the configured builders, and proceed to the next PR.</li>
Expand Down
8 changes: 6 additions & 2 deletions homu/parse_issue_comment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,14 @@ def parse_issue_comment(username, body, sha, botname, hooks=[]):
commands.append(IssueCommentCommand.rollup(rollup_value))

elif word == 'squash':
commands.append(IssueCommentCommand.squash())
# Squash is broken, prevent its usage.
# commands.append(IssueCommentCommand.squash())
pass

elif word == 'squash-':
commands.append(IssueCommentCommand.unsquash())
# Squash is broken, prevent its usage.
# commands.append(IssueCommentCommand.unsquash())
pass

elif word == 'force':
commands.append(IssueCommentCommand.force())
Expand Down