scm/git UI fixes #5254

vinokurig · 2019-05-25T06:12:08Z

akosyakov · 2019-05-27T08:42:42Z

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 · 2019-05-27T09:23:34Z

@akosyakov OK, merged previous PRs

akosyakov · 2019-05-27T10:09:30Z

@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.

packages/git/src/browser/git-contribution.ts

akosyakov · 2019-05-27T12:31:50Z

@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 · 2019-05-27T12:54:32Z

@vinokurig please try to toggle SCM several times:

icon and widget caption are not rendered after toggling couple times

packages/scm/src/browser/scm-widget.tsx

akosyakov · 2019-05-27T13:02:20Z

@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.

packages/scm/src/browser/scm-widget.tsx

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 · 2019-05-27T14:31:29Z

@akosyakov

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

Fixed

vinokurig · 2019-05-28T05:42:33Z

@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 · 2019-05-28T06:01:16Z

@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

packages/scm/src/browser/scm-widget.tsx

akosyakov · 2019-05-28T07:20:07Z

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

vinokurig · 2019-05-28T07:30:51Z

@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 · 2019-05-28T11:16:15Z

@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 · 2019-05-28T12:02:56Z

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 · 2019-05-28T12:03:19Z

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

Why status bar elements are not removed.

vinokurig · 2019-05-28T12:04:19Z

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

working on it now

akosyakov · 2019-05-28T12:08:34Z

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 · 2019-05-28T13:34:46Z

@akosyakov Fixed icon cleanup

vinokurig · 2019-05-28T14:19:35Z

@akosyakov any updates?

akosyakov · 2019-05-28T14:20:05Z

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 · 2019-05-28T14:22:44Z

@akosyakov Is it ok to fix it tomorrow?

akosyakov · 2019-05-28T14:24:47Z

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

To show how it used to work:

akosyakov · 2019-05-29T05:24:58Z

@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 · 2019-05-29T06:40:49Z

@akosyakov Fixed icons order

akosyakov · 2019-05-29T07:07:46Z

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

vinokurig · 2019-05-29T07:16:14Z

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

yes

akosyakov · 2019-05-29T07:32:12Z

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 · 2019-05-29T08:21:53Z

@akosyakov detection addition/deletion repositories is fixed

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

fixed

vinokurig · 2019-05-29T08:25:31Z

@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 · 2019-05-29T08:32:27Z

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

Signed-off-by: Igor Vinokur <ivinokur@redhat.com>

akosyakov

please merge, thank you again

marcdumais-work · 2019-05-29T11:26:29Z

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

akosyakov · 2019-05-29T12:18:35Z

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

akosyakov · 2019-05-29T13:00:58Z

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

vinokurig · 2019-05-29T13:20:18Z

@akosyakov yes, working on it

vinokurig · 2019-05-29T14:33:36Z

@akosyakov

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

fixed

vinokurig requested review from akosyakov and AlexTugarev May 25, 2019 06:12

vinokurig mentioned this pull request May 27, 2019

Introduce SCM Plugin-Api #4279

Merged

vinokurig requested review from benoitf and evidolob as code owners May 27, 2019 09:22

This was referenced May 27, 2019

[scm] wrong icon for open changes #5245

Closed

[scm/git] bogus inline command contribution #5265

Closed

This was referenced May 27, 2019

[scm] show SCM #5246

Closed

[scm] revert changes to core package #5262

Closed

[scm] unnecessary information in status bar #5266

Closed

akosyakov reviewed May 27, 2019

View reviewed changes

packages/git/src/browser/git-contribution.ts Show resolved Hide resolved

vinokurig mentioned this pull request May 27, 2019

[scm] command categories and labels should show SCM, not Scm #5267

Closed

akosyakov reviewed May 27, 2019

View reviewed changes

packages/scm/src/browser/scm-widget.tsx Show resolved Hide resolved

akosyakov reviewed May 27, 2019

View reviewed changes

packages/scm/src/browser/scm-widget.tsx Show resolved Hide resolved

akosyakov reviewed May 27, 2019

View reviewed changes

vinokurig force-pushed the theia-5245 branch from 88662a4 to 69745eb Compare May 28, 2019 05:15

akosyakov reviewed May 28, 2019

View reviewed changes

packages/scm/src/browser/scm-widget.tsx Outdated Show resolved Hide resolved

akosyakov reviewed May 28, 2019

View reviewed changes

packages/scm/src/browser/scm-widget.tsx Outdated Show resolved Hide resolved

akosyakov changed the title ~~Fix Git open changes icon~~ scm/git UI fixes May 28, 2019

akosyakov mentioned this pull request May 29, 2019

Navigate and inline are lower case in the command menu #5291

Closed

Cleanup Scm

433a36c

Signed-off-by: Igor Vinokur <ivinokur@redhat.com>

vinokurig force-pushed the theia-5245 branch from 1f9f1f2 to 433a36c Compare May 29, 2019 08:35

akosyakov approved these changes May 29, 2019

View reviewed changes

vinokurig merged commit afc3499 into master May 29, 2019

vinokurig deleted the theia-5245 branch May 29, 2019 09:07

vinokurig mentioned this pull request May 29, 2019

Refactor Git extension to use Scm where possible #5299

Closed

scm/git UI fixes #5254

scm/git UI fixes #5254

Conversation

vinokurig commented May 25, 2019 • edited by akosyakov Loading

akosyakov commented May 27, 2019

vinokurig commented May 27, 2019

akosyakov commented May 27, 2019

akosyakov commented May 27, 2019 • edited Loading

akosyakov commented May 27, 2019

akosyakov commented May 27, 2019

akosyakov left a comment

Choose a reason for hiding this comment

vinokurig commented May 27, 2019 • edited Loading

vinokurig commented May 28, 2019

akosyakov commented May 28, 2019 • edited Loading

akosyakov commented May 28, 2019

vinokurig commented May 28, 2019 • edited Loading

vinokurig commented May 28, 2019

akosyakov commented May 28, 2019 • edited Loading

akosyakov commented May 28, 2019

vinokurig commented May 28, 2019 • edited Loading

akosyakov commented May 28, 2019

vinokurig commented May 28, 2019

vinokurig commented May 28, 2019

akosyakov commented May 28, 2019

vinokurig commented May 28, 2019

akosyakov commented May 28, 2019

akosyakov commented May 29, 2019

vinokurig commented May 29, 2019

akosyakov commented May 29, 2019

vinokurig commented May 29, 2019

akosyakov commented May 29, 2019 • edited Loading

vinokurig commented May 29, 2019 • edited Loading

vinokurig commented May 29, 2019

akosyakov commented May 29, 2019

akosyakov left a comment

Choose a reason for hiding this comment

marcdumais-work commented May 29, 2019

akosyakov commented May 29, 2019

akosyakov commented May 29, 2019

vinokurig commented May 29, 2019

vinokurig commented May 29, 2019

vinokurig commented May 25, 2019 •

edited by akosyakov

Loading

akosyakov commented May 27, 2019 •

edited

Loading

vinokurig commented May 27, 2019 •

edited

Loading

akosyakov commented May 28, 2019 •

edited

Loading

vinokurig commented May 28, 2019 •

edited

Loading

akosyakov commented May 28, 2019 •

edited

Loading

vinokurig commented May 28, 2019 •

edited

Loading

akosyakov commented May 29, 2019 •

edited

Loading

vinokurig commented May 29, 2019 •

edited

Loading