Skip to content

Avoid empty or ambiguous repository label in Repositories submenu (fix #196613)#196623

Merged
lszomoru merged 7 commits intomicrosoft:mainfrom
gjsjohnmurray:fix-196613
Nov 21, 2023
Merged

Avoid empty or ambiguous repository label in Repositories submenu (fix #196613)#196623
lszomoru merged 7 commits intomicrosoft:mainfrom
gjsjohnmurray:fix-196613

Conversation

@gjsjohnmurray
Copy link
Contributor

This PR fixes #196613

Using the repro provided on the issue, the new result is:

image

@gjsjohnmurray
Copy link
Contributor Author

/assign @lszomoru

@gjsjohnmurray
Copy link
Contributor Author

I made the minimally disruptive change, but arguably all menu items should use label rather than basename because it's possible for a multiroot workspace to yield more than one repository entry with the same basename.

@lszomoru lszomoru added this to the November 2023 milestone Oct 26, 2023
@gjsjohnmurray
Copy link
Contributor Author

Based on this example, I'm changing the PR to make the label always get used for this submenu.

image

@gjsjohnmurray gjsjohnmurray changed the title Show repository label in Repositories submenu if uri basename is empty (fix #196613) Oct 26, 2023
@gjsjohnmurray
Copy link
Contributor Author

Now:
image

@lszomoru
Copy link
Member

lszomoru commented Nov 2, 2023

@gjsjohnmurray, thank you very much for your contribution. I have pushed a commit to fix some compilation errors, as well as I pushed a change so that the name is computed only once (since _rootUri cannot change). Could you please take a look at the changes? Thanks!

@gjsjohnmurray
Copy link
Contributor Author

@lszomoru thanks for the improvements. It's passed my testing, so please get the PR approved and merged.

@lszomoru lszomoru added the scm General SCM compound issues label Nov 21, 2023
@lszomoru lszomoru merged commit 1817634 into microsoft:main Nov 21, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Jan 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

scm General SCM compound issues

3 participants