Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
13 daysRely on synchronous ResourceRefreshHandler to refresh after checkoutMatthias Sohn1-12/+2
- Convert asynchronous ResourceRefreshJob to a synchronous ResourceRefreshHandler. - Move it to EGit core since it does not depend on the UI. - Remove merging of multiple WorkingTreeChanges and progress monitors since that's not necessary when refreshing synchronously. - Unconditionally refresh resources found, even when in projects not shared with EGit. Bug: 551289 Change-Id: I338e4eff366bf2300e347a1da00c2ab0eee6bc14 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-09-21Migrate JDT project settings to 2019-09 formatMichael Keppler2-1/+19
There is no change in settings. All the newly added lines are the default values (e.g. iterate all project property pages and apply without changing any value). Be aware that the projects currently do not use identical settings everywhere. That can be cleaned up later. Change-Id: I1d574ca5336abe1a2ee9cfa74a54700f25cb730d Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-08-29Prepare 5.6.0-SNAPSHOT buildsMatthias Sohn2-13/+13
Change-Id: I617ef95d0f31df937987d1d4046b0f10db05cf47 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-06-27Added option to create light weight tagsMarco Stornelli1-14/+87
When the tag has no message in CreateTagDialog create a lightweight tag instead of an annotated tag. Adds tests for both the UI and for the new "annotated" flag in TagOperation. (Since the lower-level TagOperation allows creating an annotated tag without message, an extra flag is needed.) Bug 438902 Change-Id: I99b53c08f94744f78aabe1c1e57b91d0da587bc7 Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com> Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-06-12Prepare 5.5.0-SNAPSHOT buildsMatthias Sohn2-13/+13
Change-Id: Ic3c01dd294e3d348ba7ab6f2b104da3dc6b6724d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-06-12Prepare 5.4.1-SNAPSHOT buildsMatthias Sohn2-13/+13
Change-Id: If0d2486c59ec5f3533148d71195fd5e008b55be3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-06-12EGit v5.4.0.201906121030-rv5.4.0.201906121030-rMatthias Sohn2-2/+2
Change-Id: Ifd2ffd4217fb55a318c081b987fbf3d60c78dcec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-06-11Handle absolute paths to SSH identity filesThomas Wolf1-0/+65
The list of private keys in Eclipse may contain absolute paths. Only resolve relative paths relative to the configured SSH2 home directory. Bug: 548121 Change-Id: I7ace545e2736c451b625699d07cba438f0e3934b Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-06-10Remove pre-Mars adapter workaroundMichael Keppler1-9/+8
Since our minimum target is Mars, we no longer need the previous workaround for avoiding compiler warnings around adapters. This is not a git revert, but an inline refactoring of the previously introduced method. Also inline AdapterUtils.adapt() in such a way that Adapters.adapt() is called instead. Bug:460685 Change-Id: Idbbe4853f68a9b6d1ffff1f434bdbfb9bc705a80 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-05-15Use try-with-resourcesCarsten Hammer1-9/+10
Convert try finally block to try-with-resources Change-Id: I29a482e2bbfe5e9029b41c1fe7a5bf45308905c2 Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
2019-04-27Use String.isEmpty() instead of comparing to ""Carsten Hammer1-2/+2
Use of String.equals("") can be replaced with with String.length() == 0 (for JDK5 and lower) or String.isEmpty() (for JDK6 and higher) Change-Id: I278bcc6e7095802469cfe2db24f029bb5dc870a9 Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
2019-04-26Remove unnecessary type specificationsCarsten Hammer5-9/+9
Since Java 7 the diamond operator can be used instead of explicit typeparameters. Change-Id: I602e7b1bf45ca1c6612305e655fc4618742d0d4f Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
2019-04-11silence PDE warning "not all packages exported"Michael Keppler1-0/+34
Since 2019-03 PDE shows a warning in each plugin which does not export all its packages. Let us silence this warning in all test bundles. Change-Id: I4b9bbf8dccc5ab9976d415988616013ebdb79fb6 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-04-08upgrade jdt preferencesMichael Keppler2-1/+43
Upgrade JDT preferences to current versions (by means of browsing the project preference pages). There are no changes in preference values. Change-Id: I50367fba1b83d7d2ff5d4f08b1eb4bc37e94288a Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-03-24Set minimum versions to the ones from Neon.0Thomas Wolf1-6/+6
Increase required bundle versions to the Neon.0 baseline. Decrease the Mylyn required version from 3.21 to the 3.20 present in Neon.0. Change-Id: I5d7bdc841994838ee9d333f9206d71a110362839 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-03-20remove jdt.core.launch from dependenciesMichael Keppler1-1/+0
We always have exceptions in builds referring to a missing jdt.core.launch for macos. We probably don't need this dependency at all. Change-Id: Iff7b20511ae9dfad5e1e7a69d2215c7cd076b4ee Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-03-17Fix type-safe warningsMichael Keppler1-4/+4
After the generifying of the adapter methods by Thomas, these were all remaining type-safe warnings. Change-Id: I7c5f485f80ebe6cfd185c0a026e00e27a4f46fbb Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-03-16Replace usages of deprecated Repository methodsThomas Wolf1-6/+4
getTags() and peel() are deprecated; replace by equivalent other methods. Change-Id: I1edc2ff88f0f79ea3749a53bf89ffac46d4b4c62 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-03-16Fix typo in test method nameMichael Keppler1-1/+1
Change-Id: I1f0a36d2180f9590102846934f96a03d7baa1a6b Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-03-07Prepare 5.4.0-SNAPSHOT buildsMatthias Sohn2-13/+13
Change-Id: I55662cb58064e5858671cf371ed3c46767532b9b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-02-05Avoid jobs still running at test shutdownMichael Keppler1-26/+14
Sometimes during tests we have jobs still running. Recent example is https://ci.eclipse.org/egit/job/egit/4991/consoleFull (search for "following jobs"). Therefore increase the timeout from 5 to 10 seconds. 10 seconds have already been used at other places in our tests, and they avoided the message for me locally when experimenting with different values. Since the log output occurs seldom, the increase in test runtime can be ignored (in most cases there will not be any increase). Also correct a Javadoc in that area, and inline one other method (to avoid one more duplication of wrong Javadoc). Change-Id: I14b16d33e493cc9d4a7fe833b1fd29a42f4822b5 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-01-03Replace FileInputStream and FileOutputStream with static Files methodsMatthias Sohn2-17/+7
FileInputStream and FileOutputStream rely on finalize() method to ensure resources are closed. This implies they are added to the finalizer queue which causes additional work for the JVM GC process. This is an open bug on the OpenJDK [1] and the recommended workaround is to use the Files.newInputStream and Files.newOutputStream static methods instead. [1] https://bugs.openjdk.java.net/browse/JDK-8080225 Change-Id: I59e72d0a12d70396a5cf558029c13e2a1b0d5741 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-01-02Enabled ignored testsMichael Keppler2-11/+4
Disabled tests should always be re-enabled as soon as possible (or deleted). ResourceUtilTest has been adapted to test for the most nested project, caused by the implementation of bug #476585. I'm not sure if we can eventually remove the "innermost" parameter of getFileForLocation by now. Change-Id: I9f343dbb371e124e8e1576dbe2f3693f3b2f1d71 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-01-01Fix path related failing tests on WindowsMichael Keppler1-8/+14
* DynamicVariablesTest: IPath.toString() uses a fixed separator "/", therefore the calculated variable value cannot be compared with the Windows file separator. * CommitFileRevisionTest: file revisions in commits are resolved using "/", therefore a relative Windows path cannot be located in the git storage. Change-Id: I9be225654fec285ddd1a4059fffac6058547b668 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-12-02Prepare 5.3.0-SNAPSHOT buildsMatthias Sohn2-13/+13
Change-Id: I957447f76605a4a22774cb47f535f0940243d767 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-12-02Clear password of crypto API after usageMichael Keppler1-3/+6
The (internally cloned) password of a key spec needs to be cleared after usage. For this unit test this is not really relevant. However, we don't want someone to copy/paste our code into a real security relevant project without having the clearPassword(). Found with Cognicrypt plugin. Change-Id: Ic92a65ca14fc0d528049ba0534d73c4715597ffa Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-11-25[releng] Remove obsolete package imports for org.mockito.runnersThomas Wolf1-1/+0
Change-Id: I194de8dc240f0f42ba18d648bd8d0fe16e129670 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-11-25Fix Mockito deprecation warningsMichael Keppler2-1/+2
The JUnit runner hierarchy has changed, and the new super class shall be used instead of the previous runner. Change-Id: Ia6fbf8bb875c6fdc7860ecd21e2a39da5af2bd51 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-11-21Update mockito to 2.13.0Matthias Sohn1-4/+6
Update mockito and its dependencies to latest version available in Orbit: - mockito 2.13.0.v20180426-1843 - net.bytebuddy.byte-buddy 1.7.9.v20180420-1519 - net.bytebuddy.byte-buddy-agent 1.7.9.v20180420-1519 - org.objenesis 2.6.0.v20180420-1519 CQ: 18301 CQ: 18302 CQ: 18303 CQ: 18318 Change-Id: Ibe07af497f9a4209dac51e63572eb3cf3d9cbed8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-11-20Have test base classes in new plugin for better reuseMichael Keppler8-1497/+4
* new plugin egit.core.junit * other test plugins/fragments can depend on it * non-test classes for all test bundles/fragments can be added here (moved 5 classes, which are used in multiple test bundles) Bug: 541008 Change-Id: Ib9a3c9c8856a97746c07ab307c0016332cd5f853 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-11-20Unify gitignore rules in a single top level fileMichael Keppler1-2/+0
Remove all project specific ignore rules and instead use a single top level gitignore. Change-Id: I10235c66804508829eab57eea8bb87a3857a939f
2018-11-01ConfigureGerritAfterCloneTask - relax matching Gerrit versionMarkus Duft1-0/+29
Relax checking with regards to SSH port and additional suffixes to the version which might appear (-dirty) Change-Id: I95ff82525d034eb5d6804dff8cd5fb1fcdcedfae Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-10-20[releng] Fix deprecated GitBlobStorage constructor usageMichael Keppler1-5/+16
Use the chained constructor instead of the deprecated constructor. Change-Id: Ib2a2e32eca77a883f1ec0f6d76f8200b50293a66 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-10-15Releng: Store all project settings explicitlyMichael Keppler3-3/+65
We use project specific properties in many projects. However, the files containing them are old, therefore they do not contain all the keys and values that have been added in newer Eclipse releases. This change makes all those missing settings explicit. All project properties have been opened in the UI and the "Apply" button has been used without changing any controls. We should therefore see only additions in the diff, no changes in values. The main intention of this change is to reduce the noise for actual changes of settings which are intended to be applied afterwards. If that is accepted, I will do the same on jgit and egit-github. The removal of JDT settings in org.eclipse.egit is intentional. That is a PDE project without Java nature. Change-Id: I1b6d56b2f38e85ec8842076a1aa462a990d09f3f Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-10-08Have separate test sourcesMichael Keppler1-1/+5
There are no functional changes in the IDE, except for test source folders having a different icon color. Bug: 539933 Change-Id: If190168072caedc23e398c8061adbaf0cbcc4168 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-10-06Fix typos in Javadoc and test namesMichael Keppler2-3/+3
No functional changes. Change-Id: Id3f0df9f5e33d50a2a1c60e6d05a53a9f3e97fca Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-09-23Fix Mylyn commit message templateMichael Keppler1-1/+1
The commit message template contains a superfluous blank at the end of the first line, which is deleted by this change. This is only relevant for egit contributors, not for egit users. Change-Id: I2ebaefe80ecaf5a9373575ec7ebdca7201af3e0d Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-09-05Prepare 5.2.0-SNAPSHOT buildsMatthias Sohn2-13/+13
Change-Id: Ia0ea47172ebde6c8ea28955123c97fa849e32931 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-20Organize OSGi manifestsMatthias Sohn1-6/+5
- ensure all packages appear in manifest - mark internal packages - calculate 'uses' directives for public packages - remove unused dependencies - add required dependencies - remove unnecessary lazy activation headers Change-Id: I308e0b1f380fbc02a64f1c94ea13388c70baa93b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-13refactor: simplify collection.toArray()Michael Keppler5-6/+6
On recent VMs, collection.toArray(new T[0]) is faster than collection.toArray(new T[collection.size()]). Since it is also more readable, it should now be the preferred way of collection to array conversion. https://shipilev.net/blog/2016/arrays-wisdom-ancients/ Change-Id: If0c3202aa3ebb2d4e4ea68da8fe431cd8f363826 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-07-02Do not refresh projects that use a PessimisticResourceRuleFactoryThomas Wolf1-12/+10
With some setups where the Eclipse workspace is inside the git working tree EGit may end up trying to refresh a project that needs the workspace root as scheduling rule for a refresh. EGit generally uses multi-rules containing affected projects, though, and thus it may run into an IAE in that case. EGit-managed projects use an optimistic rule factory that uses the project itself as scheduling rule. So do normal unshared projects. So this can only occur if there are projects inside the git working tree that are not shared with EGit but with some other provider that does not use an optimistic rule factory. This is a rare occurrence, and such projects had better be git-ignored, too. Not refreshing such projects is a thus viable approach. Bug: 536472 Change-Id: I17c06fd69e232a7b864a98c4e95598fa7ab6b7b0 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-06-30Fix typo in test method nameMichael Keppler1-2/+2
Change-Id: Ifa2b84a2cda71c95cebccaef40bcbd525bf073c9 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-05-29Merge branch 'stable-5.0'Matthias Sohn76-152/+304
* stable-5.0: Fix description property in org.eclipse.egit-feature/feature.properties Update license to EPL-2.0 Add tracing of low-level JSch log messages Change-Id: I2bd4012226097efc8826db3396cccd9e423a283d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-05-29Update license to EPL-2.0Matthias Sohn76-152/+304
Bug: 530393 Change-Id: Iea3b247253a97c28043187df0e35daecf518011e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-05-23Prepare 5.1.0-SNAPSHOT buildsMatthias Sohn2-13/+13
Change-Id: I5b4427a73f05ed2144d886acb37640fc714757bc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-05-22Prepare 5.0.0-SNAPSHOT buildsMatthias Sohn2-2/+2
Change-Id: I7aa21538b1340e8499390e4d543ab0a768c4934b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-05-22EGit v5.0.0.201805221745-rc1v5.0.0.201805221745-rc1Matthias Sohn2-2/+2
Change-Id: I5deced0bacd81c5590e81e3aa9bc269d8a4e3f77 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-05-16Prepare 5.0.0-SNAPSHOT buildsMatthias Sohn2-2/+2
Change-Id: Ib97ec464d423b1b44fa4c8fd26dbfbe5de32f825 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-05-15EGit v5.0.0.201805151920-m7v5.0.0.201805151920-m7Matthias Sohn2-2/+2
Change-Id: Ibd27f90e8c944d483feed6b63ea6f8d3b1cc999d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-05-12Merge "Respect gitattributes in the compare editor"Matthias Sohn3-11/+345

Back to the top