diff --git a/fossil4idea.jar b/fossil4idea.jar new file mode 100644 index 0000000..8b1a8aa Binary files /dev/null and b/fossil4idea.jar differ diff --git a/src/org/github/irengrig/fossil4idea/commandLine/FossilTextCommand.java b/src/org/github/irengrig/fossil4idea/commandLine/FossilTextCommand.java index 6493187..bf4e3a9 100644 --- a/src/org/github/irengrig/fossil4idea/commandLine/FossilTextCommand.java +++ b/src/org/github/irengrig/fossil4idea/commandLine/FossilTextCommand.java @@ -7,7 +7,6 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; -import com.intellij.profile.ProfileManager; import org.jetbrains.annotations.NotNull; import java.io.File; diff --git a/src/org/github/irengrig/fossil4idea/util/RootUtil.java b/src/org/github/irengrig/fossil4idea/util/RootUtil.java index 0605cd3..63ef2b7 100644 --- a/src/org/github/irengrig/fossil4idea/util/RootUtil.java +++ b/src/org/github/irengrig/fossil4idea/util/RootUtil.java @@ -25,6 +25,7 @@ */ public class RootUtil { private final static String ourCheckoutFileName = "_FOSSIL_"; + private final static String newCheckoutFileName = ".fslckout"; public static List getFossilRoots(final VirtualFile[] roots) { if (roots == null || roots.length == 0) return Collections.emptyList(); @@ -34,7 +35,7 @@ public static List getFossilRoots(final VirtualFile[] roots) { new Processor() { @Override public boolean process(final VirtualFile virtualFile) { - if (ourCheckoutFileName.equals(virtualFile.getName())) { + if (ourCheckoutFileName.equals(virtualFile.getName()) || newCheckoutFileName.equals(virtualFile.getName())) { result.add(virtualFile.getParent()); } return true; @@ -50,7 +51,7 @@ public static File getWcRoot(final File file) { VirtualFile virtualFile = lfs.refreshAndFindFileByIoFile(current); while (current != null) { if (virtualFile != null) { - if (virtualFile.findChild(ourCheckoutFileName) != null) return new File(virtualFile.getPath()); + if (virtualFile.findChild(ourCheckoutFileName) != null || virtualFile.findChild(newCheckoutFileName) != null) return new File(virtualFile.getPath()); virtualFile = virtualFile.getParent(); } else { current = current.getParentFile();