From ea196dee7b6a81ff6780f0c056a067493193a87a Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Tue, 5 Apr 2016 12:40:18 +0200 Subject: [PATCH] git commands: undo last commit --- .../parts/git/browser/gitActions.contribution.ts | 3 ++- src/vs/workbench/parts/git/browser/gitActions.ts | 9 +++++++-- .../parts/git/browser/views/changes/changesView.ts | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts index b4feb586ec1..afbdbc9cc40 100644 --- a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts +++ b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts @@ -28,7 +28,7 @@ import {IFileService} from 'vs/platform/files/common/files'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import wbar = require('vs/workbench/common/actionRegistry'); import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; -import { OpenChangeAction, OpenFileAction, SyncAction, PullAction, PushAction, PublishAction, StartGitBranchAction, StartGitCheckoutAction, InputCommitAction } from './gitActions'; +import { OpenChangeAction, OpenFileAction, SyncAction, PullAction, PushAction, PublishAction, StartGitBranchAction, StartGitCheckoutAction, InputCommitAction, UndoLastCommitAction } from './gitActions'; import paths = require('vs/base/common/paths'); import URI from 'vs/base/common/uri'; @@ -479,3 +479,4 @@ workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(Publish workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(StartGitBranchAction, StartGitBranchAction.ID, StartGitBranchAction.LABEL), category); workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(StartGitCheckoutAction, StartGitCheckoutAction.ID, StartGitCheckoutAction.LABEL), category); workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(InputCommitAction, InputCommitAction.ID, InputCommitAction.LABEL), category); +workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(UndoLastCommitAction, UndoLastCommitAction.ID, UndoLastCommitAction.LABEL), category); diff --git a/src/vs/workbench/parts/git/browser/gitActions.ts b/src/vs/workbench/parts/git/browser/gitActions.ts index ac48111b5a8..dd27f1162d5 100644 --- a/src/vs/workbench/parts/git/browser/gitActions.ts +++ b/src/vs/workbench/parts/git/browser/gitActions.ts @@ -1162,9 +1162,14 @@ export class LiveSyncAction extends BaseSyncAction { export class UndoLastCommitAction extends GitAction { static ID = 'workbench.action.git.undoLastCommit'; + static LABEL = nls.localize('undoLastCommit', "Undo Last Commit"); - constructor(@IGitService gitService: IGitService) { - super(UndoLastCommitAction.ID, nls.localize('undoLastCommit', "Undo Last Commit"), 'git-action undo-last-commit', gitService); + constructor( + id = UndoLastCommitAction.ID, + label = UndoLastCommitAction.LABEL, + @IGitService gitService: IGitService + ) { + super(UndoLastCommitAction.ID, UndoLastCommitAction.LABEL, 'git-action undo-last-commit', gitService); } public run():Promise { 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 f726f39779f..7832d6ec572 100644 --- a/src/vs/workbench/parts/git/browser/views/changes/changesView.ts +++ b/src/vs/workbench/parts/git/browser/views/changes/changesView.ts @@ -259,7 +259,7 @@ export class ChangesView extends EventEmitter.EventEmitter implements GitView.IV new ActionBar.Separator(), this.instantiationService.createInstance(GitActions.CommitAction, this), this.instantiationService.createInstance(GitActions.StageAndCommitAction, this), - this.instantiationService.createInstance(GitActions.UndoLastCommitAction), + this.instantiationService.createInstance(GitActions.UndoLastCommitAction, GitActions.UndoLastCommitAction.ID, GitActions.UndoLastCommitAction.LABEL), new ActionBar.Separator(), this.instantiationService.createInstance(GitActions.GlobalUnstageAction), this.instantiationService.createInstance(GitActions.GlobalUndoAction), -- GitLab