Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2016-09-14 22:38:56 +0000
committerGerrit Code Review @ Eclipse.org2016-09-14 22:38:57 +0000
commit630a0f003e27c772d68f2b7909554e8b52a8201f (patch)
treeb9b478cb27da089c991be49744a5d4cbc94c72cf
parent310f37ca03d89d3a498c94912a7790cd4e6c9050 (diff)
parent5652cb7ba8ce14c25a21657c345336f383edc064 (diff)
downloadegit-630a0f003e27c772d68f2b7909554e8b52a8201f.tar.gz
egit-630a0f003e27c772d68f2b7909554e8b52a8201f.tar.xz
egit-630a0f003e27c772d68f2b7909554e8b52a8201f.zip
Merge changes I1ce531aa,I54b6e45f
* changes: Fix staging view to respect project-specific commit message template Fix discouraged access warnings in CommitTextTaskActivationListener
-rw-r--r--org.eclipse.egit.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java6
2 files changed, 7 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
index 07a02ed43..f1569952a 100644
--- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
@@ -109,7 +109,7 @@ Export-Package: org.eclipse.egit.ui;version="4.5.0";x-friends:="org.eclipse.egit
org.eclipse.egit.ui.internal.search;version="4.5.0";x-internal:=true,
org.eclipse.egit.ui.internal.selection;version="4.5.0";x-friends:="org.eclipse.egit.gitflow.ui",
org.eclipse.egit.ui.internal.sharing;version="4.5.0";x-internal:=true,
- org.eclipse.egit.ui.internal.staging;version="4.5.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.staging;version="4.5.0";x-friends:="org.eclipse.egit.mylyn.ui",
org.eclipse.egit.ui.internal.stash;version="4.5.0";x-internal:=true,
org.eclipse.egit.ui.internal.submodule;version="4.5.0";x-internal:=true,
org.eclipse.egit.ui.internal.synchronize;version="4.5.0";x-internal:=true,
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java
index bdf536c14..cba4ec81c 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -35,6 +36,7 @@ import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
import org.eclipse.egit.core.RevUtils;
import org.eclipse.egit.core.internal.gerrit.GerritUtil;
+import org.eclipse.egit.core.internal.util.ProjectUtil;
import org.eclipse.egit.ui.Activator;
import org.eclipse.egit.ui.ICommitMessageProvider;
import org.eclipse.egit.ui.UIPreferences;
@@ -678,6 +680,10 @@ public class CommitMessageComponent {
if (file != null)
resources.add(file.getProject());
}
+ if (resources.size() == 0 && repository != null) {
+ resources
+ .addAll(Arrays.asList(ProjectUtil.getProjects(repository)));
+ }
try {
ICommitMessageProvider messageProvider = getCommitMessageProvider();
if (messageProvider != null) {

Back to the top