From 1d804abce77dc3e3e26973aece3bac7b821e91f4 Mon Sep 17 00:00:00 2001 From: Vojtech Krasa Date: Wed, 17 Apr 2013 21:27:41 +0200 Subject: [PATCH] IDEA-105387 svn working copy root should never be marked as ignored --- .../org/jetbrains/idea/svn/SvnChangeProviderContext.java | 4 +++- plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) 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 dbc78b2799d8..18d6faf9e814 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java @@ -941,6 +941,15 @@ public class SvnVcs extends AbstractVcs { } } + 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;