Adding option to add all to stacky commit stacky commit --a
#46
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For many repositories it is possible to have more than one base branch we want to work off of. For instance if you have a release branch that you don't want to rebase into main but want to work on the release branch. You should be able to have multiple bottom branches in a repo. stacky upstack as bottom will change the current branch to be a bottom branch. We will track all non master branches with a new ref refs/stacky-bottom-branch/branch-name. A bottom branch cannot be restacked onto something else, but another bottom branch can adopt a bottom branch to bring it back into a stack. stacky update will also now clean up unused refs. Tested using git co test_1 && stacky.py branch new test_2 && stacky.py upstack as bottom && stacky.py info stacky update stack restack onto master for a bottom branch stacky adopt stacky info --pr Stacky should work just fine with either rebasing or git merging. This makes a change that adds a [GIT] section to the stacky config and 2 settings use_merge and use_force_merge to change to merge commits and disallowing force pushes. If we disallow force pushes and want to use merging we should also disallowing amending commits, which this pr does. Sample ~/.stackyconfig with these changes set ``` [UI] change_to_main = True [GIT] use_merge = True use_force_push = False ``` --------- Co-authored-by: Yashwanth Nannapaneni <[email protected]>
|
Pr is failing some tests @yashNaN it seems. |
|
Hum ok it's the XAR stuff ... |
#3) * New command stacky branch commit which will create a branch and commit * Updating readme for stacky branch commit
Contributor
Author
|
What's the XAR stuff? |
… repo (#5) Co-authored-by: Yashwanth Nannapaneni <[email protected]>
…sed or failed for a pr (#6) * Adding functionality to stacky inbox to alsio list if checks have passed or failed for a pr * Fixing new line when not displaying checks * Cleaning up some stuff with inbox --------- Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Adding a command to allow folding the current branch into it's parent branch. All children branches of my current branch will become children of the parent Also fixing issue where use_merge was overwritten --------- Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Adding new command stacky pr, which will list all of the current users PRs and let you interactively update descriptions Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Adding a comment to the pr description showing the current stack Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Co-authored-by: Yashwanth Nannapaneni <[email protected]>
…se_merge or not (#19) Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Including the entire forest in stacky comment for a PR rather than just the linear path to the stack bottom
Updated emoji logic match stacky inbox categorization:
- 🚧 Construction for draft PRs (work in progress)
- ✅ Check-mark for approved PRs
- 🔄 Loading for PRs waiting on review (has pending review requests)
- ❌ X for PRs waiting on author action (no pending reviews, likely needs changes)
…n compact_pr_display to for stacky info --pr to be more compact (#24) Co-authored-by: Yashwanth Nannapaneni <[email protected]>
Adding a new enable_stack_comment setting to enable/disable stacky stack comment
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Can now do
stacky commit -am "message"to add all files and then commit