CHE-3271: Add more Git actions to context menu #3618

vinokurig · 2017-01-05T13:30:31Z

What does this PR do?

Added file related git actions to project explorer and editor context menu.

Updated those git actions to have an ability to use them with resource selection.

What issues does this PR fix or reference?

#3271

Tests written?

Yes

vzhukovs · 2017-01-05T14:33:59Z

...in-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/AddToIndexAction.java

+        Resource[] resources = appContext.getResources();
+        Path[] paths = new Path[resources.length];
+        for (int i = 0; i < resources.length; i++) {
+            Path path = resources[i].getLocation().removeFirstSegments(appContext.getRootProject().getLocation().segmentCount());


appContext.getRootProject().getLocation().segmentCount() will be always equals to 1, so you can safely remove the first segment without this checking.

vzhukovs · 2017-01-05T14:36:35Z

...in-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/AddToIndexAction.java

 **/
 @Singleton
 public class AddToIndexAction extends GitAction {
-    private final AddToIndexPresenter  presenter;
+    private static final String ADD_TO_INDEX_COMMAND_NAME = "Git add to index";


You have two equals constants in action and presenter, consider to extract it to the shared place of interface.

moved to constants

vzhukovs · 2017-01-05T14:37:22Z

...in-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/add/AddToIndexPresenter.java

-                consolesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
-                notificationManager.notify(constant.statusFailed(), FAIL, FLOAT_MODE);
+    public void showDialog() {
+        if (appContext.getResources().length == 1) {


appContext.getResources() may be null add additional checking for that.

vzhukovs · 2017-01-05T14:41:20Z

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

+     * @param all
+     *         automatically stage files that have been modified and deleted
+     * @param files
+     *         the list of iles that are commited, ignoring the index


iles -> files and commited -> committed

vzhukovs · 2017-01-05T14:46:36Z

...gin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/add/AddToIndexViewImpl.java

-    HTML     message;
-    @UiField
-    TextArea items;
+    Label     message;


Reformat this code.

vzhukovs · 2017-01-05T14:47:44Z

...gin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/add/AddToIndexViewImpl.java

-            this.items.setText(sb.toString());
-        }
+    public void setMessage(String message) {
+        this.message.getElement().setInnerHTML(message);


this.message.setText(message);.

The message parameter is given in html format, and setText() would display the raw massage with html tags. How about just to rename this parameter to htmlMessage?

Yes, it would be better to rename the parameter.

vzhukovs · 2017-01-05T14:50:54Z

...e-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitView.java

-     * @param includeSelection is selection included
-     */
-    void setIncludeSelection(boolean includeSelection);
+    /** Returns true if the project explorer selection must be added to index before commit, and <code>false</code> otherwise. */


Simple selection, it might not be from project explorer. Paraphrase this sentence.

vzhukovs · 2017-01-05T14:52:55Z

...xt-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenter.java

+                    String selectedItemPath = selectedItem.getLocation()
+                                                          .removeFirstSegments(appContext.getRootProject().getLocation().segmentCount())
+                                                          .toString();
+                    for (IndexFile file : indexedFiles)


Wrap this block of code in curly brackets according to our coding style.

vzhukovs · 2017-01-05T14:53:25Z

...xt-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenter.java

+                //Mark selected items to reset from index
+                for (Resource selectedItem : appContext.getResources()) {
+                    String selectedItemPath = selectedItem.getLocation()
+                                                          .removeFirstSegments(appContext.getRootProject().getLocation().segmentCount())


The same as above, you can simply remove the first segment from the path.

codenvy-ci · 2017-01-05T15:21:07Z

Build # 1525 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/1525/ to view the results.

codenvy-ci · 2017-01-05T21:17:27Z

Build # 1532 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/1532/ to view the results.

codenvy-ci · 2017-01-06T09:38:02Z

Build # 1534 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/1534/ to view the results.

vparfonov · 2017-01-10T07:51:22Z

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

+     * @param amend
+     *         indicates that previous commit must be overwritten
+     */
+    Promise<Revision> commit(DevMachine devMachine, Path project, String message, boolean all, Path[] files, boolean amend);


why we need Path[] files if you added all options ? If all will be true what need to set to the files?

all parameter means add to index all changes and files parameter defines what files to commit. all can be true and files parameter can contain items, this will happen when user would call commit operation on selected items and would select Add all changes except of new files check box.
We have separate issue: #3614 to improve this window where add to index action will be performed automaticaly because user will have an ability to chose all changed files directly in the window.

codenvy-ci · 2017-01-10T20:05:20Z

Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/1565/

CHE-3271: Add more Git actions to context menu

f5335bb

vinokurig requested review from vparfonov and vzhukovs January 5, 2017 13:30

vzhukovs requested changes Jan 5, 2017

View reviewed changes

fixup! CHE-3271: Add more Git actions to context menu

60a0ddc

Igor Vinokur added 2 commits January 6, 2017 09:09

Merge branch 'master' of github.com:eclipse/che into CHE-3271

81412a1

fixup! CHE-3271: Add more Git actions to context menu

6f29bb8

vzhukovs approved these changes Jan 6, 2017

View reviewed changes

vparfonov reviewed Jan 10, 2017

View reviewed changes

Merge branch 'master' of github.com:eclipse/che into CHE-3271

d8ba8d8

vparfonov approved these changes Jan 10, 2017

View reviewed changes

Igor Vinokur added 3 commits January 10, 2017 14:52

Merge branch 'master' of github.com:eclipse/che into CHE-3271

c2ceb09

commit

dab6592

Merge branch 'master' of github.com:eclipse/che into CHE-3271

5f531b0

vinokurig merged commit a899f50 into master Jan 10, 2017

vinokurig deleted the CHE-3271 branch January 10, 2017 15:25

slemeur added the kind/enhancement A feature request - must adhere to the feature request template. label Jan 18, 2017

slemeur added this to the 5.1.0 milestone Jan 18, 2017

JamesDrummond mentioned this pull request Jan 31, 2017

5.1.0 Milestone Overview #3972

Closed

9 tasks

vinokurig pushed a commit that referenced this pull request Feb 7, 2017

fixup! CHE-3271: Add more Git actions to context menu (#3618)

d3942e8

JPinkney pushed a commit to JPinkney/che that referenced this pull request Aug 17, 2017

CHE-3271: Add more Git actions to context menu (eclipse-che#3618)

04fe137

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CHE-3271: Add more Git actions to context menu #3618

CHE-3271: Add more Git actions to context menu #3618

vinokurig commented Jan 5, 2017

vzhukovs Jan 5, 2017

vinokurig Jan 5, 2017

vzhukovs Jan 5, 2017

vinokurig Jan 5, 2017

vzhukovs Jan 5, 2017

vinokurig Jan 5, 2017

vzhukovs Jan 5, 2017

vinokurig Jan 5, 2017

vzhukovs Jan 5, 2017

vzhukovs Jan 5, 2017

vinokurig Jan 5, 2017

vzhukovs Jan 6, 2017

vzhukovs Jan 5, 2017

vinokurig Jan 5, 2017

vzhukovs Jan 5, 2017

vinokurig Jan 5, 2017

vzhukovs Jan 5, 2017

vinokurig Jan 5, 2017

codenvy-ci commented Jan 5, 2017

codenvy-ci commented Jan 5, 2017

codenvy-ci commented Jan 6, 2017

vparfonov Jan 10, 2017 •

edited

Loading

vinokurig Jan 10, 2017

codenvy-ci commented Jan 10, 2017

CHE-3271: Add more Git actions to context menu #3618

CHE-3271: Add more Git actions to context menu #3618

Conversation

vinokurig commented Jan 5, 2017

What does this PR do?

What issues does this PR fix or reference?

Tests written?

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codenvy-ci commented Jan 5, 2017

codenvy-ci commented Jan 5, 2017

codenvy-ci commented Jan 6, 2017

vparfonov Jan 10, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codenvy-ci commented Jan 10, 2017

vparfonov Jan 10, 2017 •

edited

Loading