Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-08-23Show that there are changes in "Git Repositories" viewPeter Karena3-10/+13
Equal to the modification of a file, where the sign '>' is added to the filename, the same character is added, when a file in a repository gets changed. It's very usefull when you work with many repositories. Change-Id: I5fe30cb738c0ec5334430fc710d2d826deaebff1 Signed-off-by: Peter Karena <peter.karena@arcor.de>
2015-08-23Trying to fix unstable test: GitRepositoriesViewTest.testOpenAndrey Loskutov2-1/+5
See build #7441 and #7433 on https://hudson.eclipse.org/egit/job/egit.gerrit. Change-Id: Ic145d3d59426c04b5d50758ead56c2ebc18b5785 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-08-16[gitflow] Feature finish squash should allow changing the commit messageMax Hohenegger4-10/+145
- open standard commit message edit dialog to change squashed message - duplicated stripCommentLines(..) from RebaseCommand to delete comments - added UI test for feature finish squash - pulled up some redundant test code Bug: 473550 Change-Id: I028a05f21c7ca3f3a501dba160a3ed4ff035c87b Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-08-14[gitflow] Implement squash parameter for feature finishMax Hohenegger1-0/+1
- added squash option - added dialog to select squash option - fixed package name dialog => dialogs - added test for squash and fixed existing test Bug: 471026 Change-Id: Iaaa8a88e2962737c90f646966f1bc1e380708f39 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2015-08-14Use default repository location for all import wizardsAndrey Loskutov2-6/+5
Bug: 395143 Change-Id: Iadc600c78e58195da4d2173764b90001fb410b2a Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-08-01[test stability] Fix test crash on timeout due running wizard operationAndrey Loskutov1-3/+18
Sometimes we are too fast checking the wizard state and fail afterwards to close it, causing test crash. If one tries to close wizard dialog while operation is still running, wizard opens each time a new message dialog with the warning about running task. This causes SWTBot to give up closing the wizard shell, but after the timeout of one minute, for each test running after the current one => the execution will be aborted after 40 minutes timeout. So before trying to validate search result, give the wizard operation a chance to complete! Change-Id: I2287725261a6c012029152d160ba6fae07c9f289 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-07-25Test stability: log real stack traces before failing testAndrey Loskutov2-7/+22
ConnectProviderOperation seems to be unstable and permanent reason for sporadic test failures. Catch the errors reported by the operation and log them, so that we can at least try to analyze the root cause. Change-Id: Ie522136bef18787405f1189c3ec8f49388a1503d Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-07-22[gitflow] Fix feature rebase which sometimes fails silentlyMax Hohenegger2-4/+49
- always show warning message if rebase operation was unsuccessful - fix conflict warning for non-feature finish operations - refactoring to avoid redundancy - fix UI test and add test for dirty working dir Bug: 470434 Change-Id: I963b61768add59d65070f0b193ef91eade95f28a Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-07-07Test stability: GlobalConfigurationPageTest swtbot workaroundsAndrey Loskutov2-1/+5
Check result from the editor component, which might cause sporadic NPE's because of swt bot bug 472110. Change-Id: Ieacda0d11493e065ead0040078c506ee0ae016ad Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-07-07Test stability: another attempt to have stable connect() behaviorAndrey Loskutov1-1/+5
Refactored ConnectProviderOperation to make it easier to understand and to be more verbose if it fails to connect. If multiple projects are to be connected, do not fail entire task if only some of the projects have issues. RepositoryFinder should also not silently fail during connect if resource is unknown in workspace. Change-Id: Ied79b1846495d7662ee40128b1a0edceb55d6860 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-07-07Test stability: force shell activation before tests startsAndrey Loskutov1-0/+16
Change-Id: I31a31d63a8872d1d05ecd3febc272c461dd8c414 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-07-05[gitflow] add UI testsMax Hohenegger6-7/+350
- git flow init - git flow feature start/stop - git flow feature rebase - SWTBot 2.3.0 waitForJobs(..) API Bug: 470710 Change-Id: I4dd936abcb2250ba2b358d01b61319948114fc99 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2015-07-05Test stability: don't use Calender.roll()Andrey Loskutov1-3/+4
If seconds overflow, minutes will not be updated Change-Id: I602e61f553c869f33333024fa797553a9d1c5359 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-07-04Test stability: wait extra time until new projects are connectedAndrey Loskutov1-1/+5
Change-Id: Iacc5ab3a153aa96c4705b00ff4e906aaadaacfe2 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-07-04Test stability: added more assertions to testNoActionOnLinkedResourcesAndrey Loskutov1-5/+25
LinkedResourcesTest.testNoActionOnLinkedResources fails randomly, but the root cause is not clear. Added more assertions so that we can get an idea where the problem could be. Change-Id: I4e5d0a3af5cf134c164802e67c7b7fb00db715ca Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-07-03Don't use RepositoryProvider.getProvider() directly to avoid deadlocksAndrey Loskutov1-2/+2
Added ResourceUtil.getGitProvider(IProject) and ResourceUtil.isSharedWithGit(IResource) utility methods which mimics the code in the RepositoryProvider.getProvider() without accessing any locks. Bug: 469555 Change-Id: I2349280b7fe73289a2a1cd9e8c802f8f7499327c Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-07-01Use bot.viewById instead of bot.viewByTitleAndrey Loskutov10-30/+42
View title can change if it contains some context information, like "Synchronize" -> "Synchronize (Git (GeneralProject))". To make the tests more stable we should never use bot.viewByTitle. Change-Id: Ifc731c7be4e4f6ff5d2d654f5c793bbfa5d0bd70 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-07-01Test fixes: BranchAndResetActionTest, LinkedResourcesTestAndrey Loskutov3-9/+21
Next round of test stability fixes... Change-Id: Ia9d93652b2a855245c922dbf921f9ee44f0a00d3 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-06-30Test fixes: ReplaceActionsTest, SynchronizeViewWorkspaceModelTestAndrey Loskutov4-5/+14
Still trying to fix unstable tests... Change-Id: I92aa2168c8d9d652eb37da6f189c401d0733989b Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-06-30Test fixes: CommitSearchDialogTest, SynchronizeViewWorkspaceModelTestAndrey Loskutov3-4/+13
Still trying to fix unstable tests... Change-Id: I5e665b677d741b13f76f5be9ad2d958f0c00ba2e Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-06-30Test stability: missing RepositoryMappingAndrey Loskutov1-2/+40
Trying to fix instabilities in recently failed unstable CommitActionTest.testOpenCommitWithoutChanged test, where the RepositoryMapping was not found for just created projects. Change-Id: I14b8b1a45d9032068f265c87dfc6983034f06483 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-06-29Test stability fixes related to job scheduling/resource changes etcAndrey Loskutov6-26/+75
Trying to fix instabilities in recently failed unstable tests: Job.join() can immediately return if expected job is not yet scheduled. So let TestUtil.joinJobs() wait before joining. Many git operations may trigger resource changes, resource changes can trigger jobs via listeners, so make sure we proceed eventually triggered jobs after such events. Change-Id: If8017ab14dca8e1d5422ae2b024195601d334e31 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-06-28More test stability fixes after resource changesAndrey Loskutov2-6/+12
Trying to fix instabilities in AbstractSynchronizeViewTest and LocalRepositoryTestCase, probably caused by inconsistent or not up-to-date resource model after resource modifications. Change-Id: I2003bcc7259623020adc5a6214ce36664e69aacc Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-06-28Introduced waitForJobs() after resetWorkspace and project operationsAndrey Loskutov2-2/+35
To be more stable, unit tests should wait for jobs which might be triggered after resource operations. Change-Id: Iab28f65bc163b82a8f3573611d329eedc0412580 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-06-26Make sure widget is focused and UI events are processed before clickingAndrey Loskutov1-0/+4
Trying to make tests which cannot find active shell more stable Change-Id: I0c7964da106e2c965accfa727eedb3b7cc9e38fe Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-06-22Use named shell instead of activeShell() for testAndrey Loskutov1-1/+4
Seems that openCommitTabOnSearchDialog() is unstable because it relies on activeShell(). Let see if using named shell access is more reliable. Change-Id: I80f19bc7702fd7f02893d58ef5318d9e1b909480 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-06-09Merge branch 'stable-4.0'Matthias Sohn1-0/+2
* stable-4.0: Prepare 4.0.1-SNAPSHOT builds EGit v4.0.0.201506090130-r Fix GitRepositoriesViewHandlingTest.testAddRepoButton() Don't pre-select all repositories when opening RepositorySearchDialog Update documentation for 4.0 Fixes potential NPE in CompareTreeView. Fix broken spell checking in commit message and Staging view Fix that double click is needed to "Check/Uncheck All Repositories" Ignore build result folders for gitflow bundles Fix tycho.scmUrl in pom.xml Update build to use Tycho 0.23 Don't suggest branch name for push from remote tracking branch Fix SWTException "Widget is disposed" in BranchSelectionDialog Fix SWTException "Widget is disposed" in BlameOperation Fix NPE in CommitHelper.getHeadCommit Fix ClassCastException in GitModelSynchronizeParticipant Fix that double click is needed to "Check/Uncheck All Repositories" Silence unchecked conversion warnings in GitFlowAdapterFactory Fix NPE in GitFlowAdapterFactory Change-Id: I369d800f1241d8bd40d2481b0f220fa8a0d6d88e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09Prepare 4.0.1-SNAPSHOT buildsMatthias Sohn2-13/+13
Change-Id: I9ea88a9cc70eadced38cd7a8ba6cf1a46237a649 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09EGit v4.0.0.201506090130-rv4.0.0.201506090130-rMatthias Sohn2-2/+2
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-03Prepare 4.1.0-SNAPSHOT buildsMatthias Sohn2-13/+13
Change-Id: I8a3123e90609b0ee84342bd30d2af5fe7933e628 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-02Prepare post 4.0-RC3 buildsMatthias Sohn2-2/+2
Change-Id: If492c0bb7290a7ccc67256bd26d390aea59f3b7a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-02EGit v4.0.0.201506020755-rc3v4.0.0.201506020755-rc3Matthias Sohn2-2/+2
Change-Id: I9927210a4e8536baa2363c4714d60e5d8e4ca17b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26Prepare post 4.0.0-rc2 buildsMatthias Sohn2-2/+2
Change-Id: I6e34f35e7309a0f1b3c8cbd7164880bc9eedbe40 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-26EGit v4.0.0.201505260635-rc2v4.0.0.201505260635-rc2Matthias Sohn2-2/+2
Change-Id: I33a1edb31e5b545c206a53dd8e4e5951c581ec2b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-21Use try-with-resource to avoid leaks with RevWalk and TreeWalkMatthias Sohn3-63/+73
Change-Id: I1ea48039ea38766bb07f079e5ef4569de034d577 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-04-20Format check must honor soft-wrapped commit messagesChristian Georgi1-22/+20
Bug: 464952 Change-Id: I24beb28bded3cbc983370c60c380ff8bab54582c Signed-off-by: Christian Georgi <christian.georgi@sap.com>
2015-04-20Check for empty second line in commit messageChristian Georgi1-0/+67
Staging view and commit dialog now show a warning 'Second line should be empty'. Also add test for this new check. Bug: 464952 Change-Id: I04a9320601d24bf3c8825bf57c967496d94a8acc Signed-off-by: Christian Georgi <christian.georgi@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-04-18Fix unnecessary cast errors from generified IAdaptable#getAdapter(..)Andrey Loskutov3-9/+12
Bug: 460685 Change-Id: Iec050627f71b31f0b10b19771b67e5eb86f1aa86 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-03-23Adapt to org.eclipse.jgit.java7 being merged into org.eclipse.jgitMatthias Sohn2-6/+0
Adapt the EGit build to change Ib5da61b0886ddbdea65298f1e8c6d65c9879ced1 which merges the bundle org.eclipse.jgit.java7 into the bundle org.eclipse.jgit. JGit-Dependency: Ib5da61b0886ddbdea65298f1e8c6d65c9879ced1 Change-Id: I5d06588e4f815c3bfd26d7f33c36eed0c62352f1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-03-04Accept git clone command as URIMichael Keppler1-0/+24
It happens regularly that I copy/paste a complete git clone command from a website into the clone wizard instead of just the URI. This change makes the dialog accept such input by automatically stripping the prefix "git clone ". Change-Id: I0baf9472a4210bca59b8a8e64148e4a61cfc1354 Signed-off-by: Michael Keppler <michael.keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-03-03Fix behavior of EGit when repo is a symlinkGunnar Wagenknecht1-4/+4
The use of getCanonicalPath is problematic on POSIX file systems. If the repo is a symlink (or one folder of the repo path) then this will be resolved to the real file system location. There are multiple issues with that. Most notably is the fact that Eclipse resource locations will not use the canonical path but an absolute path. This translates into a couple of weird issue with RepositoryMapping and resolving paths. This change removes every occurence of getCanonicalPath() calls, which should also be line with what JGit does. Bug: 460118 Change-Id: I884eded8b24c2de14f0255d2371d016b4e435c28 Signed-off-by: Gunnar Wagenknecht <gunnar@wagenknecht.org>
2015-03-02Replace deprecated RevWalk.close()Matthias Sohn7-28/+7
Use try-with-resources statements instead. Change-Id: I05ba3440a5c1b55afb2d759088c25ad22bee24e6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-24Merge branch 'stable-3.7'Matthias Sohn5-2/+55
* stable-3.7: Add org.slf4j.api and slf4j-log4j bridge to target platforms Fix UI tests for platform versions newer than Kepler Use Target Platform Definition DSL to generate target platforms Leftover after review 42168: trailing space in StagingView Fix test error in StagingViewTest.testCommitSingleFile Close opened views on teardown to avoid broken StagingView tests Fix test error in StagingViewTest.testMergeConflict Refactoring the way how StagingView reacts on selection. Don't use ModalContext.run(..) during part activation event notification GitLightweightDecorator code cleanup part 1 Make welcome page contribution more consistent Don't apply fonts and colors if they are undefined in current theme Conflicts: tools/egit-developer-tools.p2f Change-Id: I5d892763c88ea23de6444795683af9a3d75fbddc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-23Fix UI tests for platform versions newer than KeplerMatthias Sohn1-2/+7
- add dependency to org.eclipse.e4.rcp otherwise workbench UI doesn't come up during UI tests - remove Mac 32 bit OS platform which is no longer supported in Mars - avoid specifying version range for platform version, we already use a target platform to specify that, having a second redundant way to specify platform version is error prone. Change-Id: I29cca7327e91f2571aa95f23f8db31ed1c7523c3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-19Fix test error in StagingViewTest.testCommitSingleFileAndrey Loskutov2-0/+27
StagingView starts async tasks in UI now, so we need to proceed UI queue after opening views in TestUtil. Error Message Tree item element containg text "GeneralProject/folder/test.txt" was not found. Existing tree items: ProjectWithoutDotProject/.project Stacktrace org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException: Tree item element containg text "GeneralProject/folder/test.txt" was not found. Existing tree items: ProjectWithoutDotProject/.project at org.eclipse.egit.ui.test.TestUtil.getNode(TestUtil.java:476) at org.eclipse.egit.ui.common.StagingViewTester.stageFile(StagingViewTester.java:64) at org.eclipse.egit.ui.test.stagview.StagingViewTest.testCommitSingleFile(StagingViewTest.java:70) Change-Id: I068da330909b420d0570af607db91665533dfb6f Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-02-19Close opened views on teardown to avoid broken StagingView testsAndrey Loskutov2-0/+20
Another attempt to fix unstable tests which I can't reproduce locally. They fail on Hudson with this stack: Tree item element containg text "GeneralProject/folder/test.txt" was not found. Existing tree items: ProjectWithoutDotProject/.project Stacktrace org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException: Tree item element containg text "GeneralProject/folder/test.txt" was not found. Existing tree items: ProjectWithoutDotProject/.project at org.eclipse.egit.ui.test.TestUtil.getNode(TestUtil.java:495) at org.eclipse.egit.ui.common.StagingViewTester.stageFile(StagingViewTester.java:65) at org.eclipse.egit.ui.test.stagview.StagingViewTest.testCommitSingleFile(StagingViewTest.java:70) Change-Id: Ib42b28f79b3ff9fcf8f5d35e039ba7fc1803588b Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Change-Id: I6f48af116b3e908ab8d0ac5fc346daaad2756a9d Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-02-19Fix test error in StagingViewTest.testMergeConflictMatthias Sohn1-0/+1
Run org.eclipse.egit.ui.test.stagview.StagingViewTest.testMergeConflict testMergeConflict(org.eclipse.egit.ui.test.stagview.StagingViewTest) org.eclipse.core.internal.resources.ResourceException: Resource is out of sync with the file system: '/GeneralProject/folder/test.txt'. at org.eclipse.core.internal.localstore.FileSystemResourceManager.write(FileSystemResourceManager.java:1076) at org.eclipse.core.internal.resources.File.internalSetContents(File.java:321) at org.eclipse.core.internal.resources.File.setContents(File.java:360) at org.eclipse.egit.ui.common.LocalRepositoryTestCase.setTestFileContent(LocalRepositoryTestCase.java:561) at org.eclipse.egit.ui.test.stagview.StagingViewTest.setContent(StagingViewTest.java:155) at org.eclipse.egit.ui.test.stagview.StagingViewTest.commitOneFileChange(StagingViewTest.java:138) at org.eclipse.egit.ui.test.stagview.StagingViewTest.testMergeConflict(StagingViewTest.java:113) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ... Change-Id: Ic60e38581d2327e2a4717725670f679d1ee765fe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-10Set minimum required Java version to Java 7Matthias Sohn3-5/+5
Also update the installation instructions. Bug: 458476 Change-Id: I7a2b20bb7d5ec71d63feeb068078bc4a94fa2f24 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-04Prepare post 3.7.0.201502031740-rc1 buildsMatthias Sohn2-2/+2
Change-Id: I3ca05472be02232041a9ed4a8add1316b2759f7f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

Back to the top