Introduce SCM Plugin-Api #4279

vinokurig · 2019-02-07T13:59:28Z

This PR contains:

SCM Plugin API methods
SCM Service witch handles registered providers and fires related events. This service is designed to handle scm menu contributions (support scm menu contributions #4171)
Git toolbar items are handled by SCM Service.

#4103, #4666, #4266
VsCode Git Extension integration:

benoitf · 2019-02-07T14:25:25Z

hello @vinokurig
Which SCM VSCode extension do you have used to check SCM ?

It may help people to know which one you used and how it is working, etc.

akosyakov · 2019-02-08T07:08:09Z

packages/scm/src/browser/scmService.ts

@@ -0,0 +1,187 @@
+/********************************************************************************
+ * Copyright (C) 2018 Red Hat, Inc. and others.


2019, please review copyrights for new filws

packages/scm/src/browser/scmService.ts

packages/scm/src/common/scm.ts

akosyakov · 2019-02-08T07:14:57Z

Should not SCM extension provide SCM UI and not rely on git extension for it?

vinokurig · 2019-02-08T09:56:14Z

@akosyakov It should provide UI, I think this is going to be done in the scope of #4171. The Scm Service doesn't relay on git extension, Git sends events to Scm Service.

@benoitf The Api is needed for VsCode Git extension (eclipse-che/che#4266) but since there is no UI part for SCM Service yet, it is hard to test it in the current state.

kittaakos · 2019-02-08T12:49:30Z

Reviewing...

akosyakov · 2019-02-08T13:37:31Z

#4171 is just about menu contributions

the description of #4103 says:

We need to extract Git-agnostic UI to a new extension. This extension should provide APIs similar to VS Code. Git extension has to be updated to use this API.

This PR does not seem to implement it yet. I'm fine doing migration via several PRs though. The issue should be resolved when git extension is completely refactored to work via scm extension.

examples/browser/package.json

packages/git/package.json

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

packages/scm/src/browser/scm-service-impl.ts

packages/scm/src/common/scm.ts

vinokurig · 2019-02-11T08:59:13Z

@akosyakov
#4171 is just about menu contributions

the description of #4103 says:

We need to extract Git-agnostic UI to a new extension. This extension should provide APIs similar to VS Code. Git extension has to be updated to use this API.

This PR does not seem to implement it yet. I'm fine doing migration via several PRs though. The issue should be resolved when git extension is completely refactored to work via scm extension.

Ok, I am going to continue with UI, but I think this can be merged as a part 1.

benoitf

I'm fine, waiting approval from @kittaakos as he did a review

kittaakos · 2019-02-19T10:07:23Z

Thanks for the reminder, @benoitf. I will look into the changes once more when the DCO check and the builds are fine.

vinokurig · 2019-02-19T12:56:18Z

@kittaakos The tests passed locally but they failed at travis-ci job

kittaakos · 2019-02-20T09:04:37Z

Thank you for your patience, @vinokurig! I have looked into your changes, tried it locally with multiple repositories. It works, however, when I have three repositories in my workspace when I do a browser refresh and I take the heap dumb, I can see nine ScmRepositoryImpl instances in the memory. Presumably, it should be three. Please take a look.

vinokurig · 2019-02-20T12:09:53Z

Sorry, couldn't reproduce, I got the same result after refreshing three times:

kittaakos · 2019-02-20T12:34:55Z

Thanks for checking, I will try once more.

kittaakos · 2019-02-20T13:38:14Z

I could. Here are the steps:

Open Theia in a WS.
Clone any repository (R1) into the workspace.
Clone a second repository (R2) into the workspace.
Refresh the browser.
Activate the Git widget.
Make sure you have activated all three repositories (R1, R2, and theia) from the status bar.
Refresh the browser.
Create the heap dump. (From this point after each refresh, I have three new instances.)

I hope this helps to fix the leak.

vinokurig · 2019-02-21T15:41:49Z

It is strange, but I couldn't reproduce your scenario, have you pulled the latest version?

kittaakos · 2019-02-21T15:42:35Z

have you pulled the latest version?

Yes.

kittaakos · 2019-02-21T15:44:12Z

I'll give it a try once more...

vinokurig · 2019-02-21T15:44:21Z

I'll record a video of my steps ASAP

Signed-off-by: Nigel Westbury <nigelipse@miegel.org>

vinokurig · 2019-05-21T14:26:41Z

@benoitf done

benoitf · 2019-05-21T14:37:04Z

@svenefftinge is it ok on your side to merge this PR ?

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

svenefftinge

Yes, sorry fr the delay. I thought it was already merged.

akosyakov · 2019-05-24T10:44:10Z

@vinokurig you did not address my comment #4279 (comment) @svenefftinge this PR lost changes from master, we have to revert or fix it asap

akosyakov · 2019-05-24T10:45:18Z

This is Git VsCode Extension and it has the same icon:

I was not taliknig about VS Code exteniosn, but theia Git extenison. It is bogus now on master. Also you have not fixed menu items in the main menu.

AlexTugarev · 2019-05-24T11:09:24Z

examples/browser/test/left-panel/left-panel.ui-spec.ts

@@ -33,9 +33,8 @@ before(() => {
 });

 describe('theia left panel', () => {
-    it("should show 'Explorer' and 'Git'", () => {
+    it("should show 'Explorer'", () => {


@vinokurig, indeed. but why?

what's the reason to not show SCM?

akosyakov · 2019-05-24T11:12:34Z

I've randomly picked a commit from history for Git extension and it's turned out to be lost as well:
d334126#diff-dca13dfc45fedafbb7c0b5a3f5bf180c

@vinokurig please analyze changes to git extension done since you've started working on it and make sure that everything is recovered.

AlexTugarev · 2019-05-24T11:23:09Z

@vinokurig, as pointed out by @akosyakov, there are missing changes. we should take a step back, revert this PR and improve it.

vinokurig · 2019-05-24T11:26:49Z

Ok, I'll create a new PR with the changes

AlexTugarev · 2019-05-24T11:27:50Z

Ok, I'll create a new PR with the changes

could you clarify? would you revert for now?

vinokurig · 2019-05-24T11:29:18Z

Is it possible to keep it and provide fixes ASAP?

akosyakov · 2019-05-24T11:32:41Z

@vinokurig it has to be fixed beginning next week, since there are products and example apps relying on next version of git extension. I will help with analysis Monday morning, depending on how much is lost, we decide whether we revert or fix it on the same day.

if @AlexTugarev @svenefftinge are not objecting, if you need git extension working as before today, then go ahead and revert.

vinokurig · 2019-05-27T06:04:20Z

@akosyakov @AlexTugarev I've opened a PRs with fixes #5254, #5255, #5256, could you please tkae a look. Can we avoid revert SCM with those fixes?

vinokurig requested review from benoitf, evidolob and akosyakov February 7, 2019 13:59

vinokurig force-pushed the theia-4103 branch from f1f45dc to f1839df Compare February 7, 2019 14:00

akosyakov requested review from svenefftinge and kittaakos February 8, 2019 07:06

akosyakov reviewed Feb 8, 2019

View reviewed changes

packages/scm/src/common/scm.ts Outdated Show resolved Hide resolved

kittaakos reviewed Feb 8, 2019

View reviewed changes

vinokurig force-pushed the theia-4103 branch from aa32ee9 to 8a4fd9a Compare February 11, 2019 08:46

benoitf approved these changes Feb 19, 2019

View reviewed changes

vinokurig force-pushed the theia-4103 branch 3 times, most recently from 20a5ba6 to 7f27542 Compare February 19, 2019 11:28

ScmAmendComponent fixes

3bed733

Signed-off-by: Nigel Westbury <nigelipse@miegel.org>

vinokurig force-pushed the theia-4103 branch from 1a4f14c to 8516a69 Compare May 21, 2019 14:25

fixup! Add Scm component and bind Git to it

48e0599

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

vinokurig force-pushed the theia-4103 branch from 8516a69 to 48e0599 Compare May 21, 2019 15:01

svenefftinge approved these changes May 23, 2019

View reviewed changes

vinokurig merged commit c0a4970 into master May 24, 2019

vinokurig deleted the theia-4103 branch May 24, 2019 06:33

AlexTugarev mentioned this pull request May 24, 2019

[scm] Clean up left-overs #5242

Merged

AlexTugarev mentioned this pull request May 24, 2019

[scm] wrong icon for open changes #5245

Closed

AlexTugarev reviewed May 24, 2019

View reviewed changes

AlexTugarev mentioned this pull request May 24, 2019

[scm] show SCM #5246

Closed

AlexTugarev restored the theia-4103 branch May 24, 2019 11:23

kittaakos mentioned this pull request May 24, 2019

Add 'reject-cycles' lerna option #5239

Merged

westbury mentioned this pull request May 29, 2019

Create container views to support source control other than Git #3438

Closed

westbury mentioned this pull request Jun 8, 2019

Git 'Amend' can cause confusion #3851

Closed

vinokurig deleted the theia-4103 branch July 8, 2019 08:49

westbury mentioned this pull request Nov 27, 2019

[scm] support 'undo last commit' #6652

Closed

westbury mentioned this pull request Sep 24, 2020

add branch name into commit textarea placeholder #6156

Merged

1 task

westbury mentioned this pull request Mar 18, 2021

Improve ability of downstream apps to control file watching #9163

Merged

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Introduce SCM Plugin-Api #4279

Introduce SCM Plugin-Api #4279

vinokurig commented Feb 7, 2019 •

edited

Loading

benoitf commented Feb 7, 2019

akosyakov Feb 8, 2019 •

edited

Loading

vinokurig Feb 8, 2019

akosyakov commented Feb 8, 2019

vinokurig commented Feb 8, 2019

kittaakos commented Feb 8, 2019

akosyakov commented Feb 8, 2019

vinokurig commented Feb 11, 2019

benoitf left a comment

kittaakos commented Feb 19, 2019

vinokurig commented Feb 19, 2019

kittaakos commented Feb 20, 2019

vinokurig commented Feb 20, 2019

kittaakos commented Feb 20, 2019

kittaakos commented Feb 20, 2019

vinokurig commented Feb 21, 2019

kittaakos commented Feb 21, 2019

kittaakos commented Feb 21, 2019

vinokurig commented Feb 21, 2019

vinokurig commented May 21, 2019

benoitf commented May 21, 2019

svenefftinge left a comment

akosyakov commented May 24, 2019 •

edited

Loading

akosyakov commented May 24, 2019

AlexTugarev May 24, 2019

akosyakov commented May 24, 2019 •

edited

Loading

AlexTugarev commented May 24, 2019

vinokurig commented May 24, 2019

AlexTugarev commented May 24, 2019

vinokurig commented May 24, 2019

akosyakov commented May 24, 2019 •

edited

Loading

vinokurig commented May 27, 2019

		@@ -0,0 +1,187 @@
		/********************************************************************************
		* Copyright (C) 2018 Red Hat, Inc. and others.

Introduce SCM Plugin-Api #4279

Introduce SCM Plugin-Api #4279

Conversation

vinokurig commented Feb 7, 2019 • edited Loading

benoitf commented Feb 7, 2019

akosyakov Feb 8, 2019 • edited Loading

Choose a reason for hiding this comment

vinokurig Feb 8, 2019

Choose a reason for hiding this comment

akosyakov commented Feb 8, 2019

vinokurig commented Feb 8, 2019

kittaakos commented Feb 8, 2019

akosyakov commented Feb 8, 2019

vinokurig commented Feb 11, 2019

benoitf left a comment

Choose a reason for hiding this comment

kittaakos commented Feb 19, 2019

vinokurig commented Feb 19, 2019

kittaakos commented Feb 20, 2019

vinokurig commented Feb 20, 2019

kittaakos commented Feb 20, 2019

kittaakos commented Feb 20, 2019

vinokurig commented Feb 21, 2019

kittaakos commented Feb 21, 2019

kittaakos commented Feb 21, 2019

vinokurig commented Feb 21, 2019

vinokurig commented May 21, 2019

benoitf commented May 21, 2019

svenefftinge left a comment

Choose a reason for hiding this comment

akosyakov commented May 24, 2019 • edited Loading

akosyakov commented May 24, 2019

AlexTugarev May 24, 2019

Choose a reason for hiding this comment

akosyakov commented May 24, 2019 • edited Loading

AlexTugarev commented May 24, 2019

vinokurig commented May 24, 2019

AlexTugarev commented May 24, 2019

vinokurig commented May 24, 2019

akosyakov commented May 24, 2019 • edited Loading

vinokurig commented May 27, 2019

vinokurig commented Feb 7, 2019 •

edited

Loading

akosyakov Feb 8, 2019 •

edited

Loading

akosyakov commented May 24, 2019 •

edited

Loading

akosyakov commented May 24, 2019 •

edited

Loading

akosyakov commented May 24, 2019 •

edited

Loading