Merge remote-tracking branch 'origin/master'
[idea/community.git] / plugins / svn4idea / src / org / jetbrains / idea / svn / history / SvnChangeList.java
index 8d0fb047ab1252e96620a2e664d0d99ec654b129..0be7f65cb1f5ae3c473b288b9dce6c131122920b 100644 (file)
@@ -27,7 +27,6 @@ import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.AbstractVcs;
 import com.intellij.openapi.vcs.FilePath;
-import com.intellij.openapi.vcs.FilePathImpl;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.*;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
@@ -369,12 +368,10 @@ public class SvnChangeList implements CommittedChangeList, VcsRevisionNumberAwar
           return Boolean.FALSE;
         }
       });
-      final SvnRepositoryContentRevision contentRevision =
-        SvnRepositoryContentRevision.create(myVcs, myRepositoryRoot, path, localPath, getRevision(isBeforeRevision));
-      if (knownAsDirectory) {
-        ((FilePathImpl) contentRevision.getFile()).setIsDirectory(true);
-      }
-      return contentRevision;
+      long revision = getRevision(isBeforeRevision);
+      return localPath == null
+             ? SvnRepositoryContentRevision.createForRemotePath(myVcs, myRepositoryRoot, path, knownAsDirectory, revision)
+             : SvnRepositoryContentRevision.create(myVcs, myRepositoryRoot, path, localPath, revision);
     }
 
     public List<Change> getList() {