-
Notifications
You must be signed in to change notification settings - Fork 68
Add --interactive option to rebase #115
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
Conversation
897f303 to
20d631c
Compare
|
It seems like the tests for Python 3.5 and 3.6 are broken due to no Update: fixed! |
4a8e9fa to
2f9429f
Compare
jpgrayson
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for implementing this feature. I'm suspect this will be valuable to many StGit users.
I've added a few review comments for you to consider, but I think this code is good enough as-is. Thank you also for writing tests!
`stg rebase --interactive` is a new tool which mirrors `git rebase --interactive`. Using an editor `--interactive` lets the user [reorder patches](https://asciinema.org/a/421486), [squash patch chains](https://asciinema.org/a/421488), or [delete individual patches](https://asciinema.org/a/421487) (links go to recordings showing these features!). Further instructions could be added but this seemed like a good base set. I've been using this locally and it helps execute certain sets of commands much faster! Tests are included. Signed-off-by: Topher Brown <[email protected]>
2f9429f to
ff4d175
Compare
The test suite is what drew me to write this as a first-class citizen in the first place! (as opposed to a separate script in I'd love any feedback you have on how to clean up the tests. I went for verbosity over DRY whenever I was confused, which is great because it led to landing the feature quickly 😂. Happy to clean them up however you see fit. One (potential) downside of the way the I have a few test steps like this: |
stg rebase --interactiveis a new tool which mirrorsgit rebase --interactive.Using an editor
--interactivelets the user reorder patches, squash patch chains, or delete individual patches.Further instructions could be added but this seemed like a good base set. I've been using this locally and it helps execute certain sets of commands much faster! Tests are included.