scm/git UI fixes

[vinokurig]

• fix [scm] wrong icon for open changes #5245
• fix [scm] command categories and labels should show SCM, not Scm #5267
• fix [git] the repo info in git view can't be updated when click the refresh button in some case #3800
• fix [scm] unnecessary information in status bar #5266
• fix [scm] revert changes to core package #5262
• fix [scm] show SCM #5246
• fix [scm/git] bogus inline command contribution #5265 (see [scm/git] bogus inline command contribution #5265 (comment))
• fix [scm] proper main menu contribution #5263
• fix [ui][git] Discard All action has layout issues when the Git widget is too narrow #4851
• fix Navigate and inline are lower case in the command menu #5291

[akosyakov]

Let's keep this PR to recover all lost changes in one commit that we don't create too much noise with fixing what already used to work. I'm going to go through git extension history starting from Jan now and list commits which should be recovered here. Hope is not much.

[vinokurig]

@akosyakov OK, merged previous PRs

[akosyakov]

@vinokurig ok, please close other PRs then, I am half through changes, will check/test the rest after the lunch. I open issues for everything which i find and will retest them against this PR after analyzing commits.

[akosyakov]

@vinokurig I went through all changes from Jan and updated a comment with referenced issues. I'm starting testing and will mark verified as done.

[akosyakov]

@vinokurig please try to toggle SCM several times:

icon and widget caption are not rendered after toggling couple times

[akosyakov]

@vinokurig https://github.com/theia-ide/theia/pull/5254/files#diff-a2eb5b2bcd08435891fb7969b75c9fccL119 looks bogus, it means if you move git widget to any other area except left updating title won't work anymore.

[akosyakov]

I've verified existing issues and commented at the code which looks suspicious. Let me know if you need my help to resolve remaining. I hope we can fix them and merge tomorrow.

[vinokurig]

@akosyakov

@vinokurig please try to toggle SCM several times:
icon and widget caption are not rendered after toggling couple times

Fixed

[vinokurig]

@akosyakov

@vinokurig https://github.com/theia-ide/theia/pull/5254/files#diff-a2eb5b2bcd08435891fb7969b75c9fccL119 looks bogus, it means if you move git widget to any other area except left updating title won't work anymore.

Fixed

[akosyakov]

@vinokurig everything seems to work now, except #3800 removed repositories are not detected, i would expect that there should be an event for onDidChangeSelectedRepositories with undefined but it does not happen

[akosyakov]

@vinokurig are you looking into #3800? i can do if you don't have time, we need to resolve and merge it today

[vinokurig]

@akosyakov

@vinokurig are you looking into #3800? i can do if you don't have time, we need to resolve and merge it today

I am working on it right now

[vinokurig]

@akosyakov
There is GitRepositoryProvider that provides Git specific repositories. The selected repository in GitRepositoryProvider is set by SCM service. To get rid of GitRepositoryProvider it is needed to completely rework Git extension and other related extensions. It looks like very big part of work.
I agree that firing repository deleted event from Git extension is not good, but I can't detect deletion of projects folder in the Scm because File watcher event returns only an array of deleted files.

[akosyakov]

I don't mean to remove GitRepositoryProvider but make it git specific facade of ScmService. Handling of ScmProvider also should be moved to GitRepositoryProvider instead of keeping allRepositories.

ScmService should be a single source of the whole scm state, git extension should populate it and provide git specific view instead of duplicating this state partially and trying to sync it.

Ok, let's open an issue to refactor it.

[akosyakov]

Have you managed to track down #5254 (comment)?

Why status bar elements are not removed.

[vinokurig]

Have you managed to track down #5254 (comment)?
Why status bar elements are not removed.

working on it now

[akosyakov]

Here https://github.com/theia-ide/theia/blob/59fdb74937de03764ec9cdb6255dbcd7832c55a2/packages/git/src/browser/git-contribution.ts#L274-L288

I wonder whether we should reset to undefined selected repository for git extension as well. Otherwise it keeps a reference to a repository which is not selected anymore. Maybe it is a reason.

[vinokurig]

@akosyakov Fixed icon cleanup

[vinokurig]

@akosyakov any updates?

[akosyakov]

now it cannot detect when a new repository is cloned after removing

Strangely it is detected in the status bar, but not in SCM view. Order of items also is bogus.

Also if you have a folder opened with 2 repos and delete one. The status bar item to pick a repo should disappear and appear when this repo is cloned again. It was working nicely before.

[vinokurig]

@akosyakov Is it ok to fix it tomorrow?

[akosyakov]

@vinokurig yes @marcdumais-work said that we can wait till SCM is cleaned up

To show how it used to work:

[akosyakov]

@vinokurig after testing more previous state: it is fine that new repositories cannot be detected without explicit refresh, but then status bar should not snow bogus elements like in #5254 (comment)

With explicit refresh with multiple git repositories, all new repositories should be detected.

[vinokurig]

@akosyakov Fixed icons order

[akosyakov]

@vinokurig ok, testing, are you looking into detection addition/deletion repositories on refresh?

[vinokurig]

@vinokurig ok, testing, are you looking into detection addition/deletion repositories on refresh?

yes

[akosyakov]

When I delete the repo it still shows a branch picker in the status bar:

and when i clone it again, it shows SCM elements in status bar, although it should not show anything (i did not trigger refresh):

For right now i see state is duplicated several times:

• GitContribution.dirtyResporitories duplicating GitRepositoryProvider.allRepositories which duplicating ScmService.repositories
• and what discussed yesterday GitRepositoryProvider.selectedRepository duplicating ScmService.selectedRepository

I suspect deleted repository is still cached somewhere.

[vinokurig]

@akosyakov detection addition/deletion repositories is fixed

When I delete the repo it still shows a branch picker in the status bar:

fixed

[vinokurig]

@akosyakov

when i clone it again, it shows SCM elements in status bar, although it should show anything (i did not trigger refresh

couldn't reproduce, maybe it is fixed with the latest commits

[akosyakov]

@vinokurig thank you for all effort! it works good now. Please squash commits, we are waiting for travis to be green then.

[akosyakov]

please merge, thank you again

[marcdumais-work]

@akosyakov So if I understand correctly, this is not blocking the 0.7.0 release any more?

[akosyakov]

@marcdumais-work yes, it should be good for 0.7.0

[akosyakov]

@vinokurig Could you have a look at #5300? i've missed during testing :(

[vinokurig]

@akosyakov yes, working on it

[vinokurig]

@akosyakov

@vinokurig Could you have a look at #5300? i've missed during testing :(

fixed