Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-09-08Allow horizontal space in file:// URIishs in GitUrlCheckerThomas Wolf2-0/+31
Bug: 538322 Change-Id: I8184e9867474934df4a703c1a1b8e7ac7d5aeb85 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-09-06Revert "Select repositories via double-click in RepositorySearchDialog"Matthias Sohn1-7/+0
This reverts commit 815ee43ce52548a7092cefff9fef95f6843e5ff5 since this causes Bug 538386 on GTK. Bug: 538386 Change-Id: I4295d83166455b07cef4e375e6519d8be76a7897 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-09-05Prepare 5.1.0-SNAPSHOT buildsMatthias Sohn38-39/+39
Change-Id: Ica4fdc7b32809b00fbe2ce11be50b22fe4788436 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-09-05EGit v5.1.0.201809051400-rc1v5.1.0.201809051400-rc1Matthias Sohn38-39/+39
Change-Id: I9fbc165f94573ba179138eb24ada2c0bfa820369 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-09-05Merge branch 'master' into stable-5.1Matthias Sohn41-118/+406
* master: Restrict visibility of Gitflow menu items Focus file list in commit editor Cleaned up Gitflow NLS Fixed: EGit allows starting features with diverging develop branches Fixed: GitFlow test launch config: Added missing dependencies Commit editor: Abbreviate parent SHA-1 with 7 characters Reorder reflog view context menu Fix Findbugs RV_NEGATING_RESULT_OF_COMPARETO Minor: Fix Javadoc typos NPE in git model synchronization Icon for "Stash Changes..." menu Have ellipsis at "Create patch" menu Sort upstream branch configuration case insensitive Update Orbit to S20180829155938 for 2018-09 RC1 Use new TPD update site Change-Id: I7a168b6d28fd5d19d57e666d1a4492f2243c46ba Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-09-03Restrict visibility of Gitflow menu itemsMichael Keppler1-6/+45
* "Init Gitflow" only visible on the repository node (similar to "enable LFS" and "Add Submodule", which are all a kind of configuration change) * Gitflow sub menu only visible on the repository node, the "branches" node and all children of the "branches" node. The change is most notable when opening the context menu on tags, the working tree etc. Bug: 536205 Change-Id: Icd69482f2c2415444c22a1f6690fcc589f05a25a Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-09-03Focus file list in commit editorMichael Keppler2-0/+16
That avoids the commit ID label getting the focus and showing a cursor. Bug: 538505 Change-Id: I59a1952e7bf6ee6f65138f4cb7f89ed9e2e66329 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-09-03Cleaned up Gitflow NLSMax Hohenegger9-53/+34
- prefer NLS.bind over String.format for consistency - fixed typos 'Feautre', 'Hotifx', 'inital' - fixed inconsistent use of single quotes for branch names - fixed inconsistent use of "Gitflow" - removed redundant NLS string 'Not on a feature branch' - removed unused NLS string 'Not on ...' - removed unused NLS field 'HotfixFinishOperation_mergeF...' Change-Id: Ibf652c22dee080f493cce0efc3256a6041663d09
2018-09-03Fixed: EGit allows starting features with diverging develop branchesMax Hohenegger7-4/+181
In comparison, when the upstream develop branch is ahead of the local develop branch command line Gitflow (AVH) raises an error: $ git flow feature start "foo" Branches 'develop' and 'origin/develop' have diverged. Fatal: And branch 'develop' may be fast-forwarded. Adjusted JUnit tests to cover new code. Change-Id: I2629301539e96b3911987ad300a7ed538b1d0516
2018-09-03Fixed: GitFlow test launch config: Added missing dependenciesMax Hohenegger1-1/+1
- org.eclipse.core.net.proxy - org.eclipse.jsch.core Change-Id: I2c2c874f76dc617fb439545ce521d547493af724
2018-09-01Commit editor: Abbreviate parent SHA-1 with 7 charactersMichael Keppler3-24/+80
Abbreviate the parent SHA-1 with the same 7 characters used in history and other places. Add a tooltip to show the complete value on hovering. Add a context menu for copying the SHA-1. Bug:537931 Change-Id: Ia0154d3904481869fb05611c746c2d6180ecb43a Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-09-01Reorder reflog view context menuMichael Keppler2-6/+9
* put open in commit viewer to top and have a separator afterwards, since that is the default action * use "Check Out" instead of "Checkout" as in other places Change-Id: I5d04e149e55bdcfddbb36897c2c81fb6653f0084 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-09-01Fix Findbugs RV_NEGATING_RESULT_OF_COMPARETOMichael Keppler1-1/+1
Instead of negating, invert the order of compareTo. Change-Id: Iba3ed5985d91111b07f1276a92f5e9abb406666e Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-09-01Minor: Fix Javadoc typosMichael Keppler1-2/+2
Change-Id: I0422dfdbfd096842c9ae119a52b66b16347700e8 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-09-01NPE in git model synchronizationMichael Keppler2-0/+6
The calling class accesses the array without null checks, therefore all implementors must return a non null array. Bug: 538492 Change-Id: Ibe610e76f94ed7193cb4afc286a2435b992e7c78 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-09-01Icon for "Stash Changes..." menuMichael Keppler2-1/+7
Bug: 538490 Change-Id: I3c3068eacc7cad423b3cbba8964d46387342feb3 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-09-01Have ellipsis at "Create patch" menuMichael Keppler1-1/+1
While the git context menu already had the ellipsis, it was missing in the synchronize view. Bug: 538502 Change-Id: Ia7216f570da5ebeee16f5cd2ad564399afbb23b8 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-09-01Sort upstream branch configuration case insensitiveMichael Keppler1-5/+9
Bug: 538488 Change-Id: I098d42b31419ec10e0e5110bc0c4bf0b17af05d3 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-09-01Update Orbit to S20180829155938 for 2018-09 RC1Matthias Sohn11-17/+17
Change-Id: Id8d46ce35963c15e3e5d1e592db7a4458a89906c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-31Use new TPD update siteMichael Keppler1-1/+1
The project has been moved to Eclipse. The old update site URL is no longer reachable, but the artifacts are still available on bintray. Bug: 538414 Change-Id: I37c8a250d4bea4a3c2636cd85e6b4ff13e0c484e Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-08-29Merge branch 'stable-5.1'Matthias Sohn0-0/+0
* stable-5.1: Prepare 5.1.0-SNAPSHOT builds EGit v5.1.0.201808281540-m3 Change-Id: I54ff0367b3daa063088d6954ab501b2727a1b18d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-29Prepare 5.1.0-SNAPSHOT buildsMatthias Sohn38-39/+39
Change-Id: I9212ef2ecbc02ee8608daecc8416c100f0719ab4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-28EGit v5.1.0.201808281540-m3v5.1.0.201808281540-m3Matthias Sohn38-39/+39
Change-Id: I6d2104ab8b642c378170b0c13a4e03281b414607 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-28Update Orbit to S20180820175350 for 2018-09 M3Matthias Sohn11-17/+17
Change-Id: Ib996bfcac0a617dbae28093bb8a605d67988f04b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-25Fix layout and title in CommitSelectionDialogThomas Wolf3-8/+15
Since commit 7011de7 the Table of a CommitGraphTable is wrapped in an intermediate Composite for its TableColumnLayout so that column widths can be adapted in response to resizes. However, CommitGraphTable.getControl() still returned the table. As a result, the GridLayoutData used in the CommitSelectionDialog got attached to the wrong widget. Fix this by returning the intermediate Composite from getControl(). Add a new getTable() method that indeed returns the Table; it's needed for focus tracking. (The getControl().setFocus() calls are fine; the Composite forwards the focus to its first focusable child, which is the Table.) Also use the short repository name in the dialog title instead of the git directory path. Bug: 537959 Change-Id: I636982330ca53888d1a23e3ba1ff1f8698829de8 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-08-25Merge branch 'stable-5.0'Matthias Sohn6-5/+62
* stable-5.0: Update Photon orbit repository to R20180606145124 Prepare 4.10.1-SNAPSHOT builds EGit v4.10.0.201712302008-r Update documentation for 4.10 Change-Id: I6b97690cc544c4c6f3c8ab229d30291b06f013e4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-25Avoid more UI freezes in ReflogView: redraw once onlyThomas Wolf1-3/+9
Adding lots of children (for instance, some 1500 ReflogItems) to the viewer is slow because the viewer tries to redraw too often. UI monitoring still reported UI freezes of about 3sec (at least on Cocoa). Avoid this by suppressing redraws while the viewer is adding the items. Redraw it once all items have been added. Change-Id: Ic38ae975a5edee5cc75d3c296d438e352844daa6 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-08-25Merge branch 'stable-4.11' into stable-5.0Matthias Sohn6-22/+27
* stable-4.11: Update Photon orbit repository to R20180606145124 Prepare 4.10.1-SNAPSHOT builds EGit v4.10.0.201712302008-r Update documentation for 4.10 Change-Id: I354b7a6fb5a66050daa6120382e9bdb80979f698 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-25Merge branch 'stable-4.10' into stable-4.11stable-4.11Matthias Sohn11-53/+53
* stable-4.10: Update Photon orbit repository to R20180606145124 Prepare 4.10.1-SNAPSHOT builds EGit v4.10.0.201712302008-r Update documentation for 4.10 Change-Id: Ifa9d3ab425979d00c1ee7e96dae9da1e5e4d4c4b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-25Focus default button in PullResultDialogMichael Keppler1-1/+3
Avoid the system automatically focusing the first focusable result, the text widget with the rebase/merge status result. Change-Id: I8fa041944a98d9ee70711733141d6bcd9065068b Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Bug:538066
2018-08-25Merge branch 'stable-4.9' into stable-4.10stable-4.10Matthias Sohn3-17/+17
* stable-4.9: Update Photon orbit repository to R20180606145124 Change-Id: I4f2e557215d13f1332a574f70bc0ebe011e0f2bb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-25Refactor: Remove unneeded null checksMichael Keppler2-6/+4
RevWalk.parseCommit() was marked @NonNull in January 2018, and existing egit code has not been adapted in all cases. Change-Id: Ic5f35768852cf695ac7ee8fdf53a24d53f6cc10e Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2018-08-25Replace PlotWalk usage by RevWalkMichael Keppler1-5/+1
* replace PlotWalk by RevWalk * use try-with-resource to automatically call close() * remove call to dispose(), to be more symmetric with other instances and to avoid the remaining unfilteredCommit variable to become invalid Change-Id: Id39560715a5483e58ff3957416263b17d966505f Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Bug:537937
2018-08-25SelectionUtils now contains methods to return multiple repositoriesLuís Copetti2-112/+146
The current API for the SelectionUtils only handled selections that contained a single repository, now it has been refactored so that it is as easy to get multiple repositories for an IStructuredSelection than it was for a single repository. Change-Id: Iec38362538aebd891cda74d366567de785d61f21 Signed-off-by: Luís Copetti <lhcopetti@gmail.com>
2018-08-24Avoid UI blocks in ReflogViewThomas Wolf3-20/+35
The view already loads the reflog in the background. But the (short) commit message was obtained through RevWalk.parseCommit inside the label provider. This is a potentially long-running operation, and the label provider runs in the UI thread. Avoid this by getting the commit messages up front in the background, too. Change-Id: If0f33d391659aa774ac5d71f7a85dafa4792a193 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-08-24Minor clean-ups in HyperlinkSourceViewerThomas Wolf1-11/+14
* Dispose of colors after having called super.handleDispose() * Fix a comment * Slightly simplify updating colors Change-Id: I25a52ed50567747326cfd756da65175487df26dd Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-08-23Fix missing optional import of jgit.lfs in egit.core MANIFEST.MFThomas Wolf1-0/+1
Commit e2be982 inadvertently lost the optional import again, leading to a CCE at run-time if the JGit LFS was installed because the package was not on the bundle classpath. Re-add it again. Change-Id: I31ce187f6496d5482e485bbe6f9bbbeb365ce685 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-08-23Update Photon orbit repository to R20180606145124stable-4.9Matthias Sohn3-13/+13
The S-repository doesn't exist anymore and we should have updated to the final Photon orbit repository already. Change-Id: Ic60337717635c293c6dd890b8e8f6d21c0824dc4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-23[releng] Use spotbugs 3.1.6David Pursehouse1-1/+1
Change-Id: I2ebe6c89a78190efdc7fd2edca65a878823bf0cd Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
2018-08-22[releng] Use spotbugs 3.1.5Thomas Wolf1-2/+3
Also fix the non-existing config <findbugsXmlOutput>; according to [1] one should use <xmlOutput>. [1] https://spotbugs.github.io/spotbugs-maven-plugin/check-mojo.html Bug: 538074 Change-Id: I9aacf90f3b3a1fd5f15cdc5eb16fa93f5d16e185 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-08-20Organize OSGi manifestsMatthias Sohn13-102/+70
- 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-19Update Jetty to 9.4.11.v20180605Matthias Sohn12-115/+115
Change-Id: I0b05d625b91d39581868b4eb206a5bd597f1a935 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-18Fix comparison of SWTCommit to detect changed selectionThomas Wolf1-1/+1
Commit d3b1c74 avoided unnecessary re-loading of the commit and file diffs if the same commit was selected again. Change the comparison from equals() to ==. Equals would compare the object ids only, and thus suppress updates when only the parents had changed. Change-Id: I54389ad6d0ffc37cb5e127c5b3d4a9c1c8fc900a Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-08-18[releng] Correct TPD of orbit S20180730183850Thomas Wolf6-11/+11
The TPD file still specified R20180606145124 as location. Change-Id: Ibb346735f4fe1f4c4e43f2a21b96901a0c64312c Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-08-18Radio button style configuration selection of repository propertiesMichael Keppler1-4/+8
Avoid disabling the currently selected menu item, and use radio button style, since the choice is exclusive. Change-Id: Idf2ba10a163867ee566255fae7cb106602fcb276 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Bug:537955
2018-08-18[releng] Fix target platforms for httpclient 4.5.5Thomas Wolf6-29/+29
httpclient 4.5.5 requires commons.codec 1.10.0 and logging 1.2.0. See [1]. [1] https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient/4.5.5 Change-Id: I30d9fbe273addb04767e3b25fcfb62dbcf18e7e4 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-08-16Update apache httpcore and httpclientMatthias Sohn11-54/+35
Update - org.apache.httpcomponents.httpclient to 4.5.5.v20180409-1525 - org.apache.httpcomponents.httpcore to 4.4.9.v20180409-1525 CQ: 16959 CQ: 16960 Change-Id: I3ade09569473fbd0bc7c8ae7b96f115cd278ef76 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-15Merge "Fix bugs with the new lightweight decorator for RepositoryTreeNodes"Thomas Wolf3-91/+147
2018-08-15[staging] use icons for author and committerMichael Keppler1-16/+26
Add the same icons as in the commit editor also to the staging area. Reduce the unwanted margin around the group of (author, committer, commit buttons) and reduce the gap above the commit buttons. Move the icons and the labels closer together, and increase the spacing between labels and the text fields by one pixel to avoid that the content-assist lightbulb gets clipped. Bug: 537200 Change-Id: Id70658b8776dd3b9494445be3e4913e85187f055 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2018-08-14Sort branches before tags in pull result dialogMichael Keppler1-2/+2
Changes on branches are often more interesting than changes in tags, since the branch changes contain the real new commits. Therefore make the branches appear before the tags in the pull result dialog. Bug: 537690 Change-Id: I629857872d494329bab98a30463fb1e619ad98f6 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

Back to the top