Commit Graph

53 Commits (3da13d54b5e67c83505d61ade4e97f0f2269cc2f)

Author SHA1 Message Date
Mykhailo Kuznietsov 2c2bd6637c
Set new year in license headers (#8244) 2018-01-11 16:04:49 +02:00
Igor Vinokur 907429eaa5
CHE-7885: Throw exception on Git Status if checkout is in progress (#8071) 2017-12-28 11:51:36 +00:00
Igor Vinokur f4c1946fb6
CHE-7001: Fix Git status of untracked files in Git diff (#7962) 2017-12-21 09:16:23 +00:00
Igor Vinokur 9cf76ab45e
CHE-7220: Fix Git add to index when deleted files are present (#7874) 2017-12-15 11:58:25 +00:00
Igor Vinokur 3c86904c50
CHE-7792: Do not allow to get Git status if commit is in progress (#7835)
This prevents sending redundant websocket message to client, when index file is updated while commit operation.
2017-12-13 12:32:32 +00:00
Igor Vinokur 5f730e20b4
CHE-7162: Improve branch search mechanism in Git checkout command (#7491) 2017-11-28 09:45:27 +00:00
Oleksandr Andriienko 6cd13682e5
CHE-6741: Fix Git files colors after git commit. (#7422)
Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
2017-11-20 16:56:53 +00:00
Mykola Morhun 46ddf5e840
Base of Git Panel (#7235) 2017-11-13 09:24:40 +02:00
Florent BENOIT 3f262e620e Cleanup some Mockito deprecated usage (che6) (#6864)
* Cleanup some Mockito deprecated usage
org.mockito.Matchers —> org.mockito.ArgumentMatchers
org.mockito.runners.MockitoJUnitRunner —> org.mockito.junit.MockitoJUnitRunner

Change-Id: Icf7351cb58e0f42fa95885c2d2cf6b5e98206c35
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-21 09:07:43 +02:00
Florent BENOIT 6a95b6d74a Apply google format v1.4 https://github.com/google/google-java-format/releases/tag/google-java-format-1.4
Change-Id: I5df30c23165df1fd39eef4c57893bebd1d681c1d
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-19 22:23:04 +02:00
Florent BENOIT 9581a9bbef Move to mockito 2.10
Some changes are required like
 - anyString() --> nullable(String.class) for many tests as in fact we provide null values
 - add class for VerificationMode as there are more than one method now (can't use lambdas)
 - remove cast on ArgumentMatcher (now we can use lambdas as there is generics)
 - remove unecessary stubbing (mockito is now reporting un-needed stubs)

Change-Id: I69c7ccc86bc85a4401d5e33671229ae0ce560dbb
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-15 10:34:15 +02:00
Igor Vinokur fe005f3df5 Add git changes markers to the editor (#6054) 2017-10-09 10:02:41 +03:00
Dmitrii Bocharov 57b2fc7058 CHE-6024: Add 'Git revert' action (#6108) 2017-10-03 09:21:33 +03:00
Anatoliy Bazko 2512d7b9bf Revert Git revert action (#6470) 2017-09-27 15:21:46 +00:00
Anatoliy Bazko dac5b6610f CHE-6024: Revert commit action (#6386)
* CHE-6024: Revert commit action
2017-09-27 08:26:25 +00:00
Igor Vinokur 9f08923327 CHE-6033: Fix bug when git colors are note updated after git operations (#6262)
CHE-6033: Fix bug when git colors are note updated after git operations
2017-09-18 12:21:24 +03:00
Igor Vinokur fc35ba2618 CHE-6114: Fix problems with project explorer performance in big projects (#6175)
1. Add ability to get Git status with filter.
2. Reworked Injecting VCS status info in Project service to make Status request only once instead of requesting each time in the loop.
3. Removed `format` parameter from get status method in Git Service, because it is redundant and do not affects to anything, since we use Jgit as a Git engine.
2017-09-12 14:41:28 +00:00
Sergii Kabashniuk 5b373e6cf5 Used Google Java Codestyle (#5851) 2017-08-18 17:00:58 +03:00
Mykhailo Kuznietsov 69d5148385 Changed copyright owner to "Red Hat, Inc." in license headers (#5964)
Change license header contributor to Red Hat, Inc.
2017-08-11 10:46:58 +03:00
Igor Vinokur c9c9a4a692 CHE-3415: Add ability to perform Git pull with rebase (#5787) 2017-07-27 09:33:33 +03:00
Sergii Kabashniuk a6a569b9f7 Concept of Minimal and Full assembly (#4578)
Concept of Minimal and Full assembly
2017-04-14 10:05:03 +03:00
Igor Vinokur 2c045e7364 ARTIK-318: Add close to JGit clone operation (#4418)
* ARTIK-318: Add close to JGit clone operation

* fixup! ARTIK-318: Add close to JGit clone operation

* fixup! ARTIK-318: Add close to JGit clone operation
2017-03-15 11:17:00 +02:00
Igor Vinokur 6a644e74ea CHE-3760: Fix git commit not staged specified path with amend (#3833) 2017-03-03 12:14:28 +02:00
Mykola Morhun 7187062d37 CHE-4015 Add deleted files to index(Regression) (#4187)
CHE-4015: Fix deleted file is not added to index
2017-02-27 17:55:00 +02:00
Igor Vinokur da8c4193cf CHE-3609: Create visual Git history window instead of old one (#3799) 2017-02-08 10:37:52 +02:00
Igor Vinokur a899f5013d CHE-3271: Add more Git actions to context menu (#3618) 2017-01-10 17:25:18 +02:00
Mihail Kuznyetsov 0e8b21ad3f Set new license year 2017-01-04 17:10:31 +02:00
Igor Vinokur 88f788b28d CHE-2870 Fix get git config property value (#3077)
Fix get() method of JGitConfigImpl class.
Previous behavior:
If the same property is present in the global git config file, and in the git repository config file, execution of gitConnection.getConfig().get(<property name>) returnes property from global git config file.
2016-11-18 15:16:32 +02:00
Igor Vinokur 1bbb902e19 CHE-1297: Git service refactoring (#1515)
The goal of this refactoring is to set correct type of HTTP methods in GitService. Now almost all HTTP methods in this service are POST methods, but there are methods that are used to get some content, so they should be marked as GET method. Also I had to change such methods to receive query parameters instead of body.
Implemented parameter objects to use them instead of using DTO as parameter in GitConnection methods.
2016-11-03 16:32:50 +02:00
Aleksandr Andrienko cd0423c3d0 CHE-2888: Fix pull requests-build due to git tests. (#2932)
Signed-off-by: Aleksandr Andrienko <aandrienko@codenvy.com>
2016-10-31 17:15:04 +02:00
ShimonBenYair d55fbe961a Add support for Git Log API. (#2046)
Add support for skip and maxCount when calling the LOG API.
Add support to get the log for a specific folder or file in the repository.
For every commit that is returned when calling the LOG API, the following data was added:
The author of the commit
A list of branch names that the commit is related to.
A list of file names that were changed/deleted/added in the commit.
A list of commit parents (to enable for example clients to paint a graph)

Change-Id: I2cc486cc49787c681b031067728b7a33f8fb11e7
Signed-off-by: Shimon Ben.Yair <shimon.ben.yair@sap.com>
2016-10-27 11:13:44 +03:00
Florent BENOIT 7d6739329d Expose getCurrentBranch() method on git connection + rework gitvalueProviderFactory (#2569)
* expose getCurrentBranch() method on git connection
Also change the git value provider factory to use this method instead of using status command as status is requiring lot of I/O

Change-Id: If88da1e1b63a252f0226f1a586f3a67d7295e6c3
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
2016-09-29 15:18:45 +02:00
Igor Vinokur d8c70d13ba Fix JGitConnection test (#2651) 2016-09-29 13:18:49 +03:00
Igor Vinokur 1982d2e60c CHE-2045: Fix recursive clone by ssh (#2155) 2016-09-29 12:42:27 +03:00
i053322 4595c9d1ce Add support of BasicAuthentication Authentication to Git (#1940)
Signed-off-by: i053322 <yossi.balan@sap.com>
2016-09-22 18:33:15 +03:00
Igor Vinokur a59f3f498e CHE-476 Add support for git urls with credentials 2016-08-10 11:20:55 +03:00
i053322 3a846378f6 Add support for checkout exception
add a mapper for checkout git exceptions
add new messages : GitConlict , GitInvalidRefName , GitRefAlreadyExist , GitRefNotFound

Signed-off-by: i053322 <yossi.balan@sap.com>
2016-08-09 10:28:58 +03:00
i053322 6bcc1381cb generateExceptionMessage for git actions
Signed-off-by: i053322 <yossi.balan@sap.com>
2016-08-09 10:28:58 +03:00
Max Shaposhnik 19083335ae CHE-1935; add custom User-Agent header value for JGit; (#1936) 2016-07-26 14:34:01 +03:00
Max Shaposhnik 4fdecd8d97 CHE-1893; fix authorization flow during clone from private repo (#1905) 2016-07-22 15:25:20 +03:00
Dmytro Nochevnov d11c12ffe2 fixup! fixup! CODENVY-739: pass proxy credentials to jgit
Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>
2016-07-13 18:31:47 +03:00
Dmytro Nochevnov 5eedc0ac48 fixup! CODENVY-739: pass proxy credentials to jgit
Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>
2016-07-13 17:16:40 +03:00
Dmytro Nochevnov 44ad9e2ddd CODENVY-739: pass proxy credentials to jgit
Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>
2016-07-13 17:16:40 +03:00
Igor Vinokur 28c4f367ee CHE-117: Fix viewing some git errors on client 2016-07-06 10:45:41 +03:00
Igor Vinokur bd9e581b7d CHE-1408:Add check for amend before throwing error
When we perform commit without staged changes we will get an error.
If it is needed to change the message of last commit we should allow
to do it, even if there are no staged changes.
2016-07-05 11:29:13 +03:00
Igor Vinokur 539bd823e7 CHE-1403: Fix clone with http url in JGit implementation
JGit does not support HTTP 301 redirects yet, it throws exception when
performing commands with remote using http url instead https.
Native git can do it.
2016-07-04 09:45:00 +03:00
Igor Vinokur ffef620a82 CHE-1113: Add ability to clone project with submodules 2016-06-29 21:17:03 +03:00
Igor Vinokur 077f1a2056 CHE-1159: Add to Jgit implementation ability to view cloning process 2016-06-29 17:04:02 +03:00
Igor Vinokur 43cd95fb60 CHE-1349: Throw exception if nothing to commit with Jgit implementation 2016-06-29 15:58:31 +03:00
Igor Vinokur e3b410ef9a CHE-1350: Fix empty message after successfull push with JGit
Also chenge "Everything up-to-date" message like in Native git
2016-06-29 15:39:06 +03:00