diff options
24 files changed, 78 insertions, 51 deletions
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index c264c1f2c4..9b5ccdddac 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -21,8 +21,8 @@ </license> <url> - <update label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> - <discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> + <update label="%updateSiteName" url="https://download.eclipse.org/egit/updates"/> + <discovery label="%updateSiteName" url="https://download.eclipse.org/egit/updates"/> </url> <requires> diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index f9d549bb52..6b799065bd 100644 --- a/org.eclipse.egit.gitflow-feature/feature.xml +++ b/org.eclipse.egit.gitflow-feature/feature.xml @@ -21,8 +21,8 @@ </license> <url> - <update label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> - <discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> + <update label="%updateSiteName" url="https://download.eclipse.org/egit/updates"/> + <discovery label="%updateSiteName" url="https://download.eclipse.org/egit/updates"/> </url> <requires> diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index ca8d4a9cde..4bc07b0790 100644 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ b/org.eclipse.egit.mylyn-feature/feature.xml @@ -21,8 +21,8 @@ </license> <url> - <update label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> - <discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> + <update label="%updateSiteName" url="https://download.eclipse.org/egit/updates"/> + <discovery label="%updateSiteName" url="https://download.eclipse.org/egit/updates"/> </url> <requires> diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml index 269f1b1b3b..3732ea599d 100644 --- a/org.eclipse.egit.repository/category.xml +++ b/org.eclipse.egit.repository/category.xml @@ -44,5 +44,5 @@ </description> </category-def> <category-def name="EGit.experimental" label="Git integration for Eclipse - experimental features (incubation)"/> - <repository-reference location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui" enabled="true" /> + <repository-reference location="https://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui" enabled="true" /> </site> diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 1517195e90..1bbb6bb9ea 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -28,8 +28,8 @@ <name>EGit P2 Repository</name> <properties> - <p2MirrorsURL>http://www.eclipse.org/downloads/download.php?file=${PUBLISH_FOLDER}&format=xml</p2MirrorsURL> - <p2StatsURL>http://download.eclipse.org/stats/egit/${project.artifactId}</p2StatsURL> + <p2MirrorsURL>https://www.eclipse.org/downloads/download.php?file=${PUBLISH_FOLDER}&format=xml</p2MirrorsURL> + <p2StatsURL>https://download.eclipse.org/stats/egit/${project.artifactId}</p2StatsURL> <!-- At the moment, this list of features needs to be maintained manually. --> <statsTrackedArtifacts>org.eclipse.jgit.feature,org.eclipse.jgit.source.feature,org.eclipse.jgit.pgm.feature,org.eclipse.jgit.pgm.source.feature,org.eclipse.jgit.http.apache.feature,org.eclipse.jgit.ssh.apache.feature,org.eclipse.egit.feature,org.eclipse.egit.gitflow.feature,org.eclipse.egit.mylyn.feature,org.eclipse.egit.source.feature</statsTrackedArtifacts> </properties> @@ -63,7 +63,7 @@ <target.eclipse.version>4.6.0 (Neon) or newer</target.eclipse.version> </symbols> <associateSites> - <site>http://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui</site> + <site>https://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui</site> </associateSites> </configuration> </execution> @@ -95,11 +95,11 @@ </dependencies> <repositories> <repository> - <url>http://download.eclipse.org/webtools/releng/repository</url> + <url>https://download.eclipse.org/webtools/releng/repository</url> <layout>p2</layout> </repository> <repository> - <url>http://download.eclipse.org/staging/neon/</url> + <url>https://download.eclipse.org/staging/neon/</url> <layout>p2</layout> </repository> </repositories> diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 920f3c36fd..76786ab9c1 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -21,8 +21,8 @@ </license> <url> - <update label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> - <discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> + <update label="%updateSiteName" url="https://download.eclipse.org/egit/updates"/> + <discovery label="%updateSiteName" url="https://download.eclipse.org/egit/updates"/> </url> <requires> diff --git a/org.eclipse.egit.target/egit-4.10.target b/org.eclipse.egit.target/egit-4.10.target index e177a08532..7b68049752 100644 --- a/org.eclipse.egit.target/egit-4.10.target +++ b/org.eclipse.egit.target/egit-4.10.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.10" sequenceNumber="1567064574"> +<target name="egit-4.10" sequenceNumber="1567671967"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/> @@ -99,7 +99,7 @@ <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/> <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.sdk.ide" version="0.0.0"/> diff --git a/org.eclipse.egit.target/egit-4.10.tpd b/org.eclipse.egit.target/egit-4.10.tpd index ec9bb1e44c..f1ca69afda 100644 --- a/org.eclipse.egit.target/egit-4.10.tpd +++ b/org.eclipse.egit.target/egit-4.10.tpd @@ -2,5 +2,5 @@ target "egit-4.10" with source configurePhase include "projects/jetty-9.4.20.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/S20190827152740.tpd" +include "orbit/R20190827152740-2019-09.tpd" include "releasetrain/4.10-2018-12.tpd" diff --git a/org.eclipse.egit.target/egit-4.11.target b/org.eclipse.egit.target/egit-4.11.target index a381ab9f8b..cadca2fb89 100644 --- a/org.eclipse.egit.target/egit-4.11.target +++ b/org.eclipse.egit.target/egit-4.11.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.11" sequenceNumber="1567064573"> +<target name="egit-4.11" sequenceNumber="1567671967"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/> @@ -99,7 +99,7 @@ <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/> <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.sdk.ide" version="0.0.0"/> diff --git a/org.eclipse.egit.target/egit-4.11.tpd b/org.eclipse.egit.target/egit-4.11.tpd index 9082005322..04ed93b35a 100644 --- a/org.eclipse.egit.target/egit-4.11.tpd +++ b/org.eclipse.egit.target/egit-4.11.tpd @@ -2,5 +2,5 @@ target "egit-4.11" with source configurePhase include "projects/jetty-9.4.20.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/S20190827152740.tpd" +include "orbit/R20190827152740-2019-09.tpd" include "releasetrain/4.11-2019-03.tpd" diff --git a/org.eclipse.egit.target/egit-4.12.target b/org.eclipse.egit.target/egit-4.12.target index 790e903530..e15b0a46bd 100644 --- a/org.eclipse.egit.target/egit-4.12.target +++ b/org.eclipse.egit.target/egit-4.12.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.12" sequenceNumber="1567064574"> +<target name="egit-4.12" sequenceNumber="1567671967"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/> @@ -99,7 +99,7 @@ <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/> <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.sdk.ide" version="0.0.0"/> diff --git a/org.eclipse.egit.target/egit-4.12.tpd b/org.eclipse.egit.target/egit-4.12.tpd index 5c788508d5..ac31f042ca 100644 --- a/org.eclipse.egit.target/egit-4.12.tpd +++ b/org.eclipse.egit.target/egit-4.12.tpd @@ -2,5 +2,5 @@ target "egit-4.12" with source configurePhase include "projects/jetty-9.4.20.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/S20190827152740.tpd" +include "orbit/R20190827152740-2019-09.tpd" include "releasetrain/4.12-2019-06.tpd" diff --git a/org.eclipse.egit.target/egit-4.13-staging.target b/org.eclipse.egit.target/egit-4.13-staging.target index 879cce9430..aa062ec106 100644 --- a/org.eclipse.egit.target/egit-4.13-staging.target +++ b/org.eclipse.egit.target/egit-4.13-staging.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.13-staging" sequenceNumber="1567064573"> +<target name="egit-4.13-staging" sequenceNumber="1567671967"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/> @@ -99,7 +99,7 @@ <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/> <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.sdk.ide" version="0.0.0"/> diff --git a/org.eclipse.egit.target/egit-4.13-staging.tpd b/org.eclipse.egit.target/egit-4.13-staging.tpd index e3ac2e23c9..2e93d5e971 100644 --- a/org.eclipse.egit.target/egit-4.13-staging.tpd +++ b/org.eclipse.egit.target/egit-4.13-staging.tpd @@ -2,5 +2,5 @@ target "egit-4.13-staging" with source configurePhase include "projects/jetty-9.4.20.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/S20190827152740.tpd" +include "orbit/R20190827152740-2019-09.tpd" include "releasetrain/staging.tpd" diff --git a/org.eclipse.egit.target/egit-4.6.target b/org.eclipse.egit.target/egit-4.6.target index 2cb600f7fe..17726f5af8 100644 --- a/org.eclipse.egit.target/egit-4.6.target +++ b/org.eclipse.egit.target/egit-4.6.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.6" sequenceNumber="1567064574"> +<target name="egit-4.6" sequenceNumber="1567671958"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/> @@ -99,7 +99,7 @@ <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/> <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.sdk.ide" version="0.0.0"/> diff --git a/org.eclipse.egit.target/egit-4.6.tpd b/org.eclipse.egit.target/egit-4.6.tpd index 7d2dc07a2d..e38f258cdd 100644 --- a/org.eclipse.egit.target/egit-4.6.tpd +++ b/org.eclipse.egit.target/egit-4.6.tpd @@ -2,5 +2,5 @@ target "egit-4.6" with source configurePhase include "projects/jetty-9.4.20.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/S20190827152740.tpd" +include "orbit/R20190827152740-2019-09.tpd" include "releasetrain/4.6-neon.tpd" diff --git a/org.eclipse.egit.target/egit-4.7.target b/org.eclipse.egit.target/egit-4.7.target index d1e32a32ef..68645aa1a3 100644 --- a/org.eclipse.egit.target/egit-4.7.target +++ b/org.eclipse.egit.target/egit-4.7.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.7" sequenceNumber="1567064574"> +<target name="egit-4.7" sequenceNumber="1567671958"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/> @@ -99,7 +99,7 @@ <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/> <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.sdk.ide" version="0.0.0"/> diff --git a/org.eclipse.egit.target/egit-4.7.tpd b/org.eclipse.egit.target/egit-4.7.tpd index 3ebd52d1e0..5320ca374f 100644 --- a/org.eclipse.egit.target/egit-4.7.tpd +++ b/org.eclipse.egit.target/egit-4.7.tpd @@ -2,5 +2,5 @@ target "egit-4.7" with source configurePhase include "projects/jetty-9.4.20.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/S20190827152740.tpd" +include "orbit/R20190827152740-2019-09.tpd" include "releasetrain/4.7-oxygen.tpd" diff --git a/org.eclipse.egit.target/egit-4.8.target b/org.eclipse.egit.target/egit-4.8.target index ac170451c8..6a7a705199 100644 --- a/org.eclipse.egit.target/egit-4.8.target +++ b/org.eclipse.egit.target/egit-4.8.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.8" sequenceNumber="1567064574"> +<target name="egit-4.8" sequenceNumber="1567671957"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/> @@ -99,7 +99,7 @@ <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/> <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.sdk.ide" version="0.0.0"/> diff --git a/org.eclipse.egit.target/egit-4.8.tpd b/org.eclipse.egit.target/egit-4.8.tpd index 02d2c8943e..6918336d68 100644 --- a/org.eclipse.egit.target/egit-4.8.tpd +++ b/org.eclipse.egit.target/egit-4.8.tpd @@ -2,5 +2,5 @@ target "egit-4.8" with source configurePhase include "projects/jetty-9.4.20.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/S20190827152740.tpd" +include "orbit/R20190827152740-2019-09.tpd" include "releasetrain/4.8-photon.tpd" diff --git a/org.eclipse.egit.target/egit-4.9.target b/org.eclipse.egit.target/egit-4.9.target index 9d37ea7225..db04e714ba 100644 --- a/org.eclipse.egit.target/egit-4.9.target +++ b/org.eclipse.egit.target/egit-4.9.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.9" sequenceNumber="1567064566"> +<target name="egit-4.9" sequenceNumber="1567671967"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/> @@ -99,7 +99,7 @@ <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/> <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.sdk.ide" version="0.0.0"/> diff --git a/org.eclipse.egit.target/egit-4.9.tpd b/org.eclipse.egit.target/egit-4.9.tpd index 75f65dadcd..7c57031356 100644 --- a/org.eclipse.egit.target/egit-4.9.tpd +++ b/org.eclipse.egit.target/egit-4.9.tpd @@ -2,5 +2,5 @@ target "egit-4.9" with source configurePhase include "projects/jetty-9.4.20.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/S20190827152740.tpd" +include "orbit/R20190827152740-2019-09.tpd" include "releasetrain/4.9-2018-09.tpd" diff --git a/org.eclipse.egit.target/orbit/S20190827152740.tpd b/org.eclipse.egit.target/orbit/R20190827152740-2019-09.tpd index 3b32c08172..410ec451a8 100644 --- a/org.eclipse.egit.target/orbit/S20190827152740.tpd +++ b/org.eclipse.egit.target/orbit/R20190827152740-2019-09.tpd @@ -1,7 +1,7 @@ -target "S20190827152740 for 2019-09 M3" with source configurePhase +target "R20190827152740-2019-09" with source configurePhase // see http://download.eclipse.org/tools/orbit/downloads/ -location "https://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository" { +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository" { com.google.gson [2.8.2.v20180104-1110,2.8.2.v20180104-1110] com.google.gson.source [2.8.2.v20180104-1110,2.8.2.v20180104-1110] com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902] diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index 10ded25b65..e114863094 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -92,9 +92,9 @@ import org.eclipse.egit.ui.internal.commit.CommitJob; import org.eclipse.egit.ui.internal.commit.CommitMessageHistory; import org.eclipse.egit.ui.internal.commit.CommitProposalProcessor; import org.eclipse.egit.ui.internal.commit.DiffViewer; +import org.eclipse.egit.ui.internal.components.DropDownMenuAction; import org.eclipse.egit.ui.internal.components.PartVisibilityListener; import org.eclipse.egit.ui.internal.components.RepositoryMenuUtil.RepositoryToolbarAction; -import org.eclipse.egit.ui.internal.components.DropDownMenuAction; import org.eclipse.egit.ui.internal.decorators.ProblemLabelDecorator; import org.eclipse.egit.ui.internal.dialogs.CommandConfirmation; import org.eclipse.egit.ui.internal.dialogs.CommitMessageArea; @@ -4197,27 +4197,54 @@ public class StagingView extends ViewPart } private void commit(boolean pushUpstream) { - // don't allow to do anything as long as commit is in progress + boolean reEnable = false; + // Don't allow to do anything as long as commit is in progress enableAllWidgets(false); + try { + boolean jobScheduled = internalCommit(pushUpstream, + () -> enableAllWidgets(true)); + // If a job was scheduled, our Runnable will re-enable the widgets + // once the commit and push is done; even if it fails. Otherwise, we + // must re-enable the widgets here and now ourselves. + reEnable = !jobScheduled; + } catch (RuntimeException e) { // See bugs 550336, 550513 + // If internalCommit() should fail after having scheduled the job, + // we may re-enable a little too early. But better that than never. + reEnable = true; + Activator.handleError(e.getLocalizedMessage(), e, true); + } finally { + if (reEnable) { + enableAllWidgets(true); + } + } + } + /** + * Performs some checks and if successful schedules a background job to + * execute the commit (and possibly push). + * + * @param pushUpstream + * whether to also push the commit to upstream + * @param afterJob + * code to run after the job if a job is scheduled + * @return whether a job was scheduled + */ + private boolean internalCommit(boolean pushUpstream, Runnable afterJob) { if (!isCommitWithoutFilesAllowed()) { MessageDialog md = new MessageDialog(getSite().getShell(), UIText.StagingView_committingNotPossible, null, UIText.StagingView_noStagedFiles, MessageDialog.ERROR, new String[] { IDialogConstants.CLOSE_LABEL }, 0); md.open(); - enableAllWidgets(true); - return; + return false; } if (!commitMessageComponent.checkCommitInfo()) { - enableAllWidgets(true); - return; + return false; } if (!UIUtils.saveAllEditors(currentRepository, UIText.StagingView_cancelCommitAfterSaving)) { - enableAllWidgets(true); - return; + return false; } String commitMessage = commitMessageComponent.getCommitMessage(); @@ -4229,8 +4256,7 @@ public class StagingView extends ViewPart commitMessage); } catch (CoreException e) { Activator.handleError(UIText.StagingView_commitFailed, e, true); - enableAllWidgets(true); - return; + return false; } if (amendPreviousCommitAction.isChecked()) commitOperation.setAmending(true); @@ -4251,7 +4277,7 @@ public class StagingView extends ViewPart @Override public void done(IJobChangeEvent event) { asyncExec(() -> { - enableAllWidgets(true); + afterJob.run(); if (event.getResult().isOK()) { commitMessageText.setText(EMPTY_STRING); } @@ -4263,6 +4289,7 @@ public class StagingView extends ViewPart CommitMessageHistory.saveCommitHistory(commitMessage); clearCommitMessageToggles(); + return true; } /** |