Disable git (#1047)

pull/1054/head
yann300 4 years ago committed by GitHub
parent 79c09b7322
commit 306192ec66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      apps/remix-ide-e2e/src/tests/remixd.test.ts
  2. 6
      apps/remix-ide/src/app/files/remixd-handle.js
  3. 2
      apps/remix-ide/src/app/panels/terminal.js
  4. 3
      libs/remixd/src/bin/remixd.ts

@ -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']) .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 browser
.executeScript('git status') .executeScript('git status')
.pause(3000) .pause(3000)

@ -38,7 +38,7 @@ export class RemixdHandle extends WebsocketPlugin {
deactivate () { deactivate () {
if (super.socket) super.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) => { this.locahostProvider.close((error) => {
if (error) console.log(error) if (error) console.log(error)
}) })
@ -49,7 +49,7 @@ export class RemixdHandle extends WebsocketPlugin {
} }
async canceled () { 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') await this.appManager.deactivatePlugin('remixd')
} }
@ -81,7 +81,7 @@ export class RemixdHandle extends WebsocketPlugin {
} }
}, 3000) }, 3000)
this.locahostProvider.init(() => {}) this.locahostProvider.init(() => {})
this.call('manager', 'activatePlugin', 'git') // this.call('manager', 'activatePlugin', 'git')
} }
} }
if (this.locahostProvider.isConnected()) { if (this.locahostProvider.isConnected()) {

@ -749,7 +749,7 @@ class Terminal extends Plugin {
try { try {
let result let result
if (script.trim().startsWith('git')) { if (script.trim().startsWith('git')) {
result = await this.call('git', 'execute', script) // result = await this.call('git', 'execute', script)
} else { } else {
result = await this.call('scriptRunner', 'execute', script) result = await this.call('scriptRunner', 'execute', script)
} }

@ -59,11 +59,12 @@ function startService<S extends 'git' | 'folder'> (service: S, callback: (ws: WS
sharedFolderClient.setupNotifications(program.sharedFolder) sharedFolderClient.setupNotifications(program.sharedFolder)
sharedFolderClient.sharedFolder(program.sharedFolder) sharedFolderClient.sharedFolder(program.sharedFolder)
}) })
/*
startService('git', (ws: WS, sharedFolderClient: servicesList.Sharedfolder) => { startService('git', (ws: WS, sharedFolderClient: servicesList.Sharedfolder) => {
sharedFolderClient.setWebSocket(ws) sharedFolderClient.setWebSocket(ws)
sharedFolderClient.sharedFolder(program.sharedFolder) sharedFolderClient.sharedFolder(program.sharedFolder)
}) })
*/
} catch (error) { } catch (error) {
throw new Error(error) throw new Error(error)
} }

Loading…
Cancel
Save