p4 integration should handle file move regardless of its cached file status, more...

diff --git a/platform/util/src/com/intellij/util/containers/MultiMap.java b/platform/util/src/com/intellij/util/containers/MultiMap.java
index 459f76efbd19b5d0cd8247abc019269319e7d134..53ed1d6b92eb7ce5ee638aee3f698e1e45503f5e 100644 (file)
--- a/platform/util/src/com/intellij/util/containers/MultiMap.java
+++ b/platform/util/src/com/intellij/util/containers/MultiMap.java
@@ -246,4 +246,9 @@ public class MultiMap<K, V> implements Serializable {
   public int hashCode() {
     return myMap.hashCode();
   }
+
+  @Override
+  public String toString() {
+    return myMap.toString();
+  }
 }

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java
index 9c2c9a0d03b165a5f6d2d6ed414e04ce7fe1e5f6..f43664e0c01da9a0f614feeb5edd3bda9a5bd50e 100644 (file)
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java
@@ -240,6 +240,9 @@ public abstract class VcsVFSListener implements Disposable {
     }
   }
 
+  protected boolean filterOutUnknownFiles() {
+    return true;
+  }
 
   protected void processMovedFile(VirtualFile file, String newParentPath, String newName) {
     final FileStatus status = FileStatusManager.getInstance(myProject).getStatus(file);
@@ -249,7 +252,7 @@ public abstract class VcsVFSListener implements Disposable {
         myDirtyFiles.add(file); // will be at new path
       }
     }
-    if (status != FileStatus.UNKNOWN && status != FileStatus.IGNORED) {
+    if (!(filterOutUnknownFiles() && status == FileStatus.UNKNOWN) && status != FileStatus.IGNORED) {
       final String newPath = newParentPath + "/" + newName;
       boolean foundExistingInfo = false;
       for (MovedFileInfo info : myMovedFiles) {

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java
index 7897453bc415397559f41c307eb99af38085eb88..cea2eed4b04bdab2670534f4e85ec82751ba398d 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java
@@ -17,7 +17,6 @@ package com.intellij.openapi.vcs.changes;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.newvfs.FileAttribute;
 import com.intellij.openapi.vfs.newvfs.ManagingFS;
@@ -81,15 +80,6 @@ public class LastUnchangedContentTracker {
     }
 
     LOG.assertTrue(contentId > 0, contentId);
-    if (ChangeListManagerImpl.DEBUG) {
-      System.out.println("LastUnchangedContentTracker.saveCurrentContent");
-      try {
-        System.out.println("content = " + VfsUtil.loadText(file));
-      }
-      catch (IOException e) {
-        e.printStackTrace();
-      }
-    }
 
     long stamp = file.getModificationStamp();
     try {