Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-04-27Prepare 3.7.2-SNAPSHOT buildsstable-3.7Matthias Sohn26-179/+179
Change-Id: Id8ee20e0c6646eec3590512130f32f09eded06bd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-04-26EGit v3.7.1.201504261725-rv3.7.1.201504261725-rMatthias Sohn26-27/+27
Change-Id: I5c67b1a647baf5cc7373835240888d485a25d85b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-03-27Use safer way to get the active workbench pageAndrey Loskutov1-2/+3
Bug: 463240 Change-Id: Iadd39115ea701dd851a7cc7d076c2bf5ded8a019 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-03-04Use the right selection from event for staged files compareAndrey Loskutov1-2/+2
Bug: 461238 Change-Id: Ic4597b0a03512fead7451b8818ef784409dab4bc Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-02-27Prepare 3.7.1-SNAPSHOT buildsMatthias Sohn26-179/+179
Change-Id: I839585149eebcc9cd2966a08b2a30d3b9287c3b1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-26EGit v3.7.0.201502260915-rv3.7.0.201502260915-rMatthias Sohn26-27/+27
Change-Id: I82fabae6555e3f37b3845fa77a87f77064fc0a79 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-26Update documentation for 3.7.0Matthias Sohn16-242/+167
Change-Id: I61cf05eceae3d69efbfdaac2a1717c278181e784 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-26Auto-configure Gerrit configuration if repository is cloned from GerritMatthias Sohn13-97/+375
If a repository is cloned over http or https protocol use Gerrit's REST API endpoint "Get Version" [1] to find out if the repository is hosted by a Gerrit server. Implement a shortcut for https and ssh endpoint of the Eclipse Gerrit server. If we detect the repository was cloned from a Gerrit server auto configure the repository for Gerrit. Configure the push refspec to HEAD:refs/for/master which should be ok in most cases. [1] https://gerrit-documentation.storage.googleapis.com/Documentation/2.11/rest-api-config.html#get-version Bug: 460423 Change-Id: I30b916e279e0bc84f86abbffae241f8aab3fa8df Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Also-by: Andrey Loskutov <loskutov@gmx.de>
2015-02-25Fix NPE in PushMenuMatthias Sohn1-1/+1
Bug: 460803 Change-Id: I4a77f3b33e28ac9d5bd4ba030776fa50408ca461 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-25Merge "Declare CloneDestinationPage public" into stable-3.7Matthias Sohn1-1/+11
2015-02-23Add org.slf4j.api and slf4j-log4j bridge to target platformsMatthias Sohn8-6/+44
We want to use slf4j in JGit hence add it to the joint target platform. We will use log4j with EGit hence add slf4j-log4j bridge to jgit feature. CQ: 9206 CQ: 9207 CQ: 9241 Bug: 458445 Change-Id: Ie23869aaac37af15e1013e917d966b28cb8caba3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-23Fix UI tests for platform versions newer than KeplerMatthias Sohn3-15/+14
- 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-23Use Target Platform Definition DSL to generate target platformsMatthias Sohn21-381/+636
The "Target Platform Definition DSL and Generator" [1] heavily simplifies maintenance of target platforms. It allows to modularize target platform definitions which eliminates code duplication. The .target files understood by P2 and Tycho are generated from .tpd files which are written in the target platform definition DSL. In order to edit .tpd files and generate .target files install the "Target Platform Definition DSL and Generator" 2.0 or later [2] (Note: on Kepler you also need to add [3] to get Xtext 2.5 which is not available by default on Kepler). This tools is needed only if you need to change the Target Platform definition files (*.targetplatform and *.tpd) and re-generate the *.target files. In normal development you do not need this and can simply use the generated *.target themselves. In addition - update to Mars M5 Orbit repository for 4.5 - use Luna SR2 Orbit p2 repository for platform version Luna and earlier - update hamcrest to 1.3 which is used by swtbot on newer platform versions - update p2f file [1] https://github.com/mbarbero/fr.obeo.releng.targetplatform [2] http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/ [3] http://download.eclipse.org/modeling/tmf/xtext/updates/releases/ Change-Id: Id0dfd18440211141ba8a16bdc7c8ed41f69fa9f4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-23Declare CloneDestinationPage publicMatthias Sohn1-1/+11
This allows alternative Git wizard implementations to use CloneDestinationPage. Requested in [1]. [1] https://dev.eclipse.org/mhonarc/lists/egit-dev/msg03787.html Change-Id: I3073cc700b33580379f175d26e9a0eb34254ba07 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-19Leftover after review 42168: trailing space in StagingViewAndrey Loskutov1-1/+1
Change-Id: I75a454903843ff79e992f9d6e6b5fee476aaf1ea Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
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-18Refactoring the way how StagingView reacts on selection.Andrey Loskutov5-39/+205
StagingView will ignore all *text* selection changes now. We do not need to do extra work if user just types in the editor. Added PartListener which tracks the part activation/deactivation and so allows to get the selection from the last activated part. As a nice side effect the view tracks now information if it is visible or not and in case the view is not visible, *all* selection changes are ignored (but last one remembered). The calculation of the repository for selected resource is now done in background job. The reload() of the repository is not blocking the caller thread anymore and is done asynhronously (but still in UI thread). Bug: 460243 Change-Id: Ie98d3d796e74f00d754e7e4de9716c7bd0990040 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-02-18Don't use ModalContext.run(..) during part activation event notificationAndrey Loskutov1-26/+11
Applied the simplest possible fix from bug bug 459661 comment 9. This can cause UI freezes in case of getSubmoduleRepository() takes longer. Bug: 460243 Change-Id: Ibf73d94e52b655638440a75880ee08b7da4dc578 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-02-11GitLightweightDecorator code cleanup part 1Andrey Loskutov1-26/+24
- Made non-final fields final where possible - Renamed constants to match Java coding guidelines - Changed mutable final String array fields to immutable String Lists - moved ensureFontAndColorsCreated() call at the begin in constructor before connecting any listeners - Display.getDefault() -> PlatformUI.getWorkbench().getDisplay() - smaller cleanups The code behavior is not changed. Change-Id: Ia149409c5dd08b8d42338d9e63b09eb75a6b0056 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-02-11Merge "Don't apply fonts and colors if they are undefined in current theme" ↵Matthias Sohn1-11/+18
into stable-3.7
2015-02-11Make welcome page contribution more consistentMatthias Sohn11-24/+24
* Use similar words as the CVS team provider uses. * Use EGit icon instead of Git icon * Link to user guide in help content instead of linking to wiki Bug: 459238 Change-Id: I3d94fba6b2c68ad758ebc62859e89a23b8f0d9d5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> (cherry picked from commit 8820b8acd84c3967b79fd6c01f1615aaeca18901)
2015-02-08Don't apply fonts and colors if they are undefined in current themeAndrey Loskutov1-11/+18
Bug: 432016 Change-Id: I74d75b61e6cb0a3f31d349bc390f4cc6b0b840b4 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-02-04Prepare post 3.7.0.201502031740-rc1 buildsMatthias Sohn26-27/+27
Change-Id: I3ca05472be02232041a9ed4a8add1316b2759f7f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-03EGit v3.7.0.201502031740-rc1v3.7.0.201502031740-rc1Matthias Sohn26-27/+27
Change-Id: Ia4dff70fcfaf199febb564c3b57e70536b3d6865 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-03Lookup active window before opening commit selection dialogAndrey Loskutov1-3/+3
Just seen that "Compare with Previous" will fail on Eclipse 3.8 due to some bugs in HandlerUtil, if executed on a file which last version is a merge version. In this case we open a selection dialog (for selecting the merge commit's predecessor version to compare against), and this makes the "active window" variable disappear. The simple fix is to read the variable before we open a dialog. Change-Id: I8b9cbcda45cc01aa2e8ccd65527638bb51b6e52d Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-02[stagingview] "Updating index" should indicate that view is "busy"Andrey Loskutov1-0/+8
If we are linked, each time IndexDiffUpdateJob starts, indicate that the view is busy (e.g. reload() will trigger this job in background!). This is not the best solution if one has many repositories: on Eclipse startup the view could be shown busy even if the right repository is already updated, but practically it works fine. Usually one has not really many *huge* repositories in the same Eclipse workspace which can delay startup for long time, and after startup is done, index refresh usually happens for the current repository only because index diff updates are started only on repositories where user makes some changes or selects elements. Bug 457571 Change-Id: I5f84c70466d7cd47cc7334ce416174b857774402 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-02-02[stagingview] "Refresh" operation should indicate that view is "busy"Andrey Loskutov2-8/+12
Bug: 457562 Change-Id: I6d3b740e9846d5efde91a84f74fcf3e8dce0c37e Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-02Update readme to describe current state of symlink supportMatthias Sohn1-2/+4
Also see https://dev.eclipse.org/mhonarc/lists/egit-dev/msg03771.html and https://bugs.eclipse.org/bugs/show_bug.cgi?id=429304 for remaining issues. Change-Id: I14739db33e05e982e2df3286b5abd008217f6e2a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-02Let staging view use submodule reposChristian Halstrick4-6/+88
If the staging view is linked to the selected resource and if that resource belongs to a submodule then staging view should also run in the context of the submodule repo. This allows to work with submodules in a similar manner than with native git. If I want to do a commit in a submodule repo then select a resource in that submodule repo and you can use Staging view to prepare the commit in the submodule repo. In native git you would "cd" to a folder containing a file from the submodule to switch context from the containing repo to the submodule repo. In EGit you have to select a resource from the submodule to achieve the same. RepositoryMapping is enhanced by one method which can return a submodule repository. In future RepositoryMapping could be further enhanced to support git submodules in general. Bug: 382093 Bug: 446344 Change-Id: Ie61c597c87a68da16a92cd52fea0bc5a4ff5ec28 Also-By: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-02UI Activator: allow tracing if workbench UI is activeMatthias Sohn1-0/+14
Change-Id: Ie7304bc3de53471633bfe4b316ec3efdc8fd8242 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-02Jobs should not unnecessarily lock the workspaceMatthias Sohn3-4/+7
Bug: 455506 Change-Id: I09e5ad7c52d50fdf971de41c96e66a4e88c89463 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-02Open mergetool by default in staging view when in conflicting stateMatthias Sohn1-1/+1
Bug: 457055 Change-Id: I8299a9fff62147923d2300a1b4303ff5cb5a1c5e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-01Don't run "Compare with previous" in UI threadAndrey Loskutov1-27/+44
Bug: 450145 Change-Id: I8d4fa304db3c34707e477dee11fb24ba046acd9d Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-01Implement hasChildren() to avoid diff calculation in UI threadAndrey Loskutov2-2/+23
Fetch/Push result table content provider will now always report "true" in hasChildren() if the requested object is a RepositoryCommit. This is needed for tree viewer to paint "arrows" for expandable nodes without calculation of the commit content - this calculation on huge repositories can block UI thread forever. Bug: 458839 Change-Id: I78ec6b62f36b46932a38fbcbea1fda2c61af9089 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-01Don't run indexDiff.diff() in UI threadAndrey Loskutov3-27/+108
Avoids calculation of staged resources in UI thread. This can hang UI on huge repositories just by right-clicking any file in explorer. Instead, the calculation is postponed, and in case there were no staged changes, a dialog will be shown. Bug: 457698 Change-Id: I8492dc586c6d1e10db55b1d4988fd9bb2fa56a9e Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-01Always run compare input calculation in background threadAndrey Loskutov3-56/+144
Bug: 458251 Change-Id: I5a52025dfa59a2c28515d13f6f5161ad64769449 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-02-01Scalability: don't run incremental update if there are too many changesAndrey Loskutov5-34/+483
Always check if the number of changed files exceeds the magic limit for incremental index updates. In case of huge repositories with lot of ignored files (> 65000) the incremental merge of ignored lists can be highly inefficient if the number of changed files is higher then 2000. Added tests for job scheduling to make sure reload and update are used as expected. Bug: 452237 Change-Id: I6cb733ae24a1eec33becb3aff0f96da151365a41 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-01-25Merge "Add utility method for creating warning status and logging it"Andrey Loskutov1-2/+26
2015-01-22Case insensitive order of remotes in push branch dialogMichael Keppler1-0/+8
For a long list of remotes, the selection is easier with case insensitive sorting. This fits the generally case insensitive display of branches and other items. Change-Id: I9589d2c26625813c376c0dc44a7ed7f943cda06f Signed-off-by: Michael Keppler <michael.keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-01-22Transparent icons in push branch dialogMichael Keppler1-2/+2
setBackgroundImage() has problems with transparency on some platforms (seen on Windows7). Therefore the 2 icons in that dialog have solid white and black background. Fixed by using setImage() as in all other dialogs. Tested on Windows 7 and Ubuntu/GTK. Change-Id: I84fd41b292a15f823abb5d517325314adba95579 Signed-off-by: Michael Keppler <michael.keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-01-22Fix "Unnecessary cast to ICommandService cast" warningMatthias Sohn1-2/+3
Change-Id: I51c521210bcaf1718a7dff84c23b4dc141f90d6a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-01-21Merge remote-tracking branch 'origin/stable-3.6'Matthias Sohn1-1/+3
* origin/stable-3.6: Prepare 3.6.3-SNAPSHOT builds EGit v3.6.2.201501210735-r Fix NPE hit when restoring commit editor from task context Change-Id: I4299568420ad662da11d7e93527b434fbdf03260 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-01-21Prepare 3.6.3-SNAPSHOT buildsstable-3.6Matthias Sohn26-177/+177
Change-Id: Ib86d139a0abd03ce256b47e875efc8e07cdcafdf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-01-21EGit v3.6.2.201501210735-rv3.6.2.201501210735-rMatthias Sohn26-27/+27
Change-Id: I1f5120ef877f32174c694f6d8258c33639acad35 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-01-17Add utility method for creating warning status and logging itMatthias Sohn1-2/+26
Also simplify logging error status. Change-Id: Ib145ef3082fdb60843c46292aa0bf0833378d175 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-01-16Consider URLs w/ and w/o .git when importing project setsChristian Georgi1-5/+19
Some Git URLs may end with .git while some don't. Still consider these URLs (and thus the repos) the same. Bug: 453892 Change-Id: I64fcfccd29502bbe215dcdddab3b0fd8ec64a913 Signed-off-by: Christian Georgi <christian.georgi@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-01-15[stagingView] Disable context menu item "Open Workspace Version"Andreas Hermann1-1/+13
Disable the staging view context menu "Open Workspace Version" when no item of the selection can be opened in the workspace. Change-Id: I8442affe24f5da1d583404b318cb66c6544bac3a Signed-off-by: Andreas Hermann <a.v.hermann@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-01-15Ensure that configure branch dialog has right marginTomasz Zarna2-8/+7
Bug: 453027 Change-Id: I29c43aa6fdee95329373bb4b880bff8f9167eca1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

Back to the top