Merge remote-tracking branch 'origin/master'

platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java

@@ -444,11 +444,13 @@ public class FileWatcher {
   }
 
   private void writeLine(String line) throws IOException {
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("to fsnotifier: " + line);
+    }
+
+    final Process process = notifierProcess;
+    final BufferedWriter writer = notifierWriter;
     try {
-      if (LOG.isDebugEnabled()) {
-        LOG.debug("to fsnotifier: " + line);
-      }
-      final BufferedWriter writer = notifierWriter;
       if (writer != null) {
         writer.write(line);
         writer.newLine();
@@ -457,7 +459,6 @@ public class FileWatcher {
     }
     catch (IOException e) {
       try {
-        final Process process = notifierProcess;
         if (process != null) {
           process.exitValue();
         }

platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinEnvironment.java

@@ -67,4 +67,10 @@ public interface CheckinEnvironment extends VcsProviderMarker {
   List<VcsException> scheduleUnversionedFilesForAddition(List<VirtualFile> files);
 
   boolean keepChangeListAfterCommit(ChangeList changeList);
+
+  /**
+   * @return true if VFS refresh has to be performed after commit, because files might have changed during commit
+   * (for example, due to keyword substitution in SVN or read-only status in Perforce).
+   */
+  boolean isRefreshAfterCommitNeeded();
 }

platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java

@@ -378,11 +378,26 @@ public class CommitHelper {
     }
 
     public void customRefresh() {
+      final List<Change> toRefresh = new ArrayList<Change>();
+      ChangesUtil.processChangesByVcs(myProject, myIncludedChanges, new ChangesUtil.PerVcsProcessor<Change>() {
+        @Override
+        public void process(AbstractVcs vcs, List<Change> items) {
+          CheckinEnvironment ce = vcs.getCheckinEnvironment();
+          if (ce != null && ce.isRefreshAfterCommitNeeded()) {
+            toRefresh.addAll(items);
+          }
+        }
+      });
+
+      if (toRefresh.isEmpty()) {
+        return;
+      }
+      
       final ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
       if (indicator != null) {
         indicator.setText(VcsBundle.message("commit.dialog.refresh.files"));
       }
-      RefreshVFsSynchronously.updateChanges(myIncludedChanges);
+      RefreshVFsSynchronously.updateChanges(toRefresh);
     }
 
     public Runnable postRefresh() {

plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsCheckinEnvironment.java

@@ -138,4 +138,9 @@ public class CvsCheckinEnvironment implements CheckinEnvironment {
   public boolean keepChangeListAfterCommit(ChangeList changeList) {
     return false;
   }
+
+  @Override
+  public boolean isRefreshAfterCommitNeeded() {
+    return true;
+  }
 }

plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java

@@ -88,6 +88,11 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
     return false;
   }
 
+  @Override
+  public boolean isRefreshAfterCommitNeeded() {
+    return false;
+  }
+
   @Nullable
   public RefreshableOnComponent createAdditionalOptionsPanel(CheckinProjectPanel panel,
                                                              PairConsumer<Object, Object> additionalDataConsumer) {

plugins/git4idea/src/git4idea/commands/GitHandler.java

@@ -109,12 +109,6 @@ public abstract class GitHandler {
     myAppSettings = GitVcsApplicationSettings.getInstance();
     myProjectSettings = GitVcsSettings.getInstance(myProject);
     myEnv = new HashMap<String, String>(System.getenv());
-    if (!myEnv.containsKey("HOME")) {
-      String home = System.getProperty("user.home");
-      if (home != null) {
-        myEnv.put("HOME", home);
-      }
-    }
     myVcs = GitVcs.getInstance(project);
     myWorkingDirectory = directory;
     myCommandLine = new GeneralCommandLine();

plugins/hg4idea/src/org/zmlx/hg4idea/provider/commit/HgCheckinEnvironment.java

@@ -197,6 +197,11 @@ public class HgCheckinEnvironment implements CheckinEnvironment {
     return false;
   }
 
+  @Override
+  public boolean isRefreshAfterCommitNeeded() {
+    return false;
+  }
+
   private Map<VirtualFile, Set<HgFile>> getFilesByRepository(List<Change> changes) {
     Map<VirtualFile, Set<HgFile>> result = new HashMap<VirtualFile, Set<HgFile>>();
     for (Change change : changes) {

plugins/svn4idea/src/org/jetbrains/idea/svn17/checkin/SvnCheckinEnvironment17.java

@@ -365,6 +365,11 @@ public class SvnCheckinEnvironment17 implements CheckinEnvironment {
     return false;
   }
 
+  @Override
+  public boolean isRefreshAfterCommitNeeded() {
+    return true;
+  }
+
   private class KeepLocksComponent implements RefreshableOnComponent {
     private final JCheckBox myKeepLocksBox;
     private boolean myIsKeepLocks;

plugins/svn4ideaOld/src/org/jetbrains/idea/svn/checkin/SvnCheckinEnvironment.java

@@ -373,6 +373,11 @@ public class SvnCheckinEnvironment implements CheckinEnvironment {
     return false;
   }
 
+  @Override
+  public boolean isRefreshAfterCommitNeeded() {
+    return true;
+  }
+
   private class KeepLocksComponent implements RefreshableOnComponent {
     private final JCheckBox myKeepLocksBox;
     private boolean myIsKeepLocks;