Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-06-06EGit v2.0.0.201206060730-rc3v2.0.0.201206060730-rc3Matthias Sohn32-35/+35
Change-Id: If91387f23fb559b3250428e406d0d6407ecd2e2a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-06[historyView] Handle branch deletion more user-friendlyMathias Kinzler1-5/+12
Let's assume we have a commit which the currently checked out branch and a remote tracking branch points to. With the current implementation, right-clicking on "Delete Branch" will delete the remote tracking branch quietly. With this change, the branch selection dialog will come up offering to delete the remote tracking branch. Change-Id: Ia4096aef8f459cd3476f87fe9622b6dbefe29e03 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-06[historyView] Set values of fill & wrap preferences when createdKevin Sawicki1-2/+8
Change-Id: Idac18df97c50667a8f97dc385e1937175eb30741 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-06[repoView] Show name of checked out tag in repository labelKevin Sawicki7-26/+31
Make the project decoration and repository decoration be consistent when showing a non-symbolic ref. This moves the logic to compute a short branch string for a repository to RepositoryUtil to be accessed by both the decorator for resources and the decorator for repository view elements. Updates the following decoration styling: * Ref name is now shortened so "refs/tags" prefix is dropped * Ref name is shown before abbreviated SHA-1 * Parentheses have been removed * Ellipsis has been removed * Single space between ref name and SHA-1 Change-Id: Id8a1b6089763fd17980de7640fd42f14f2d41c2e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-06Silence a boxing warningRobin Rosenberg1-0/+1
Change-Id: I4bd34a4d1bb132ae90c32a47546a907e4732d88e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-06Removed unnecessary @SuppressWarningsRobin Rosenberg2-2/+0
Change-Id: I0bd34d7c8c0f1f7a68ceebfbd8800067f99934fc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-06Removed unused private method parameterRobin Rosenberg1-4/+4
Change-Id: Ia165e0ffdf7df88ebb23ab0c3448ce96691e30c1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-06Include about.html for org.eclipse.egit.importMatthias Sohn1-1/+2
Change-Id: Ifbcecaee410f5e01e8a29dbafcaf953f0d499d5c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-05Fix name of zipped p2 repositoryMatthias Sohn1-1/+1
Change-Id: I92c58cbe19f9698f5a581f8749f42695d3063975 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-05Update build to use Tycho 0.15.0Matthias Sohn1-2/+2
JGit-Dependency: Id4ee884027d55cd2d43e8a6ef58a67f74ab488e4 Change-Id: I5b799d2ba4b140c82e63d4cbf86111c4bd7ccff7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-05Update to official Juno Orbit buildMatthias Sohn5-5/+5
Use the official Orbit build released for Juno [1]. [1] http://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg07655.html Change-Id: Ife7f3f7db29d73abe9966920decca94ee24507dd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-04[repoView] Release RevWalks used in label providerRobin Stocker1-3/+14
Change-Id: Ibb5e800f7dd6915bc19d63f6bf0bf6d4143449ba Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-04[historyView] Perform clear on background thread when disposedKevin Sawicki1-1/+17
An NPE can occur if SWTCommitList.clear() is called from dispose() while fillTo() is running from GenerateHistoryJob. dispose() is always called on the UI-thread so schedule a background thread that synchronizes on the instance and calls clear since all other state accessing calls to the SWTCommitList instance are done inside synchronized blocks. Change-Id: I855d5bfeb5131c634b4790e6b7231424f2be4566
2012-06-04[historyView] Load commit body lazilyStefan Lay8-16/+58
The body of loaded objects is now thrown away in the walker after it has parsed the information necessary to render the history graph. It is reloaded when content of the body is needed in the HistoryView. For large repositories this saves a lot of memory, e.g. about 110 MB for linux kernel. JGit-Dependency: I9291ba8c34c8744bc009b1bd302ed28bfa4e9476 Change-Id: I1504a6127e7fc2ebea67baade5e9799b256ab116
2012-06-04Load history incrementallyMatthias Sohn5-73/+159
Loading history incrementally can drastically reduce memory consumption and the time needed to render the part of the history the user is interested in. Most often only the most recent part of the history is needed. Hence load only one batch of 256 commits initially and keep the GenerateHistoryJob in order to incrementally load the next batch when the user has scrolled down half of the loading batch size (128 commits). JGit-Dependency: Id3b97d88d3b4b2d67561b11f8810cb88fe040823 Change-Id: Ibc88d589ea2a5f233cd65c203bde9187c122a277 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2012-06-04Allow amending a published commitKevin Sawicki4-20/+72
Provide a message type from CommitMessageComponent so calling classes know the severity of the message and report amending a published commit as a warning. A warning message is sufficient to notify the committer that they may be rewriting published history but it still should be allowed since there are valid cases for amending published commits and then force pushing. Change-Id: Ic2d4e279feb70c7f9ad45328cc369cdd981f3b96 Signed-off-by: Robin Stocker <robin@nibor.org>
2012-06-03[historyView] Fix tooltip position on Ref hoverRobin Stocker1-5/+5
With the fix in I8fe269af7a73274ee6cbca96778ba7be0754d6bb, the positions would have been right. But because it has been fixed by 3ee1488 in a different way, we now have to adjust the position in this place. Change-Id: I23c619e6eed73b8b1055218c57016e502e6dec69 Signed-off-by: Robin Stocker <robin@nibor.org>
2012-06-03Revert Jetty from 8.1.3.v20120416 to 7.6.0.v20120127Matthias Sohn5-103/+120
Update target platform to use the latest available Jetty 7.6.0.v20120127 release instead of Jetty 8.1.3.v20120416. We can't use Jetty 8.x since it depends on Servlet API 3.0 which requires Java 6 but JGit still wants to support Java 5. JGit change I343273d994dc7b6e0287c604e5926ff77d5b585b needs this target platform. Change-Id: Ibf67a6d3539fa0708a3e5dbe44fb899c56fbd8ed Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-01Fix wrong bundle name and vendorDani Megert2-1/+3
Bug 381319 Change-Id: I80cc9b46a0b637f0d17a76e0a4fde04ca46473d3 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-31[historyView] Fix hover over Ref tagsMathias Kinzler1-1/+3
After 5c5d942, the implementation of the hover must be adjusted, otherwise the hover over the Ref tags (showing the full names of the Ref) will wrongly activated when the mouse is width of first column left of the actual tag. This also sets the foreground color explicitly, as the current implementation is rendered nearly unreadable on Ubuntu 12.04 (dark grey on black). Change-Id: Ib1d6ad50105c746e9f2918bbb1cc212c5ffcdc50
2012-05-31[historyView] Use jface.text framework for ref tooltipsRobin Stocker1-74/+63
By using AbstractHoverInformationControlManager instead of bare SWT, the following bugs are fixed: * Tooltips block clicks in history view * Tooltip on history view remains open when switching applications Also, it seems to behave more than one would expect with regards to how fast it appears and how it stays visible. And to top it off, it's less code. Bug: 371695 Bug: 380815 Bug: 380831 Change-Id: I671eccb2ef055bc548ce7145677ea64aaf03ac96 Signed-off-by: Robin Stocker <robin@nibor.org>
2012-05-31Prepare next 2.0.0-SNAPSHOT buildsMatthias Sohn32-38/+38
Change-Id: I9c98269f048922d88b8faea02be9acd3d7fe3151 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-30EGit v2.0.0.201205301645-rc2v2.0.0.201205301645-rc2Matthias Sohn32-38/+38
Change-Id: I2aea187a7b545073e93a48b64321698e4e11b9b6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-30Fix maven coordinates of org.eclipse.egit.import featureMatthias Sohn1-1/+2
Tycho 0.14 requires Maven artifactID to match bundle/feature ID. Hence change Maven artifactID accordingly and choose a different Maven groupID to prevent the feature's Maven artifactID to clash with the bundle's Maven artifactID. Change-Id: Iabbfad76893a96dd575e3d514eae03ad3831bd72 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-30Git API does not declare GitAPIException call() and related changesRobin Rosenberg25-120/+67
Anyone that calls a Git API should catch GitAPIException and not just the currently known exceptions. During the process of cleaning this up a number of cases, but not all cases, where only checked exceptions are thrown, are changed to catch all Exceptions except Error. This changes adapt EGit to changes made in JGit for this reason. Bug: 366914 JGit-Change-Id: I50380f13fc82c22d0036f47c7859cc3a77e767c5 Change-Id: I4de4902003a9f306912475e8b15b1e72d43e7475 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-23Add support for Eclipse-SourceReferences headerTomasz Zarna36-3/+1662
Add extensions required to import a plug-in using SCM URL from its MANIFEST.MF. To give it a try, open Plug-ins view, select a plug-in, right click and Import As > Project from a Repository.... Then follow instructions in the wizard. Importing with a tag is not supported yet, see bug 367712. This allows EGit compilation against all supported eclipse platform versions but only builds the p2 repository when built against Juno. This should be improved in a subsequent change. Bug: 327381 Change-Id: Ia4eb34fec24f5fe714a1b5a2b50fe0393e8d3f39 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-23Define target platforms for the buildMatthias Sohn15-40/+538
This simplifies setting up the Eclipse workspace and allows to use Eclipse versions for development which are not matching the target platform version. In order to set a target platform open it using the target editor and click "Set as Target Platform". The EGit Maven build now also is based on the same target platform definition. This way dependencies used in the Maven build are identical to those used in Eclipse. This change is a prerequisite for change Id9d721ae574a83ad9440a93ddb143b1271fc2b2b as this is using a feature of the team framework only available in Juno. Without a target platform definition this could not be built in older Eclipse versions. Change-Id: I462e4a35fea4caec7ae95b08ac13cb495c0fa309 JGit-Dependency: Ifc4bfbb3efbab0f5bfbde74f0b2ddc5a2f9ee6a5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-21Remove content length checking from AddOperationTestKevin Sawicki1-6/+8
With JGit updates to correct how smudged index entries are handled these tests were currently failing. Remove the explicit length checking from AddOperationTest but still verify added entries are present in the index. Length checking is not necessary here since files being in the index after the operation completes is what is being validated and file length checking is done in lower level JGit unit tests. Change-Id: I7f17379df0ecd415a7f08b65962596953d05b255 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-21Use JGit ResetCommandKevin Sawicki10-183/+32
This replaces the local EGit reset command logic with calls to the JGit ResetCommand class. Change-Id: Ie91f999eca66de2a773f6143d758364f2e0e96fc Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2012-05-21Fix BranchAndResetActionTestMathias Kinzler1-7/+10
The control was changed from a radio button to a toolbar dropdown button without adjusting the test. Change-Id: I9f055433393a0c2d512154fa0ca70e1a095f6a8a
2012-05-21GitResourceDeltaVisitor: Avoid adding null pathsMathias Kinzler1-1/+2
This gets rid of lots of Exceptions with the following stack trace: java.lang.NullPointerException at org.eclipse.jgit.treewalk.filter.PathFilter.create(PathFilter.java:77) at org.eclipse.jgit.treewalk.filter.PathFilterGroup.createFromStrings(PathFilterGroup.java:90) at org.eclipse.egit.core.internal.indexdiff.IndexDiffCacheEntry.calcIndexDiffData(IndexDiffCacheEntry.java:313) at org.eclipse.egit.core.internal.indexdiff.IndexDiffCacheEntry.access$8(IndexDiffCacheEntry.java:302) at org.eclipse.egit.core.internal.indexdiff.IndexDiffCacheEntry$6.run(IndexDiffCacheEntry.java:262) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) Change-Id: Ib5423963c61766cf2fbc13a1829e2b0e1b461e49
2012-05-21Fix assembling JGit source bundle into EGit p2 repositoryMatthias Sohn2-3/+3
Adapting build of EGit p2 repository to the workaround in I3192dbd00b51e6ee6596d2301050b2a6f7028e3b, also re-enable assembling the JGit source bundle. JGit-Dependency: I3192dbd00b51e6ee6596d2301050b2a6f7028e3b Change-Id: I9c00208b2f5262494d527366ae2e650200a9ea23 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-21Fire config change event when edited via preference pageKevin Sawicki2-2/+11
The previous behavior can be seen by opening the Configuration preference page while the Properties view is being displayed for a repository. Selecting Apply or OK from the preference page does not update the Properties view. This is because the config used by the preference page does not propagate the change event to the repository's listeners list. The preference page now registers a listener on the local config being modified and passed the event to the repository when fired. Change-Id: Id0d2b13139eecb382c439c4b253131107ec75470
2012-05-20[repoView] Use display from workbench when scheduling runnableKevin Sawicki1-2/+5
This adds more guards against the Git Repositories view being disposed when the refresh job completes. Bug: 378216 Change-Id: I7c26418b37dd87711660878e8149a8244ae76a69
2012-05-19Warn when amending a commit already on a remote tracking branchRobin Stocker8-8/+273
It sometimes happens that a user amends a commit that is already pushed. This leads to a rejected push when the user tries to push the next time. It happens either by accident or when the user doesn't yet know about how to use amend. To avoid this, a warning text is now shown when the user presses amend. It's only shown when the commit to amend is contained in any remote tracking branch (which means the commit is no longer just local). In the commit dialog, the warning is shown as a dialog message, the same way the existing warnings already are. In the staging view, a label above the commit message editor is shown when there is a warning. It's not only used for the amend warning, but also warnings about author and committer text, the same way as in the commit dialog. Bug: 379172 Change-Id: If79d3459e9d6db3e1179489ebe3b206e4f5ae6eb Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-18Prevent listener leak in properties pageKevin Sawicki1-1/+35
Store the listener handle provided when the listener is added and remove the handle when the page's control is disposed. Change-Id: Ia4ff8a821b0a0b694115e0a4a8c9b01c26a285c9
2012-05-18Improve clone operation failure dialogDariusz Luksza7-13/+144
Improves dialog showed when ls-remotes command failed by adding additional information about failure cause and suggestions what could solve this issue. Bug: 336795 Change-Id: I1f6bdfd7355941a9a732be7d55d44fc76c618cb8 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-17[historyView] Show commit SHA-1 in first columnKevin Sawicki3-16/+24
Move the Id column from position 3 to position 0 and show the SHA-1 abbreviated to 7 characters. Set the minimum width of the first column to show the entire abbreviated id text. This should make it easier to give the author/committer and date columns the remaining space after the message column but still be able to see the SHA-1 without being the focus of the content displayed. Change-Id: If39f8973d3d4b06b8b884bc02e70384e4d56c022
2012-05-16[stagingView] Add content assist for file names and commit messagesRobin Stocker5-57/+142
It previously only existed for the commit dialog. This change extracts some code to share it with the staging view and makes it available there. Bug: 368081 Change-Id: I2e2c6e737167650127f87f94aa4fa39fb8fa3db0 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-16Extract class for saving/loading previous commit messagesRobin Stocker2-75/+111
This enables reuse for implementing content assist in StagingView. Bug: 368081 Change-Id: Id80411e36842262b9078e9eb6ec1010061b4679f Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-16Merge "Do not run tests using maven-surefire-plugin in OSGi environment"Matthias Sohn1-28/+4
2012-05-15Do not run tests using maven-surefire-plugin in OSGi environmentMatthias Sohn1-28/+4
Running plain junit tests in an OSGi environment using maven-surefire-plugin isn't guaranteed to work as split packages can lead to signing errors when the maven-surefire-plugin loads classes not respecting OSGi class loading rules. Hence run the few plain junit tests as part of the swtbot tests which are run on top of Eclipse platform's OSGi runtime. Change-Id: Ib94f947e639d149d57b676d50a1302ea5517bb78 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-14Add information about missing SSH key configurationDariusz Luksza3-0/+7
Check in EclipseSshSessionFactory does user have properly configured SSH keys, if not throw exception with suitable message. Bug: 336795 Change-Id: I46f7915116325a6c3b2a9ffa8c01c0bc1dba0ecb Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2012-05-11[historyView] Add preference to show/hide e-mail addressesKevin Sawicki8-7/+68
Adds a new toggle option in the view menu to control whether e-mail addresses are shown in the 'Author' and 'Committer' columns in the table. Also moves the 'Relative Dates' option to the 'Show' sub-menu for consistency. Change-Id: I515a1457e8c2187db3c006ac58408ba16e1c66ae Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-11[historyView] Don't abbreviate commit idKevin Sawicki1-1/+1
The amount of characters displayed in this column can be controlled by explicitly sizing it. Change-Id: I389d28f9e0d993e3df554cdf61a6d568b064f289 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-11Select use/create option when projects are in repositoriesKevin Sawicki1-0/+9
If all the projects being shared are already in a repository then preselect the user/create option. This combined with the project being prechecked in the table allows the user to share a project without doing any explicit actions and just clicking 'Finish' button for cases where the projects they are sharing are already in Git repositories. Change-Id: If97b765294adb683c7ea29e29da4c1664c0b2508
2012-05-11Prevent NPE in RevUtils.getCommonAncestorDariusz Luksza2-4/+9
NPE in RevUtils.getCommonAncestor occured when one of given commit id's was null. To prevent that we ensure that getCommonAncestor is never called with null arguments. Also updates documentation for RevUtils.getCommonAncestor and adds not null checks. Bug: 373671 Change-Id: I98a3a2a9f4f8336429d9465267e4ebbf8984a3c0 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-11Fix memory leak in GitHistoryPageStefan Lay3-8/+36
When a GenerateHistoryJob was cancelled because a new input was set the SWTCommitList was not deregistered as DisposeListener. The List held references to all SWTCommits which could consume several hundreds of MB for large repos. Change-Id: I95b3f79ce883bb65cc168d7288040826d6fde514 Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-11[historyView] Do not store the RevWalk as a field in GitHistoryPageStefan Lay2-59/+46
When the history is redrawn a new RevWalk is created and configured corresponding to the settings of the history view. This RevWalk is used in the scheduled GenerateHistoryJob. The RevWalk was stored in a field in the GitHistoryPage, although it is not a property of such a Page. This can potentially lead to problems, and indeed it caused bug 374675 which was fixed by 3604b5cd5fbf6ac354bc2a247115df7eade81959. By passing it as a parameter the scope of the RevWalk instance is made clearer. Change-Id: I340f2a3cc7340dec781c09b8b8ced6a3fb03bdc5 Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-11Log exceptions thrown by calcIndexDiffData when tracingKevin Sawicki1-13/+15
Change-Id: I2ce2e104d3203077d4de1e3c370f11fdeb2ee200 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

Back to the top