diff --git a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts index 6c238d363da..588047cbec8 100644 --- a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts +++ b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts @@ -31,7 +31,7 @@ import {IFileService, IFileStat} from 'vs/platform/files/common/files'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import wbar = require('vs/workbench/browser/actionRegistry'); import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; -import { OpenChangeAction, SyncAction } from './gitActions'; +import { OpenChangeAction, SyncAction, PullAction, PushAction, PublishAction } from './gitActions'; import Severity from 'vs/base/common/severity'; import paths = require('vs/base/common/paths'); import URI from 'vs/base/common/uri'; @@ -444,4 +444,7 @@ let workbenchActionRegistry = ( platform.Registry // Register Actions const category = nls.localize('git', "Git"); workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(GlobalOpenChangeAction, GlobalOpenChangeAction.ID, GlobalOpenChangeAction.LABEL), category); +workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(PullAction, PullAction.ID, PullAction.LABEL), category); +workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(PushAction, PushAction.ID, PushAction.LABEL), category); workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SyncAction, SyncAction.ID, SyncAction.LABEL), category); +workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(PublishAction, PublishAction.ID, PublishAction.LABEL), category); diff --git a/src/vs/workbench/parts/git/browser/gitActions.ts b/src/vs/workbench/parts/git/browser/gitActions.ts index ac5e80fdeee..83a385d469a 100644 --- a/src/vs/workbench/parts/git/browser/gitActions.ts +++ b/src/vs/workbench/parts/git/browser/gitActions.ts @@ -883,9 +883,14 @@ export class PullWithRebaseAction extends PullAction { export class PushAction extends GitAction { static ID = 'workbench.action.push'; + static LABEL = nls.localize('push', "Push"); - constructor(@IGitService gitService: IGitService) { - super(PushAction.ID, nls.localize('push', "Push"), 'git-action push', gitService); + constructor( + id: string = PushAction.ID, + label: string = PushAction.LABEL, + @IGitService gitService: IGitService + ) { + super(id, label, 'git-action push', gitService); } protected isEnabled():boolean { @@ -925,13 +930,16 @@ export class PushAction extends GitAction { export class PublishAction extends GitAction { static ID = 'workbench.action.publish'; + static LABEL = nls.localize('publish', "Publish"); constructor( + id: string = PublishAction.ID, + label: string = PublishAction.LABEL, @IGitService gitService: IGitService, @IQuickOpenService private quickOpenService: IQuickOpenService, @IMessageService private messageService: IMessageService ) { - super(PublishAction.ID, nls.localize('publish', "Publish"), 'git-action publish', gitService); + super(id, label, 'git-action publish', gitService); } protected isEnabled():boolean { diff --git a/src/vs/workbench/parts/git/browser/views/changes/changesView.ts b/src/vs/workbench/parts/git/browser/views/changes/changesView.ts index 64f42aad651..5fcc6c18408 100644 --- a/src/vs/workbench/parts/git/browser/views/changes/changesView.ts +++ b/src/vs/workbench/parts/git/browser/views/changes/changesView.ts @@ -250,9 +250,9 @@ export class ChangesView extends EventEmitter.EventEmitter implements GitView.IV this.instantiationService.createInstance(GitActions.SyncAction, GitActions.SyncAction.ID, GitActions.SyncAction.LABEL), this.instantiationService.createInstance(GitActions.PullAction, GitActions.PullAction.ID, GitActions.PullAction.LABEL), this.instantiationService.createInstance(GitActions.PullWithRebaseAction), - this.instantiationService.createInstance(GitActions.PushAction), + this.instantiationService.createInstance(GitActions.PushAction, GitActions.PushAction.ID, GitActions.PushAction.LABEL), new ActionBar.Separator(), - this.instantiationService.createInstance(GitActions.PublishAction), + this.instantiationService.createInstance(GitActions.PublishAction, GitActions.PublishAction.ID, GitActions.PublishAction.LABEL), new ActionBar.Separator(), this.instantiationService.createInstance(GitActions.CommitAction, this), this.instantiationService.createInstance(GitActions.StageAndCommitAction, this),