Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-05-22Merge branch 'master' into stable-5.4Matthias Sohn97-1102/+910
* master: Update Orbit to S20190521195709 for 2019-06 M3 History: new operation to check out files from a commit Simplify comparators by using Comparator.comparing() Get rid of the RebasePlanIndexer Fix resetting conflicting files on branch switch Use try-finally to dispose clipboard Fix formatting after lambda change Use jdk 5 for-each loop Use try-with-resources Convert to lambda or member reference Minor re-organization of FileRevisionEditorInput Join catch sections using multicatch Handle delete-modify conflicts in staging view Remove the "publish" maven profile Change-Id: Ib310fbcaa78f1397f1e453cdbdec9fc3da26e036 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-05-22Update Orbit to S20190521195709 for 2019-06 M3Matthias Sohn15-67/+73
Update - org.apache.ant to 1.10.6.v20190516-0412 (CQ 19829) - org.apache.httpcomponents.httpclient to 4.5.6.v20190503-0009 Change-Id: I45bf9c54991c9a727ebd72e40898ddf8125920c5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-05-22Prepare 5.4.0-SNAPSHOT buildsMatthias Sohn35-36/+36
Change-Id: Ibc0161ac248d654fe07389f27e461e6221f4d984 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-05-22History: new operation to check out files from a commitThomas Wolf8-159/+298
Add a new operation in the CommitFileDiffViewer to check out file revisions shown into the working tree. Previously the user would have to navigate to the file in the package explorer (or project explorer) and use "Replace with...->Commit" there, which opens a dialog to choose the commit. Or use "Open This Version" and then copy-paste the text. Both are rather round-about ways to achieve this. Newly there's a "Check Out This Version" command in the context menu that enables the user to do this directly. The same operation is also available in the outline view of the unified diff page of the commit viewer. The code checking for potential loss of uncommitted changes and for running launches and then asking the user to confirm the operation has been factored out of DiscardChangesActionHandler into CommandConfirmation. Bug: 362907 Change-Id: Ie237e24b9e78b888b0de816d39c1c43ca44c400a Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-05-22Simplify comparators by using Comparator.comparing()Thomas Wolf9-70/+22
Clean up (unwrap) comparators that just forward to another comparator. CommonUtils.RESOURCE_NAME_COMPARATOR is left unchanged; using Comparator.comparing() there would cause Policy.getComparator() being called once only and very early, which might change behavior if Policy.setComparator() is used. Change-Id: I852f97e2d885063ce3bed273603fd8b241f2e953 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-05-19Get rid of the RebasePlanIndexerThomas Wolf4-169/+32
When a rebase plan is re-parsed due to a repository event (ref changed, or index diff changed) it was possible that the plan indexer was updated while the TreeViewer still did a refresh of items from the previous plan. This would require a thread-safe indexer, and moreover we would need to make sure that the current plan and the current indexer always were in synch. From code inspection I suspect that was not true in all cases. This plan indexer existed only to provide the step numbers in the "Step" column in the view. We can add this information to the PlanElements in the content provider instead, and then remove the whole indexer. That avoids this whole problem since then the label provider depends only on the PlanElements actually in the tree. Bug: 547434 Change-Id: Ifeefa55090285c464fe912e924d91757dbac6e37 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-05-17Fix resetting conflicting files on branch switchThomas Wolf3-4/+24
The new code from commit 8a66893 inadvertently reset to the index version instead of to HEAD and thus didn't reset staged changes. Fix this and add a new test. Change-Id: Icf6ffe38949cc8fd42cb35196c090a66c5527901 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-05-15Use try-finally to dispose clipboardMichael Keppler7-43/+57
Clipboard uses system resources. Use try-finally there similarly as we would with any Closable. Change-Id: Ida5bd1ded9d69f904b89a739c888b21fbeaf8526 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-05-15Fix formatting after lambda changeThomas Wolf18-129/+108
Commit f7252ca introduced a number of places where the formatting did not match the Eclipse formatter settings. Reformat the changed lines. Omit redundant lambda parameter types, just use "a" and "b" for comparator parameter names, and in a few cases do other minor clean-up on the affected lines. Change-Id: Iaf459a8f2366a8176f1ca3e257e5e1900b7f8c66 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-05-15Use jdk 5 for-each loopCarsten Hammer20-90/+87
Replace simple uses of Iterator with a corresponding for-loop. Also add missing braces on loops as necessary. Change-Id: I2190569ff0076ca8004d83ec8bda6e6cd57887aa Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
2019-05-15Use try-with-resourcesCarsten Hammer10-67/+42
Convert try finally block to try-with-resources Change-Id: I29a482e2bbfe5e9029b41c1fe7a5bf45308905c2 Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
2019-05-15Convert to lambda or member referenceCarsten Hammer21-302/+181
Convert anonymous inner classes to lambda expressions or member references. Change-Id: I80ef719e9282eac73f178e4d45cc2ed57280cb25 Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
2019-05-14Minor re-organization of FileRevisionEditorInputThomas Wolf1-26/+20
Move the temp files into the plugin's state location instead of using /tmp. Shorted file names by using only the first 7 characters of the commit SHA1. Also remove an unused constructor, and replace Object by IFileRevision in the others: this is only ever used with IFileRevision. As far as I see it is also never used with IFileState for the storage. Removing that code is for another commit, though. Bug: 547110 Change-Id: I88aa62a0200bd9c1b5414a93024d6649842473c5 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-05-14Join catch sections using multicatchCarsten Hammer10-41/+10
Change-Id: I4d0eabb0faf45a6d032f69377ad08c63363cd463 Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
2019-05-12Handle delete-modify conflicts in staging viewThomas Wolf2-1/+60
Delete-modify conflicts could not be resolved in the staging view by removing the file. If a conflicting file has been removed from the working tree, make staging it in the staging view remove it from the index. Note that if the preference for "Automatically stage files being deleted" is switched *on*, then deleting the conflicting file in the working tree would remove it from the index already. But with that preference *off* the user had no real way to resolve such conflicts. (Sometimes, this could be worked around by first staging the conflict, then unstaging, then deleting the file, and then staging the deletion.) The solution in this change works, but still leaves some non-working commands in the context menu. There's no delete command in the context menu, and the "replace with" commands (ours/theirs/HEAD/index) don't do anything for the side that deleted the file. Fixing that is left for a future enhancement. Bug: 546869 Change-Id: I9594587f9445acf0a9972b01933bc5d453168f65 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-05-08EGit v5.4.0.201905081430-m2v5.4.0.201905081430-m2Matthias Sohn35-36/+36
Change-Id: I89ca47ca879d02a905ff071cad6d89c07ce2abfb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-05-07Remove the "publish" maven profileThomas Wolf1-38/+0
The new builds on jenkins (egit-bot) do not use this profile. Instead they publish the update site via ssh and scp in the Jenkins build. The profile would not work anyway since publishing is possible on the new build infrastructure _only_ via ssh with the correct SSH identity. Bug: 546138 Change-Id: Ic0b02a9286e96c5dde475cfb5d560bea537581e3 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-05-06Update Apache MINA sshd client to 2.2.0Matthias Sohn8-60/+72
The egit target platform contains also dependencies for jgit to enable joint development of both projects in the same workspace. Also egit redistributes the jgit bundles, features and dependencies to simplify installation of egit. Bug: 541425 Change-Id: Id2b874c7895389c18adacd9f9efca5e41fd8db16 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-05-06Update Orbit to S20190501151401 for 2019-06 M2Matthias Sohn15-72/+127
Change-Id: I88532a30754e8756db26aeb962a936360b52484f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-05-01Get display instance from workbenchMichael Keppler24-57/+52
org.eclipse.ui.IWorkbench.getDisplay() recommends to always use that method instead of Display.getDefault(). Change-Id: I0d7512aa9b40ad26e0b71356aa90bebd5b7611f7 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-05-01Silence wrong resource leak warningMichael Keppler1-0/+1
JDT warns about repo not being closed here. However, this resource is not created here, the variable is initialized by casting another instance. This is a false positive. Change-Id: I4533002a1308cfd6b94edd7f2c5383af9cfe10b4 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-05-01Shorten SHA1 in editor titleMichael Keppler2-2/+12
When opening a commit from history, it used the full SHA1 in the editor title, leading to very wide tabs. Use a short version instead. The shortening of the SHA1 was done in the editor input calculation instead of the getContentIdentifier() method to avoid side effects at other callers of getContentIdentifier(), which use that for equals() comparisons of revisions. Bug:544983 Change-Id: Ic15c12d0cd4827090d124de10765b76c62e1096e Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-04-28Register progress icons from UI threadMichael Keppler2-15/+29
The UIIcons initialization code can be called from other threads as shown in the bug, therefore move the jface resource related code to the activator of the UI bundle, to more easily synchronize on the UI thread. Bug:546750 Change-Id: I46369472c4748787c582351b051bea10d009ac53 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-04-28Use latest CBI license featureMichael Keppler4-4/+4
There is meanwhile a license feature 2.0.1 available. By using 0.0.0 we always get the latest and don't need to track CBI changes. Change-Id: If328caf5a0961beedbc79a65928d066851a36773 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-04-27rename TableTree related variablesMichael Keppler2-19/+19
Platform 4.12 removes swt.custom.TableTree. While egit does not use that, some variable names still contained "tableTree" due to refactoring from Tree to Table in the past. Rename those variables to avoid confusion in the future. Change-Id: I76608c6a0f0d7cca065bb6ec5cba035d360bb1be Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-04-27Use String.isEmpty() instead of comparing to ""Carsten Hammer10-14/+14
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-26Replace usage of String.indexOf with String.contains where possibleCarsten Hammer3-5/+4
Change-Id: I6976afb1bc4524a860eec3bfe11c963858419e76 Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
2019-04-26Remove unnecessary type specificationsCarsten Hammer25-71/+71
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-26Only warn about losing changes if there are changes at allThomas Wolf3-65/+176
Only show the confirmation dialog for DiscardChangesOperation if there are actually uncommitted changes on the selected files. Bug: 546194 Change-Id: Id63601bcc9e307a8a3f6bd0456dfdd2923b76b80 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-04-22Update target platforms to include JSch 0.1.55Thomas Wolf18-40/+282
Using Orbit I20190404224055. Bug: 546130 Change-Id: I5f40815d8e4f2482b58091ecc2ed38134eaff613 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-04-19Merge "Use isEmpty() instead of size()==0 where possible"Michael Keppler5-5/+5
2019-04-18Use isEmpty() instead of size()==0 where possibleCarsten Hammer5-5/+5
Change-Id: I8182dcc5775c699f82aa4c5e019e995c1717e143 Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
2019-04-18Make o.e.debug.ui plugin truly optionalPeter Severin9-126/+256
This change hides direct access to o.e.debug.ui plugin behind an interface with a NOOP implementation used if the debug plugin is not present. It also adds back an explicit dependency on o.e.core.resources and o.e.core.expressions plugins instead of depending on them indirectly via the optional debug.ui plugin. Bug: 546329 Change-Id: I09901a796dc548d462cc2cfd477e989ebb2f9c3b Signed-off-by: Peter Severin <peter@wireframesketcher.com>
2019-04-16Fix merge dialog shortcut conflictsMichael Keppler1-2/+2
Bug:546387 Change-Id: I92dab00424c938baa16c0d9c3708eae7835e4486 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-04-16Upgrade Tycho to 1.4.0Michael Keppler1-1/+1
Change-Id: Ib6741223128a41fd5b7656b5698aa7342da6d2ee Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-04-14Always use 7 characters for short SHA1Michael Keppler22-41/+53
Use one common implementation to create short object ids. One visible change is that commit revision editors (opened from history etc.) now show 7 instead of 6 characters after the file name. Bug:544984 Change-Id: I3207b70b9fdba746ad5781d35a64fc54bb4782f2 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-04-11silence PDE warning "not all packages exported"Michael Keppler5-0/+170
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 Keppler20-10/+430
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-04-04Merge remote-tracking branch 'origin/stable-5.3'Thomas Wolf0-0/+0
Change-Id: I8cd39eb4752a35b9a322f89ac967d55b849b8681 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-04-03Try to stabilize testsstable-5.3Thomas Wolf2-14/+20
Ignore one test; close a repository in another. (Cherry-picked from master commit d4ecfa96.) Change-Id: I6a25f1296c5e7aefb3afd5ec6b90691b258a5128 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-04-03Tycho repository build: specify execution environmentThomas Wolf1-23/+24
The default is JavaSE-1.7. If we don't specify it explicitly, typcho-eclipserun appears to use a JRE 7, which doesn't understand some of the command-line options needed on the new Kubernetes build infrastructure. (Cherry-picked from master commit 73925448) Change-Id: I34e2b6f7b0c06e520ad8594522ccdf6e3f75b434 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-04-02Ensure warning is shown if blocking commit is enabledMatthias Sohn2-3/+7
If committing is blocked since a build error or warning is present we should ensure that a corresponding warning is shown to ensure the user understands why the commit button is blocked. Change-Id: Ic0e9f75253860154cdcf24cbcbebf506e32536db Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-04-02Remove obsolete JGit features from update siteThomas Wolf1-6/+0
JGit sources have been unified in a single source feature. Change-Id: I27eb6a8fc72a08431b2f0b0274459167de99b05e Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-04-01Improve performance of blocking commit buttonMichael Keppler1-19/+12
* only calculate the problem severity of staged files as very last condition after checking all other early exits (preferences, checkbox in view) * exit early if the maximum severity has been found, without iterating remaining files * indicate the maximum searched severity in the call, so we can exit early even with severity warning, if that is what was configured in preferences Interestingly, none of my static code analysis tools seems to be able to recommend reordering "booleanMethod() && booleanVariable" for better short circuit evaluation. Bug:545996 Change-Id: I74df19a3bfd6e9bfd2f12329f461780b9ddbe22e Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-03-30Minor clean-up in StagingViewThomas Wolf1-25/+11
Don't use the forms toolkit to create the container for the filter text input in the toolbar, and make its GridLayout match the one used for the history view's search bar. Change-Id: I642a4a3ce5666a912347b642539dd1e0f1a9dff0 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-03-30[releng] Add dependency from source to binary featureThomas Wolf2-37/+11
Adapt the version.sh script to also replace this version number. The script now handles all feature.xml files the same way. Bug: 545906 Change-Id: I8a7f422f2c2ab0034a3921281b8cddb2412fa08d Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-03-28[releng] Update & cycle API baselines in Oomph setupThomas Wolf1-10/+10
Change-Id: Ia4ad596a72b464ac08f7c5b2b90c06d9996765b3 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-03-28convert target platform to simple POM projectMichael Keppler4-23/+0
There is no reason why this is a plugin project. It is sufficient as Xtext nature project which is only built via Maven. Change-Id: Ibe6df1d82eb90e8c8520772eea651385e950aa1b Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-03-25Integrate the smart import wizard fragment into the EGit UI bundleThomas Wolf40-1813/+202
Move the class into the main bundle now that the EGit baseline is a version that supports smart import. Add the wizard extension in plugin.xml. Move the test class into the EGit UI tests and rewrite it to use a local test repo instead of trying to clone JGit over HTTPS. Remove the smartimport fragment and the ui.importer.tests project. Add the update clause to the p2.inf of EGit UI to ensure that p2 removes the fragment when EGit UI is updated. Also remove the smartimport fragment from the repository, and remove the maven modules. Change-Id: I6b9c3138da25d77995ef0acd9168ddccc3663568 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2019-03-24Set minimum versions to the ones from Neon.0Thomas Wolf13-97/+96
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>

Back to the top