Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-15Prepare 4.4.2-SNAPSHOT buildsstable-4.4Matthias Sohn38-253/+253
Change-Id: Icf37806bbb421848fd0d682a56b7e7891d7b5c53 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-07-15EGit v4.4.1.201607150455-rv4.4.1.201607150455-rMatthias Sohn38-39/+39
Change-Id: Id4b2a66d8556f7eec6e19245b68554105a86e207 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-06-23Allow using JDK 7 bootclasspath when compiling egit using Java 8Matthias Sohn1-0/+4
When compiling jgit using Java 8 pass the property JDK_HOME mvn clean install -DJDK_HOME=<JAVA_HOME path of JDK7 installation> to Maven in order to compile against JDK 7 class libraries. Otherwise egit may hit runtime exceptions when running on Java 7 (e.g. the return type of ConcurrentHashMap.keySet() in the JDK 8 class library does not exist in JDK 7). Bug: 496262 Change-Id: Ib3f681f9844b717e26ad88059e25cb9303668494 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-06-15Fix wrong toc.xml in documentation bundleMatthias Sohn3-28/+25
- fix wrong new and noteworthy version in build-help.xml - regenerate documentation following [1] [1] https://wiki.eclipse.org/EGit/Contributor_Guide#EGit_3 Bug: 496089 Change-Id: I1f60276750b44492d00e78d7b668bce9c4f04d1a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-06-15Update wikitext used to generated documentation from wiki to 2.9Matthias Sohn2-5/+6
Change-Id: I47195081c6958f92e8bbecc3d123f544ceb2fb05 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-06-07Prepare 4.4.1-SNAPSHOT buildsMatthias Sohn38-253/+253
Change-Id: I8a3c9f5d5a26f020ca6c3ae19cd75c70313a4dae Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-06-07EGit v4.4.0.201606070830-rv4.4.0.201606070830-rMatthias Sohn38-39/+39
Change-Id: I4510a1f6ebc6c319d1e0ed0d488d280df8902d0b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-06-06Update documentation for 4.4Matthias Sohn13-248/+198
Change-Id: Icbdd82db3e564a4e72c14b940b1d92d06a6fcd6f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-06-01Prepare 4.4.0-SNAPSHOT buildsMatthias Sohn38-39/+39
Change-Id: I6d20a6c4036c23b3b1470c8db395ba325429b51d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-06-01EGit v4.4.0.201606011500-rc2v4.4.0.201606011500-rc2Matthias Sohn38-39/+39
Change-Id: I189426a415772184bbb57de7268326571d86a0a3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-06-01Merge branch 'master' into stable-4.4Matthias Sohn23-95/+383
* master: Fix property page for git configs if the system config is inaccessible Initialize dialog settings when a remote is configured Enable copying source branch in "Create Branch" dialog to clipboard Fix NPE in CloneDestinationPage.checkPreviousPageSelections() Fix NPE in SourceBranchPage/CloneDestinationPage.revalidate() Fix NPE in BranchOperationUI.show() Avoid NPE in CommitGraphTable.mapElement() Test stability: wait for specific child node after expansion Test stability: wait for add to index/remove from index jobs Test stability: wait for index diff cache update Test stability: after clicking finish, wait for shell to close. Harmonize Gerrit fetch and push operation availability Change-Id: I09af5af38d8581845b772ef8a13b31522aae57ec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-06-01Fix property page for git configs if the system config is inaccessibleThomas Wolf1-7/+30
* Fix NPE when the directory where the system config should be does not exist. Also disable the "System Configuration" drop-down menu entry in this case. * Fix display of values from the system config if it does exist. * Disable edit button if system config cannot be written to. Bug: 335219 Change-Id: I7e5499b5f9ff9b8d53c8645efaa34ed7d12aa5bc Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-06-01Initialize dialog settings when a remote is configuredThomas Wolf6-27/+151
When a user cloned a repository via git:// and then configured the remote for Gerrit through "Gerrit Configuration..." (specifying a ssh:// push URI), the "Push to Gerrit..." wizard would still open with the git:// URI pre-selected because the dialog hadn't remembered any "last used" URI yet and "git://" is lexicographically smaller than "ssh://". This was counter-intuitive. Therefore: if a remote is configured for Gerrit, or a push or fetch refspec is configured (and it's a Gerrit refspec), and the "Push to Gerrit" or "Fetch Change from Gerrit" dialogs have no last used URI set, initialize it to the URI just configured. This gives a reasonable initial value when those dialogs are subsequently opened the first time for that repository. Bug: 493935 Change-Id: I9815358a5d2e0a31ce355513d5ad76139e6e123d Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-05-31Merge "Fix NPE in CloneDestinationPage.checkPreviousPageSelections()"Matthias Sohn1-3/+4
2016-05-31Merge "Fix NPE in SourceBranchPage/CloneDestinationPage.revalidate()"Matthias Sohn3-12/+22
2016-05-31Enable copying source branch in "Create Branch" dialog to clipboardMatthias Sohn2-4/+7
Bug: 494943 Change-Id: Ib7db01442c1e6ead995b3c363f43a1512f38611b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-31Fix NPE in CloneDestinationPage.checkPreviousPageSelections()Matthias Sohn1-3/+4
Bug: 494352 Change-Id: I17e57db83b08609761b75cd7ade28d4e9569930e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-31Fix NPE in SourceBranchPage/CloneDestinationPage.revalidate()Matthias Sohn3-12/+22
Bug: 494357 Change-Id: Ifedbd1ab0679d623732eb364ee574877a4c87b5d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-31Fix NPE in BranchOperationUI.show()Matthias Sohn2-2/+5
Also change visibility of this internal method to private since it shouldn't be used from outside. Bug: 494351 Change-Id: I983929383b679a1f425ef65ceb623ef8ffbe28b2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-30Merge "Test stability: wait for specific child node after expansion"Thomas Wolf2-3/+45
2016-05-30Avoid NPE in CommitGraphTable.mapElement()Andrey Loskutov1-0/+3
Bug: 494906 Change-Id: I18953b574d988d377680dd7229b5a4c3bd4220b3 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2016-05-30Test stability: wait for specific child node after expansionThomas Wolf2-3/+45
The first test in GlobalConfigurationPageTest frequently fails on Hudson because it doesn't find the child node "Configuration". It appears that child nodes in the preference page's tree are added one after another, so waiting until there is any child is not good enough: "Configuration" is the second child and might not have appeared yet. Change-Id: Ic5690b481b111fe98aa6d8da1108d5ee462c6e1a Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-05-30Test stability: wait for add to index/remove from index jobsThomas Wolf1-0/+6
Staging tests need not only wait for an index diff update but also and first for the add to index or remove from index jobs. This should resolve spurious test failures in StageUnstageActionTest. Change-Id: I20efada649b0d7c92701ded7c2a471a17d600ec8 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-05-29Test stability: wait for index diff cache updateThomas Wolf1-0/+3
Apparently the DisconnectConnectTest.testDecorations() not always waits long enough for the decorations to appear. Decorations are triggered by an index diff cache update, so let's wait for that first, and only then for the decoration job. Change-Id: I5b32299006a99f3332b49e70d1fcdbfa375d362f Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-05-25Test stability: after clicking finish, wait for shell to close.Thomas Wolf1-5/+14
Eliminate Thread.sleep() calls, which is a sure recipe for unstable tests. Instead wait for the shell to close, and since we then test properties of workspace resources, refresh the workspace first. Change-Id: I96fa669d655bd0118fb49e599cd3538bb555bc71 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-05-25Prepare 4.4.0-SNAPSHOT buildsMatthias Sohn38-39/+39
Change-Id: I29a722bb59ff9b9312fa542c328a9111b98a2a32 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-25EGit v4.4.0.201605250940-rc1v4.4.0.201605250940-rc1Matthias Sohn38-39/+39
Change-Id: I03be6d0ee3a483c7ab362f8aaacf1ff5bf3f1f4d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-25Update Orbit repository for Neon to R20160520211859Matthias Sohn5-8/+8
Change-Id: Id4fd198413afb03da1e7657673c9b06dfa936c1a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-25Harmonize Gerrit fetch and push operation availabilityThomas Wolf5-32/+93
Determining whether a refspec is for Gerrit must be in synch with the ResourcePropertyTester. Moreover, fetch and push refspecs must be considered separately. With that in place, add new properties to the property tester: canFetchFromGerrit and canPushToGerrit. Use these properties to determine visibility of the "Push to Gerrit..." and "Fetch from Gerrit..." commands such that they are visible only if they can be performed. Bug: 493352 Change-Id: Idc66e6a912134d8979b3fad4ce6db4395388a1e2 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-05-25Merge branch 'master' into stable-4.4Matthias Sohn119-600/+1516
* master: Create push wizards in CommitJob in UI thread Fix NPE in AbstractRebaseCommandHandler$1.done() Fix NPE in GitSelectRepositoryPage.refreshRepositoryList() Fix NPE in PushBranchWizard.startPush() Fix NPE in ResourceUtil.isSharedWithGit() Catch IOException in ConfigureGerritAfterCloneTask Replace uses of deprecated Repository.getRef() Ensure Git is closed using try with resource Check HandlerUtil.getActiveSite(event) result to avoid NPE's Prepare 4.3.2-SNAPSHOT builds Ensure compatibility with pre-Mars Eclipse Update Orbit repository to S20160518051658 for Neon RC2 Relayout buttons after enabling check for warnings Add accelerators for "Compare With" and "Replace With" commands New convenience commands to compare/replace with Gitflow develop branch Mark branding plugin and gitflow plugin as singletons [releng] p2.inf to remove the old importer fragment [findBugs] Fix potential NPE in RepositoryMapping Remove duplicate rename branch dialog [findBugs] Avoid unnecessary boxing when parsing int from String Replace use of deprecated Repository.getRef() method Ensure Git is closed using try with resource Remove unnecessary @SuppressWarnings("resource") Exclude labels from tab stop Mark current feature-branch and prevent attempted re-checkout Ignore SmartImportWizardTest [releng] Include missing extension point schemas in EGit binaries [releng] Importer fragment must have host bundle version constraint Leave the commit message enabled in staging view Adapt target platform to changed Neon staging p2 repository [releng] Importer fragment must have host bundle version constraint Topic input on PushToGerritPage Add "Open in Commit Viewer" in context menu of stashed commit Handle linked resources in the same repository Refactor code: simplification, and avoid findbugs warning Set repository when opening staging view from commit action Test stability: one "widget disposed" message is enough EGit v4.3.1.201605051710-r Test stability: really shut down repositories Fix typo in testcase name Fix wrong cursor position while editing URIs Test stability: wait for repositories view refresh after config change [memory leak] make sure we only allow one GitHistoryPageSource instance Prevent NPE in ProjectUtil.getProjectsUnderPath(IPath) Change-Id: I13ee8cfb7648a356dfca9e2c86b9ffb5d92ebe84 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-25Create push wizards in CommitJob in UI threadThomas Wolf1-28/+35
The PushBranchWizard may have an AddRemotePage, which is a RepositorySelectionPage, which accesses the clipboard in its constructor. Let's create the wizard already in the UI thread, as it was before commit af5c88dc. Bug: 494469 Change-Id: Ifd7383a806becc7db20b2b44b6a67533394d91e5 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-05-24Fix NPE in AbstractRebaseCommandHandler$1.done()Matthias Sohn1-0/+3
Bug: 494349 Change-Id: Iab252c60b1e963b10aaf83940726fff1955b9fa3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-24Fix NPE in GitSelectRepositoryPage.refreshRepositoryList()Matthias Sohn1-1/+1
Bug: 494353 Change-Id: Ic90bbb72cdd3c27a969a0da856a7f496901e7052 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-24Fix NPE in PushBranchWizard.startPush()Matthias Sohn1-1/+2
Bug: 464421 Change-Id: Ia70db60627298f8017b302b639965134a7d83eae Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-24Merge "Fix NPE in ResourceUtil.isSharedWithGit()"Matthias Sohn1-1/+5
2016-05-23Fix NPE in ResourceUtil.isSharedWithGit()Matthias Sohn1-1/+5
Bug: 494356 Change-Id: I005c765b2d116c4f6c6b00c9cc2121a1c0cd6fef Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-23Catch IOException in ConfigureGerritAfterCloneTaskThomas Wolf1-43/+36
This task must not make the git clone be reported as failed -- the repository was already successfully cloned. Catch the exception and return false, which is the safe thing to do: in the worst case, the user may have to do the Gerrit config setup him- or herself via the ConfigureGerritWizard. Also clean up closing streams and disconnecting. Bug: 494342 Change-Id: Ie10cb12da8e8d732c956e7352c15702898e23710 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-05-22Replace uses of deprecated Repository.getRef()Thomas Wolf36-59/+58
Use Repository.findRef() or Repository.exactRef(), as appropriate. No functional change. Change-Id: Ie481c7fa5ac69d4778cf9f70ac2b019bee6e53c9 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-05-21Ensure Git is closed using try with resourceThomas Wolf10-76/+86
Eliminates a number of "resource leak" warnings. No change in behavior; newGit(repo).close() does not close the repository. Changed remaining cases in egit.core, plus all cases in egit.ui. Change-Id: I642c546e105e56dca836737a79b00ceeaedbe3e8 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-05-19Check HandlerUtil.getActiveSite(event) result to avoid NPE'sAndrey Loskutov2-8/+21
Bug: 493987 Change-Id: I9b143e6f0f34a8e9ef09fa15bb0817156a474381
2016-05-19Merge "Mark branding plugin and gitflow plugin as singletons"Matthias Sohn2-2/+2
2016-05-19Merge branch 'stable-4.3'Matthias Sohn1-1/+2
* stable-4.3: Prepare 4.3.2-SNAPSHOT builds Ensure compatibility with pre-Mars Eclipse [releng] Importer fragment must have host bundle version constraint EGit v4.3.1.201605051710-r Change-Id: I470ee6a38fde58eb3a08677d336752b28d6911dc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-19Prepare 4.3.2-SNAPSHOT buildsstable-4.3Matthias Sohn38-249/+249
Change-Id: I8238aa65197c4894da78278d054ebbbbd7379ec8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-19Ensure compatibility with pre-Mars EclipseThomas Wolf1-1/+2
TreeViewer.getStructuredSelection() was introduced in Jface 3.11 only. Do not use it to ensure compatibility with olderJFace versions in older Eclipses. Bug: 493945 Change-Id: I1588a04a4b13ed4b6ee841262da78761d58dfcc0 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-05-18Update Orbit repository to S20160518051658 for Neon RC2Matthias Sohn5-14/+14
Change-Id: Ida4fb4e138452007ef10ceee19a18b7f29762416
2016-05-18Relayout buttons after enabling check for warningsMichael Keppler1-1/+1
When the checkbox for overriding the errors and warning check becomes visible, the complete right half of the staging view needs a re-layout, since the height of the commit message text area needs to be reduced. Bug: 492178 Change-Id: Ia91f88fa9acc184ce07f76a63662df0f7b24bf67 Signed-off-by: Michael Keppler <michael.keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-18Add accelerators for "Compare With" and "Replace With" commandsAlena Laskavaia2-2/+4
Bug: 475108 Change-Id: Ic6999b7abfaedaf502699c07a56f774205a9cd5c Signed-off-by: Alena Laskavaia <elaskavaia.cdt@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-18New convenience commands to compare/replace with Gitflow develop branchMax Hohenegger7-2/+302
When working on a feature or release branch, develop is the most common reference point for comparison. Hence, there should be a shortcut. Change-Id: I76e73bd6a7a9eb11a793fb2c628e7da81fa9b286 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2016-05-18Mark branding plugin and gitflow plugin as singletonsMatthias Sohn2-2/+2
Allowing installation of multiple versions of these plugins doesn't seem to be useful. Change-Id: I7d79a11f6edc670d377d5d1f433daed4312ef41d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-17Merge "[releng] p2.inf to remove the old importer fragment"Matthias Sohn1-0/+2

Back to the top