MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-86695 Git cherry-pick correctly get the instance of GitCheckinEnvironment

Browse Source 
AbstractVcs#getCheckinEnvironment returns a proxy instance.
We can query directly for the Service.
This commit is contained in:
Kirill Likhodedov
2012-06-01 17:27:35 +04:00
parent 1f36582167
commit f2bde69eb5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
+3 -3
View File
@@ -18,6 +18,7 @@ package git4idea.history.browser;
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationListener;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.Project;
@@ -496,10 +497,9 @@ public class GitCherryPicker {
public void execute(Collection<Change> changes, String commitMessage) {
final Collection<Document> committingDocs = markCommittingDocs();
try {
CheckinEnvironment ce = myPlatformFacade.getVcs(myProject).getCheckinEnvironment();
LOG.assertTrue(ce != null && ce instanceof GitCheckinEnvironment, "Invalid CheckinEnvironment: " + ce);
GitCheckinEnvironment ce = ServiceManager.getService(myProject, GitCheckinEnvironment.class);
try {
((GitCheckinEnvironment)ce).reset();
ce.reset();
List<VcsException> exceptions = ce.commit(myChanges, myCommitMessage);
VcsDirtyScopeManager.getInstance(myProject).filePathsDirty(ChangesUtil.getPaths(myChanges), null);
if (exceptions != null && !exceptions.isEmpty()) {