From bb96af94769b2922e73fd0b66608e5093ee5eea7 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 6 Dec 2012 11:51:29 +0100
Subject: [PATCH 01/23] Another day, another WM name

---
 .../src/com/intellij/idea/IdeaApplication.java        | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
index 2c9dd2f177d0..939c3ad64898 100644
--- a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
+++ b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
@@ -133,17 +133,8 @@ public class IdeaApplication {
       LOG.info("WM detected: " + wmName);
       if (wmName == null) return;
 
-      if ("Mutter".equals(wmName)) {
+      if (wmName.startsWith("Mutter") || "Muffin".equals(wmName) || "GNOME Shell".equals(wmName)) {
         try {
-          xwmClass.getDeclaredField("MUTTER_WM");
-        }
-        catch (NoSuchFieldException e) {
-          setWM(xwm, "METACITY_WM");  // Mutter support absent - mimic Metacity
-        }
-      }
-      else if ("Muffin".equals(wmName) || "GNOME Shell".equals(wmName)) {
-        try {
-          xwmClass.getDeclaredField("MUTTER_WM");
           setWM(xwm, "MUTTER_WM");
         }
         catch (NoSuchFieldException e) {

From 04b67d0ae001098265ca2974b47a1b53ec5cdcb2 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Thu, 6 Dec 2012 15:42:15 +0400
Subject: [PATCH 02/23] EA-31416

---
 .../src/org/jetbrains/idea/svn/StatusWalkerPartnerImpl.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/StatusWalkerPartnerImpl.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/StatusWalkerPartnerImpl.java
index 9d62a7e8e02c..15bc2b866c3e 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/StatusWalkerPartnerImpl.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/StatusWalkerPartnerImpl.java
@@ -17,6 +17,7 @@ package org.jetbrains.idea.svn;
 
 import com.intellij.lifecycle.PeriodicalTasksCloser;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.roots.FileIndexFacade;
 import com.intellij.openapi.util.Computable;
@@ -74,6 +75,7 @@ public class StatusWalkerPartnerImpl implements StatusWalkerPartner {
     return ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
       @Override
       public Boolean compute() {
+        if (myVcs.getProject().isDisposed()) throw new ProcessCanceledException();
         return myExcludedFileIndex.isExcludedFile(vFile);
       }
     });

From ea2114fa4b5df8d6d6ee1747602d2745d5a2ddfa Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Thu, 6 Dec 2012 15:44:19 +0400
Subject: [PATCH 03/23] EA-31416

---
 .../intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java
index 3a1cd8e24d69..fe4bce648e55 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java
@@ -123,6 +123,7 @@ class UpdatingChangeListBuilder implements ChangelistBuilder {
     return ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
       @Override
       public Boolean compute() {
+        checkIfDisposed();
         return myIndex.isExcludedFile(file);
       }
     });

From dd476a5d2c514baa6af7baeaa4fce1ff627375f2 Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Thu, 6 Dec 2012 15:53:02 +0400
Subject: [PATCH 04/23] IDEA-96686 When maven-surefire-plugin configurate with
 classpath, that include webapp dir, finding files don't work properly

---
 .../maven/execution/MavenJUnitPatcher.java    | 59 +++++++++++++++++++
 .../maven/importing/MavenModuleImporter.java  | 59 ++-----------------
 .../src/main/resources/META-INF/plugin.xml    |  2 +
 .../MavenClasspathsAndSearchScopesTest.java   |  2 +-
 4 files changed, 66 insertions(+), 56 deletions(-)
 create mode 100644 plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenJUnitPatcher.java

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenJUnitPatcher.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenJUnitPatcher.java
new file mode 100644
index 000000000000..58278c720ac6
--- /dev/null
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenJUnitPatcher.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.idea.maven.execution;
+
+import com.intellij.execution.JUnitPatcher;
+import com.intellij.execution.configurations.JavaParameters;
+import com.intellij.openapi.module.Module;
+import org.jdom.Element;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.idea.maven.dom.MavenDomUtil;
+import org.jetbrains.idea.maven.dom.MavenPropertyResolver;
+import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel;
+import org.jetbrains.idea.maven.project.MavenProject;
+import org.jetbrains.idea.maven.project.MavenProjectsManager;
+import org.jetbrains.idea.maven.utils.MavenJDOMUtil;
+
+import java.util.List;
+
+/**
+ * @author Sergey Evdokimov
+ */
+public class MavenJUnitPatcher extends JUnitPatcher {
+
+  @Override
+  public void patchJavaParameters(@Nullable Module module, JavaParameters javaParameters) {
+    if (module == null) return;
+
+    MavenProject mavenProject = MavenProjectsManager.getInstance(module.getProject()).findProject(module);
+    if (mavenProject == null) return;
+
+    Element config = mavenProject.getPluginConfiguration("org.apache.maven.plugins", "maven-surefire-plugin");
+    List<String> paths = MavenJDOMUtil.findChildrenValuesByPath(config, "additionalClasspathElements", "additionalClasspathElement");
+
+    if (paths.isEmpty()) return;
+
+    MavenDomProjectModel domModel = MavenDomUtil.getMavenDomProjectModel(module.getProject(), mavenProject.getFile());;
+
+    for (String path : paths) {
+      if (domModel != null) {
+        path = MavenPropertyResolver.resolve(path, domModel);
+      }
+
+      javaParameters.getClassPath().add(path);
+    }
+  }
+}
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
index 8b399277236d..02f12d408be8 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
@@ -220,65 +220,14 @@ public class MavenModuleImporter {
   }
 
   private void configSurefirePlugin() {
-    List<String> urls = new ArrayList<String>();
-
-    AccessToken accessToken = ReadAction.start();
-    try {
-      MavenDomProjectModel domModel = null;
-
-      Element config = myMavenProject.getPluginConfiguration("org.apache.maven.plugins", "maven-surefire-plugin");
-      for (String each : MavenJDOMUtil.findChildrenValuesByPath(config, "additionalClasspathElements", "additionalClasspathElement")) {
-        String url = VfsUtil.pathToUrl(each);
-
-        if (domModel == null) {
-          domModel = MavenDomUtil.getMavenDomProjectModel(myModule.getProject(), myMavenProject.getFile());
-        }
-
-        if (domModel != null) {
-          url = MavenPropertyResolver.resolve(url, domModel);
-        }
-
-        urls.add(url);
-      }
-    }
-    finally {
-      accessToken.finish();
-    }
-
+    // Remove "maven-surefire-plugin urls" library created by previous version of IDEA.
+    // todo remove this code after 01.06.2013
     LibraryTable moduleLibraryTable = myRootModelAdapter.getRootModel().getModuleLibraryTable();
 
     Library library = moduleLibraryTable.getLibraryByName(SUREFIRE_PLUGIN_LIBRARY_NAME);
-    if (library == null) {
-      if (urls.isEmpty()) {
-        return;
-      }
-
-      library = moduleLibraryTable.createLibrary(SUREFIRE_PLUGIN_LIBRARY_NAME);
-      LibraryOrderEntry orderEntry = myRootModelAdapter.getRootModel().findLibraryOrderEntry(library);
-      orderEntry.setScope(DependencyScope.TEST);
+    if (library != null) {
+      moduleLibraryTable.removeLibrary(library);
     }
-    else {
-      if (urls.isEmpty()) {
-        moduleLibraryTable.removeLibrary(library);
-        return;
-      }
-    }
-
-    String[] oldUrls = library.getUrls(OrderRootType.CLASSES);
-    if (!urls.equals(Arrays.asList(oldUrls))) {
-      Library.ModifiableModel modifiableModel = library.getModifiableModel();
-
-      for (String url : oldUrls) {
-        modifiableModel.removeRoot(url, OrderRootType.CLASSES);
-      }
-
-      for (String url : urls) {
-        modifiableModel.addRoot(url, OrderRootType.CLASSES);
-      }
-
-      modifiableModel.commit();
-    }
-
   }
 
   private void addAttachArtifactDependency(@NotNull Element buildHelperCfg,
diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index 6d10f242467a..746886a64fbf 100644
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -45,6 +45,8 @@
     <configurationProducer implementation="org.jetbrains.idea.maven.execution.MavenConfigurationProducer"/>
     <orderEnumerationHandlerFactory implementation="org.jetbrains.idea.maven.execution.MavenOrderEnumeratorHandler$FactoryImpl"/>
 
+    <junitPatcher implementation="org.jetbrains.idea.maven.execution.MavenJUnitPatcher" />
+
     <compiler implementation="org.jetbrains.idea.maven.compiler.MavenResourceCompiler" order="last"/>
     <compileServer.plugin classpath="jps/maven-jps-plugin.jar"/>
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathsAndSearchScopesTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathsAndSearchScopesTest.java
index a7de775b9492..95c445193055 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathsAndSearchScopesTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathsAndSearchScopesTest.java
@@ -774,7 +774,7 @@ public class MavenClasspathsAndSearchScopesTest extends MavenImportingTestCase {
                             getProjectPath() + "/m3/target/classes");
   }
 
-  public void testAdditionalClasspathElementsInTests() throws Exception {
+  public void _testAdditionalClasspathElementsInTests() throws Exception {
     File iof1 = new File(myDir, "foo/bar1");
     File iof2 = new File(myDir, "foo/bar2");
     iof1.mkdirs();

From 508c7a8f213e12b7e722814a3e94c86711e404c4 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Thu, 6 Dec 2012 16:00:12 +0400
Subject: [PATCH 05/23] svn mapping: @NotNull

---
 plugins/svn4idea/src/org/jetbrains/idea/svn/SvnMapping.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnMapping.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnMapping.java
index 3eced3e3e3ea..2d5004798582 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnMapping.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnMapping.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -91,7 +92,7 @@ public class SvnMapping {
   }
 
   @Nullable
-  public String getRootForPath(final String path) {
+  public String getRootForPath(@NotNull final String path) {
     String floor = myFile2UrlMap.floorKey(path);
     if (floor == null) return null;
     NavigableMap<String, RootUrlInfo> head = myFile2UrlMap.headMap(floor, true);

From 475878e30945e49dcaee28a997b1b6b95ba3700e Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Wed, 5 Dec 2012 11:57:19 +0100
Subject: [PATCH 06/23] debugger attributes (cherry picked from commit
 3cdb2aab652a6ff552b8bf5abef49c2a1a4d6aae)

---
 colorSchemes/src/colorSchemes/Darcula.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/colorSchemes/src/colorSchemes/Darcula.xml b/colorSchemes/src/colorSchemes/Darcula.xml
index 43f34d6f5e4e..268887e33cef 100644
--- a/colorSchemes/src/colorSchemes/Darcula.xml
+++ b/colorSchemes/src/colorSchemes/Darcula.xml
@@ -140,7 +140,7 @@
     <option name="BREAKPOINT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" />
-        <option name="BACKGROUND" value="88382d" />
+        <option name="BACKGROUND" value="3a2323" />
         <option name="FONT_TYPE" value="0" />
         <option name="EFFECT_COLOR" />
         <option name="EFFECT_TYPE" value="0" />
@@ -630,7 +630,7 @@
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" />
-        <option name="BACKGROUND" value="313f7f" />
+        <option name="BACKGROUND" value="2d6099" />
         <option name="FONT_TYPE" value="0" />
         <option name="EFFECT_COLOR" />
         <option name="EFFECT_TYPE" value="0" />

From ea940e93d092e59dd6c1f8249c74441cb5c150d1 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Wed, 5 Dec 2012 18:26:47 +0100
Subject: [PATCH 07/23] IDEA-96190 Annotate stacktrace action: does not work
 (cherry picked from commit f59976c4fc15c3f97e7d62d0832c8e8fab355c7d)

Conflicts:

	platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java
---
 .../intellij/execution/filters/ExceptionWorker.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/java/openapi/src/com/intellij/execution/filters/ExceptionWorker.java b/java/openapi/src/com/intellij/execution/filters/ExceptionWorker.java
index d9e01db682e7..e00d4d6ef7e0 100644
--- a/java/openapi/src/com/intellij/execution/filters/ExceptionWorker.java
+++ b/java/openapi/src/com/intellij/execution/filters/ExceptionWorker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.editor.colors.CodeInsightColors;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.markup.TextAttributes;
+import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.TextRange;
@@ -208,7 +209,7 @@ public class ExceptionWorker {
     return null;
   }
 
-  private static class MyHyperlinkInfo implements HyperlinkInfo {
+  private static class MyHyperlinkInfo implements FileHyperlinkInfo {
     private final VirtualFile myVirtualFile;
     private final int myLineNumber;
     private final Project myProject;
@@ -246,5 +247,11 @@ public class ExceptionWorker {
 
       new OpenFileHyperlinkInfo(myProject, currentVirtualFile, myLineNumber - 1).navigate(project);
     }
+
+    @Nullable
+    @Override
+    public OpenFileDescriptor getDescriptor() {
+      return new OpenFileDescriptor(myProject, myVirtualFile, myLineNumber);
+    }
   }
 }

From 24509dff0309d42db70a4050fb53f07cccaa3192 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Wed, 5 Dec 2012 13:15:19 +0100
Subject: [PATCH 08/23] cleanup (cherry picked from commit
 5004b2c1f0fb8bf0085d5105d2057327df91dfa2)

---
 .../src/com/intellij/unscramble/AnnotateStackTraceAction.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/unscramble/AnnotateStackTraceAction.java b/platform/lang-impl/src/com/intellij/unscramble/AnnotateStackTraceAction.java
index 8f180861b0c2..a0d93bb12e85 100644
--- a/platform/lang-impl/src/com/intellij/unscramble/AnnotateStackTraceAction.java
+++ b/platform/lang-impl/src/com/intellij/unscramble/AnnotateStackTraceAction.java
@@ -72,7 +72,7 @@ class AnnotateStackTraceAction extends AnAction {
   private HashMap<VirtualFile, List<Integer>> files2lines = new HashMap<VirtualFile, List<Integer>>();
 
   AnnotateStackTraceAction(ConsoleViewImpl consoleView) {
-    super("Annotate", null, AllIcons.Actions.Annotate);
+    super("Show files modification info", null, AllIcons.Actions.Annotate);
     myHyperlinks = consoleView.getHyperlinks();
     myEditor = consoleView.getEditor();
     myEditor.getColorsScheme().setColor(

From a038285f3d51fc78a1efcabeac5f1539516398c0 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Thu, 6 Dec 2012 13:13:08 +0100
Subject: [PATCH 09/23] IDEA-96793 RecentFiles popup should show go to class
 popup if nothing found

---
 .../intellij/ide/actions/GotoActionBase.java  |  4 ++
 .../actionSystem/PlatformDataKeys.java        |  4 +-
 .../com/intellij/ide/actions/Switcher.java    | 54 +++++++++++++++++--
 .../src/com/intellij/ui/SpeedSearchBase.java  | 12 ++---
 4 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
index 4337ab9df1a2..dda54c2459a0 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
@@ -110,6 +110,10 @@ public abstract class GotoActionBase extends AnAction {
   }
 
   protected static Pair<String, Integer> getInitialText(boolean useEditorSelection, AnActionEvent e) {
+    final String predefined = e.getData(PlatformDataKeys.PREDEFINED_TEXT);
+    if (!StringUtil.isEmpty(predefined)) {
+      return Pair.create(predefined, 0);
+    }
     if (useEditorSelection) {
       final Editor editor = e.getData(PlatformDataKeys.EDITOR);
       if (editor != null) {
diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/PlatformDataKeys.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/PlatformDataKeys.java
index e348b266da6e..c492000388bb 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/PlatformDataKeys.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/PlatformDataKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,6 +93,8 @@ public class PlatformDataKeys {
   public static final DataKey<ModalityState> MODALITY_STATE = DataKey.create("ModalityState");
   public static final DataKey<Boolean> SOURCE_NAVIGATION_LOCKED = DataKey.create("sourceNavigationLocked");
 
+  public static final DataKey<String> PREDEFINED_TEXT = DataKey.create("predefined.text.value");
+
   /**
    * Returns java.awt.Point to guess where to show context menu invoked by key.
    * This point should be relative to the currently focused component
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
index 107cf7c3e839..8ad76f90d431 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
@@ -16,9 +16,11 @@
 package com.intellij.ide.actions;
 
 import com.intellij.featureStatistics.FeatureUsageTracker;
+import com.intellij.ide.DataManager;
 import com.intellij.ide.IdeEventQueue;
 import com.intellij.ide.ui.UISettings;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.impl.PresentationFactory;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.markup.EffectType;
 import com.intellij.openapi.editor.markup.TextAttributes;
@@ -33,10 +35,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.GraphicsConfig;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
-import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.Condition;
-import com.intellij.openapi.util.Iconable;
-import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.*;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.FileStatus;
@@ -57,6 +56,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
 import com.intellij.util.IconUtil;
 import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.ui.StatusText;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
@@ -908,11 +908,48 @@ public class Switcher extends AnAction implements DumbAware {
       }
 
       @Override
-      protected void processKeyEvent(KeyEvent e) {
+      protected void processKeyEvent(final KeyEvent e) {
         final int keyCode = e.getKeyCode();
         if (keyCode == VK_LEFT || keyCode == VK_RIGHT) {
           return;
         }
+        if (keyCode == VK_ENTER && files.getModel().getSize() + toolWindows.getModel().getSize() == 0) {
+          AnAction gotoAction = ActionManager.getInstance().getAction("GotoClass");
+          if (gotoAction == null) {
+            gotoAction = ActionManager.getInstance().getAction("GotoFile");
+          }
+          if (gotoAction != null) {
+            final String search = mySpeedSearch.getEnteredPrefix();
+            myPopup.cancel();
+            final AnAction action = gotoAction;
+            SwingUtilities.invokeLater(new Runnable() {
+              @Override
+              public void run() {
+
+                DataManager.getInstance().getDataContextFromFocus().doWhenDone(new AsyncResult.Handler<DataContext>() {
+                  @Override
+                  public void run(final DataContext context) {
+                    final DataContext dataContext = new DataContext() {
+                      @Nullable
+                      @Override
+                      public Object getData(@NonNls String dataId) {
+                        if (PlatformDataKeys.PREDEFINED_TEXT.is(dataId)) {
+                          return search;
+                        }
+                        return context.getData(dataId);
+                      }
+                    };
+                    final AnActionEvent event =
+                      new AnActionEvent(e, dataContext, ActionPlaces.EDITOR_POPUP, new PresentationFactory().getPresentation(action),
+                                        ActionManager.getInstance(), 0);
+                    action.actionPerformed(event);
+                  }
+                });
+              }
+            });
+            return;
+          }
+        }
         super.processKeyEvent(e);
       }
 
@@ -983,6 +1020,13 @@ public class Switcher extends AnAction implements DumbAware {
         final Object value = list.getSelectedValue();
         ((NameFilteringListModel)files.getModel()).refilter();
         ((NameFilteringListModel)toolWindows.getModel()).refilter();
+        if (files.getModel().getSize() + toolWindows.getModel().getSize() == 0) {
+          toolWindows.getEmptyText().setText("");
+          files.getEmptyText().setText("Press 'Enter' to search in Project");
+        } else {
+          files.getEmptyText().setText(StatusText.DEFAULT_EMPTY_TEXT);
+          toolWindows.getEmptyText().setText(StatusText.DEFAULT_EMPTY_TEXT);
+        }
         files.repaint();
         toolWindows.repaint();
         getSelectedList(list).setSelectedValue(value, true);
diff --git a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
index 4d58db0d0dfc..75552ecd60ce 100644
--- a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
+++ b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
@@ -335,13 +335,13 @@ public abstract class SpeedSearchBase<Comp extends JComponent> extends SpeedSear
 
     public SearchPopup(String initialString) {
       final Color foregroundColor = UIUtil.getToolTipForeground();
-      Color color1 = UIUtil.getToolTipBackground();
+      Color color1 = new JBColor(UIUtil.getToolTipBackground().brighter(), Gray._111);
       mySearchField = new SearchField();
       final JLabel searchLabel = new JLabel(" " + UIBundle.message("search.popup.search.for.label") + " ");
       searchLabel.setFont(searchLabel.getFont().deriveFont(Font.BOLD));
       searchLabel.setForeground(foregroundColor);
       mySearchField.setBorder(null);
-      mySearchField.setBackground(color1.brighter());
+      mySearchField.setBackground(color1);
       mySearchField.setForeground(foregroundColor);
 
       mySearchField.setDocument(new PlainDocument() {
@@ -358,7 +358,7 @@ public abstract class SpeedSearchBase<Comp extends JComponent> extends SpeedSear
           String newText = oldText.substring(0, offs) + str + oldText.substring(offs);
           super.insertString(offs, str, a);
           if (findElement(newText) == null) {
-            mySearchField.setForeground(Color.RED);
+            mySearchField.setForeground(JBColor.RED);
           }
           else {
             mySearchField.setForeground(foregroundColor);
@@ -368,7 +368,7 @@ public abstract class SpeedSearchBase<Comp extends JComponent> extends SpeedSear
       mySearchField.setText(initialString);
 
       setBorder(BorderFactory.createLineBorder(Color.gray, 1));
-      setBackground(color1.brighter());
+      setBackground(color1);
       setLayout(new BorderLayout());
       add(searchLabel, BorderLayout.WEST);
       add(mySearchField, BorderLayout.EAST);
@@ -421,10 +421,10 @@ public abstract class SpeedSearchBase<Comp extends JComponent> extends SpeedSear
     private void updateSelection(Object element) {
       if (element != null) {
         selectElement(element, mySearchField.getText());
-        mySearchField.setForeground(Color.black);
+        mySearchField.setForeground(UIUtil.getLabelForeground());
       }
       else {
-        mySearchField.setForeground(Color.red);
+        mySearchField.setForeground(JBColor.red);
       }
       if (mySearchPopup != null) {
         mySearchPopup.setSize(mySearchPopup.getPreferredSize());

From 5d59ae64c27f4248a1b36a263d560dcbf8d129c7 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Thu, 6 Dec 2012 13:10:00 +0100
Subject: [PATCH 10/23] external build: profiling mode support

---
 .../compiler/server/BuildManager.java         | 19 +++++--
 .../jetbrains/jps/cmdline/BuildSession.java   |  9 +++
 .../jps/cmdline/ProfilingHelper.java          | 56 +++++++++++++++++++
 .../org/jetbrains/jps/incremental/Utils.java  |  1 +
 4 files changed, 80 insertions(+), 5 deletions(-)
 create mode 100644 jps/jps-builders/src/org/jetbrains/jps/cmdline/ProfilingHelper.java

diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index 0c8e38be00f9..1d177b699d5a 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -770,11 +770,16 @@ public class BuildManager implements ApplicationComponent{
     }
     cmdLine.addParameter("-D"+ GlobalOptions.COMPILE_PARALLEL_OPTION +"=" + Boolean.toString(config.PARALLEL_COMPILATION));
 
+    boolean isProfilingMode = false;
     final String additionalOptions = config.COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS;
     if (!StringUtil.isEmpty(additionalOptions)) {
       final StringTokenizer tokenizer = new StringTokenizer(additionalOptions, " ", false);
       while (tokenizer.hasMoreTokens()) {
-        cmdLine.addParameter(tokenizer.nextToken());
+        final String option = tokenizer.nextToken();
+        if ("-Dprofiling.mode=true".equals(option)) {
+          isProfilingMode = true;
+        }
+        cmdLine.addParameter(option);
       }
     }
 
@@ -803,9 +808,17 @@ public class BuildManager implements ApplicationComponent{
       }
     }
 
+    final File workDirectory = getBuildSystemDirectory();
+    workDirectory.mkdirs();
+    ensureLogConfigExists(workDirectory);
+
     final List<String> cp = ClasspathBootstrap.getBuildProcessApplicationClasspath();
     cp.add(compilerPath);
     cp.addAll(myClasspathManager.getCompileServerPluginsClasspath(project));
+    if (isProfilingMode) {
+      cp.add(new File(workDirectory, "yjp-controller-api-redist.jar").getPath());
+      cmdLine.addParameter("-agentlib:yjpagent=disablej2ee,disablealloc,sessionname=ExternalBuild");
+    }
 
     cmdLine.addParameter("-classpath");
     cmdLine.addParameter(classpathToString(cp));
@@ -815,10 +828,6 @@ public class BuildManager implements ApplicationComponent{
     cmdLine.addParameter(Integer.toString(port));
     cmdLine.addParameter(sessionId.toString());
 
-    final File workDirectory = getBuildSystemDirectory();
-    workDirectory.mkdirs();
-    ensureLogConfigExists(workDirectory);
-
     cmdLine.addParameter(FileUtil.toSystemIndependentName(workDirectory.getPath()));
 
     cmdLine.setWorkDirectory(workDirectory);
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
index 8338c3963098..04c02ef9e59a 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
@@ -91,6 +91,11 @@ final class BuildSession implements Runnable, CanceledStatus {
     final Ref<Boolean> hasErrors = new Ref<Boolean>(false);
     final Ref<Boolean> doneSomething = new Ref<Boolean>(false);
     try {
+      ProfilingHelper profilingHelper = null;
+      if (Utils.IS_PROFILING_MODE) {
+        profilingHelper = new ProfilingHelper();
+      }
+
       runBuild(new MessageHandler() {
         public void processMessage(BuildMessage buildMessage) {
           final CmdlineRemoteProto.Message.BuilderMessage response;
@@ -132,6 +137,10 @@ final class BuildSession implements Runnable, CanceledStatus {
           }
         }
       }, this);
+
+      if (profilingHelper != null) {
+        profilingHelper.stopProfiling();
+      }
     }
     catch (Throwable e) {
       LOG.info(e);
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ProfilingHelper.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ProfilingHelper.java
new file mode 100644
index 000000000000..cd2b94c4b473
--- /dev/null
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ProfilingHelper.java
@@ -0,0 +1,56 @@
+package org.jetbrains.jps.cmdline;
+
+import java.lang.reflect.Method;
+
+/**
+ * @author Eugene Zhuravlev
+ *         Date: 12/6/12
+ */
+class ProfilingHelper {
+
+  private final Class<?> myControllerClass;
+  private final Object myController;
+
+  ProfilingHelper() throws Exception {
+    myControllerClass = Class.forName("com.yourkit.api.Controller");
+    myController = myControllerClass.newInstance();
+  }
+
+  public void startProfiling() {
+    try {
+      final Method startMethod = myControllerClass.getDeclaredMethod("startCPUProfiling", long.class, String.class);
+      if (startMethod != null) {
+        startMethod.invoke(myController, 4L/*ProfilingModes.CPU_SAMPLING*/, null);
+      }
+      else {
+        System.err.println("Cannot find method 'startCPUProfiling' in class " + myControllerClass.getName());
+      }
+    }
+    catch (Throwable e) {
+      e.printStackTrace();
+    }
+  }
+
+  public void stopProfiling() {
+    try {
+      final Method captureMethod = myControllerClass.getDeclaredMethod("captureSnapshot", long.class);
+      if (captureMethod != null) {
+        final String path = (String)captureMethod.invoke(myController, 0L/*ProfilingModes.SNAPSHOT_WITHOUT_HEAP*/);
+        System.err.println("CPU Snapshot captured: " + path);
+        final Method stopMethod = myControllerClass.getDeclaredMethod("stopCPUProfiling");
+        if (stopMethod != null) {
+          stopMethod.invoke(myController);
+        }
+        else {
+          System.err.println("Cannot find method 'stopCPUProfiling' in class " + myControllerClass.getName());
+        }
+      }
+      else {
+        System.err.println("Cannot find method 'captureSnapshot' in class " + myControllerClass.getName());
+      }
+    }
+    catch (Throwable e) {
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/Utils.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/Utils.java
index 95c9c43718bf..331e42ac5d8a 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/Utils.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/Utils.java
@@ -24,6 +24,7 @@ public class Utils {
   public static final Key<Boolean> ERRORS_DETECTED_KEY = Key.create("_errors_detected_");
   private static volatile File ourSystemRoot = new File(System.getProperty("user.home"), ".idea-build");
   public static final boolean IS_TEST_MODE = Boolean.parseBoolean(System.getProperty("test.mode", "false"));
+  public static final boolean IS_PROFILING_MODE = Boolean.parseBoolean(System.getProperty("profiling.mode", "false"));
 
   private Utils() {
   }

From 536a46956d6fd92dee7aa43770c6cb6365c0ee2f Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 6 Dec 2012 12:16:24 +0100
Subject: [PATCH 11/23] optimize getInstance() for big collections

---
 .../src/com/intellij/usages/UsageInfoToUsageConverter.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/usageView/src/com/intellij/usages/UsageInfoToUsageConverter.java b/platform/usageView/src/com/intellij/usages/UsageInfoToUsageConverter.java
index 69cc7af5e4bd..b55b4413275a 100644
--- a/platform/usageView/src/com/intellij/usages/UsageInfoToUsageConverter.java
+++ b/platform/usageView/src/com/intellij/usages/UsageInfoToUsageConverter.java
@@ -26,6 +26,7 @@ import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -67,10 +68,13 @@ public class UsageInfoToUsageConverter {
 
     @NotNull
     private static List<SmartPsiElementPointer<PsiElement>> convertToSmartPointers(@NotNull PsiElement[] primaryElements) {
+      if (primaryElements.length == 0) return Collections.emptyList();
+  
+      final SmartPointerManager smartPointerManager = SmartPointerManager.getInstance(primaryElements[0].getProject());
       return ContainerUtil.mapNotNull(primaryElements, new Function<PsiElement, SmartPsiElementPointer<PsiElement>>() {
               @Override
               public SmartPsiElementPointer<PsiElement> fun(final PsiElement s) {
-                return SmartPointerManager.getInstance(s.getProject()).createSmartPsiElementPointer(s);
+                return smartPointerManager.createSmartPsiElementPointer(s);
               }
             });
     }

From f81ebf39b3a949d8f59ce6aec787bb7f69d4120d Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 6 Dec 2012 13:19:03 +0100
Subject: [PATCH 12/23] search for yet non-loaded elements in list in
 background

---
 .../daemon/impl/PsiElementListNavigator.java  |  7 +++-
 .../hint/ImplementationViewComponent.java     | 12 +++---
 .../actions/ShowImplementationsAction.java    | 14 ++++---
 .../navigation/BackgroundUpdaterTask.java     | 22 ++++++++++-
 .../navigation/GotoTargetHandler.java         |  8 ++--
 .../src/com/intellij/find/FindUtil.java       | 37 +++++++++++++++----
 .../intellij/usages/impl/UsageViewImpl.java   |  4 ++
 7 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java
index 9192cb3cfb9b..2b08187fab0f 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java
@@ -25,12 +25,14 @@ import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.PopupChooserBuilder;
 import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.util.Ref;
 import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.PsiElement;
 import com.intellij.ui.CollectionListModel;
 import com.intellij.ui.JBListWithHintProvider;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.popup.AbstractPopup;
+import com.intellij.usages.UsageView;
 import com.intellij.util.Processor;
 import org.jetbrains.annotations.Nullable;
 
@@ -113,12 +115,13 @@ public class PsiElementListNavigator {
           return true;
         }
       });
+    final Ref<UsageView> usageView = new Ref<UsageView>();
     if (findUsagesTitle != null) {
       popupChooserBuilder = popupChooserBuilder.setCouldPin(new Processor<JBPopup>() {
         @Override
         public boolean process(JBPopup popup) {
           final List<NavigatablePsiElement> items = model.getItems();
-          FindUtil.showInUsageView(null, items.toArray(new PsiElement[items.size()]), findUsagesTitle, targets[0].getProject());
+          usageView.set(FindUtil.showInUsageView(null, items.toArray(new PsiElement[items.size()]), findUsagesTitle, targets[0].getProject()));
           popup.cancel();
           return false;
         }
@@ -127,7 +130,7 @@ public class PsiElementListNavigator {
 
     final JBPopup popup = popupChooserBuilder.createPopup();
     if (listUpdaterTask != null) {
-      listUpdaterTask.init((AbstractPopup)popup, list);
+      listUpdaterTask.init((AbstractPopup)popup, list, usageView);
 
       ProgressManager.getInstance().run(listUpdaterTask);
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java
index 0ba7901aa413..cd167714cfc8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java
@@ -45,6 +45,7 @@ import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ui.SideBorder;
 import com.intellij.ui.components.JBScrollPane;
+import com.intellij.usages.UsageView;
 import com.intellij.util.PairFunction;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -337,7 +338,7 @@ public class ImplementationViewComponent extends JPanel {
       if (file == null) continue;
       final PsiElement parent = element.getParent();
       files.add(new FileDescriptor(file, names.size() > 1 || parent == file ? element : parent));
-      candidates.add(element.getNavigationElement());
+      candidates.add(element);
     }
     
     fun.fun(PsiUtilCore.toPsiElementArray(candidates), files);
@@ -367,7 +368,7 @@ public class ImplementationViewComponent extends JPanel {
   private void updateEditorText() {
     disposeNonTextEditor();
 
-    final PsiElement elt = myElements[myIndex];
+    final PsiElement elt = myElements[myIndex].getNavigationElement();
     Project project = elt.getProject();
     PsiFile psiFile = getContainingFile(elt);
     final VirtualFile vFile = psiFile.getVirtualFile();
@@ -498,11 +499,8 @@ public class ImplementationViewComponent extends JPanel {
     return myElements;
   }
 
-  public void showInUsageView() {
-    FindUtil.showInUsageView(null, collectNonBinaryElements(), myTitle, myEditor.getProject());
-    if (myHint.isVisible()) {
-      myHint.cancel();
-    }
+  public UsageView showInUsageView() {
+    return FindUtil.showInUsageView(null, collectNonBinaryElements(), myTitle, myEditor.getProject());
   }
 
   private class BackAction extends AnAction implements HintManagerImpl.ActionToIgnore {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java
index 214f623202dc..c4a632ec0f53 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java
@@ -36,6 +36,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.pom.PomTargetPsiElement;
 import com.intellij.psi.*;
@@ -46,6 +47,7 @@ import com.intellij.ui.popup.AbstractPopup;
 import com.intellij.ui.popup.NotLookupOrSearchCondition;
 import com.intellij.ui.popup.PopupPositionManager;
 import com.intellij.ui.popup.PopupUpdateProcessor;
+import com.intellij.usages.UsageView;
 import com.intellij.util.Processor;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -204,6 +206,7 @@ public class ShowImplementationsAction extends AnAction implements PopupAction {
       }
     }
 
+    final Ref<UsageView> usageView = new Ref<UsageView>();
     final String title = CodeInsightBundle.message("implementation.view.title", text);
     if (myPopupRef != null) {
       final JBPopup popup = myPopupRef.get();
@@ -211,7 +214,7 @@ public class ShowImplementationsAction extends AnAction implements PopupAction {
         final ImplementationViewComponent component = (ImplementationViewComponent) ((AbstractPopup)popup).getComponent();
         ((AbstractPopup)popup).setCaption(title);
         component.update(impls, index);
-        updateInBackground(editor, element, component, title, (AbstractPopup)popup);
+        updateInBackground(editor, element, component, title, (AbstractPopup)popup, usageView);
         if (invokedByShortcut) {
           ((AbstractPopup)popup).focusPreferredComponent();
         }
@@ -242,13 +245,14 @@ public class ShowImplementationsAction extends AnAction implements PopupAction {
         .setCouldPin(new Processor<JBPopup>() {
           @Override
           public boolean process(JBPopup popup) {
-            component.showInUsageView();
+            usageView.set(component.showInUsageView());
+            popup.cancel();
             return false;
           }
         })
         .createPopup();
 
-      updateInBackground(editor, element, component, title, (AbstractPopup)popup);
+      updateInBackground(editor, element, component, title, (AbstractPopup)popup, usageView);
 
       PopupPositionManager.positionPopupInBestPosition(popup, editor, DataManager.getInstance().getDataContext());
       component.setHint(popup, title);
@@ -261,7 +265,7 @@ public class ShowImplementationsAction extends AnAction implements PopupAction {
                                   @Nullable PsiElement element,
                                   ImplementationViewComponent component,
                                   String title,
-                                  AbstractPopup popup) {
+                                  AbstractPopup popup, Ref<UsageView> usageView) {
     if (myTaskRef != null) {
       final BackgroundUpdaterTask updaterTask = myTaskRef.get();
       if (updaterTask != null) {
@@ -271,7 +275,7 @@ public class ShowImplementationsAction extends AnAction implements PopupAction {
 
     if (element == null) return; //already found
     final ImplementationsUpdaterTask task = new ImplementationsUpdaterTask(element, editor, title);
-    task.init(popup, component);
+    task.init(popup, component, usageView);
 
     myTaskRef = new WeakReference<BackgroundUpdaterTask>(task);
     ProgressManager.getInstance().run(task);
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/BackgroundUpdaterTask.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/BackgroundUpdaterTask.java
index 20075ac26341..9e76cfeb7945 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/BackgroundUpdaterTask.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/BackgroundUpdaterTask.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInsight.navigation;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.progress.PerformInBackgroundOption;
 import com.intellij.openapi.progress.ProgressIndicator;
@@ -22,8 +23,13 @@ import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopupAdapter;
 import com.intellij.openapi.ui.popup.LightweightWindowEvent;
+import com.intellij.openapi.util.Ref;
 import com.intellij.psi.PsiElement;
 import com.intellij.ui.popup.AbstractPopup;
+import com.intellij.usageView.UsageInfo;
+import com.intellij.usages.UsageInfo2UsageAdapter;
+import com.intellij.usages.UsageView;
+import com.intellij.usages.impl.UsageViewImpl;
 import com.intellij.util.Alarm;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -39,6 +45,7 @@ import java.util.List;
 public abstract class BackgroundUpdaterTask<T> extends Task.Backgroundable {
   protected AbstractPopup myPopup;
   protected T myComponent;
+  private Ref<UsageView> myUsageView;
   private final List<PsiElement> myData = new ArrayList<PsiElement>();
 
   private final Alarm myAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD);
@@ -61,9 +68,10 @@ public abstract class BackgroundUpdaterTask<T> extends Task.Backgroundable {
     super(project, title, canBeCancelled, backgroundOption);
   }
 
-  public void init(@NotNull AbstractPopup popup, T component) {
+  public void init(@NotNull AbstractPopup popup, T component, Ref<UsageView> usageView) {
     myPopup = popup;
     myComponent = component;
+    myUsageView = usageView;
 
     myPopup.addPopupListener(new JBPopupAdapter() {
       @Override
@@ -83,7 +91,17 @@ public abstract class BackgroundUpdaterTask<T> extends Task.Backgroundable {
     return canceled;
   }
 
-  public boolean updateComponent(PsiElement element, @Nullable final Comparator comparator) {
+  public boolean updateComponent(final PsiElement element, @Nullable final Comparator comparator) {
+    final UsageView view = myUsageView.get();
+    if (view != null && !((UsageViewImpl)view).isDisposed()) {
+      ApplicationManager.getApplication().runReadAction(new Runnable() {
+        public void run() {
+          view.appendUsage(new UsageInfo2UsageAdapter(new UsageInfo(element)));
+        }
+      });
+      return true;
+    }
+
     if (myCanceled) return false;
     if (myPopup.isDisposed()) return false;
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java
index 59514c711663..ca970d93e49e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java
@@ -34,6 +34,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.PopupChooserBuilder;
 import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.util.Ref;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -41,6 +42,7 @@ import com.intellij.psi.PsiNamedElement;
 import com.intellij.ui.CollectionListModel;
 import com.intellij.ui.JBListWithHintProvider;
 import com.intellij.ui.popup.AbstractPopup;
+import com.intellij.usages.UsageView;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
 import com.intellij.util.Processor;
@@ -169,6 +171,7 @@ public abstract class GotoTargetHandler implements CodeInsightActionHandler {
       }
     });
 
+    final Ref<UsageView> usageView = new Ref<UsageView>();
     final JBPopup popup = builder.
       setTitle(title).
       setItemChoosenCallback(runnable).
@@ -183,8 +186,7 @@ public abstract class GotoTargetHandler implements CodeInsightActionHandler {
       setCouldPin(new Processor<JBPopup>() {
         @Override
         public boolean process(JBPopup popup) {
-          FindUtil.showInUsageView(gotoData.source, gotoData.targets, 
-                                   getFindUsagesTitle(gotoData.source, name, gotoData.targets.length), project);
+          usageView.set(FindUtil.showInUsageView(gotoData.source, gotoData.targets, getFindUsagesTitle(gotoData.source, name, gotoData.targets.length), project));
           popup.cancel();
           return false;
         }
@@ -192,7 +194,7 @@ public abstract class GotoTargetHandler implements CodeInsightActionHandler {
       setAdText(getAdText(gotoData.source, targets.length)).
       createPopup();
     if (gotoData.listUpdaterTask != null) {
-      gotoData.listUpdaterTask.init((AbstractPopup)popup, list);
+      gotoData.listUpdaterTask.init((AbstractPopup)popup, list, usageView);
       ProgressManager.getInstance().run(gotoData.listUpdaterTask);
     }
     popup.showInBestPositionFor(editor);
diff --git a/platform/lang-impl/src/com/intellij/find/FindUtil.java b/platform/lang-impl/src/com/intellij/find/FindUtil.java
index 6425c34af124..dc8653bc95ae 100644
--- a/platform/lang-impl/src/com/intellij/find/FindUtil.java
+++ b/platform/lang-impl/src/com/intellij/find/FindUtil.java
@@ -46,6 +46,9 @@ import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.TextEditor;
 import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory;
 import com.intellij.openapi.keymap.KeymapUtil;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.JDOMUtil;
@@ -60,6 +63,7 @@ import com.intellij.psi.PsiFile;
 import com.intellij.ui.LightweightHint;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.usages.*;
+import com.intellij.usages.impl.UsageViewImpl;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -910,19 +914,36 @@ public class FindUtil {
     boolean shouldReplace(TextRange range, String replace);
   }
 
-  public static void showInUsageView(PsiElement sourceElement, PsiElement[] targets, String title, Project project) {
+  public static UsageView showInUsageView(PsiElement sourceElement, final PsiElement[] targets, String title, Project project) {
     final UsageViewPresentation presentation = new UsageViewPresentation();
     presentation.setCodeUsagesString(title);
     presentation.setTabName(title);
     presentation.setTabText(title);
-    final UsageInfo[] usages = new UsageInfo[targets.length];
-    for (int i = 0; i < targets.length; i++) {
-      usages[i] = new UsageInfo(targets[i]);
-    }
     final UsageTarget[] usageTargets =
       sourceElement == null ? UsageTarget.EMPTY_ARRAY : new UsageTarget[]{new PsiElement2UsageTargetAdapter(sourceElement)};
-    final Usage[] foundUsages = UsageInfoToUsageConverter.convert(
-      new UsageInfoToUsageConverter.TargetElementsDescriptor(targets), usages);
-    UsageViewManager.getInstance(project).showUsages(usageTargets, foundUsages, presentation);
+
+    final UsageInfoToUsageConverter.TargetElementsDescriptor targetElementsDescriptor = 
+      sourceElement != null ? new UsageInfoToUsageConverter.TargetElementsDescriptor(sourceElement)
+                            : new UsageInfoToUsageConverter.TargetElementsDescriptor(PsiElement.EMPTY_ARRAY);
+    final Usage[] usages = {UsageInfoToUsageConverter.convert(targetElementsDescriptor, new UsageInfo(targets[0]))};
+    final UsageView view =
+      UsageViewManager.getInstance(project).showUsages(usageTargets, usages, presentation);
+    ProgressManager.getInstance().run(new Task.Backgroundable(project, "Updating Usage View ...") {
+      @Override
+      public void run(@NotNull ProgressIndicator indicator) {
+        
+        for (int i = 1; i < targets.length; i++) {
+          if (((UsageViewImpl)view).isDisposed()) break;
+          final PsiElement target = targets[i];
+          ApplicationManager.getApplication().runReadAction(new Runnable() {
+            public void run() {
+              final Usage usage = UsageInfoToUsageConverter.convert(targetElementsDescriptor, new UsageInfo(target));
+              view.appendUsage(usage);
+            }
+          });
+        }
+      }
+    });
+    return view;
   }
 }
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
index b7510034f5a4..d61735b307db 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
@@ -985,6 +985,10 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
     }
   }
 
+  public boolean isDisposed() {
+    return isDisposed;
+  }
+
   private void showNode(@NotNull final UsageNode node) {
     if (!myPresentation.isDetachedMode()) {
       UIUtil.invokeLaterIfNeeded(new Runnable() {

From 7a84d8b4cd29638a387a456f82bc20089ba160a1 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Thu, 6 Dec 2012 16:27:42 +0400
Subject: [PATCH 13/23] EA-38016 No update task to handle request(s)         
 java.lang.Throwable          	at
 com.intellij.openapi.diagnostic.Logger.error(Logger.java:54)          	at
 com.intellij.openapi.vcs.changes.UpdateRequestsQueue$MyRunnable.run(UpdateRequestsQueue.java:292)

---
 .../com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java
index 970662c50653..5105a5563d09 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java
@@ -288,7 +288,7 @@ public class UpdateRequestsQueue {
             myWaitingUpdateCompletionQueue.removeAll(copy);
           }
 
-          if (! myWaitingUpdateCompletionQueue.isEmpty() && ! myRequestSubmitted) {
+          if (! myWaitingUpdateCompletionQueue.isEmpty() && ! myRequestSubmitted && ! myStopped) {
             LOG.error("No update task to handle request(s)");
           }
         }

From 36ef3cb22fb19d384cd175c3fe8e03941c11c74b Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Thu, 6 Dec 2012 16:47:06 +0400
Subject: [PATCH 14/23] IDEA-96501 Exception at opening project

---
 .../vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java
index a69b66d9e92c..f371d376ddec 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java
@@ -46,12 +46,12 @@ public class FilePathImpl implements FilePath {
   private boolean myIsDirectory;
   private final boolean myLocal;
 
-  private FilePathImpl(VirtualFile virtualParent,
+  private FilePathImpl(@NotNull VirtualFile virtualParent,
                        @NotNull String name,
                        final boolean isDirectory,
                        VirtualFile child,
                        final boolean forDeleted) {
-    this(virtualParent == null ? new File(name) : new File(new File(virtualParent.getPath()), name), isDirectory, true);
+    this(new File(virtualParent.getPath(), name), isDirectory, true);
     myVirtualParent = virtualParent;
 
     if (!forDeleted) {
@@ -88,6 +88,7 @@ public class FilePathImpl implements FilePath {
   }
   private FilePathImpl(@NotNull File file, final boolean isDirectory, boolean local) {
     myFile = file;
+    assert myFile.isAbsolute();
     myName = file.getName();
     myIsDirectory = isDirectory;
     myLocal = local;

From 4c6ae376c96687335a0959a232b0efe05fc25c7e Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Wed, 5 Dec 2012 15:20:30 +0400
Subject: [PATCH 15/23] [git] Cherry pick: use the common commit dialog.

Instead of using a custom commit executor & custom commit session, use the common commit dialog.
The problem is that the commit dialog "onOK"-procedure is asynchronous.
To fix this provide a CommitResultHandler that is called on successful or failed commit, and wait (in the GitCherryPicker) until it reports that commit has completed.
Don't show notification or report error during commit if the CommitResultHandler is set.

This fixes IDEA-84825, IDEA-88236 and is necessary for IDEA-87476.
---
 .../com/intellij/dvcs/test/MockVcsHelper.java |   6 +-
 .../openapi/vcs/AbstractVcsHelper.java        |  14 +-
 .../vcs/changes/CommitResultHandler.java      |  35 ++++
 .../vcs/changes/ChangeListManagerImpl.java    |   2 +-
 .../changes/ui/CommitChangeListDialog.java    |  32 +--
 .../openapi/vcs/changes/ui/CommitHelper.java  |  68 ++++---
 .../vcs/impl/AbstractVcsHelperImpl.java       |  13 +-
 .../history/browser/GitCherryPicker.java      | 187 +++---------------
 .../zmlx/hg4idea/test/HgMockVcsHelper.java    |   6 +-
 9 files changed, 150 insertions(+), 213 deletions(-)
 create mode 100644 platform/vcs-api/src/com/intellij/openapi/vcs/changes/CommitResultHandler.java

diff --git a/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java b/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
index 7cf6b346d536..e14bd69fe468 100644
--- a/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
+++ b/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.vcs.*;
 import com.intellij.openapi.vcs.annotate.AnnotationProvider;
 import com.intellij.openapi.vcs.annotate.FileAnnotation;
 import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.CommitExecutor;
+import com.intellij.openapi.vcs.changes.CommitResultHandler;
 import com.intellij.openapi.vcs.changes.LocalChangeList;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vcs.history.VcsHistoryProvider;
@@ -185,8 +185,8 @@ public class MockVcsHelper extends AbstractVcsHelper {
   }
 
   @Override
-  public boolean commitChanges(@NotNull List<Change> changes, @NotNull LocalChangeList initialChangeList,
-                               @NotNull String commitMessage, @Nullable CommitExecutor executor) {
+  public boolean commitChanges(@NotNull Collection<Change> changes, @NotNull LocalChangeList initialChangeList,
+                               @NotNull String commitMessage, @Nullable CommitResultHandler customResultHandler) {
     if (myCommitHandler != null) {
       return myCommitHandler.commit(commitMessage);
     }
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java
index fbdc14b28527..b90eee515c20 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.annotate.AnnotationProvider;
 import com.intellij.openapi.vcs.annotate.FileAnnotation;
 import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.CommitExecutor;
+import com.intellij.openapi.vcs.changes.CommitResultHandler;
 import com.intellij.openapi.vcs.changes.LocalChangeList;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vcs.history.VcsHistoryProvider;
@@ -167,11 +167,11 @@ public abstract class AbstractVcsHelper {
   
   
   /**
-   * Shows commit dialog, fills it with the given changes and given commit message, initially selects the given changelist.
-   * @return true if user commits the changes, and commit succeeds; false if user presses Cancel or commit fails with errors.
+   * <p>Shows commit dialog, fills it with the given changes and given commit message, initially selects the given changelist.</p>
+   * <p>Note that the method is asynchronous: it returns right after user presses "Commit" or "Cancel" and after all pre-commit handlers
+   *    have been called. It doesn't wait for commit itself to succeed or fail - for this use the {@code customResultHandler}.</p>
+   * @return true if user decides to commit the changes, false if user presses Cancel.
    */
-  public abstract boolean commitChanges(@NotNull List<Change> changes, @NotNull LocalChangeList initialChangeList,
-                                        @NotNull String commitMessage, @Nullable CommitExecutor executor);
-
-  
+  public abstract boolean commitChanges(@NotNull Collection<Change> changes, @NotNull LocalChangeList initialChangeList,
+                               @NotNull String commitMessage, @Nullable CommitResultHandler customResultHandler);
 }
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/CommitResultHandler.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/CommitResultHandler.java
new file mode 100644
index 000000000000..aaf7575de301
--- /dev/null
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/CommitResultHandler.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.vcs.changes;
+
+import com.intellij.openapi.vcs.AbstractVcsHelper;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+/**
+ * CommitResultHandler may be passed to {@link AbstractVcsHelper#commitChanges(Collection, LocalChangeList, String, CommitResultHandler)}.
+ * It is called after commit is performed: successful or failed.
+ *
+ * @author Kirill Likhodedov
+ */
+public interface CommitResultHandler {
+
+  void onSuccess(@NotNull String commitMessage);
+
+  void onFailure();
+
+}
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
index eb615cd57a33..232301901c35 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
@@ -1158,7 +1158,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
 
   private boolean doCommit(final LocalChangeList changeList, final List<Change> changes, final boolean synchronously) {
     return new CommitHelper(myProject, changeList, changes, changeList.getName(),
-                     changeList.getComment(), new ArrayList<CheckinHandler>(), false, synchronously, NullableFunction.NULL).doCommit();
+                     changeList.getComment(), new ArrayList<CheckinHandler>(), false, synchronously, NullableFunction.NULL, null).doCommit();
   }
 
   public void commitChangesSynchronously(LocalChangeList changeList, List<Change> changes) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
index 065b05204d95..561ec3170e12 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
@@ -111,6 +111,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
   private final ZipperUpdater myZipperUpdater;
   private final Runnable myRefreshDetails;
   private CommitAction myCommitAction;
+  @Nullable private CommitResultHandler myResultHandler;
 
   private static class MyUpdateButtonsRunnable implements Runnable {
     private CommitChangeListDialog myDialog;
@@ -139,7 +140,8 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
   private final MyUpdateButtonsRunnable myUpdateButtonsRunnable = new MyUpdateButtonsRunnable(this);
 
   private static boolean commit(final Project project, final List<Change> changes, final LocalChangeList initialSelection,
-                             final List<CommitExecutor> executors, final boolean showVcsCommit, final String comment) {
+                                final List<CommitExecutor> executors, final boolean showVcsCommit, final String comment,
+                                @Nullable CommitResultHandler customResultHandler) {
     final AbstractVcs[] allActiveVcss = ProjectLevelVcsManager.getInstance(project).getAllActiveVcss();
     final List<VcsCheckinHandlerFactory> factoryList =
       CheckinHandlersManager.getInstance().getMatchingVcsFactories(Arrays.<AbstractVcs>asList(allActiveVcss));
@@ -155,7 +157,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
     final ArrayList<LocalChangeList> changeLists = new ArrayList<LocalChangeList>(manager.getChangeListsCopy());
     CommitChangeListDialog dialog =
       new CommitChangeListDialog(project, changes, initialSelection, executors, showVcsCommit, defaultList, changeLists, null, false,
-                                 comment);
+                                 comment, customResultHandler);
     if (!ApplicationManager.getApplication().isUnitTestMode()) {
       dialog.show();
     }
@@ -179,10 +181,10 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
   public static boolean commitChanges(final Project project, final Collection<Change> changes, final LocalChangeList initialSelection,
                                       @Nullable final CommitExecutor executor, final String comment) {
     if (executor == null) {
-      return commitChanges(project, changes, initialSelection, collectExecutors(project, changes), true, comment);
+      return commitChanges(project, changes, initialSelection, collectExecutors(project, changes), true, comment, null);
     }
     else {
-      return commitChanges(project, changes, initialSelection, Collections.singletonList(executor), false, comment);
+      return commitChanges(project, changes, initialSelection, Collections.singletonList(executor), false, comment, null);
     }
   }
 
@@ -197,22 +199,29 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
     return result;
   }
 
+  /**
+   * Shows the commit dialog, and performs the selected action: commit, commit & push, create patch, etc.
+   * @param customResultHandler If this is not null, after commit is completed, custom result handler is called instead of
+   *                            showing the default notification in case of commit or failure.
+   * @return true if user agreed to commit, false if he pressed "Cancel".
+   */
   public static boolean commitChanges(final Project project, final Collection<Change> changes, final LocalChangeList initialSelection,
-                                   final List<CommitExecutor> executors, final boolean showVcsCommit, final String comment) {
+                                      final List<CommitExecutor> executors, final boolean showVcsCommit, final String comment,
+                                      @Nullable CommitResultHandler customResultHandler) {
     if (changes.isEmpty() && !ApplicationManager.getApplication().isUnitTestMode()) {
       Messages.showInfoMessage(project, VcsBundle.message("commit.dialog.no.changes.detected.text") ,
                                  VcsBundle.message("commit.dialog.no.changes.detected.title"));
       return false;
     }
 
-    return commit(project, new ArrayList<Change>(changes), initialSelection, executors, showVcsCommit, comment);
+    return commit(project, new ArrayList<Change>(changes), initialSelection, executors, showVcsCommit, comment, customResultHandler);
   }
 
   public static void commitAlienChanges(final Project project, final List<Change> changes, final AbstractVcs vcs,
                                         final String changelistName, final String comment) {
     final LocalChangeList lcl = new AlienLocalChangeList(changes, changelistName);
     new CommitChangeListDialog(project, changes, null, null, true, AlienLocalChangeList.DEFAULT_ALIEN, Collections.singletonList(lcl), vcs,
-                               true, comment).show();
+                               true, comment, null).show();
   }
 
   private CommitChangeListDialog(final Project project,
@@ -221,13 +230,14 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
                                  final List<CommitExecutor> executors,
                                  final boolean showVcsCommit, final LocalChangeList defaultChangeList,
                                  final List<LocalChangeList> changeLists, final AbstractVcs singleVcs, final boolean isAlien,
-                                 final String comment) {
+                                 final String comment, @Nullable CommitResultHandler customResultHandler) {
     super(project, true);
     myCommitContext = new CommitContext();
     myProject = project;
     myExecutors = executors;
     myShowVcsCommit = showVcsCommit;
     myVcs = singleVcs;
+    myResultHandler = customResultHandler;
     myListComments = new HashMap<String, String>();
     myAdditionalData = new PseudoMap<Object, Object>();
     myDiffDetails = new ShortDiffDetails(myProject, new Getter<Change[]>() {
@@ -570,7 +580,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
           runBeforeCommitHandlers(new Runnable() {
               public void run() {
                 CommitChangeListDialog.super.doOKAction();
-                doCommit();
+                doCommit(myResultHandler);
               }
             }, null);
 
@@ -925,7 +935,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
     super.doCancelAction();
   }
 
-  private void doCommit() {
+  private void doCommit(@Nullable CommitResultHandler customResultHandler) {
     final CommitHelper helper = new CommitHelper(
       myProject,
       myBrowser.getSelectedChangeList(),
@@ -933,7 +943,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
       myActionName,
       getCommitMessage(),
       myHandlers,
-      myAllOfDefaultChangeListChangesIncluded, false, myAdditionalData);
+      myAllOfDefaultChangeListChangesIncluded, false, myAdditionalData, customResultHandler);
 
     if (myIsAlien) {
       helper.doAlienCommit(myVcs);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
index e84293f2bbee..df86e92215db 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
@@ -44,6 +44,7 @@ import com.intellij.util.NullableFunction;
 import com.intellij.util.WaitForProgressToShow;
 import com.intellij.util.ui.ConfirmationDialog;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -66,6 +67,7 @@ public class CommitHelper {
   private final boolean myAllOfDefaultChangeListChangesIncluded;
   private final boolean myForceSyncCommit;
   private final NullableFunction<Object, Object> myAdditionalData;
+  @Nullable private final CommitResultHandler myCustomResultHandler;
   private final List<Document> myCommittingDocuments = new ArrayList<Document>();
   private final VcsConfiguration myConfiguration;
   private final VcsDirtyScopeManager myDirtyScopeManager;
@@ -78,7 +80,8 @@ public class CommitHelper {
                       final String commitMessage,
                       final List<CheckinHandler> handlers,
                       final boolean allOfDefaultChangeListChangesIncluded,
-                      final boolean synchronously, final NullableFunction<Object, Object> additionalDataHolder) {
+                      final boolean synchronously, final NullableFunction<Object, Object> additionalDataHolder,
+                      @Nullable CommitResultHandler customResultHandler) {
     myProject = project;
     myChangeList = changeList;
     myIncludedChanges = includedChanges;
@@ -88,6 +91,7 @@ public class CommitHelper {
     myAllOfDefaultChangeListChangesIncluded = allOfDefaultChangeListChangesIncluded;
     myForceSyncCommit = synchronously;
     myAdditionalData = additionalDataHolder;
+    myCustomResultHandler = customResultHandler;
     myConfiguration = VcsConfiguration.getInstance(myProject);
     myDirtyScopeManager = VcsDirtyScopeManager.getInstance(myProject);
     myFeedback = new HashSet<String>();
@@ -133,8 +137,11 @@ public class CommitHelper {
 
           @Override
           public NotificationInfo notifyFinished() {
-            String text = reportSuccess(processor);
-            return new NotificationInfo("VCS Commit", "VCS Commit Finished", text, true);
+            if (myCustomResultHandler == null) {
+              String text = reportSuccess(processor);
+              return new NotificationInfo("VCS Commit", "VCS Commit Finished", text, true);
+            }
+            return null;
           }
         };
       ProgressManager.getInstance().run(task);
@@ -511,6 +518,9 @@ public class CommitHelper {
       }
 
       processor.afterSuccessfulCheckIn();
+      if (myCustomResultHandler != null) {
+        myCustomResultHandler.onSuccess(myCommitMessage);
+      }
     }
     else {
       for (CheckinHandler handler : myHandlers) {
@@ -523,28 +533,38 @@ public class CommitHelper {
       if (indicator != null) {
         indicator.setText(VcsBundle.message("commit.dialog.completed.successfully"));
       }
-    } else {
-      WaitForProgressToShow.runOrInvokeLaterAboveProgress(new Runnable() {
-          public void run() {
-            final String message;
-            if (errorsSize > 0 && warningsSize > 0) {
-              message = VcsBundle.message("message.text.commit.failed.with.errors.and.warnings");
-            }
-            else if (errorsSize > 0) {
-              message = VcsBundle.message("message.text.commit.failed.with.errors");
-            }
-            else {
-              message = VcsBundle.message("message.text.commit.finished.with.warnings");
-            }
-            //new VcsBalloonProblemNotifier(myProject, message, MessageType.ERROR).run();
-            Messages.showErrorDialog(message, VcsBundle.message("message.title.commit"));
-
-            if (errorsSize > 0) {
-              processor.afterFailedCheckIn();
-            }
-          }
-        }, null, myProject);
     }
+    else {
+      if (myCustomResultHandler == null) {
+        showErrorDialogAndMoveToAnotherList(processor, errorsSize, warningsSize);
+      }
+      else {
+        myCustomResultHandler.onFailure();
+      }
+    }
+  }
+
+  private void showErrorDialogAndMoveToAnotherList(final GeneralCommitProcessor processor, final int errorsSize, final int warningsSize) {
+    WaitForProgressToShow.runOrInvokeLaterAboveProgress(new Runnable() {
+      public void run() {
+        final String message;
+        if (errorsSize > 0 && warningsSize > 0) {
+          message = VcsBundle.message("message.text.commit.failed.with.errors.and.warnings");
+        }
+        else if (errorsSize > 0) {
+          message = VcsBundle.message("message.text.commit.failed.with.errors");
+        }
+        else {
+          message = VcsBundle.message("message.text.commit.finished.with.warnings");
+        }
+        //new VcsBalloonProblemNotifier(myProject, message, MessageType.ERROR).run();
+        Messages.showErrorDialog(message, VcsBundle.message("message.title.commit"));
+
+        if (errorsSize > 0) {
+          processor.afterFailedCheckIn();
+        }
+      }
+    }, null, myProject);
   }
 
   public static void moveToFailedList(final ChangeList changeList,
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
index 1cbbae8458f8..2ee68e92031c 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
@@ -47,10 +47,7 @@ import com.intellij.openapi.vcs.*;
 import com.intellij.openapi.vcs.actions.AnnotateToggleAction;
 import com.intellij.openapi.vcs.annotate.AnnotationProvider;
 import com.intellij.openapi.vcs.annotate.FileAnnotation;
-import com.intellij.openapi.vcs.changes.BackgroundFromStartOption;
-import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.CommitExecutor;
-import com.intellij.openapi.vcs.changes.LocalChangeList;
+import com.intellij.openapi.vcs.changes.*;
 import com.intellij.openapi.vcs.changes.committed.*;
 import com.intellij.openapi.vcs.changes.ui.*;
 import com.intellij.openapi.vcs.history.*;
@@ -225,9 +222,11 @@ public class AbstractVcsHelperImpl extends AbstractVcsHelper {
   }
   
   @Override
-  public boolean commitChanges(@NotNull List<Change> changes, @NotNull LocalChangeList initialChangeList,
-                               @NotNull String commitMessage, @Nullable CommitExecutor executor) {
-    return CommitChangeListDialog.commitChanges(myProject, changes, initialChangeList, executor, commitMessage);
+  public boolean commitChanges(@NotNull Collection<Change> changes, @NotNull LocalChangeList initialChangeList,
+                               @NotNull String commitMessage, @Nullable CommitResultHandler customResultHandler) {
+      return CommitChangeListDialog.commitChanges(myProject, changes, initialChangeList,
+                                                  CommitChangeListDialog.collectExecutors(myProject, changes), true, commitMessage,
+                                                  customResultHandler);
   }
 
   private static void addDirectMessages(VcsErrorViewPanel vcsErrorViewPanel, List<VcsException> abstractVcsExceptions) {
diff --git a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
index c13413180501..66728c5a2354 100644
--- a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
+++ b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
@@ -18,24 +18,17 @@ 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;
-import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.vcs.FilePath;
-import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.*;
-import com.intellij.openapi.vcs.changes.ui.CommitHelper;
 import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.openapi.vcs.merge.MergeDialogCustomizer;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Consumer;
-import com.intellij.util.WaitForProgressToShow;
 import git4idea.GitPlatformFacade;
-import git4idea.checkin.GitCheckinEnvironment;
 import git4idea.commands.Git;
 import git4idea.commands.GitCommandResult;
 import git4idea.commands.GitSimpleEventDetector;
@@ -43,15 +36,13 @@ import git4idea.commands.GitUntrackedFilesOverwrittenByOperationDetector;
 import git4idea.merge.GitConflictResolver;
 import git4idea.repo.GitRepository;
 import git4idea.util.UntrackedFilesNotifier;
-import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
 import javax.swing.event.HyperlinkEvent;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -246,26 +237,44 @@ public class GitCherryPicker {
   private boolean showCommitDialog(@NotNull final GitRepository repository, @NotNull final GitCommitWrapper commit,
                                    @NotNull final LocalChangeList changeList, @NotNull final String commitMessage) {
     final AtomicBoolean commitSucceeded = new AtomicBoolean();
+    final Semaphore sem = new Semaphore(0);
     myPlatformFacade.invokeAndWait(new Runnable() {
       @Override
       public void run() {
         cancelCherryPick(repository);
         List<Change> changes = commit.getCommit().getChanges();
-        CherryPickCommitExecutor executor = new CherryPickCommitExecutor(myProject, myPlatformFacade, changes, commitMessage);
-        boolean commitNotCancelled = myPlatformFacade.getVcsHelper(myProject).commitChanges(changes, changeList, commitMessage, executor);
-        boolean success = commitNotCancelled && !executor.hasCommitFailed();
-        if (success) {
-          commit.setActualSubject(getSubjectFromCommitMessage(executor.getActualCommitMessage()));
+        boolean commitNotCancelled = myPlatformFacade.getVcsHelper(myProject).commitChanges(changes, changeList, commitMessage,
+                                                                                            new CommitResultHandler() {
+          @Override
+          public void onSuccess(@NotNull String commitMessage) {
+            commit.setActualSubject(commitMessage);
+            commitSucceeded.set(true);
+            sem.release();
+          }
+
+          @Override
+          public void onFailure() {
+            commitSucceeded.set(false);
+            sem.release();
+          }
+        });
+
+        if (!commitNotCancelled) {
+          sem.release();
+          commitSucceeded.set(false);
         }
-        commitSucceeded.set(success);
       }
     }, ModalityState.NON_MODAL);
-    return commitSucceeded.get();
-  }
 
-  private static String getSubjectFromCommitMessage(String commitMessage) {
-    int newLine = commitMessage.indexOf("\n");
-    return newLine < 0 ? commitMessage : commitMessage.substring(0, newLine);
+    // need additional waiting, because commitChanges is asynchronous
+    try {
+      sem.acquire();
+    }
+    catch (InterruptedException e) {
+      LOG.error(e);
+      return false;
+    }
+    return commitSucceeded.get();
   }
 
   /**
@@ -451,142 +460,6 @@ public class GitCherryPicker {
     }
   }
 
-  /*
-    Commit procedure is overridden by the executor with its own CommitSession.
-    The reason of that is the asynchronous nature of the CommitHelper: it returns, we continue cherry-picking and occasionally pick
-    the next commit in the queue, and only then Git is called for commit. Thus it commits two cherry-picks at once, which is wrong.
-
-    Here we call GitCheckinEnvironment manually
-   */
-  private static class CherryPickCommitExecutor implements CommitExecutor {
-
-    @NotNull private final Project myProject;
-    @NotNull private final GitPlatformFacade myPlatformFacade;
-    @NotNull private final List<Change> myChanges;
-    @NotNull private final String myOriginalCommitMessage;
-    private boolean myCommitFailed;
-
-    @Nullable private CherryPickCommitExecutor.CherryPickCommitSession myCommitSession;
-
-    CherryPickCommitExecutor(@NotNull Project project, @NotNull GitPlatformFacade platformFacade,
-                             @NotNull List<Change> changes, @NotNull String originalCommitMessage) {
-      myProject = project;
-      myPlatformFacade = platformFacade;
-      myChanges = changes;
-      myOriginalCommitMessage = originalCommitMessage;
-    }
-
-    @Nls
-    @Override
-    public String getActionText() {
-      return "Commit";
-    }
-
-    @NotNull
-    @Override
-    public CommitSession createCommitSession() {
-      myCommitSession = new CherryPickCommitSession();
-      return myCommitSession;
-    }
-
-    public boolean hasCommitFailed() {
-      return myCommitFailed;
-    }
-
-    @NotNull
-    public String getActualCommitMessage() {
-      return myCommitSession == null ? myOriginalCommitMessage : myCommitSession.getActualCommitMessage();
-    }
-
-    private class CherryPickCommitSession implements CommitSession {
-      private String myActualCommitMessage;
-
-      @Override
-      public JComponent getAdditionalConfigurationUI() {
-        return null;
-      }
-
-      @Override
-      public JComponent getAdditionalConfigurationUI(Collection<Change> changes, String commitMessage) {
-        return null;
-      }
-
-      @Override
-      public boolean canExecute(Collection<Change> changes, String commitMessage) {
-        return true;
-      }
-
-      @Override
-      public void execute(Collection<Change> changes, String commitMessage) {
-        final Collection<Document> committingDocs = markCommittingDocs();
-        try {
-          GitCheckinEnvironment ce = ServiceManager.getService(myProject, GitCheckinEnvironment.class);
-          try {
-            ce.reset();
-            List<VcsException> exceptions = ce.commit(myChanges, commitMessage);
-            VcsDirtyScopeManager.getInstance(myProject).filePathsDirty(ChangesUtil.getPaths(myChanges), null);
-            if (exceptions != null && !exceptions.isEmpty()) {
-              VcsException exception = exceptions.get(0);
-              handleError(exception);
-            }
-            myActualCommitMessage = commitMessage;
-          }
-          catch (Throwable e) {
-            LOG.error(e);
-            handleError(e);
-          }
-        }
-        finally {
-          unmarkCommittingDocs(committingDocs);
-        }
-      }
-
-      private void handleError(Throwable exception) {
-        myCommitFailed = true;
-        final String errorMessage = exception.getMessage();
-        WaitForProgressToShow.runOrInvokeLaterAboveProgress(new Runnable() {
-          public void run() {
-            Messages.showErrorDialog(myProject, errorMessage, "Commit Failed");
-          }
-        }, null, myProject);
-      }
-
-      @Override
-      public void executionCanceled() {
-      }
-
-      @Override
-      public String getHelpId() {
-        return null;
-      }
-
-      private void unmarkCommittingDocs(final Collection<Document> committingDocs) {
-        myPlatformFacade.runReadAction(new Runnable() {
-          @Override
-          public void run() {
-            CommitHelper.unmarkCommittingDocuments(committingDocs);
-          }
-        });
-      }
-
-      @NotNull
-      private Collection<Document> markCommittingDocs() {
-        final Collection<Document> committingDocs = new ArrayList<Document>();
-        myPlatformFacade.runReadAction(new Runnable() {
-          @Override
-          public void run() {
-            committingDocs.addAll(CommitHelper.markCommittingDocuments(myProject, myChanges));
-          }
-        });
-        return committingDocs;
-      }
-
-      public String getActualCommitMessage() {
-        return myActualCommitMessage;
-      }
-    }
-  }
-
   /**
    * This class is needed to hold both the original GitCommit, and the commit message which could be changed by the user.
    * Only the subject of the commit message is needed.
diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMockVcsHelper.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMockVcsHelper.java
index 4c75d27c207c..c8ffe9e6b71d 100644
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMockVcsHelper.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMockVcsHelper.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.vcs.*;
 import com.intellij.openapi.vcs.annotate.AnnotationProvider;
 import com.intellij.openapi.vcs.annotate.FileAnnotation;
 import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.CommitExecutor;
+import com.intellij.openapi.vcs.changes.CommitResultHandler;
 import com.intellij.openapi.vcs.changes.LocalChangeList;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vcs.history.VcsHistoryProvider;
@@ -171,8 +171,8 @@ public class HgMockVcsHelper extends AbstractVcsHelper {
   }
 
   @Override
-  public boolean commitChanges(@NotNull List<Change> changes, @NotNull LocalChangeList initialChangeList,
-                               @NotNull String commitMessage, @Nullable CommitExecutor executor) {
+  public boolean commitChanges(@NotNull Collection<Change> changes, @NotNull LocalChangeList initialChangeList,
+                               @NotNull String commitMessage, @Nullable CommitResultHandler customResultHandler) {
     throw new UnsupportedOperationException();
   }
 

From 12613503fa1fc32a5c47debd57ba1ba054773069 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Wed, 5 Dec 2012 15:36:05 +0400
Subject: [PATCH 16/23] [git] cherry-pick: release semaphore if exception is
 thrown.

---
 .../history/browser/GitCherryPicker.java      | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
index 66728c5a2354..93abb620c5d4 100644
--- a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
+++ b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
@@ -241,27 +241,33 @@ public class GitCherryPicker {
     myPlatformFacade.invokeAndWait(new Runnable() {
       @Override
       public void run() {
-        cancelCherryPick(repository);
-        List<Change> changes = commit.getCommit().getChanges();
-        boolean commitNotCancelled = myPlatformFacade.getVcsHelper(myProject).commitChanges(changes, changeList, commitMessage,
-                                                                                            new CommitResultHandler() {
-          @Override
-          public void onSuccess(@NotNull String commitMessage) {
-            commit.setActualSubject(commitMessage);
-            commitSucceeded.set(true);
-            sem.release();
-          }
+        try {
+          cancelCherryPick(repository);
+          List<Change> changes = commit.getCommit().getChanges();
+          boolean commitNotCancelled = myPlatformFacade.getVcsHelper(myProject).commitChanges(changes, changeList, commitMessage,
+                                                                                              new CommitResultHandler() {
+            @Override
+            public void onSuccess(@NotNull String commitMessage) {
+              commit.setActualSubject(commitMessage);
+              commitSucceeded.set(true);
+              sem.release();
+            }
 
-          @Override
-          public void onFailure() {
+            @Override
+            public void onFailure() {
+              commitSucceeded.set(false);
+              sem.release();
+            }
+          });
+
+          if (!commitNotCancelled) {
             commitSucceeded.set(false);
             sem.release();
           }
-        });
-
-        if (!commitNotCancelled) {
-          sem.release();
+        } catch (Throwable t) {
+          LOG.error(t);
           commitSucceeded.set(false);
+          sem.release();
         }
       }
     }, ModalityState.NON_MODAL);

From 25a7e4c52f350ad999b05a2661c4f3330d48cdb4 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 6 Dec 2012 13:13:09 +0400
Subject: [PATCH 17/23] [git] IDEA-87476 Persist author on cherry-pick.

* Let LocalChangeList have arbitrary data associated with it.
* When a changelist is created via ChangeListManager#addChangeList, only a copy is returned, therefore there is no way to set data after changelist has been created. To solve this introduce addChangeList extension that accepts the data parameter.
* On cherry-pick pass the GitCommit being cherry-picked as a data to the changelist.
* When displaying the commit dialog get the author from the provided data (GitCheckinEnvironment) and set it to the combobox.
* Fix GitCheckinOptions#saveState to take the value from the editor instead of the list. This should solve IDEA-81181 as well.
* Remove GitChangeList - not used.
---
 .../testFramework/vcs/MockChangeList.java     |  7 ++
 .../vcs/MockChangeListManager.java            |  4 +
 .../openapi/vcs/changes/LocalChangeList.java  |  6 ++
 .../vcs/changes/ChangeListManagerEx.java      |  3 +
 .../vcs/changes/ChangeListManagerImpl.java    | 10 ++-
 .../ChangeListManagerSerialization.java       |  3 +-
 .../openapi/vcs/changes/ChangeListWorker.java | 10 ++-
 .../changes/ChangeListsWriteOperations.java   |  2 +-
 .../vcs/changes/LocalChangeListImpl.java      | 12 +++
 .../openapi/vcs/changes/Modifier.java         |  4 +-
 .../openapi/vcs/changes/local/AddList.java    |  6 +-
 .../vcs/changes/ui/AlienLocalChangeList.java  |  7 ++
 .../src/git4idea/changes/GitChangeList.java   | 74 -------------------
 .../checkin/GitCheckinEnvironment.java        | 21 ++++--
 .../history/browser/GitCherryPicker.java      | 11 +--
 15 files changed, 83 insertions(+), 97 deletions(-)
 delete mode 100644 plugins/git4idea/src/git4idea/changes/GitChangeList.java

diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeList.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeList.java
index f1242a36fa58..c2fb7749ea35 100644
--- a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeList.java
+++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeList.java
@@ -18,6 +18,7 @@ package com.intellij.testFramework.vcs;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.LocalChangeList;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -79,6 +80,12 @@ public class MockChangeList extends LocalChangeList {
     throw new UnsupportedOperationException();
   }
 
+  @Nullable
+  @Override
+  public Object getData() {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public LocalChangeList copy() {
     throw new UnsupportedOperationException();
diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java
index 8514ec50d46a..470b3ccbc155 100644
--- a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java
+++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java
@@ -365,4 +365,8 @@ public class MockChangeListManager extends ChangeListManagerEx {
   public void freezeImmediately(@Nullable String reason) {
   }
 
+  @Override
+  public LocalChangeList addChangeList(@NotNull String name, @Nullable String comment, @Nullable Object data) {
+    return addChangeList(name, comment);
+  }
 }
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java
index fbb3cfbf6302..002c0163321c 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java
@@ -63,6 +63,12 @@ public abstract class LocalChangeList implements Cloneable, ChangeList {
 
   public abstract void setReadOnly(boolean isReadOnly);
 
+  /**
+   * Get additional data associated with this changelist.
+   */
+  @Nullable
+  public abstract Object getData();
+
   public abstract LocalChangeList copy();
 
   public boolean hasDefaultName() {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerEx.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerEx.java
index b95b94cf323e..bab36f26697b 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerEx.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerEx.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.openapi.vcs.changes;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
@@ -31,4 +32,6 @@ public abstract class ChangeListManagerEx extends ChangeListManager {
 
 
   public abstract void freezeImmediately(@Nullable String reason);
+
+  public abstract LocalChangeList addChangeList(@NotNull String name, @Nullable final String comment, @Nullable Object data);
 }
\ No newline at end of file
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
index 232301901c35..d34ae8db6eb0 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
@@ -230,7 +230,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
       public void run() {
         synchronized (myDataLock) {
           if (myWorker.isEmpty()) {
-            final LocalChangeList list = myWorker.addChangeList(VcsBundle.message("changes.default.changlist.name"), null);
+            final LocalChangeList list = myWorker.addChangeList(VcsBundle.message("changes.default.changlist.name"), null, null);
             setDefaultChangeList(list);
 
             if (myIgnoredIdeaLevel.isEmpty()) {
@@ -829,11 +829,16 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
   }
 
   public LocalChangeList addChangeList(@NotNull final String name, @Nullable final String comment) {
+    return addChangeList(name, comment, null);
+  }
+
+  @Override
+  public LocalChangeList addChangeList(@NotNull final String name, @Nullable final String comment, @Nullable final Object data) {
     return ApplicationManager.getApplication().runReadAction(new Computable<LocalChangeList>() {
       @Override
       public LocalChangeList compute() {
         synchronized (myDataLock) {
-          final LocalChangeList changeList = myModifier.addChangeList(name, comment);
+          final LocalChangeList changeList = myModifier.addChangeList(name, comment, data);
           myChangesViewManager.scheduleRefresh();
           return changeList;
         }
@@ -841,6 +846,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
     });
   }
 
+
   public void removeChangeList(final String name) {
     ApplicationManager.getApplication().runReadAction(new Runnable() {
       @Override
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java
index 2a4ee9a8d071..71e271d07a38 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java
@@ -70,7 +70,8 @@ class ChangeListManagerSerialization {
     final String changeListName = listNode.getAttributeValue(ATT_NAME);
     LocalChangeList list = myWorker.getCopyByName(changeListName);
     if (list == null) {
-      list = myWorker.addChangeList(listNode.getAttributeValue(ATT_ID), changeListName, listNode.getAttributeValue(ATT_COMMENT), false);
+      list = myWorker.addChangeList(listNode.getAttributeValue(ATT_ID), changeListName, listNode.getAttributeValue(ATT_COMMENT), false,
+                                    null);
     }
     //noinspection unchecked
     final List<Element> changeNodes = (List<Element>)listNode.getChildren(NODE_CHANGE);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
index 350a4e7ef77e..2082443edc24 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
@@ -198,14 +198,16 @@ public class ChangeListWorker implements ChangeListsWriteOperations {
     return list != null;
   }
 
-  public LocalChangeList addChangeList(@NotNull final String name, @Nullable final String description) {
-    return addChangeList(null, name, description, false);
+  public LocalChangeList addChangeList(@NotNull final String name, @Nullable final String comment, @Nullable Object data) {
+    return addChangeList(null, name, comment, false, data);
   }
 
-  LocalChangeList addChangeList(String id, @NotNull final String name, @Nullable final String description, final boolean inUpdate) {
+  LocalChangeList addChangeList(String id, @NotNull final String name, @Nullable final String description, final boolean inUpdate,
+                                @Nullable Object data) {
     final boolean contains = myMap.containsKey(name);
     LOG.assertTrue(! contains, "Attempt to create duplicate changelist " + name);
     final LocalChangeListImpl newList = (LocalChangeListImpl) LocalChangeList.createEmptyChangeList(myProject, name);
+    newList.setData(data);
 
     if (description != null) {
       newList.setCommentImpl(description);
@@ -751,7 +753,7 @@ public class ChangeListWorker implements ChangeListsWriteOperations {
     }
 
     public LocalChangeList addChangeList(final String name, final String comment) {
-      return myWorker.addChangeList(null, name, comment, true);
+      return myWorker.addChangeList(null, name, comment, true, null);
     }
 
     public LocalChangeList findOrCreateList(final String name, final String comment) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsWriteOperations.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsWriteOperations.java
index d7caa4f60cb0..2256393ce7d5 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsWriteOperations.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsWriteOperations.java
@@ -23,7 +23,7 @@ public interface ChangeListsWriteOperations {
   @Nullable
   String setDefault(String name);
   boolean setReadOnly(String name, boolean value);
-  LocalChangeList addChangeList(@NotNull String name, @Nullable String description);
+  LocalChangeList addChangeList(@NotNull String name, @Nullable String comment, @Nullable Object data);
   boolean removeChangeList(@NotNull String name);
   @Nullable
   MultiMap<LocalChangeList, Change> moveChangesTo(String name, Change[] changes);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java
index ab74f53e7856..9be47384272b 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java
@@ -29,6 +29,7 @@ public class LocalChangeListImpl extends LocalChangeList {
   private String myId;
   @NotNull private String myName;
   private String myComment = "";
+  @Nullable private Object myData;
 
   private boolean myIsDefault = false;
   private boolean myIsReadOnly = false;
@@ -116,6 +117,16 @@ public class LocalChangeListImpl extends LocalChangeList {
     myIsReadOnly = isReadOnly;
   }
 
+  void setData(@Nullable Object data) {
+    myData = data;
+  }
+
+  @Nullable
+  @Override
+  public Object getData() {
+    return myData;
+  }
+
   void addChange(Change change) {
     if (ChangeListManagerImpl.DEBUG) {
       ChangeListManagerImpl.log("LocalChangeListImpl.addChange: this = " + this + ", change = " + change);
@@ -260,6 +271,7 @@ public class LocalChangeListImpl extends LocalChangeList {
     copy.myComment = myComment;
     copy.myIsDefault = myIsDefault;
     copy.myIsReadOnly = myIsReadOnly;
+    copy.myData = myData;
 
     if (myChanges != null) {
       copy.myChanges = new HashSet<Change>(myChanges);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/Modifier.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/Modifier.java
index ded8c2013286..de2cb4003360 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/Modifier.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/Modifier.java
@@ -39,8 +39,8 @@ public class Modifier implements ChangeListsWriteOperations {
     myCommandQueue = new LinkedList<ChangeListCommand>();
   }
 
-  public LocalChangeList addChangeList(@NotNull final String name, @Nullable final String comment) {
-    final AddList command = new AddList(name, comment);
+  public LocalChangeList addChangeList(@NotNull final String name, @Nullable final String comment, @Nullable Object data) {
+    final AddList command = new AddList(name, comment, data);
     impl(command);
     return command.getNewListCopy();
   }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/local/AddList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/local/AddList.java
index fc4ee4e530df..5be08d54c56a 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/local/AddList.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/local/AddList.java
@@ -25,17 +25,19 @@ import org.jetbrains.annotations.Nullable;
 public class AddList implements ChangeListCommand {
   @NotNull private final String myName;
   @Nullable private final String myComment;
+  @Nullable private final Object myData;
 
   private LocalChangeList myNewListCopy;
 
-  public AddList(@NotNull final String name, @Nullable final String comment) {
+  public AddList(@NotNull final String name, @Nullable final String comment, @Nullable Object data) {
     myName = name;
     myComment = comment;
+    myData = data;
   }
 
   public void apply(final ChangeListWorker worker) {
     if (! worker.findListByName(myName)) {
-      myNewListCopy = worker.addChangeList(myName, myComment);
+      myNewListCopy = worker.addChangeList(myName, myComment, myData);
     } else {
       worker.editComment(myName, myComment);
       myNewListCopy = worker.getCopyByName(myName);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/AlienLocalChangeList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/AlienLocalChangeList.java
index cefeb54a9da1..18130b616ca8 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/AlienLocalChangeList.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/AlienLocalChangeList.java
@@ -18,6 +18,7 @@ package com.intellij.openapi.vcs.changes.ui;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.LocalChangeList;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -67,6 +68,12 @@ public class AlienLocalChangeList extends LocalChangeList {
     throw new UnsupportedOperationException();
   }
 
+  @Nullable
+  @Override
+  public Object getData() {
+    throw new UnsupportedOperationException();
+  }
+
   public LocalChangeList copy() {
     throw new UnsupportedOperationException();
   }
diff --git a/plugins/git4idea/src/git4idea/changes/GitChangeList.java b/plugins/git4idea/src/git4idea/changes/GitChangeList.java
deleted file mode 100644
index 61452047d3ee..000000000000
--- a/plugins/git4idea/src/git4idea/changes/GitChangeList.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2000-2009 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package git4idea.changes;
-
-import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.LocalChangeList;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-
-/**
- * Git change list
- */
-public class GitChangeList extends LocalChangeList {
-  private String name;
-  private String comment;
-  private final Collection<Change> changes;
-
-  public GitChangeList(@NotNull String name, String comment, Collection<Change> changes) {
-    super();
-    setName(name);
-    setComment(comment);
-    this.changes = changes;
-  }
-
-  @NotNull
-  public String getName() {
-    return name;
-  }
-
-  public void setName(@NotNull String name) {
-    this.name = name;
-  }
-
-  public String getComment() {
-    return comment;
-  }
-
-  public void setComment(String comment) {
-    this.comment = comment;
-  }
-
-  public boolean isDefault() {
-    return true;
-  }
-
-  public boolean isReadOnly() {
-    return true;
-  }
-
-  public void setReadOnly(boolean isReadOnly) {
-  }
-
-  public Collection<Change> getChanges() {
-    return changes;
-  }
-
-  public LocalChangeList copy() {
-    return new GitChangeList(name, comment, changes);
-  }
-}
diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
index 6bfeb56dd7d4..91fb4ea99c2b 100644
--- a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
+++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
@@ -25,10 +25,8 @@ import com.intellij.openapi.vcs.CheckinProjectPanel;
 import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.ObjectsConvertor;
 import com.intellij.openapi.vcs.VcsException;
-import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.ChangeList;
-import com.intellij.openapi.vcs.changes.ContentRevision;
-import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
+import com.intellij.openapi.vcs.changes.*;
+import com.intellij.openapi.vcs.checkin.CheckinChangeListSpecificComponent;
 import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
 import com.intellij.openapi.vcs.ui.RefreshableOnComponent;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -49,6 +47,7 @@ import git4idea.commands.GitSimpleHandler;
 import git4idea.config.GitConfigUtil;
 import git4idea.config.GitVcsSettings;
 import git4idea.history.NewGitUsersComponent;
+import git4idea.history.browser.GitCommit;
 import git4idea.i18n.GitBundle;
 import git4idea.push.GitPusher;
 import git4idea.repo.GitRepositoryFiles;
@@ -564,7 +563,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
   /**
    * Checkin options for git
    */
-  private class GitCheckinOptions implements RefreshableOnComponent {
+  private class GitCheckinOptions implements CheckinChangeListSpecificComponent {
     /**
      * A container panel
      */
@@ -661,7 +660,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
      * {@inheritDoc}
      */
     public void saveState() {
-      String author = (String)myAuthor.getSelectedItem();
+      String author = (String)myAuthor.getEditor().getItem();
       myNextCommitAuthor = author.length() == 0 ? null : author;
       if (author.length() == 0) {
         myNextCommitAuthor = null;
@@ -679,6 +678,16 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
     public void restoreState() {
       refresh();
     }
+
+    @Override
+    public void onChangeListSelected(LocalChangeList list) {
+      Object data = list.getData();
+      if (data instanceof GitCommit) {
+        GitCommit commit = (GitCommit)data;
+        String author = String.format("%s <%s>", commit.getAuthor(), commit.getAuthorEmail());
+        myAuthor.getEditor().setItem(author);
+      }
+    }
   }
 
   public void setNextCommitIsPushed(Boolean nextCommitIsPushed) {
diff --git a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
index 93abb620c5d4..1920cafdabfb 100644
--- a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
+++ b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
@@ -197,12 +197,12 @@ public class GitCherryPicker {
     refreshChangedFiles(paths);
     final String commitMessage = createCommitMessage(commit, paths);
     LocalChangeList previouslyDefaultChangeList = myChangeListManager.getDefaultChangeList();
-    LocalChangeList changeList = createChangeListAfterUpdate(commit.getChanges(), paths, commitMessage);
+    LocalChangeList changeList = createChangeListAfterUpdate(commit, paths, commitMessage);
     return new CherryPickData(changeList, commitMessage, previouslyDefaultChangeList);
   }
 
   @NotNull
-  private LocalChangeList createChangeListAfterUpdate(@NotNull final List<Change> changes, @NotNull final Collection<FilePath> paths,
+  private LocalChangeList createChangeListAfterUpdate(@NotNull final GitCommit commit, @NotNull final Collection<FilePath> paths,
                                                       @NotNull final String commitMessage) {
     final AtomicReference<LocalChangeList> changeList = new AtomicReference<LocalChangeList>();
     myPlatformFacade.invokeAndWait(new Runnable() {
@@ -210,7 +210,7 @@ public class GitCherryPicker {
       public void run() {
         myChangeListManager.invokeAfterUpdate(new Runnable() {
                                                 public void run() {
-                                                  changeList.set(createChangeList(changes, commitMessage));
+                                                  changeList.set(createChangeList(commit, commitMessage));
                                                 }
                                               }, InvokeAfterUpdateMode.SYNCHRONOUS_NOT_CANCELLABLE, "Cherry-pick",
                                               new Consumer<VcsDirtyScopeManager>() {
@@ -362,9 +362,10 @@ public class GitCherryPicker {
   }
 
   @NotNull
-  private LocalChangeList createChangeList(@NotNull List<Change> changes, @NotNull String commitMessage) {
+  private LocalChangeList createChangeList(@NotNull GitCommit commit, @NotNull String commitMessage) {
+    List<Change> changes = commit.getChanges();
     if (!changes.isEmpty()) {
-      final LocalChangeList changeList = myChangeListManager.addChangeList(commitMessage, commitMessage);
+      final LocalChangeList changeList = ((ChangeListManagerEx)myChangeListManager).addChangeList(commitMessage, commitMessage, commit);
       myChangeListManager.moveChangesTo(changeList, changes.toArray(new Change[changes.size()]));
       myChangeListManager.setDefaultChangeList(changeList);
       return changeList;

From 50deed4a16e9c4a99d6c6da3a1088bb7b5621ce3 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 6 Dec 2012 15:54:53 +0400
Subject: [PATCH 18/23] [git] IDEA-90566 Persist author date on cherry-pick

Remember the date on commit dialog show and use it on commit.
Transform the date to ISO 8601 standard accepted by Git.
---
 .../checkin/GitCheckinEnvironment.java        | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
index 91fb4ea99c2b..3516dd0e4a82 100644
--- a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
+++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
@@ -60,6 +60,7 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import java.awt.*;
 import java.io.*;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.List;
 
@@ -72,13 +73,14 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
   @NonNls private static final String GIT_COMMIT_MSG_FILE_EXT = ".txt"; // the file extension for commit message file
 
   private final Project myProject;
+  public static final SimpleDateFormat COMMIT_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
   private final VcsDirtyScopeManager myDirtyScopeManager;
   private final GitVcsSettings mySettings;
 
   private String myNextCommitAuthor = null; // The author for the next commit
   private boolean myNextCommitAmend; // If true, the next commit is amended
   private Boolean myNextCommitIsPushed = null; // The push option of the next commit
-
+  private Date myNextCommitAuthorDate;
 
   public GitCheckinEnvironment(@NotNull Project project, @NotNull final VcsDirtyScopeManager dirtyScopeManager, final GitVcsSettings settings) {
     myProject = project;
@@ -177,7 +179,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
               Set<FilePath> files = new HashSet<FilePath>();
               files.addAll(added);
               files.addAll(removed);
-              commit(myProject, root, files, messageFile, myNextCommitAuthor, myNextCommitAmend);
+              commit(myProject, root, files, messageFile, myNextCommitAuthor, myNextCommitAmend, myNextCommitAuthorDate);
             }
             catch (VcsException ex) {
               if (!isMergeCommit(ex)) {
@@ -439,12 +441,15 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
   /**
    * Prepare delete files handler.
    *
-   * @param project          the project
-   * @param root             a vcs root
-   * @param files            a files to commit
-   * @param message          a message file to use
-   * @param nextCommitAuthor a author for the next commit
-   * @param nextCommitAmend  true, if the commit should be amended
+   *
+   *
+   * @param project              the project
+   * @param root                 a vcs root
+   * @param files                a files to commit
+   * @param message              a message file to use
+   * @param nextCommitAuthor     a author for the next commit
+   * @param nextCommitAmend      true, if the commit should be amended
+   * @param nextCommitAuthorDate Author date timestamp to override the date of the commit or null if this overriding is not needed.
    * @return a simple handler that does the task
    * @throws VcsException in case of git problem
    */
@@ -453,7 +458,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
                              Collection<FilePath> files,
                              File message,
                              final String nextCommitAuthor,
-                             boolean nextCommitAmend)
+                             boolean nextCommitAmend, Date nextCommitAuthorDate)
     throws VcsException {
     boolean amend = nextCommitAmend;
     for (List<String> paths : VcsFileUtil.chunkPaths(root, files)) {
@@ -469,6 +474,9 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
       if (nextCommitAuthor != null) {
         handler.addParameters("--author=" + nextCommitAuthor);
       }
+      if (nextCommitAuthorDate != null) {
+        handler.addParameters("--date", COMMIT_DATE_FORMAT.format(nextCommitAuthorDate));
+      }
       handler.endOptions();
       handler.addParameters(paths);
       handler.run();
@@ -558,6 +566,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
     myNextCommitAmend = false;
     myNextCommitAuthor = null;
     myNextCommitIsPushed = null;
+    myNextCommitAuthorDate = null;
   }
 
   /**
@@ -576,6 +585,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
      * The amend checkbox
      */
     private final JCheckBox myAmend;
+    private Date myAuthorDate;
 
     /**
      * A constructor
@@ -670,6 +680,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
         mySettings.saveCommitAuthor(author);
       }
       myNextCommitAmend = myAmend.isSelected();
+      myNextCommitAuthorDate = myAuthorDate;
     }
 
     /**
@@ -686,6 +697,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
         GitCommit commit = (GitCommit)data;
         String author = String.format("%s <%s>", commit.getAuthor(), commit.getAuthorEmail());
         myAuthor.getEditor().setItem(author);
+        myAuthorDate = new Date(commit.getAuthorTime());
       }
     }
   }

From 723a71a9aecde087ad1efc59fa9f89d645f38d4d Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 6 Dec 2012 15:56:23 +0400
Subject: [PATCH 19/23] [git] rename method

---
 .../src/git4idea/history/browser/GitCherryPicker.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
index 1920cafdabfb..68a6a210f852 100644
--- a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
+++ b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
@@ -154,7 +154,7 @@ public class GitCherryPicker {
                                                                                       @NotNull GitCommitWrapper commit,
                                                                                       @NotNull List<GitCommitWrapper> successfulCommits) {
     CherryPickData data = updateChangeListManager(commit.getCommit());
-    boolean committed = showCommitDialog(repository, commit, data.myChangeList, data.myCommitMessage);
+    boolean committed = showCommitDialogAndWaitForCommit(repository, commit, data.myChangeList, data.myCommitMessage);
     if (committed) {
       removeChangeList(data);
       successfulCommits.add(commit);
@@ -234,8 +234,8 @@ public class GitCherryPicker {
     return message;
   }
 
-  private boolean showCommitDialog(@NotNull final GitRepository repository, @NotNull final GitCommitWrapper commit,
-                                   @NotNull final LocalChangeList changeList, @NotNull final String commitMessage) {
+  private boolean showCommitDialogAndWaitForCommit(@NotNull final GitRepository repository, @NotNull final GitCommitWrapper commit,
+                                                   @NotNull final LocalChangeList changeList, @NotNull final String commitMessage) {
     final AtomicBoolean commitSucceeded = new AtomicBoolean();
     final Semaphore sem = new Semaphore(0);
     myPlatformFacade.invokeAndWait(new Runnable() {

From afe5252868145601cb1bbf495e653121d6e4949b Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 6 Dec 2012 16:16:50 +0400
Subject: [PATCH 20/23] [vcs] If a RuntimeException happens on commit, treat it
 as failure not a success

Just add the exception to the processor.
---
 .../openapi/vcs/changes/ui/CommitHelper.java   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
index df86e92215db..7d591bde1e52 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
@@ -209,14 +209,18 @@ public class CommitHelper {
       processor.doBeforeRefresh();
 
       AbstractVcsHelper.getInstance(myProject).showErrors(processor.getVcsExceptions(), myActionName);
-    } catch (Exception e) {
+    }
+    catch (RuntimeException e) {
       LOG.error(e);
-      if (e instanceof RuntimeException) {
-        throw (RuntimeException) e;
-      } else {
-        throw new RuntimeException(e);
-      }
-    } finally {
+      processor.myVcsExceptions.add(new VcsException(e));
+      throw e;
+    }
+    catch (Throwable e) {
+      LOG.error(e);
+      processor.myVcsExceptions.add(new VcsException(e));
+      throw new RuntimeException(e);
+    }
+    finally {
       commitCompleted(processor.getVcsExceptions(), processor);
       processor.customRefresh();
       WaitForProgressToShow.runOrInvokeLaterAboveProgress(new Runnable() {

From d4e2a395eb052036c8d30ce8c6e72c2a0f17df77 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 6 Dec 2012 16:53:31 +0400
Subject: [PATCH 21/23] [git] Fix tests on cherry-pick

Process customResultHandler in MockVcsHelper#commit.
---
 .../com/intellij/dvcs/test/MockVcsHelper.java      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java b/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
index e14bd69fe468..da3acfb17603 100644
--- a/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
+++ b/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
@@ -188,7 +188,19 @@ public class MockVcsHelper extends AbstractVcsHelper {
   public boolean commitChanges(@NotNull Collection<Change> changes, @NotNull LocalChangeList initialChangeList,
                                @NotNull String commitMessage, @Nullable CommitResultHandler customResultHandler) {
     if (myCommitHandler != null) {
-      return myCommitHandler.commit(commitMessage);
+      boolean success = myCommitHandler.commit(commitMessage);
+      if (customResultHandler != null) {
+        if (success) {
+          customResultHandler.onSuccess(commitMessage);
+        }
+        else {
+          customResultHandler.onFailure();
+        }
+      }
+      return success;
+    }
+    if (customResultHandler != null) {
+      customResultHandler.onFailure();
     }
     return false;
   }

From 317b8d46952312ef3b996b7b902e9ca5d83c02cb Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 6 Dec 2012 16:54:26 +0400
Subject: [PATCH 22/23] [git] Display the original commit message on
 cherry-pick (without "cherry-picked from").

---
 .../src/git4idea/history/browser/GitCherryPicker.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
index 68a6a210f852..e29c20aae7b2 100644
--- a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
+++ b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
@@ -349,7 +349,7 @@ public class GitCherryPicker {
 
   @NotNull
   private static String commitDetails(@NotNull GitCommitWrapper commit) {
-    return commit.getCommit().getShortHash().toString() + " \"" + commit.getSubject() + "\"";
+    return commit.getCommit().getShortHash().toString() + " \"" + commit.getOriginalSubject() + "\"";
   }
 
   private void refreshChangedFiles(@NotNull Collection<FilePath> filePaths) {
@@ -493,6 +493,10 @@ public class GitCherryPicker {
     public GitCommit getCommit() {
       return myOriginalCommit;
     }
+
+    public String getOriginalSubject() {
+      return myOriginalCommit.getSubject();
+    }
   }
 
 }

From 49b71d0b8152a12223aa049fba519dd4a3a1e29e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 6 Dec 2012 12:37:19 +0100
Subject: [PATCH 23/23] Do not mix Java/AspectJ compiler options

---
 .../jetbrains/jps/incremental/java/JavaBuilder.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
index 40c5c958a766..7c70eb85064c 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
@@ -476,14 +476,20 @@ public class JavaBuilder extends ModuleLevelBuilder {
     return cached;
   }
 
-  public static List<String> getCompilationOptions(CompileContext context, ModuleChunk chunk, @Nullable ProcessorConfigProfile profile) {
+  private static List<String> getCompilationOptions(CompileContext context, ModuleChunk chunk, @Nullable ProcessorConfigProfile profile) {
     List<String> cached = JAVAC_OPTIONS.get(context);
     if (cached == null) {
       loadCommonJavacOptions(context);
       cached = JAVAC_OPTIONS.get(context);
+      assert cached != null : context;
     }
 
-    final List<String> options = new ArrayList<String>(cached);
+    List<String> options = new ArrayList<String>(cached);
+    addCompilationOptions(options, context, chunk, profile);
+    return options;
+  }
+
+  public static void addCompilationOptions(List<String> options, CompileContext context, ModuleChunk chunk, @Nullable ProcessorConfigProfile profile) {
     if (!isEncodingSet(options)) {
       final CompilerEncodingConfiguration config = context.getProjectDescriptor().getEncodingConfiguration();
       final String encoding = config.getPreferredModuleChunkEncoding(chunk);
@@ -574,8 +580,6 @@ public class JavaBuilder extends ModuleLevelBuilder {
     else {
       options.add("-proc:none");
     }
-
-    return options;
   }
 
   private static String getLanguageLevel(JpsModule module) {