From 10dedadf9afeb3d92f6569ac56ec146d2f787754 Mon Sep 17 00:00:00 2001 From: Urs Wolfer Date: Wed, 27 Feb 2019 21:01:37 +0100 Subject: [PATCH 1/5] fix for setups which contain Git repos with spaces in their name --- .../com/urswolfer/intellij/plugin/gerrit/rest/GerritUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/urswolfer/intellij/plugin/gerrit/rest/GerritUtil.java b/src/main/java/com/urswolfer/intellij/plugin/gerrit/rest/GerritUtil.java index be1c0019..e630da06 100644 --- a/src/main/java/com/urswolfer/intellij/plugin/gerrit/rest/GerritUtil.java +++ b/src/main/java/com/urswolfer/intellij/plugin/gerrit/rest/GerritUtil.java @@ -39,6 +39,7 @@ import com.google.gerrit.extensions.common.ProjectInfo; import com.google.gerrit.extensions.common.RevisionInfo; import com.google.gerrit.extensions.restapi.RestApiException; +import com.google.gerrit.extensions.restapi.Url; import com.google.inject.Inject; import com.intellij.idea.ActionsBundle; import com.intellij.notification.Notification; @@ -380,7 +381,7 @@ private String getProjectQueryPart(Project project) { Iterable projectNamesWithQueryPrefix = Iterables.transform(projectNames, new Function() { @Override public String apply(String input) { - return "project:" + input; + return "project:" + Url.encode(input); } }); From cca486e12a53168363846d25d7239027adb49640 Mon Sep 17 00:00:00 2001 From: Valera Pesternikov Date: Sun, 17 Mar 2019 22:30:36 +0300 Subject: [PATCH 2/5] Fix for null DataContext when invoking push dialog from hotkey (#338) * Fixed null DataContext when invoking push dialog from hotkey. Fixed empty branch name if defaultbranch is not specified in .gitreview * Switched to Guava Strings usage for checking branch name emptiness * Switched to Guava Strings.emptyToNull usage for checking branch name emptiness --- .../intellij/plugin/gerrit/push/GerritPushExtensionPanel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/urswolfer/intellij/plugin/gerrit/push/GerritPushExtensionPanel.java b/src/main/java/com/urswolfer/intellij/plugin/gerrit/push/GerritPushExtensionPanel.java index 4f9dbb37..98194822 100644 --- a/src/main/java/com/urswolfer/intellij/plugin/gerrit/push/GerritPushExtensionPanel.java +++ b/src/main/java/com/urswolfer/intellij/plugin/gerrit/push/GerritPushExtensionPanel.java @@ -113,7 +113,7 @@ public void run() { private Optional getGitReviewBranchName() { Optional branchName = Optional.absent(); - DataContext dataContext = DataManager.getInstance().getDataContextFromFocus().getResult(); + DataContext dataContext = DataManager.getInstance().getDataContext(this); Optional openedProject = dataContext != null ? Optional.fromNullable(CommonDataKeys.PROJECT.getData(dataContext)) : Optional.absent(); @@ -129,7 +129,7 @@ private Optional getGitReviewBranchName() { Properties properties = new Properties(); properties.load(fileInputStream); - branchName = Optional.fromNullable(properties.getProperty("defaultbranch")); + branchName = Optional.fromNullable(Strings.emptyToNull(properties.getProperty("defaultbranch"))); } catch (IOException e) { //no need to handle as branch name is already absent and ready to be returned } finally { From 334322066143031daedabd00f8ffd873db6c03fc Mon Sep 17 00:00:00 2001 From: Urs Wolfer Date: Sat, 13 Apr 2019 10:21:01 +0200 Subject: [PATCH 3/5] update javassist to v3.24.1-GA This update fix compatibility with Java 11. fixes #345 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b3de8099..a9ce9c07 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ dependencies { exclude group: 'commons-logging', module: 'commons-logging' exclude group: 'org.apache.httpcomponents', module: 'httpclient' } - compile 'org.javassist:javassist:3.22.0-GA' + compile 'org.javassist:javassist:3.24.1-GA' testCompile 'org.testng:testng:6.8.21' testCompile 'org.easymock:easymock:3.4' From e5a7b0de3f0b2a94a1f63523d6511e5a4ed39c9e Mon Sep 17 00:00:00 2001 From: Urs Wolfer Date: Sat, 13 Apr 2019 10:34:22 +0200 Subject: [PATCH 4/5] update gerrit-rest-java-client to v0.8.16 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a9ce9c07..c7ce39bb 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { compile ('com.google.inject.extensions:guice-multibindings:4.1.0') { exclude group: 'com.google.guava', module: 'guava' } - compile ('com.urswolfer.gerrit.client.rest:gerrit-rest-java-client:0.8.15') { + compile ('com.urswolfer.gerrit.client.rest:gerrit-rest-java-client:0.8.16') { exclude group: 'com.google.code.gson', module: 'gson' exclude group: 'com.google.guava', module: 'guava' exclude group: 'commons-logging', module: 'commons-logging' From dea894b2e028d0dda5ab2bf1a447939d774a4c97 Mon Sep 17 00:00:00 2001 From: Urs Wolfer Date: Sat, 13 Apr 2019 10:59:48 +0200 Subject: [PATCH 5/5] bump version to v1.1.2-140 --- gradle.properties | 2 +- src/main/resources/META-INF/plugin.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 33fce216..a3cbbcca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ ideaVersion=IC-14.0.4 ijPluginRepoChannel= downloadIdeaSources=false -version=1.1.1-140 +version=1.1.2-140 javaVersion=1.6 diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 98fb93d3..ea9b2fdb 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -89,6 +89,11 @@ href="https://github.com/uwolfer/gerrit-intellij-plugin#pre-releases"> https://github.com/uwolfer/gerrit-intellij-plugin#pre-releases. +
  • 1.1.2
    • +
      +
    • fix push dialog extension for Java 11 JRE
      • +
    • fix for setups which contain Git repos with spaces in their name
      • +
  • 1.1.1
    • fix for push dialog which did not appear in some situations (fix for a recent change which is included in last release)