Snapshot 568f05589922685b8c8f9a2f2f465043b8128542 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: I47fe8cb5d8a3c9876cd4c313dca1a8cc531288ec

4 files changed, 26 insertions, 17 deletions

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java
index a9bfd234985e..40c34d394590 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java
@@ -235,7 +235,9 @@ class SvnChangeProviderContext implements StatusReceiver {
         myChangelistBuilder.processLocallyDeletedFile(createLocallyDeletedChange(filePath, status));
       }
       else if (SvnVcs.svnStatusIs(status, SVNStatusType.STATUS_IGNORED)) {
-        myChangelistBuilder.processIgnoredFile(filePath.getVirtualFile());
+        if (!myVcs.isWcRoot(filePath)) {
+          myChangelistBuilder.processIgnoredFile(filePath.getVirtualFile());
+        }
       }
       else if (status.isCopied()) {
         //
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
index dfbf6e8aa73b..4120dad1d7ec 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
@@ -942,6 +942,15 @@ public class SvnVcs extends AbstractVcs<CommittedChangeList> {
     }
   }
 
+  public boolean isWcRoot(FilePath filePath) {
+    boolean isWcRoot = false;
+    WorkingCopy wcRoot = myRootsToWorkingCopies.getWcRoot(filePath.getVirtualFile());
+    if (wcRoot != null) {
+      isWcRoot = wcRoot.getFile().getAbsolutePath().equals(filePath.getIOFile().getAbsolutePath());
+    }
+    return isWcRoot;
+  }
+
   private static class JavaSVNDebugLogger extends SVNDebugLogAdapter {
     private final boolean myLoggingEnabled;
     private final boolean myLogNative;
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java
index 97420a765ce0..620bc38f6ece 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java
@@ -284,13 +284,10 @@ public class ToBeMergedDialog extends DialogWrapper implements MergeDialogI {
       }
     };
     myRevisionsList.getExpandableItemsHandler().setEnabled(false);
-    new TableViewSpeedSearch(myRevisionsList) {
+    new TableViewSpeedSearch<CommittedChangeList>(myRevisionsList) {
       @Override
-      protected String getElementText(Object element) {
-        if (element instanceof CommittedChangeList) {
-          return ((CommittedChangeList) element).getComment();
-        }
-        return null;
+      protected String getItemText(@NotNull CommittedChangeList element) {
+        return element.getComment();
       }
     };
     final ListTableModel<CommittedChangeList> flatModel = new ListTableModel<CommittedChangeList>(FAKE_COLUMN);
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java
index a1b7360206e7..14d1b4c42897 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 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.
@@ -55,7 +55,6 @@ import com.intellij.util.Processor;
 import com.intellij.util.concurrency.Semaphore;
 import com.intellij.util.io.ZipUtil;
 import com.intellij.util.ui.UIUtil;
-import junit.framework.Assert;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -71,6 +70,8 @@ import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -98,9 +99,9 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
 
   public static void imitateEvent(VirtualFile dir) {
     final VirtualFile child = dir.findChild(".svn");
-    org.junit.Assert.assertNotNull(child);
+    assertNotNull(child);
     final VirtualFile wcdb = child.findChild("wc.db");
-    org.junit.Assert.assertNotNull(wcdb);
+    assertNotNull(wcdb);
 
     final BulkFileListener listener = ApplicationManager.getApplication().getMessageBus().syncPublisher(VirtualFileManager.VFS_CHANGES);
     final VFileContentChangeEvent event =
@@ -299,7 +300,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
     final File rootFile = new File(subTree.myRootDir.getPath());
     FileUtil.delete(rootFile);
     FileUtil.delete(new File(myWorkingCopyDir.getPath() + File.separator + ".svn"));
-    Assert.assertTrue(!rootFile.exists());
+    assertTrue(!rootFile.exists());
     sleep(200);
     myWorkingCopyDir.refresh(false, true);
 
@@ -377,7 +378,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
       if (deleted) break;
       sleep(200);
     }
-    Assert.assertTrue(deleted);
+    assertTrue(deleted);
     sleep(200);
     myWorkingCopyDir.refresh(false, true);
 
@@ -420,7 +421,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
     final File rootFile = new File(subTree.myRootDir.getPath());
     FileUtil.delete(rootFile);
     FileUtil.delete(new File(myWorkingCopyDir.getPath() + File.separator + ".svn"));
-    Assert.assertTrue(!rootFile.exists());
+    assertTrue(!rootFile.exists());
     sleep(200);
     myWorkingCopyDir.refresh(false, true);
 
@@ -439,7 +440,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
 
     if (updateExternal) {
       myWorkingCopyDir.refresh(false, true);
-      Assert.assertTrue(new File(sourceDir, "external").exists());
+      assertTrue(new File(sourceDir, "external").exists());
     }
     // above is preparation
 
@@ -458,7 +459,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
     final File tmpWc = FileUtil.createTempDirectory("hhh", "");
     runInAndVerifyIgnoreOutput("co", myAnotherRepoUrl, tmpWc.getPath());
     final VirtualFile tmpWcVf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(tmpWc);
-    Assert.assertNotNull(tmpWcVf);
+    assertNotNull(tmpWcVf);
     final SubTree tree = new SubTree(tmpWcVf);
     runInAndVerifyIgnoreOutput(tmpWc, "add", "root");
     runInAndVerifyIgnoreOutput(tmpWc, "ci", "-m", "fff");
@@ -531,7 +532,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
     return new Processor<ProcessOutput>() {
       @Override
       public boolean process(ProcessOutput output) {
-        Assert.assertEquals(output.getStderr(), 0, output.getExitCode());
+        assertEquals(output.getStderr(), 0, output.getExitCode());
         return false;
       }
     };