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

Possible improvement: include the whole stack in PR/MR description with a finger pointing to the current one #1322

Closed
scamden opened this issue Sep 9, 2024 · 13 comments
Assignees
Labels
bug Something isn't working gitlab Relates to integration with GitLab
Milestone

Comments

@scamden
Copy link

scamden commented Sep 9, 2024

This is a feature I miss from using graphite. Whenever updating a stack of PRs they'd update the annotation on all PR's to include the whole tree, which allowed seamlessly navigating from one to the other. The current PR was bold I think and had a finger emoji pointing to it. A really nice experience. Just a possible suggestion. Thanks again for this awesome open source alternative!

@scamden scamden changed the title Possible improvement: include the whole stack in PR/MR comments with a finger pointing to the current one Possible improvement: include the whole stack in PR/MR description with a finger pointing to the current one Sep 9, 2024
@scamden
Copy link
Author

scamden commented Sep 9, 2024

I noticed the option to do do machete.gitlab.mrDescriptionIntroStyle:
"full" but it doesn't seem to show downstream mr's at least not on the root MR in the stack when running git machete gitlab retarget-mr

@PawelLipski
Copy link
Collaborator

Hey, yeah I was about to mention machete.gitlab.mrDescriptionIntroStyle... could you describe your case with downstream MRs not showing up in more detail? 🤔 In general, I'd expect downstream MRs to be displayed in the description intro, even for a root MR. Is the repo available publicly maybe?

@PawelLipski PawelLipski added this to the v3.29.3 milestone Sep 9, 2024
@PawelLipski PawelLipski added the bug Something isn't working label Sep 9, 2024
@PawelLipski PawelLipski self-assigned this Sep 9, 2024
@PawelLipski PawelLipski added the gitlab Relates to integration with GitLab label Sep 9, 2024
@scamden
Copy link
Author

scamden commented Sep 9, 2024

Unfortunately not available publicly. The case is:
I made MR 605 off of main and stacked another PR 611 on top of 605 later.
PR 611 shows the great stack comment but nothing on 605.
I discover mrDescriptionIntroStyle setting and turn it to full:

[machete.gitlab]
  mrDescriptionIntroStyle = full

I run git machete gitlab retarget-mr from branch of 605 which says it updated the MR description, but description of 605 still shows no cool stack comment.

Also just tested adding a 3rd PR to the stack and the second PR still doesn't show the 3rd PR downstream in it's description even after retargeting both 2nd and 3rd PR's

I would expect every PR in the stack to have a description with all of the up and downstream PR's

@PawelLipski
Copy link
Collaborator

Hmmm okay and a sanity check: what's your git machete version?

@milescrabill
Copy link

This was fixed for me by updating to the latest version. I was a little confused at first because the version installed via Homebrew on macOS was not up-to-date.

I was able to update to the latest version using brew reinstall --build-from-source git-machete.

@scamden
Copy link
Author

scamden commented Sep 11, 2024

here's mine: git-machete version 3.28.0

and yes i also installed with brew!

@PawelLipski
Copy link
Collaborator

here's mine: git-machete version 3.28.0

Whoops yeah, the feature you're looking for has only been added in v3.29.0, pls update 😅

I was able to update to the latest version using brew reinstall --build-from-source git-machete.

This is unexpected, I'm gonna check why brew upgrade didn't/doesn't work for git-machete formula 🤔

@PawelLipski
Copy link
Collaborator

Actually... @scamden I'd appreciate if you send your current brew info git-machete, then run brew upgrade git-machete and again pls include brew info git-machete. I tried upgrading Brew-installed git-machete locally and didn't see any problems... I'd better to know if there're any, given that Homebrew is our most popular installation channel 🤔

@scamden
Copy link
Author

scamden commented Sep 12, 2024

happy to! looks like for me the upgrade worked! sorry didn't think to try this originally :)

==> git-machete: stable 3.28.0 (bottled)
Git repository organizer & rebase workflow automation tool
https://github.com/VirtusLab/git-machete
Installed
/opt/homebrew/Cellar/git-machete/3.28.0 (58 files, 1.2MB) *
  Poured from bottle using the formulae.brew.sh API on 2024-08-21 at 12:04:26
From: https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/g/git-machete.rb
License: MIT
==> Dependencies
Required: [email protected] ✔
==> Caveats
zsh functions have been installed to:
  /opt/homebrew/share/zsh/site-functions
==> Analytics
install: 324 (30 days), 821 (90 days), 2,720 (365 days)
install-on-request: 324 (30 days), 821 (90 days), 2,720 (365 days)
build-error: 0 (30 days)
==> git-machete: stable 3.29.2 (bottled)
Git repository organizer & rebase workflow automation tool
https://github.com/VirtusLab/git-machete
Installed
/opt/homebrew/Cellar/git-machete/3.29.2 (42 files, 797.2KB) *
  Poured from bottle using the formulae.brew.sh API on 2024-09-12 at 07:36:03
From: https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/g/git-machete.rb
License: MIT
==> Dependencies
Required: [email protected] ✘
==> Caveats
zsh functions have been installed to:
  /opt/homebrew/share/zsh/site-functions
==> Analytics
install: 324 (30 days), 821 (90 days), 2,720 (365 days)
install-on-request: 324 (30 days), 821 (90 days), 2,720 (365 days)
build-error: 0 (30 days)

@PawelLipski
Copy link
Collaborator

Okay! so I'm assuming this is resolved ;)

@scamden
Copy link
Author

scamden commented Sep 12, 2024

yep it's fixed! thanks great feature!

@scamden
Copy link
Author

scamden commented Sep 12, 2024

maybe this is already known somewhere, but one nice addition would be to update other MR's when creating or retargeting one. Right now if I add a downstream MR it seems i have to go update all the other ones in the stack to get their descriptions to show it

@PawelLipski
Copy link
Collaborator

There's a related feature in the working queue: #1215, but this is about retargeting PRs and updating their description as traverse walks the branches. Still, a flag like --update-all-descriptions to {create,restack,retarget}-pr would be useful, lemme open an issue

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working gitlab Relates to integration with GitLab
Projects
None yet
Development

No branches or pull requests

3 participants