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.

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

Implement squash command #122

Merged
merged 1 commit into from
Dec 1, 2020
Merged

Implement squash command #122

merged 1 commit into from
Dec 1, 2020

Conversation

kellda
Copy link
Contributor

@kellda kellda commented Nov 27, 2020

Allows asking bors to squash all commits before merging.

@kellda
Copy link
Contributor Author

kellda commented Nov 28, 2020

r? @pietroalbini

Copy link
Member

@pietroalbini pietroalbini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I tried running this locally on my test repo and this exception happened at startup:

Traceback (most recent call last):                                                     
  File "/home/pietro/r/github/rust-lang/homu/homu/server.py", line 915, in sync_repo   
    g.my_username, g.repo_labels)                                                      
  File "/home/pietro/r/github/rust-lang/homu/homu/main.py", line 1646, in synchronize  
    command_src=comment.to_json()['html_url'],                                         
  File "/home/pietro/r/github/rust-lang/homu/homu/main.py", line 798, in parse_commands
    state.save()                                                                       
  File "/home/pietro/r/github/rust-lang/homu/homu/main.py", line 366, in save          
    self.squash,                                                                       
AttributeError: 'PullReqState' object has no attribute 'squash'                        

homu/main.py Outdated Show resolved Hide resolved
@kellda
Copy link
Contributor Author

kellda commented Nov 30, 2020

Should be fixed now

Copy link
Member

@pietroalbini pietroalbini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested this locally and the PR works great! Thanks for working on it :)

@pietroalbini pietroalbini merged commit 1eef8f4 into rust-lang:master Dec 1, 2020
@Mark-Simulacrum
Copy link
Member

Can we have a follow up PR expanding the docs (not sure where in repo, available at https://bors.rust-lang.org/ though) to include this?

@pietroalbini
Copy link
Member

I think the docs are in the html templates of this repo.

@kellda
Copy link
Contributor Author

kellda commented Dec 1, 2020

I sent a PR for the docs (#126)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants