Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-06-09EGit v4.0.0.201506090130-rv4.0.0.201506090130-rMatthias Sohn36-37/+37
Change-Id: I070a50eae8e52982ecc606aef94794b28e169896 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09Fix GitRepositoriesViewHandlingTest.testAddRepoButton()Matthias Sohn1-0/+2
This test was broken by 712d3a2b since now RepositorySearchDialog doesn't preselect all repositories anymore. Change-Id: I5b9dc4b0664dae7c08257071db65151c8903bd19 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-08Don't pre-select all repositories when opening RepositorySearchDialogMatthias Sohn1-15/+1
Starting with no preselection saves one click if the user wants to add one or few repositories which seems the most common case. This also fixes bug 469607. Bug: 469607 Change-Id: I7ba4e8983319e1cbf7121bb764c936b3f261d185 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-08Update documentation for 4.0Matthias Sohn17-216/+313
Change-Id: I2e62e59a80f86a747947c56e633b66ec43756b54 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-08Fixes potential NPE in CompareTreeView.Laurent Delaigue1-1/+2
getRepoRelativePath() can return null in certain scenarios, in which case there's a NullPointerException with the former implementation. Change-Id: I9aa21be4302df8a98a4cb6936962c14981a130f1 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-08Fix broken spell checking in commit message and Staging viewDani Megert1-2/+21
Bug: 428320 Change-Id: I76514be1be4b8bcd1cf7e457416cdd7ada252be5 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-08Fix that double click is needed to "Check/Uncheck All Repositories"Dani Megert1-7/+4
When using the add existing repository wizard it was necessary to double click "Check All Repositories"/"Uncheck All Repositories" to check/uncheck listed repositories. c62ffbf5 tried to fix this but made it worse for the user: while it unchecked all elements in the UI it then added all repositories on Finish. Bug: 450946 Change-Id: I268ff5c3ed2aae2aab0f3bc404410e2fb1ced4ae Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-08Ignore build result folders for gitflow bundlesMatthias Sohn3-0/+6
Change-Id: I1c1a64f07bd90aae7bc4b2e82b8d498693b2537b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-08Fix tycho.scmUrl in pom.xmlMatthias Sohn1-1/+1
The URL prefix /p which was needed to access Gerrit's git servlet isn't existing anymore since a long time Change-Id: I094db2f35c5b747f26a80588840e0c6712ca59c3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-08Update build to use Tycho 0.23Matthias Sohn1-2/+2
see https://wiki.eclipse.org/Tycho/Release_Notes/0.23 Change-Id: I5a331c5bc75e343ea7d83636221eea8bc6813053 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-08Don't suggest branch name for push from remote tracking branchMatthias Sohn2-7/+10
The "Push Branch..." wizard suggested a wrong target branch name prefixed with the remote's name if the selected source branch was a remote tracking branch. Pushing from a remote tracking branch to the remote branch it's tracking is pointless. So there's no natural candidate for the target branch. Hence do not suggest any target branch if pushing a remote tracking branch. Also improve texts in PushBranchPage to make them easier to understand. Bug: 464723 Change-Id: I3aed8c30675f1f75efb700fcf568ef91c877d0b5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-08Fix SWTException "Widget is disposed" in BranchSelectionDialogMatthias Sohn1-5/+11
Bug: 447528 Change-Id: Iafd02ebe30d3d8e9a08a6ccac2b0436152a2fc68 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-07Fix SWTException "Widget is disposed" in BlameOperationMatthias Sohn1-0/+4
Bug: 462153 Change-Id: I19ed36dc9d6807515cbf1647d6e3caeca64985e4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-07Fix NPE in CommitHelper.getHeadCommitMatthias Sohn1-0/+3
Bug: 464746 Change-Id: I5d45a83d5e0160094ab9c9c7ef85df8156b68a21 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-07Fix ClassCastException in GitModelSynchronizeParticipantMatthias Sohn1-3/+7
Bug: 468899 Change-Id: I884ca56da297a78eb1877333744bbf96fc37df55 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-07Fix that double click is needed to "Check/Uncheck All Repositories"Dani Megert1-2/+7
When using the add existing repository wizard it was necessary to double click "Check All Repositories"/"Uncheck All Repositories" to check/uncheck listed repositories Bug: 450946 Change-Id: Iba2096d051736e71ae9f1c4fd516ceef7a8917cf Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03Silence unchecked conversion warnings in GitFlowAdapterFactoryMatthias Sohn1-0/+2
Change-Id: I5b20fbf53fda03adfa60593bfcb89f8fdd7f62f3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03Fix NPE in GitFlowAdapterFactoryMatthias Sohn1-2/+4
Bug: 469063 Change-Id: I5a23b075b012a717ba6cb9848c5f9178cee434ad Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-02Prepare post 4.0-RC3 buildsMatthias Sohn36-37/+37
Change-Id: If492c0bb7290a7ccc67256bd26d390aea59f3b7a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-02EGit v4.0.0.201506020755-rc3v4.0.0.201506020755-rc3Matthias Sohn36-37/+37
Change-Id: I9927210a4e8536baa2363c4714d60e5d8e4ca17b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01Merge branch 'master' into stable-4.0Matthias Sohn25-122/+581
* master: Update 4.5 target platform to use final Mars Orbit repository [gitflow] track feature will always claim no remote features exist [gitflow] explicitly notify the user about merge/rebase conflicts Avoid deadlocks during resource changes in AutoShareProjects [gitflow] Fix broken "start release" from commit Change-Id: I8c1b27babee7323d75694a080307cd1260a62258 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01Update 4.5 target platform to use final Mars Orbit repositoryMatthias Sohn5-8/+8
Change-Id: I2323241d7e5c1a4534252fdf75b8c39cb1e008d3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01[gitflow] track feature will always claim no remote features existMax Hohenegger3-8/+28
Bug: 468873 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu> Change-Id: I9faf534035bbe53f0744457f8189d213156c767e
2015-05-31[gitflow] explicitly notify the user about merge/rebase conflictsMax Hohenegger13-44/+240
- show warning when conflicts occurred - provide branch information in detail area - list files with conflicts in detail area Bug: 467535 Change-Id: I1283e4d5a8d625e9dddbad29256a4363dd8202e9 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-27Avoid deadlocks during resource changes in AutoShareProjectsAndrey Loskutov1-37/+113
Collect project candidates in the resource listener without using potentially deadlocking RepositoryProvider/RepositoryMapping API and run actual autoshare code in separated job. Bug: 468270 Change-Id: Ia296b27050805e8b5b1475c724f018c85f6223df Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-05-27[gitflow] Fix broken "start release" from commitMax Hohenegger8-31/+198
Bug: 468134 Change-Id: Id3e23c5093c1afd9ad3117880fbdcb9d193cacba Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26Merge branch 'stable-4.0'Matthias Sohn0-0/+0
* stable-4.0: Prepare post 4.0.0-rc2 builds EGit v4.0.0.201505260635-rc2 Change-Id: Ibf98e6cdb3372bf0eb8416b40c0e330e8c14bb61 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26Prepare post 4.0.0-rc2 buildsMatthias Sohn36-37/+37
Change-Id: I6e34f35e7309a0f1b3c8cbd7164880bc9eedbe40 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26EGit v4.0.0.201505260635-rc2v4.0.0.201505260635-rc2Matthias Sohn36-37/+37
Change-Id: I33a1edb31e5b545c206a53dd8e4e5951c581ec2b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26Merge branch 'master' into stable-4.0Matthias Sohn67-914/+858
* master: Update Mars target platforms to use Mars RC2 orbit Update build to use eclipse-jarsigner-plugin 1.1.2 Allow to switch the branch sequence off in the commit message viewer Remove gitprefix in egit Fix NPE in SwitchToMenu.createDynamicMenu Use try-with-resource to avoid leaks with RevWalk and TreeWalk Replace calls to release() methods with try-with-resource Change-Id: I8a451987f0c2be60b2863301aa6166f49046ede8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-25Update Mars target platforms to use Mars RC2 orbitMatthias Sohn5-25/+25
Change-Id: Ice68d05913abaabcbbfd80ee535044062be46e3e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-25Update build to use eclipse-jarsigner-plugin 1.1.2Matthias Sohn1-1/+1
Change-Id: I676461f36c1ecbb01388af96a4be2f50bc631a57 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-24Allow to switch the branch sequence off in the commit message viewerAndrey Loskutov8-23/+70
Bug: 468126 Change-Id: I695c0e4e33ddb9dcf751498f7f513e7816ad4659 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-05-24Remove gitprefix in egitAndrey Loskutov12-154/+7
Follow up on commit d7a447 in jgit which removed gitprefix logic and broke egit compile. Change-Id: Iad39fefb72a7b8de44caf0cad85a3024a87935b3 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-05-24Fix NPE in SwitchToMenu.createDynamicMenuMatthias Sohn1-2/+10
Bug: 466973 Change-Id: I56cb08d15a4c21fa4be9a4c11649ce13ba40ca01 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-21Merge branch 'stable-4.0' into masterMatthias Sohn3-5/+4
* stable-4.0: Prepare post 4.0.0-rc1 builds EGit v4.0.0.201505191015-rc1 Change-Id: If3209915862022e5f64360b5aa3a3a37b1a815c2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-21Use try-with-resource to avoid leaks with RevWalk and TreeWalkMatthias Sohn43-699/+744
Change-Id: I1ea48039ea38766bb07f079e5ef4569de034d577 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-21Replace calls to release() methods with try-with-resourceMatthias Sohn3-12/+3
JGit deleted the deprecated release() methods in change I2c67384309c5c2e8511a7d0d4e088b4e95f819ff Change-Id: I1a166ba477543669824888296b3533dd9b0ef3be Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-19Prepare post 4.0.0-rc1 buildsMatthias Sohn36-37/+37
Change-Id: If713a9ff983f1aa3c4ec98d271c41d8be6a94006 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-19EGit v4.0.0.201505191015-rc1v4.0.0.201505191015-rc1Matthias Sohn37-41/+40
Bump version for org.eclipse.egit.ui.importer to match the version of the other bundles to allow using current release tooling without manual tweaking. Change-Id: If1cf2ba5efd39f44f71005a8f406aae268a59164 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-19Merge branch 'master' into stable-4.0Matthias Sohn144-175/+8711
* master: [gitflow] fixed build warnings [gitflow] fixed unnecessary locking of resources Sort branches in Push to Gerrit case insensitive Extend EGit to allow use of git-flow Automatic wildcard matching "Add Git repositories" dialog Update to Jetty 9.2.10 Update javax.servlet to 3.1 Ensure commit body is retained in GitSynchronizeData Make PushResultDialog amodal Fix and re-include Easymport wizard Exported missing package and update uses directives Fix NPE in CommitGraphTable.doPaint() Properly style PushResultDialog in dark theme Change-Id: I276a7a5ea35134388df8bbeb30be1e75cd9a316a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-18[gitflow] fixed build warningsMax Hohenegger6-5/+29
- bundle localization [...] not found - Bundle-Vendor header not found [...] - improve feature name to ensure end users can understand it Bug: 348610 Change-Id: Ic6df8686f5d5c552c2a0f44fa53b7b28c359be1b Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-18[gitflow] fixed unnecessary locking of resourcesMax Hohenegger8-13/+125
Bug: 348610 Change-Id: I370109d91e55719a3850cab4a7bb054fcfaa82a9 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2015-05-15Sort branches in Push to Gerrit case insensitiveMichael Keppler1-1/+2
Bug: 463676 Change-Id: I56b93e1ee8ca5c384d2d09f1dfda00ed87e595e1 Signed-off-by: Michael Keppler <michael.keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-15Extend EGit to allow use of git-flowMax Hohenegger120-12/+8354
Initial implementation: - Operations for all commonly used git flow commands without optional parameters - Menu contributions in the repository and history view, as well as the team menu on projects - Added new feature as incubation project to update site - Non-UI tests (see launch config) CQ: 9662 Bug: 348610 Change-Id: I215ed28e6434a789fa7260d7072532b402a1e714 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-15Automatic wildcard matching "Add Git repositories" dialogLars Vogel1-2/+15
Bug: 462866 Change-Id: I20f9805b783a0d2639901435cc75a5ac80075022 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-10Update to Jetty 9.2.10Matthias Sohn12-115/+115
Change-Id: If5ff5106fac617ad61d104d2a77d6e3709bd8e9f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-10Update javax.servlet to 3.1Matthias Sohn7-19/+19
Change-Id: Idf51989a1a9558ed1587766883ca1e925b7c788f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-10Ensure commit body is retained in GitSynchronizeDataMatthias Sohn1-0/+1
JGit commit 53e39094bf012a4f5b3fe5557219707cb7b0f010 made setRetainBody(false) the default for ObjectWalk. Though GitSynchronizeData needs to retain the RevCommit body. Change-Id: Ic0e80a232d47106598283808cbe1a067aa965af6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-09Make PushResultDialog amodalChristian Georgi2-6/+17
This allows for continuing work while having the push result open. Also change PushToGerritWizard such that it opens PushResultDialog after the wizard is closed. This avoid the amodal dialog on top of the modal wizard. Bug: 466900 Change-Id: I7f2ea22bfa3480f7e1d9dd87738fbcfc39e9244b Signed-off-by: Christian Georgi <christian.georgi@sap.com>

Back to the top