Revert Git revert action (eclipse-che#6470)

Author: tolusha

ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClient.java

@@ -22,7 +22,6 @@
 import org.eclipse.che.api.git.shared.PushResponse;
 import org.eclipse.che.api.git.shared.Remote;
 import org.eclipse.che.api.git.shared.ResetRequest.ResetType;
-import org.eclipse.che.api.git.shared.RevertResult;
 import org.eclipse.che.api.git.shared.Revision;
 import org.eclipse.che.api.git.shared.ShowFileContentResponse;
 import org.eclipse.che.api.git.shared.Status;
@@ -367,13 +366,4 @@ Promise<LogResponse> log(
    * @return the promise with success status
    */
   Promise<Void> deleteRepository(Path project);
-
-  /**
-   * Reverts commit.
-   *
-   * @param project the project path
-   * @param commit the hash of the commit to revert
-   * @return result of the revert operation
-   */
-  Promise<RevertResult> revert(Path project, String commit);
 }

ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClientImpl.java

@@ -43,8 +43,6 @@
 import org.eclipse.che.api.git.shared.Remote;
 import org.eclipse.che.api.git.shared.RemoteAddRequest;
 import org.eclipse.che.api.git.shared.ResetRequest;
-import org.eclipse.che.api.git.shared.RevertRequest;
-import org.eclipse.che.api.git.shared.RevertResult;
 import org.eclipse.che.api.git.shared.Revision;
 import org.eclipse.che.api.git.shared.ShowFileContentResponse;
 import org.eclipse.che.api.git.shared.Status;
@@ -88,7 +86,6 @@ public class GitServiceClientImpl implements GitServiceClient {
   private static final String REMOVE = "/git/remove";
   private static final String RESET = "/git/reset";
   private static final String REPOSITORY = "/git/repository";
-  private static final String REVERT = "/git/revert";
 
   /** Loader to be displayed. */
   private final AsyncRequestLoader loader;
@@ -506,16 +503,6 @@ public Promise<Void> deleteRepository(Path project) {
     return asyncRequestFactory.createDeleteRequest(url).loader(loader).send();
   }
 
-  @Override
-  public Promise<RevertResult> revert(Path project, String commit) {
-    RevertRequest revertRequest = dtoFactory.createDto(RevertRequest.class).withCommit(commit);
-    String url = getWsAgentBaseUrl() + REVERT + "?projectPath=" + project;
-    return asyncRequestFactory
-        .createPostRequest(url, revertRequest)
-        .loader(loader)
-        .send(dtoUnmarshallerFactory.newUnmarshaller(RevertResult.class));
-  }
-
   private String getWsAgentBaseUrl() {
     return appContext.getDevMachine().getWsAgentBaseUrl();
   }

plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitExtension.java

@@ -39,7 +39,6 @@
 import org.eclipse.che.ide.ext.git.client.action.RemoveFromIndexAction;
 import org.eclipse.che.ide.ext.git.client.action.ResetFilesAction;
 import org.eclipse.che.ide.ext.git.client.action.ResetToCommitAction;
-import org.eclipse.che.ide.ext.git.client.action.RevertCommitAction;
 import org.eclipse.che.ide.ext.git.client.action.ShowBranchesAction;
 import org.eclipse.che.ide.ext.git.client.action.ShowMergeAction;
 import org.eclipse.che.ide.ext.git.client.action.ShowRemoteAction;
@@ -93,7 +92,6 @@ public GitExtension(
       CompareWithRevisionAction compareWithRevisionAction,
       NextDiffAction nextDiffAction,
       PreviousDiffAction previousDiffAction,
-      RevertCommitAction revertCommitAction,
       KeyBindingAgent keyBinding) {
 
     resources.gitCSS().ensureInjected();
@@ -133,8 +131,6 @@ public GitExtension(
     commandGroup.add(compareGroup);
     actionManager.registerAction("gitResetToCommit", resetToCommitAction);
     commandGroup.add(resetToCommitAction);
-    actionManager.registerAction("gitRevertCommit", revertCommitAction);
-    commandGroup.add(revertCommitAction);
     actionManager.registerAction("gitRemoveFromIndexCommit", removeFromIndexAction);
     commandGroup.add(removeFromIndexAction);
     actionManager.registerAction(GIT_SHOW_COMMIT_WINDOW, commitAction);
@@ -178,7 +174,6 @@ public GitExtension(
     gitContextMenuGroup.add(addToIndexAction);
     gitContextMenuGroup.add(removeFromIndexAction);
     gitContextMenuGroup.add(resetFilesAction);
-    gitContextMenuGroup.add(revertCommitAction);
     gitContextMenuGroup.add(commitAction);
     gitContextMenuGroup.add(historyAction);
     gitContextMenuGroup.addSeparator();

plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.java

@@ -72,9 +72,6 @@ public interface GitLocalizationConstant extends Messages {
   @Key("button.compare")
   String buttonCompare();
 
-  @Key("button.revert")
-  String buttonRevert();
-
   @Key("button.save_changes")
   String buttonSaveChanges();
 
@@ -428,50 +425,13 @@ public interface GitLocalizationConstant extends Messages {
   @Key("view.reset.hard.type.description")
   String resetHardTypeDescription();
 
-  // Revert
-  @Key("view.revert.commit.title")
-  String revertCommitViewTitle();
-
-  @Key("view.revert.no_commit.type.title")
-  String revertNoCommitTypeTitle();
-
-  @Key("view.revert.no_commit.type.description")
-  String revertNoCommitTypeDescription();
-
-  @Key("view.revert.revision.table.id.title")
-  String viewRevertRevisionTableIdTitle();
-
-  @Key("view.revert.revision.table.date.title")
-  String viewRevertRevisionTableDateTitle();
-
-  @Key("view.revert.revision.table.author.title")
-  String viewRevertRevisionTableAuthorTitle();
-
-  @Key("view.revert.revision.table.comment.title")
-  String viewRevertRevisionTableCommentTitle();
-
-  @Key("reverted.commits")
-  String revertedCommits(String commits);
-
-  @Key("reverted.new.head")
-  String revertedNewHead(String newHead);
-
-  @Key("reverted.conflicts")
-  String revertedConflicts();
-
   // Remove
   @Key("view.remove_from_index.all")
   String removeFromIndexAll();
 
   @Key("view.remove_from_index.only")
   String removeFromIndexOnly();
 
-  @Key("control.revert.commit.title")
-  String revertCommitControlTitle();
-
-  @Key("control.revert.commit.prompt")
-  String revertCommitControlPrompt();
-
   @Key("view.remove_from_index.folder")
   String removeFromIndexFolder(String folder);
 

plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitResources.java

@@ -101,7 +101,4 @@ interface GitCSS extends CssResource {
 
   @Source("controls/git-output-icon.svg")
   SVGResource gitOutput();
-
-  @Source("controls/revert.svg")
-  SVGResource revert();
 }

plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/RevertCommitAction.java

@@ -60,8 +60,6 @@
 import org.eclipse.che.ide.ext.git.client.reset.commit.ResetToCommitViewImpl;
 import org.eclipse.che.ide.ext.git.client.reset.files.ResetFilesView;
 import org.eclipse.che.ide.ext.git.client.reset.files.ResetFilesViewImpl;
-import org.eclipse.che.ide.ext.git.client.revert.RevertCommitView;
-import org.eclipse.che.ide.ext.git.client.revert.RevertCommitViewImpl;
 
 /** @author Andrey Plotnikov */
 @ExtensionGinModule
@@ -82,7 +80,6 @@ protected void configure() {
     bind(RemoveFromIndexView.class).to(RemoveFromIndexViewImpl.class).in(Singleton.class);
     bind(RevisionListView.class).to(RevisionListViewImpl.class).in(Singleton.class);
     bind(CommitView.class).to(CommitViewImpl.class).in(Singleton.class);
-    bind(RevertCommitView.class).to(RevertCommitViewImpl.class).in(Singleton.class);
     bind(ChangesListView.class).to(ChangesListViewImpl.class).in(Singleton.class);
     bind(BranchView.class).to(BranchViewImpl.class).in(Singleton.class);
     bind(BranchListView.class).to(BranchListViewImpl.class).in(Singleton.class);