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

Git: Merge Branch... picker duplicates branch name in description (fix #199562) #199742

Closed
wants to merge 4 commits into from

Conversation

gjsjohnmurray
Copy link
Contributor

This PR fixes #199562

Initially created as draft while we discuss what data (if any) to use as description.

@gjsjohnmurray
Copy link
Contributor Author

Initial push replaces duplicated name with last commit timestamp:

image

As currently implemented this causes a noticeable delay while timestamps are fetched. Perhaps this can be improved by adding these lazily to the QuickPickItem description properties

Other ideas:

Commit ID (short format)

image

I think both of the above would benefit from #75835 (support for right-justfified descriptions in quickpick lists) being implemented.

Nothing
This is is what Rebase does for most of its entries. There the exception is the upstream entry, for which description gets set to '(upstream)'

image

@lszomoru
Copy link
Member

lszomoru commented Dec 1, 2023

@gjsjohnmurray, thanks for your contribution. Ideally, we would want all brach pickers should be consistent. Could we have this one look like the branch picker that is being shown when you invoke the "Checkout" command? Thanks!

@gjsjohnmurray
Copy link
Contributor Author

image

@gjsjohnmurray gjsjohnmurray marked this pull request as ready for review December 1, 2023 13:53
@gjsjohnmurray
Copy link
Contributor Author

Can this get merged soon, or do the rules of your grooming iteration mean it'll have to wait another month?

@lszomoru lszomoru added this to the December 2023/January 2024 milestone Dec 8, 2023
@lszomoru
Copy link
Member

lszomoru commented Dec 8, 2023

@gjsjohnmurray, thank you very much for the pull request. I took the liberty to build on top of this to distinguish local and remote branches. Closing this PR in favour of #200331.

@lszomoru lszomoru closed this Dec 8, 2023
@lszomoru lszomoru added the on-release-notes Issue/pull request mentioned in release notes label Dec 8, 2023
@gjsjohnmurray gjsjohnmurray deleted the fix-199562 branch December 8, 2023 11:28
@github-actions github-actions bot locked and limited conversation to collaborators Jan 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
on-release-notes Issue/pull request mentioned in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Git: Merge Branch... picker duplicates branch name in description
2 participants