Source Control bug when creating or changing branch in the workspace

[PollyGlot]

Working with several projects in a workspace, I create and/or change a branch in one project and it creates and/or changes the branch for every project in the workspace.

Enregistrement.de.l.ecran.2021-10-08.a.10.35.28.mov

Does this issue occur when all extensions are disabled?: Yes/No

• VS Code Version: 1.61.0
• OS Version: macOS Big Sur 11.5.2

Steps to Reproduce:

1. Open a workspace with several projects
2. Try to create/change branch on one project
3. It will create/change the branch for every project

[vbackeberg]

It also displays commits to be synced for both projects.

It should just display the commit for the project the commit actually belongs to.

Sorry for the lazy report.

Version: 1.61.0 (system setup)
Commit: ee8c7def80afc00dd6e593ef12f37756d8f504ea
Date: 2021-10-07T18:13:09.652Z
Electron: 13.5.1
Chrome: 91.0.4472.164
Node.js: 14.16.0
V8: 9.1.269.39-electron.0
OS: Windows_NT x64 10.0.19043

[mattseddon]

Can you try disabling scm.showActionButton in your user settings to see if it fixes the problem?

[PollyGlot]

@mattseddon I confirm that disabling scm.showActionButton it fixes the problem for me

[vbackeberg]

@mattseddon Yes confirmed. It fixes the problem. 🙂

[mattseddon]

@eamodio could this be related to / caused by the recent work to add an actionButton to the SourceControl class exposed to extensions? (#133935)

[gjsjohnmurray]

/assign @eamodio

Looks serious enough for a recovery release.

[gjsjohnmurray]

See also #134598

[zeba0039]

Can you try disabling scm.showActionButton in your user settings to see if it fixes the problem?

Fixed the problem for me

[joaomoreno]

Huge thanks to @gjsjohnmurray and @IllusionMH for helping out with the issue onslaught management. You're the real MVPs! 🙏

I've pinned this issue, just so people can find it more easily instead of filing dupes.

[gjsjohnmurray]

Huge thanks to @gjsjohnmurray and @IllusionMH for helping out with the issue onslaught management. You're the real MVPs! 🙏

Thanks @joaomoreno. I didn't want all the dups skewing the stats during issue grooming month.

I've pinned this issue, just so people can find it more easily instead of filing dupes.

👍

I've just created #135067 for an enhancement that may help tackle this kind of post-release storm in future.

[gjsjohnmurray]

Also, my previous idea at #132369 might have got enough extra eyes onto 1.61 during endgame week to have detected this particular problem before shipping. It's a only Backlog Candidate at the moment and currently needs 12 more upvotes to progress to Backlog. 🙏

[ascentcreative]

Can you try disabling scm.showActionButton in your user settings to see if it fixes the problem?

Hi - Thanks for the pointers to this wider thread and workaround.

Disabling scm.showActionButton 'largely' fixes the issue. The Commit counts and push actions all now work as expected, but I still have issues with the Commit Message fields changing focus when the UI updates. Originally it jumped between any of them. However, now it will only jump from the last one in the list to the first one. So it's not as severe, but does still mean that it jumps while I'm making a commit.

I'm aware that there's a recovery release incoming for this issue, so this is probably low priority, but thought I'd mention this for completeness.

Thanks - looking forward to the update.

[SpyPower]

Not only the focus is shifted but also the texts are moving from one place to another. Check the small mp4 i created:
https://user-images.githubusercontent.com/13405649/137311331-230c8b67-2518-4030-91c9-db96b0dd0acf.mp4
By removing scm.showActionButton, the problem from the mp4 was removed.

[ascentcreative]

Not only the focus is shifted but also the texts are moving from one place to another. Check the small mp4 i created: https://user-images.githubusercontent.com/13405649/137311331-230c8b67-2518-4030-91c9-db96b0dd0acf.mp4 By removing scm.showActionButton, the problem from the mp4 was removed.

Yep - those issues were fixed for me too by disabling that setting as described. However, I still get the jump in focus of the commit messages - mp4 at https://www.dropbox.com/s/o6hze8reydlftax/Screen%20Recording%202021-10-14%20at%2012.53.51.mov?dl=0

[vek-emilsonmoraes]

Hi dear, That fixed the problem for me too. Thank you and best regards, by Emilson

…

On 14 Oct 2021 02:34 -0300, Zeba Ramzan ***@***.***>, wrote: > Can you try disabling scm.showActionButton in your user settings to see if it fixes the problem? Fixed the problem for me — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or unsubscribe. Triage notifications on the go with GitHub Mobile for iOS or Android.

[lramos15]

A new version of vs code 1.61.1 has been released, this should fix this issue

[ghost]

I'm afraid i sill have the "jumping text cursor" issue on 1.61.1 - only disabling showActionButton helps.

Steps to reproduce:

1. Have multiple git repositories configured in a workspace
2. make changes to some repo that is not the first one in the sidebar list
3. give commit message field the focus
4. stage some files in that repo
5. watch VSCode working (progress bar appearing) and see the cursor jumps to the first commit message field.

[ascentcreative]

I can confirm that even with Show Action Button disabled, I still get the jumping cursor on 1.61.1

https://www.dropbox.com/s/9rul5jjgs7zlq9v/Screen%20Recording%202021-10-15%20at%2009.09.56.mov?dl=0

[IllusionMH]

I think focus change on list update is old issue with reports for
1.59.0 #130204
1.53.2 #116930
And 1.47.0 #102498 that supposed to be fixed for staging files

It's better to keep track of focus in separate issue rather than in closed issue for related but different topic.
#135143 is reported for latest version - please upvote it.

[EndyKaufman]

not fixed all bugs

[EndyKaufman]

if I press in check in top sub panel
cursor jump to buttom sub panel
with another git sub repository

[EndyKaufman]

it does not always lag like that, sometimes everything is good

[eyedean]

It seems like it's fixed on 1.61.1. 🎉

I was on 1.61.0 and I had the following issues, which are no longer happening: 🤞

1. Jumping cursor from one submodule to another, when I was in the middle of typing the commit message.
2. The above, caused my cmd+return to commit a submodule that wasn't ready to commit, with a half-baked message. 😫
3. The sync difference values (1 up, 2 down) next to submodules were all messed up. They would show values from each other. (i.e. all would do (1up) when only one was 1 up, or all would do nothing, when one submodule was 1 down.)

Thanks for keeping up on this!

---

Update: It's partially fixed.

I am on 1.61.0 and the cursor jumping, between submodules, still happens when I am typing a commit message.

[eyedean]

@lramos15 it's still happening, though not as crazy as it was. I created #135412 with a screen recording and repro steps.