summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2013-07-30 10:28:52 (EDT)
committerSteffen Pingel2013-07-30 11:27:12 (EDT)
commit91f2002b641f2e6770c7225bb46914ccde7ec51c (patch)
treea48dbfa1705f7ca7e1c6b7926545b156e9774a4b
parentd1e4915a4bdd3ff69be0204bbfb8186c6bcc8d75 (diff)
downloadorg.eclipse.mylyn.reviews-91f2002b641f2e6770c7225bb46914ccde7ec51c.zip
org.eclipse.mylyn.reviews-91f2002b641f2e6770c7225bb46914ccde7ec51c.tar.gz
org.eclipse.mylyn.reviews-91f2002b641f2e6770c7225bb46914ccde7ec51c.tar.bz2
warn that Gerrit 2.7 and later is not fully supportedrefs/changes/71/14971/2
Change-Id: If16765e8c306b1e1c9f8ff70c261d9e36ee78a4c Also-By: Steffen Pingel <steffen.pingel@tasktop.com> Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com>
-rw-r--r--org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritVersion.java6
-rw-r--r--org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/defaultsites.pp9
-rw-r--r--org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositorySettingsPage.java6
3 files changed, 14 insertions, 7 deletions
diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritVersion.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritVersion.java
index 7453120..aa4c144 100644
--- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritVersion.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritVersion.java
@@ -23,6 +23,8 @@ public class GerritVersion extends Version {
private static final Version VERSION_2_6_0 = new Version(2, 6, 0);
+ private static final Version VERSION_2_7_0 = new Version(2, 7, 0);
+
// e.g. 2.6 or 2.6.0
private static final Pattern MAJOR_MINOR_MICRO_VERSION_PATTERN = Pattern.compile("\\d+\\.\\d+(\\.\\d+)?"); //$NON-NLS-1$
@@ -59,4 +61,8 @@ public class GerritVersion extends Version {
public static boolean isVersion26OrLater(Version version) {
return version.compareTo(VERSION_2_6_0) >= 0;
}
+
+ public static boolean isVersion27OrLater(Version version) {
+ return version.compareTo(VERSION_2_7_0) >= 0;
+ }
}
diff --git a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/defaultsites.pp b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/defaultsites.pp
index d4d16ae..36bbf42 100644
--- a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/defaultsites.pp
@@ -26,7 +26,7 @@ define gerrit::defaultsites ($base = $gerrit::base, $userOwner = $gerrit::userOw
gerrit { "2.6.1":
}
- gerrit { "2.7-rc2":
+ gerrit { "2.7-rc3":
}
/* Sites */
@@ -58,16 +58,15 @@ define gerrit::defaultsites ($base = $gerrit::base, $userOwner = $gerrit::userOw
version => "2.6.1",
port => 28261,
sshport => 29261,
- envinfo => "Test",
require => Gerrit["2.6.1"],
}
- gerrit::site { "gerrit-2.7-rc2":
- version => "2.7-rc2",
+ gerrit::site { "gerrit-2.7-rc3":
+ version => "2.7-rc3",
port => 28270,
sshport => 29270,
envinfo => "Test",
- require => Gerrit["2.7-rc2"],
+ require => Gerrit["2.7-rc3"],
}
diff --git a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositorySettingsPage.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositorySettingsPage.java
index 28afb4f..cf55a75 100644
--- a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositorySettingsPage.java
@@ -67,7 +67,8 @@ public class GerritRepositorySettingsPage extends AbstractRepositorySettingsPage
}
private boolean isSupportedVersion() {
- return !GerritVersion.isVersion26OrLater(info.getVersion());
+ // bump after bug 412872 gets fixed
+ return !GerritVersion.isVersion27OrLater(info.getVersion());
}
}
@@ -148,7 +149,8 @@ public class GerritRepositorySettingsPage extends AbstractRepositorySettingsPage
String warning = ""; //$NON-NLS-1$
if (!gerritValidator.isSupportedVersion()) {
- warning = NLS.bind("\nPlease keep in mind that Gerrit {0} is not fully supported yet.",
+ warning = NLS.bind(
+ "\nGerrit {0} is not fully supported, yet. See https://bugs.eclipse.org/412872 for details.",
gerritValidator.getInfo().getVersion());
}