Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

💄

Browse Source
This commit is contained in:
Joao Moreno
2017-12-15 16:17:39 +01:00
parent bf741a1afd
commit eb43c80ecc
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/git/src/commands.ts
View File

@@ -328,10 +328,6 @@ export class CommandCenter {
return '';
}
private handlePathTilde(path: string): string {
return path.replace(/^~/, os.homedir());
}
private static cloneId = 0;
@command('git.clone')
@@ -358,7 +354,7 @@ export class CommandCenter {
const parentPath = await window.showInputBox({
prompt: localize('parent', "Parent Directory"),
value: this.handlePathTilde(value),
value,
ignoreFocusOut: true
});
@@ -382,7 +378,7 @@ export class CommandCenter {
statusBarItem.command = cancelCommandId;
statusBarItem.show();
const clonePromise = this.git.clone(url, this.handlePathTilde(parentPath), tokenSource.token);
const clonePromise = this.git.clone(url, parentPath.replace(/^~/, os.homedir()), tokenSource.token);
try {
window.withProgress({ location: ProgressLocation.SourceControl, title: localize('cloning', "Cloning git repository...") }, () => clonePromise);
@@ -1329,7 +1325,7 @@ export class CommandCenter {
const remoteRefs = repository.refs;
const remoteRefsFiltered = remoteRefs.filter(r => (r.remote === remotePick.label));
const branchPicks = remoteRefsFiltered.map(r => ({ label: r.name})) as {label : string; description : string}[];
const branchPicks = remoteRefsFiltered.map(r => ({ label: r.name })) as { label: string; description: string }[];
const branchPick = await window.showQuickPick(branchPicks, { placeHolder });
if (!branchPick) {
@@ -1338,7 +1334,7 @@ export class CommandCenter {
const remoteCharCnt = remotePick.label.length;
repository.pull(false, remotePick.label, branchPick.label.slice(remoteCharCnt+1));
repository.pull(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
}
@command('git.pull', { repository: true })