diff --git a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts index 3e38a818f688749acea3b90113d60c1ba4a9083d..d2749be5361f348a1d2161f25e88d42e21846bc3 100644 --- a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts +++ b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts @@ -634,7 +634,7 @@ workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(GlobalO workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(GlobalOpenInEditorAction, GlobalOpenInEditorAction.ID, GlobalOpenInEditorAction.LABEL), 'Git: Open File', category); workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(PullAction, PullAction.ID, PullAction.LABEL), 'Git: Pull', category); workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(PushAction, PushAction.ID, PushAction.LABEL), 'Git: Push', category); -workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(PushToRemoteAction, PushToRemoteAction.ID, PushToRemoteAction.LABEL), 'Git: Push To Remote', category); +workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(PushToRemoteAction, PushToRemoteAction.ID, PushToRemoteAction.LABEL), 'Git: Push to...', category); workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SyncAction, SyncAction.ID, SyncAction.LABEL), 'Git: Sync', category); workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(PublishAction, PublishAction.ID, PublishAction.LABEL), 'Git: Publish', category); workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(StartGitBranchAction, StartGitBranchAction.ID, StartGitBranchAction.LABEL), 'Git: Branch', category); diff --git a/src/vs/workbench/parts/git/browser/gitActions.ts b/src/vs/workbench/parts/git/browser/gitActions.ts index 1fc9e1458916f24628ac825178358d4c74efac1b..7c548431ee7ab2ce495d162a9e7e1833ea7e4604 100644 --- a/src/vs/workbench/parts/git/browser/gitActions.ts +++ b/src/vs/workbench/parts/git/browser/gitActions.ts @@ -1010,7 +1010,7 @@ export class PushAction extends GitAction { export class PushToRemoteAction extends GitAction { static ID = 'workbench.action.git.pushToRemote'; - static LABEL = nls.localize('pushToRemote', "Push To Remote"); + static LABEL = nls.localize('pushToRemote', "Push to..."); constructor( id: string = PushToRemoteAction.ID, @@ -1021,7 +1021,7 @@ export class PushToRemoteAction extends GitAction { super(id, label, 'git-action publish', gitService); } - protected isEnabled():boolean { + protected isEnabled(): boolean { if (!super.isEnabled()) { return false; } @@ -1045,25 +1045,15 @@ export class PushToRemoteAction extends GitAction { return true; } - public run(context?: any):Promise { + public run(context?: any): Promise { const model = this.gitService.getModel(); const remotes = model.getRemotes(); const branchName = model.getHEAD().name; - let promise: TPromise; - - - const picks = remotes.map(({ name, url }) => ({ - label: name, - description: url - })); - + const picks = remotes.map(({ name, url }) => ({ label: name, description: url })); const placeHolder = nls.localize('pushToRemotePickMessage', "Pick a remote to push the branch '{0}' to:", branchName); - promise = this.quickOpenService.pick(picks, { placeHolder }) - .then(pick => pick && pick.label); - - - return promise + return this.quickOpenService.pick(picks, { placeHolder }) + .then(pick => pick && pick.label) .then(remote => remote && this.gitService.push(remote, branchName)) .then(null, err => { if (err.gitErrorCode === GitErrorCodes.AuthenticationFailed) {