MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'IDEA-105387' of git://github.com/krasa/intellij-community

Browse Source
This commit is contained in:
Kirill Likhodedov
2013-05-27 13:18:22 +04:00
parent 9dac4bfdc2 1d804abce7
commit 6ee5a381fc
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java
+3 -1
View File
@@ -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()) {
//
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+9
View File
@@ -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;