Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable git #1047

Merged
merged 4 commits into from
Mar 30, 2021
Merged

Disable git #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70ac245
disable git
yann300 Mar 29, 2021
8b69795
diable git e2e test
yann300 Mar 29, 2021
c230443
Merge branch 'master' into disableGit
EthereumRemix Mar 30, 2021
2e63e57
Merge branch 'master' into disableGit
EthereumRemix Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/remix-ide-e2e/src/tests/remixd.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ module.exports = {
.testContracts('test_import_node_modules_with_github_import.sol', sources[4]['test_import_node_modules_with_github_import.sol'], ['ERC20', 'test11'])
},

'Run git status': function (browser) {
'Run git status': '' + function (browser) {
browser
.executeScript('git status')
.pause(3000)
Expand Down
6 changes: 3 additions & 3 deletions apps/remix-ide/src/app/files/remixd-handle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class RemixdHandle extends WebsocketPlugin {

deactivate () {
if (super.socket) super.deactivate()
this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
// this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
this.locahostProvider.close((error) => {
if (error) console.log(error)
})
Expand All @@ -49,7 +49,7 @@ export class RemixdHandle extends WebsocketPlugin {
}

async canceled () {
await this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
// await this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
await this.appManager.deactivatePlugin('remixd')
}

Expand Down Expand Up @@ -81,7 +81,7 @@ export class RemixdHandle extends WebsocketPlugin {
}
}, 3000)
this.locahostProvider.init(() => {})
this.call('manager', 'activatePlugin', 'git')
// this.call('manager', 'activatePlugin', 'git')
}
}
if (this.locahostProvider.isConnected()) {
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/panels/terminal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ class Terminal extends Plugin {
try {
let result
if (script.trim().startsWith('git')) {
result = await this.call('git', 'execute', script)
// result = await this.call('git', 'execute', script)
} else {
result = await this.call('scriptRunner', 'execute', script)
}
Expand Down
3 changes: 2 additions & 1 deletion libs/remixd/src/bin/remixd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,12 @@ function startService<S extends 'git' | 'folder'> (service: S, callback: (ws: WS
sharedFolderClient.setupNotifications(program.sharedFolder)
sharedFolderClient.sharedFolder(program.sharedFolder)
})

/*
startService('git', (ws: WS, sharedFolderClient: servicesList.Sharedfolder) => {
sharedFolderClient.setWebSocket(ws)
sharedFolderClient.sharedFolder(program.sharedFolder)
})
*/
} catch (error) {
throw new Error(error)
}
Expand Down