|
|
@ -88,7 +88,7 @@ class DGitProvider extends Plugin { |
|
|
|
async addIsomorphicGitConfig(input) { |
|
|
|
async addIsomorphicGitConfig(input) { |
|
|
|
const token = await this.call('config' as any, 'getAppParameter', 'settings/gist-access-token') |
|
|
|
const token = await this.call('config' as any, 'getAppParameter', 'settings/gist-access-token') |
|
|
|
return { |
|
|
|
return { |
|
|
|
corsProxy: 'https://corsproxy.remixproject.org/', |
|
|
|
//corsProxy: 'http://192.168.1.7:39049',
|
|
|
|
http, |
|
|
|
http, |
|
|
|
onAuth: url => { |
|
|
|
onAuth: url => { |
|
|
|
url |
|
|
|
url |
|
|
@ -591,6 +591,7 @@ class DGitProvider extends Plugin { |
|
|
|
...await this.addIsomorphicGitConfig(input), |
|
|
|
...await this.addIsomorphicGitConfig(input), |
|
|
|
...await this.addIsomorphicGitConfigFS() |
|
|
|
...await this.addIsomorphicGitConfigFS() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
console.log(cmd) |
|
|
|
this.call('terminal', 'logHtml', `Cloning ${input.url}...`) |
|
|
|
this.call('terminal', 'logHtml', `Cloning ${input.url}...`) |
|
|
|
const result = await git.clone(cmd) |
|
|
|
const result = await git.clone(cmd) |
|
|
|
if (!input.workspaceExists) { |
|
|
|
if (!input.workspaceExists) { |
|
|
@ -740,7 +741,7 @@ class DGitProvider extends Plugin { |
|
|
|
const cmd = { |
|
|
|
const cmd = { |
|
|
|
force: input.force, |
|
|
|
force: input.force, |
|
|
|
ref: input.ref.name, |
|
|
|
ref: input.ref.name, |
|
|
|
remoteRef: input.remoteRef.name, |
|
|
|
remoteRef: input.remoteRef && input.remoteRef.name, |
|
|
|
remote: input.remote.name, |
|
|
|
remote: input.remote.name, |
|
|
|
author: await this.getCommandUser(input), |
|
|
|
author: await this.getCommandUser(input), |
|
|
|
input, |
|
|
|
input, |
|
|
@ -767,7 +768,7 @@ class DGitProvider extends Plugin { |
|
|
|
async pull(input: pullInputType) { |
|
|
|
async pull(input: pullInputType) { |
|
|
|
const cmd = { |
|
|
|
const cmd = { |
|
|
|
ref: input.ref.name, |
|
|
|
ref: input.ref.name, |
|
|
|
remoteRef: input.remoteRef.name, |
|
|
|
remoteRef: input.remoteRef && input.remoteRef.name, |
|
|
|
author: await this.getCommandUser(input), |
|
|
|
author: await this.getCommandUser(input), |
|
|
|
remote: input.remote.name, |
|
|
|
remote: input.remote.name, |
|
|
|
input, |
|
|
|
input, |
|
|
|